Changeset 234

Timestamp:

03/22/07 20:58:37 (17 years ago)

Author:

r2d

Message:

• mpc2sv8 doesn't overwrite output file anymore

File:

• libmpc/branches/r2d/mpc2sv8/mpc2sv8.c (modified) (2 diffs)

libmpc/branches/r2d/mpc2sv8/mpc2sv8.c

@@ -103 +103 @@
 
         if (si.stream_version >= 8) {
-                fprintf(stderr, "Error : this file is already a sv8 file\n");
-                mpc_demux_exit(demux);
-                mpc_reader_exit_stdio(&reader);
-                return MPC_STATUS_INVALIDSV;
+                fprintf(stderr, "Error : the file \"%s\" is already a sv8 file\n", argv[1]);
+                exit(MPC_STATUS_INVALIDSV);
         }
 
         mpc_encoder_init(&e, si.samples, 6, 1);
+        e.outputFile = fopen( argv[2], "rb" );
+        if ( e.outputFile != 0 ) {
+                fprintf(stderr, "Error : output file \"%s\" already exists\n", argv[2]);
+                exit(MPC_STATUS_FILE);
+        }
         e.outputFile = fopen( argv[2], "w+b" );
         e.MS_Channelmode = si.ms;
@@ -120 +123 @@
                 size_t tmp_size = fread(buf, 1, mini(TMP_BUF_SIZE, r_size), in_file);
                 if (fwrite(buf, 1, tmp_size, e.outputFile) != tmp_size) {
-                        fprintf(stderr, "Error writing to target file\n");
-                        exit(!MPC_STATUS_OK);
+                        fprintf(stderr, "Error writing to target file : \"%s\"\n", argv[2]);
+                        exit(MPC_STATUS_FILE);
                 }
                 r_size -= tmp_size;