github.com/open-simh.simtools
1
0
Fork 0
mirror of https://github.com/open-simh/simtools.git synced 2026-05-04 06:58:32 +00:00
Code Issues Projects Releases Wiki Activity

Make messages consistent. Stop using fixed input buffer. Volset mount checks

Browse Source 
Use the VMS-style messages for all errors,warnings.

Allow selection of full message or just text in getmsg()

Use dynamic buffer for command input (except VMS).

Simplify command input and pre-processing.

Mount command improvements:
  If labels are specified, make sure they match the volumes
  Make sure number of devices specified matches hom block's volset count.
  Verify that all volumes claim to belong to the same volume set
  Verify that volumes are mounted in RVN order, and that labels match VOLSET.SYS
  When a volume set is mounted, announce its name.
  Improve cleanup on mount failure (more to do)

Remove obsolete/unused header.h
This commit is contained in:
Timothe Litt
2016-03-02 17:35:50 -05:00
parent 45e3b4e500
commit 2c8ee0b04c
11 changed files with 424 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
extracters/ods2/diskio.c
View File

@@ -40,7 +40,10 @@ unsigned read_count = 0;
unsigned write_count = 0;
#define MAX_DEVS 64
FILE *handles[1+MAX_DEVS];
struct handle {
FILE *fh;
int drive;
} handles[1+MAX_DEVS];
void phyio_show(void)
{
@@ -152,7 +155,6 @@ int diskio_showdrives( void ) {
}
if( n == 0 ) {
printf( "No drives assigned\n" );
sts = 0;
}
return sts;
}
@@ -177,7 +179,7 @@ unsigned phyio_init( int devlen,char *devnam,unsigned *handle,struct phyio_info
info->sectorsize = 0;
*handle = ~0;
for( hi = 1; hi < MAX_DEVS && handles[hi] != NULL; hi++ )
for( hi = 1; hi < MAX_DEVS && handles[hi].fh != NULL; hi++ )
;
if( hi >= MAX_DEVS ) {
@@ -195,11 +197,12 @@ unsigned phyio_init( int devlen,char *devnam,unsigned *handle,struct phyio_info
return SS$_NOSUCHFILE;
}
handles[hi] = openf ( diskfiles[i], (drives[i][3] & 1)? "rb+": "rb" );
if( handles[hi] == NULL ) {
handles[hi].fh = openf ( diskfiles[i], (drives[i][3] & 1)? "rb+": "rb" );
if( handles[hi].fh == NULL ) {
perror( diskfiles[i] );
return SS$_NOSUCHFILE;
}
handles[hi].drive = i;
++init_count;
@@ -208,25 +211,27 @@ unsigned phyio_init( int devlen,char *devnam,unsigned *handle,struct phyio_info
}
unsigned phyio_close(unsigned handle) {
if( handle == 0 || handle > MAX_DEVS || handles[handle] == NULL ) {
if( handle == 0 || handle > MAX_DEVS || handles[handle].fh == NULL ) {
return SS$_NOIOCHAN;
}
fclose ( handles[handle] );
handles[handle] = NULL;
fclose ( handles[handle].fh );
handles[handle].fh = NULL;
if( diskio_unmapdrive(drives[handles[handle].drive] ) == 0 )
abort();
return SS$_NORMAL;
}
unsigned phyio_read( unsigned handle,unsigned block,unsigned length,char *buffer ) {
if( handle == 0 || handle > MAX_DEVS || handles[handle] == NULL ) {
if( handle == 0 || handle > MAX_DEVS || handles[handle].fh == NULL ) {
return SS$_IVCHAN;
}
if( fseek( handles[handle], block * 512, SEEK_SET ) == -1 ) {
if( fseek( handles[handle].fh, block * 512, SEEK_SET ) == -1 ) {
perror( "seek" );
return SS$_DATACHECK;
}
if( fread( buffer, 1, length, handles[handle] ) != length ) {
if( fread( buffer, 1, length, handles[handle].fh ) != length ) {
perror( "read" );
return SS$_DATACHECK;
}
@@ -236,16 +241,16 @@ unsigned phyio_read( unsigned handle,unsigned block,unsigned length,char *buffer
}
unsigned phyio_write( unsigned handle,unsigned block,unsigned length,char *buffer ) {
if( handle == 0 || handle > MAX_DEVS || handles[handle] == NULL ) {
if( handle == 0 || handle > MAX_DEVS || handles[handle].fh == NULL ) {
return SS$_IVCHAN;
}
if( fseek( handles[handle], block * 512, SEEK_SET ) == -1 ) {
if( fseek( handles[handle].fh, block * 512, SEEK_SET ) == -1 ) {
perror( "seek" );
return SS$_DATACHECK;
}
abort();
if( fwrite( buffer, 1, length, handles[handle] ) != length ) {
if( fwrite( buffer, 1, length, handles[handle].fh ) != length ) {
perror( "write" );
return SS$_DATACHECK;
}