emul/fuse-utils
1
0
Fork 0
mirror of https://git.code.sf.net/p/fuse-emulator/fuse-utils synced 2025-07-31 06:04:29 +03:00
Code Activity

Fix exit code when passed bad operands.

Browse Source 
Legacy-ID: 5219
This commit is contained in:
Sergio Baldoví
2015-05-01 23:04:13 +00:00
parent 9e7be74051
commit aa3b1e3330
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hacking/ChangeLog
View File

@ -491,3 +491,4 @@
rzxcheck.1,rzxdump.1,rzxtool.1,scl2trd.1,snap2tzx.1,snapconv.1, rzxcheck.1,rzxdump.1,rzxtool.1,scl2trd.1,snap2tzx.1,snapconv.1,
tape2wav.1,tapeconv.1,tzxlist.1}: document --help and --version options tape2wav.1,tapeconv.1,tzxlist.1}: document --help and --version options
(Sergio). (Sergio).
20150502 rzxdump.c,scl2trd.c: fix exit code when passed bad operands (Sergio).

3
rzxdump.c
View File

@ -164,7 +164,8 @@ int main( int argc, char **argv )
} }
for( i = 0; i < argc; i++ ) { for( i = 0; i < argc; i++ ) {
do_file( argv[i] ); error = do_file( argv[i] );
if( error ) return error;
} }
return 0; return 0;

19
scl2trd.c
View File

@ -83,7 +83,7 @@ ui2lsb(unsigned char *mem, unsigned int value)
mem[3] = ret.b.b3; mem[3] = ret.b.b3;
} }
static void static int
Scl2Trd(char *oldname, char *newname) Scl2Trd(char *oldname, char *newname)
{ {
int TRD, SCL, i; int TRD, SCL, i;
@ -143,7 +143,7 @@ Scl2Trd(char *oldname, char *newname)
if ((TRD = open(newname, O_RDWR | O_BINARY)) == -1) { if ((TRD = open(newname, O_RDWR | O_BINARY)) == -1) {
printf("Error - cannot open TRD disk image %s !\n", newname); printf("Error - cannot open TRD disk image %s !\n", newname);
return; return 1;
} }
TRDh = malloc(4096); TRDh = malloc(4096);
@ -152,7 +152,7 @@ Scl2Trd(char *oldname, char *newname)
printf("Error - cannot read TRD header from %s\n", newname); printf("Error - cannot read TRD header from %s\n", newname);
close(TRD); close(TRD);
free(TRDh); free(TRDh);
return; return 1;
} }
tmp = (char *) TRDh + 0x8E5; tmp = (char *) TRDh + 0x8E5;
@ -270,18 +270,20 @@ Scl2Trd(char *oldname, char *newname)
Finish: Finish:
lseek(TRD, 0L, SEEK_SET); lseek(TRD, 0L, SEEK_SET);
bytes_written = write(TRD, TRDh, 4096); bytes_written = write(TRD, TRDh, 4096);
if (bytes_written < 4096) {
printf("Error - writing header to TRD file %s\n", newname);
}
close(TRD); close(TRD);
free(TRDh); free(TRDh);
return; if (bytes_written < 4096) {
printf("Error - writing header to TRD file %s\n", newname);
return 1;
}
return 0;
Abort: Abort:
close(SCL); close(SCL);
close(TRD); close(TRD);
free(TRDh); free(TRDh);
free(tmpscl); free(tmpscl);
return 1;
} }
static void static void
@ -391,7 +393,8 @@ main(int argc, char **argv)
return error; return error;
} }
Scl2Trd(options.sclfile, options.trdfile); error = Scl2Trd( options.sclfile, options.trdfile );
if( error ) return error;
return 0; return 0;
} }