github.com/open-simh.simtools
1
0
Fork 0
mirror of https://github.com/open-simh/simtools.git synced 2026-05-05 07:23:31 +00:00
Code Issues Projects Releases Wiki Activity

Remove fixed buffers in set default, simplify command_line processing

Browse Source 
Convert fixed buffers in set default to dynamic.

Remove unnecessary complexity in command_line assembly.
This commit is contained in:
Timothe Litt
2016-03-02 23:56:47 -05:00
parent 2c8ee0b04c
commit b2c51a08ad
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
extracters/ods2/ods2.c
View File

@@ -1405,12 +1405,13 @@ void setdef(char *newdef)
{ {
register unsigned sts; register unsigned sts;
struct dsc_descriptor defdsc; struct dsc_descriptor defdsc;
defdsc.dsc_a_pointer = newdef; defdsc.dsc_a_pointer = newdef;
defdsc.dsc_w_length = strlen(defdsc.dsc_a_pointer); defdsc.dsc_w_length = strlen(defdsc.dsc_a_pointer);
if ((sts = sys_setddir(&defdsc,NULL,NULL)) & 1) { if ((sts = sys_setddir(&defdsc,NULL,NULL)) & 1) {
setdef_count++; setdef_count++;
} else { } else {
printf("%%ODS2-E-SETDEF, Error %s setting default to %s\n",getmsg(sts, MSG_TEXT),newdef); printf( "%%ODS2-E-SETDEF, Error %s setting default to %s\n", getmsg(sts, MSG_TEXT), newdef );
} }
} }
@@ -1493,7 +1494,7 @@ unsigned set(int argc,char *argv[],int qualc,char *qualv[])
printf( "%%ODS2-E-NOQUAL, No qualifiers are permitted\n" ); printf( "%%ODS2-E-NOQUAL, No qualifiers are permitted\n" );
return 0; return 0;
} }
setdef(argv[2]); setdef( argv[2] );
return 1; return 1;
case 1:{ /* directory_qualifiers */ case 1:{ /* directory_qualifiers */
int options = checkquals(dir_default,dirquals,qualc,qualv); int options = checkquals(dir_default,dirquals,qualc,qualv);
@@ -1624,15 +1625,23 @@ unsigned domount(int argc,char *argv[],int qualc,char *qualv[])
sts = mount( ((options & mnt_write) != 0) | 2, devices, devs, labs, &vcb ); sts = mount( ((options & mnt_write) != 0) | 2, devices, devs, labs, &vcb );
if (sts & 1) { if (sts & 1) {
if (setdef_count == 0) { if (setdef_count == 0) {
char *colon,tmp[256],defdir[256]; char *colon, *buf;
size_t len;
snprintf( tmp, sizeof(tmp), "%s", vcb->vcbdev[0].dev->devnam); len = strlen( vcb->vcbdev[0].dev->devnam );
colon = strchr(tmp,':'); buf = (char *) malloc( len + sizeof( ":[000000]" ));
if (colon != NULL) *colon = '\0'; if( buf == NULL ) {
snprintf( defdir, sizeof(defdir), "%s:[000000]", tmp ); perror( "malloc" );
setdef(defdir); } else {
test_vcb = vcb; colon = strchr( vcb->vcbdev[0].dev->devnam, ':' );
if( colon != NULL ) len = (size_t)(colon - vcb->vcbdev[0].dev->devnam);
memcpy( buf, vcb->vcbdev[0].dev->devnam, len );
memcpy( buf+len, ":[000000]", sizeof( ":[000000]" ) );
setdef(buf);
free( buf );
}
} }
test_vcb = vcb;
} else { } else {
printf("%%ODS2-E-MOUNTERR, Mount failed with %s\n", getmsg(sts, MSG_TEXT)); printf("%%ODS2-E-MOUNTERR, Mount failed with %s\n", getmsg(sts, MSG_TEXT));
#ifdef DISKIMAGE #ifdef DISKIMAGE
@@ -2195,20 +2204,16 @@ int main(int argc,char *argv[])
int al; int al;
char *newp; char *newp;
if (command_line == NULL) {
command_line = (char *)malloc(1);
*command_line = '\0';
l = 0;
}
al = strlen(argv[i]); al = strlen(argv[i]);
newp = (char *)realloc(command_line,l+1+al+1); newp = (char *)realloc( command_line, l+(l != 0)+al+1 );
if( newp == NULL ) { if( newp == NULL ) {
perror( "realloc" ); perror( "realloc" );
exit (1); exit (1);
} }
command_line = newp; command_line = newp;
snprintf(command_line+l,1+al+1," %s",argv[i]); if( l != 0 ) command_line[l++] = ' ';
l += 1+al; memcpy( command_line+l, argv[i], al+1 );
l += al;
} }
} }
while( 1 ) { while( 1 ) {