Changeset 2275 in MondoRescue

Timestamp:

Jul 13, 2009, 2:34:31 AM (16 years ago)

Author:

Bruno Cornec

Message:

r3261@localhost: bruno | 2009-07-13 00:27:16 +0200
Replace sprintf by mr_asprintf in libmondo-fork.c

File:

• branches/2.2.10/mondo/src/common/libmondo-fork.c (modified) (29 diffs)

branches/2.2.10/mondo/src/common/libmondo-fork.c

@@ -101 +101 @@
 
     /*@ buffers      *** */
-    char *midway_call, *ultimate_call, *tmp, *command, *incoming,
-        *old_stderr, *cd_number_str;
+    char *midway_call, *ultimate_call, *tmp, *incoming, *old_stderr; 
+        
+    char *cd_number_str = NULL;
+    char *command = NULL;
     char *p;
     char *tmp1 = NULL;
+    char *tmp2 = NULL;
 
 /*@***********   End Variables ***************************************/
@@ -123 +126 @@
         fatal_error("Cannot malloc tmp");
     }
-    if (!(command = malloc(1200))) {
-        fatal_error("Cannot malloc command");
-    }
     malloc_string(incoming);
     malloc_string(old_stderr);
-    malloc_string(cd_number_str);
 
     incoming[0] = '\0';
@@ -139 +138 @@
     }
 
-    sprintf(cd_number_str, "%d", cd_no);
+    mr_asprintf(&cd_number_str, "%d", cd_no);
     resolve_naff_tokens(midway_call, tmp1, isofile, "_ISO_");
     resolve_naff_tokens(tmp, midway_call, cd_number_str, "_CD#_");
+    mr_free(cd_number_str);
+
     resolve_naff_tokens(ultimate_call, tmp, MONDO_LOGFILE, "_ERR_");
     log_msg(4, "basic call = '%s'", tmp1);
@@ -147 +148 @@
     log_msg(4, "tmp = '%s'", tmp);
     log_msg(4, "ultimate call = '%s'", ultimate_call);
-    sprintf(command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
+    mr_asprintf(&command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
 
     log_to_screen
@@ -153 +154 @@
     log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
             what_i_am_doing);
-    strcpy(tmp, command);
     if (bkpinfo->manual_cd_tray) {
-        p = strstr(tmp, "2>>");
+        mr_asprintf(&tmp2, "%s", command);
+        p = strstr(tmp2, "2>>");
         if (p) {
-            sprintf(p, "   ");
+            *p++ = ' ';
+            *p++ = ' ';
+            *p++ = ' ';
             while (*p == ' ') {
                 p++;
             }
-            for (; *p != ' '; p++) {
+            for (; (*p != ' ') && (*p != '\0'); p++) {
                 *p = ' ';
             }
         }
-        strcpy(command, tmp);
+        mr_free(command);
+        command = tmp2;
 #ifndef _XWIN
         if (!g_text_mode) {
@@ -179 +183 @@
             log_msg(2, "Basic call '%s' returned an error.", tmp1);
             popup_and_OK("Press ENTER to continue.");
-            popup_and_OK
-                ("mkisofs and/or cdrecord returned an error. CD was not created");
+            popup_and_OK("mkisofs and/or cdrecord returned an error. CD was not created");
         }
     }
@@ -186 +189 @@
     else {
         log_msg(3, "command = '%s'", command);
-//      yes_this_is_a_goto:
-        retval =
-            run_external_binary_with_percentage_indicator_NEW
-            (what_i_am_doing, command);
-    }
-
+        retval = run_external_binary_with_percentage_indicator_NEW(what_i_am_doing, command);
+    }
+    mr_free(command);
     mr_free(tmp1);
     paranoid_free(midway_call);
     paranoid_free(ultimate_call);
     paranoid_free(tmp);
-    paranoid_free(command);
     paranoid_free(incoming);
     paranoid_free(old_stderr);
-    paranoid_free(cd_number_str);
     return (retval);
 }
@@ -256 +254 @@
 {
     /*@ buffer ****************************************************** */
-    char callstr[MAX_STR_LEN * 2];
+    char *callstr = NULL;
     char incoming[MAX_STR_LEN * 2];
     char tmp[MAX_STR_LEN * 2];
+    char *tmp1 = NULL;
     char initial_label[MAX_STR_LEN * 2];
 
@@ -279 +278 @@
         return (1);
     }
-//  if (debug_level == TRUE) { debug_level=5; }
-
-    //  assert_string_is_neither_NULL_nor_zerolength(program);
 
     if (debug_level <= g_loglevel) {
@@ -287 +283 @@
         log_if_failure = TRUE;
     }
-    sprintf(callstr, "%s > %s/mondo-run-prog-thing.tmp 2> %s/mondo-run-prog-thing.err",
+    mr_asprintf(&callstr, "%s > %s/mondo-run-prog-thing.tmp 2> %s/mondo-run-prog-thing.err",
              program, bkpinfo->tmpdir, bkpinfo->tmpdir);
     while ((p = strchr(callstr, '\r'))) {
@@ -315 +311 @@
                 "--------------------------------start of output-----------------------------");
     }
-    sprintf(callstr, "cat %s/mondo-run-prog-thing.err >> %s/mondo-run-prog-thing.tmp 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
+    mr_free(callstr);
+
+    mr_asprintf(&callstr, "cat %s/mondo-run-prog-thing.err >> %s/mondo-run-prog-thing.tmp 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
     if (log_if_failure && system(callstr)) {
         log_OS_error("Command failed");
     }
-    sprintf(tmp, "%s/mondo-run-prog-thing.err", bkpinfo->tmpdir);
-    unlink(tmp);
-    sprintf(tmp, "%s/mondo-run-prog-thing.tmp", bkpinfo->tmpdir);
-    fin = fopen(tmp, "r");
+    mr_free(callstr);
+
+    mr_asprintf(&tmp1, "%s/mondo-run-prog-thing.err", bkpinfo->tmpdir);
+    unlink(tmp1);
+    mr_free(tmp1);
+
+    mr_asprintf(&tmp1, "%s/mondo-run-prog-thing.tmp", bkpinfo->tmpdir);
+    fin = fopen(tmp1, "r");
     if (fin) {
         for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin);
              fgets(incoming, MAX_STR_LEN, fin)) {
-            /* patch by Heiko Schlittermann */
             p = incoming;
             while (p && *p) {
@@ -334 +335 @@
                 }
             }
-            /* end of patch */
             strip_spaces(incoming);
             if ((res == 0 && log_if_success)
@@ -343 +343 @@
         paranoid_fclose(fin);
     }
-    unlink(tmp);
+    unlink(tmp1);
+    mr_free(tmp1);
+
     if ((res == 0 && log_if_success) || (res != 0 && log_if_failure)) {
         log_msg(0,
@@ -353 +355 @@
         }
     }
-//  else
-//    { log_msg (0, "-------------------------------ran w/ res=%d------------------------------", res); }
     return (res);
 }
@@ -379 +379 @@
 
     /*@ buffers **************************************************** */
-    char tmp[MAX_STR_LEN * 2];
-    char command[MAX_STR_LEN * 2];
-    char lockfile[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *command = NULL;
+    char *lockfile = NULL;
+    char tmp1[MAX_STR_LEN *2];
 
     /*@ end vars *************************************************** */
@@ -387 +388 @@
     assert_string_is_neither_NULL_nor_zerolength(basic_call);
 
-    sprintf(lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
-
-    sprintf(command,
+    mr_asprintf(&lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
+
+    mr_asprintf(&command,
             "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res",
             lockfile, basic_call, MONDO_LOGFILE, MONDO_LOGFILE, lockfile);
     open_evalcall_form(what_i_am_doing);
-    sprintf(tmp, "Executing %s", basic_call);
+    mr_asprintf(&tmp, "Executing %s", basic_call);
     log_msg(2, tmp);
+    mr_free(tmp);
+
     if (!(fin = popen(command, "r"))) {
         log_OS_error("Unable to popen-in command");
-        sprintf(tmp, "Failed utterly to call '%s'", command);
+        mr_asprintf(&tmp, "Failed utterly to call '%s'", command);
         log_to_screen(tmp);
+        mr_free(tmp);
+        mr_free(command);
+        mr_free(lockfile);
         return (1);
     }
+    mr_free(command);
+
     if (!does_file_exist(lockfile)) {
         log_to_screen("Waiting for external binary to start");
@@ -412 +420 @@
     while (does_file_exist(lockfile)) {
         while (!feof(fin)) {
-            if (!fgets(tmp, 512, fin))
+            if (!fgets(tmp1, 512, fin))
                 break;
-            log_to_screen(tmp);
+            log_to_screen(tmp1);
         }
         usleep(500000);
@@ -439 +447 @@
     close_evalcall_form();
     unlink(lockfile);
+    mr_free(lockfile);
+
     return (retval);
 }
@@ -458 +468 @@
 // if dir=='w' then copy from orig to archived
 // if dir=='r' then copy from archived to orig
-    char *tmp;
-    char *buf;
-    char filestr[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *buf = NULL;
+    char *filestr = NULL;
     long int bytes_to_be_read, bytes_read_in, bytes_written_out =
         0, bufcap, subsliceno = 0;
@@ -470 +481 @@
 
     log_msg(5, "Opening.");
-    if (!(tmp = malloc(tmpcap))) {
-        fatal_error("Failed to malloc() tmp");
-    }
-    tmp[0] = '\0';
+
     bufcap = 256L * 1024L;
     if (!(buf = malloc(bufcap))) {
@@ -482 +490 @@
         fin = f_orig;
         fout = f_archived;
-        sprintf(tmp, "%-64s", PIMP_START_SZ);
+        mr_asprintf(&tmp, "%-64s", PIMP_START_SZ);
         if (fwrite(tmp, 1, 64, fout) != 64) {
+            mr_free(tmp);
             fatal_error("Can't write the introductory block");
         }
+        mr_free(tmp);
+
         while (1) {
             bytes_to_be_read = bytes_read_in = fread(buf, 1, bufcap, fin);
@@ -491 +502 @@
                 break;
             }
-            sprintf(tmp, "%-64ld", bytes_read_in);
+            mr_asprintf(&tmp, "%-64ld", bytes_read_in);
             if (fwrite(tmp, 1, 64, fout) != 64) {
+                mr_free(tmp);
                 fatal_error("Cannot write introductory block");
             }
+            mr_free(tmp);
+
             log_msg(7,
                     "subslice #%ld --- I have read %ld of %ld bytes in from f_orig",
                     subsliceno, bytes_read_in, bytes_to_be_read);
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            sprintf(tmp, "%-64ld", subsliceno);
+            mr_asprintf(&tmp, "%-64ld", subsliceno);
             if (fwrite(tmp, 1, 64, fout) != 64) {
+                mr_free(tmp);
                 fatal_error("Cannot write post-thingy block");
             }
+            mr_free(tmp);
             log_msg(7, "Subslice #%d written OK", subsliceno);
             subsliceno++;
         }
-        sprintf(tmp, "%-64ld", 0L);
+        mr_asprintf(&tmp, "%-64ld", 0L);
         if (fwrite(tmp, 1, 64L, fout) != 64L) {
+            mr_free(tmp);
             fatal_error("Cannot write final introductory block");
         }
+        mr_free(tmp);
+
+        mr_asprintf(&tmp, "%-64s", PIMP_END_SZ);
+        if (fwrite(tmp, 1, 64, fout) != 64) {
+            mr_free(tmp);
+            fatal_error("Can't write the final block");
+        }
+        mr_free(tmp);
     } else {
         fin = f_archived;
         fout = f_orig;
-        if (fread(tmp, 1, 64L, fin) != 64L) {
+        if (!(tmp1 = malloc(tmpcap))) {
+            fatal_error("Failed to malloc() tmp");
+        }
+        if (fread(tmp1, 1, 64L, fin) != 64L) {
+            mr_free(tmp1);
             fatal_error("Cannot read the introductory block");
         }
-        log_msg(5, "tmp is %s", tmp);
-        if (!strstr(tmp, PIMP_START_SZ)) {
+        log_msg(5, "tmp1 is %s", tmp1);
+        if (!strstr(tmp1, PIMP_START_SZ)) {
+            mr_free(tmp1);
             fatal_error("Can't find intro blk");
         }
-        if (fread(tmp, 1, 64L, fin) != 64L) {
+        if (fread(tmp1, 1, 64L, fin) != 64L) {
+            mr_free(tmp1);
             fatal_error("Cannot read introductory blk");
         }
-        bytes_to_be_read = atol(tmp);
+        bytes_to_be_read = atol(tmp1);
         while (bytes_to_be_read > 0) {
-            log_msg(7, "subslice#%ld, bytes=%ld", subsliceno,
-                    bytes_to_be_read);
+            log_msg(7, "subslice#%ld, bytes=%ld", subsliceno, bytes_to_be_read);
             bytes_read_in = fread(buf, 1, bytes_to_be_read, fin);
             if (bytes_read_in != bytes_to_be_read) {
-                fatal_error
-                    ("Danger, WIll Robinson. Failed to read whole subvol from archives.");
+                mr_free(tmp1);
+                fatal_error("Danger, WIll Robinson. Failed to read whole subvol from archives.");
             }
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            if (fread(tmp, 1, 64, fin) != 64) {
+            if (fread(tmp1, 1, 64, fin) != 64) {
+                mr_free(tmp1);
                 fatal_error("Cannot read post-thingy block");
             }
-            if (atol(tmp) != subsliceno) {
-                log_msg(1, "Wanted subslice %ld but got %ld ('%s')",
-                        subsliceno, atol(tmp), tmp);
+            if (atol(tmp1) != subsliceno) {
+                log_msg(1, "Wanted subslice %ld but got %ld ('%s')", subsliceno, atol(tmp1), tmp1);
             }
             log_msg(7, "Subslice #%ld read OK", subsliceno);
             subsliceno++;
-            if (fread(tmp, 1, 64, fin) != 64) {
+            if (fread(tmp1, 1, 64, fin) != 64) {
+                mr_free(tmp1);
                 fatal_error("Cannot read introductory block");
             }
-            bytes_to_be_read = atol(tmp);
-        }
-    }
-
-//  log_msg(4, "Written %ld of %ld bytes", bytes_written_out, bytes_read_in);
-
-    if (direction == 'w') {
-        sprintf(tmp, "%-64s", PIMP_END_SZ);
-        if (fwrite(tmp, 1, 64, fout) != 64) {
-            fatal_error("Can't write the final block");
-        }
-    } else {
-        log_msg(1, "tmpA is %s", tmp);
-        if (!strstr(tmp, PIMP_END_SZ)) {
-            if (fread(tmp, 1, 64, fin) != 64) {
+            bytes_to_be_read = atol(tmp1);
+        }
+        log_msg(1, "tmpA is %s", tmp1);
+        if (!strstr(tmp1, PIMP_END_SZ)) {
+            if (fread(tmp1, 1, 64, fin) != 64) {
+                mr_free(tmp1);
                 fatal_error("Can't read the final block");
             }
-            log_msg(5, "tmpB is %s", tmp);
-            if (!strstr(tmp, PIMP_END_SZ)) {
-                sprintf(filestr, "%s/out.leftover", bkpinfo->tmpdir);
+            log_msg(5, "tmpB is %s", tmp1);
+            if (!strstr(tmp1, PIMP_END_SZ)) {
+                mr_asprintf(&filestr, "%s/out.leftover", bkpinfo->tmpdir);
                 ftmp = fopen(filestr, "w");
-                bytes_read_in = fread(tmp, 1, 64, fin);
+                mr_free(filestr);
+
+                bytes_read_in = fread(tmp1, 1, 64, fin);
                 log_msg(1, "bytes_read_in = %ld", bytes_read_in);
-//      if (bytes_read_in!=128+64) { fatal_error("Can't read the terminating block"); }
-                fwrite(tmp, 1, bytes_read_in, ftmp);
-                sprintf(tmp, "I am here - %lld", (long long)ftello(fin));
-//    log_msg(0, tmp);
-                fread(tmp, 1, tmpcap, fin);
-                log_msg(0, "tmp = '%s'", tmp);
-                fwrite(tmp, 1, tmpcap, ftmp);
+
+                fwrite(tmp1, 1, bytes_read_in, ftmp);
+                fread(tmp1, 1, tmpcap, fin);
+                log_msg(0, "tmp1 = '%s'", tmp1);
+                fwrite(tmp1, 1, tmpcap, ftmp);
                 fclose(ftmp);
+                mr_free(tmp1);
                 fatal_error("Missing terminating block");
             }
         }
+        mr_free(tmp1);
     }
 
     paranoid_free(buf);
-    paranoid_free(tmp);
     log_msg(3, "Successfully copied %ld bytes", bytes_written_out);
     return (retval);
@@ -600 +623 @@
 // BACKUP
     int res = -1;
-    char*command;
+    char*command = NULL;
 
     if (!does_file_exist(input_device)) {
@@ -608 +631 @@
         fatal_error("ntfsclone not found");
     }
-    malloc_string(command);
-    sprintf(command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
+    mr_asprintf(&command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
     res = run_program_and_log_output(command, 5);
-    paranoid_free(command);
+    mr_free(command);
+
     unlink(output_fname);
     return (res);
@@ -649 +672 @@
 
     /*@ buffers *********************************************************** */
-    char *command;
+    char *command = NULL;
     char *title;
     /*@ pointers ********************************************************** */
@@ -662 +685 @@
 
     malloc_string(title);
-    malloc_string(command);
     strcpy(title, tt);
-    sprintf(command, "%s 2>> %s", cmd, MONDO_LOGFILE);
+    mr_asprintf(&command, "%s 2>> %s", cmd, MONDO_LOGFILE);
     log_msg(3, "command = '%s'", command);
-    if ((res =
-         pthread_create(&childthread, NULL, run_prog_in_bkgd_then_exit,
-                        (void *) command))) {
+    if ((res = pthread_create(&childthread, NULL, run_prog_in_bkgd_then_exit, (void *) command))) {
         fatal_error("Unable to create an archival thread");
     }
@@ -693 +713 @@
         update_evalcall_form(percentage);
     }
+    mr_free(command);
+
     log_file_end_to_screen(MONDO_LOGFILE, "");
     close_evalcall_form();
@@ -702 +724 @@
     }
     log_msg(3, "Parent res = %d", res);
-    paranoid_free(command);
     paranoid_free(title);
     return (res);
@@ -720 +741 @@
 // RESTORE
     int res = -1;
-    char *command;
+    char *command = NULL;
 
     if ( !find_home_of_exe("ntfsclone")) {
         fatal_error("ntfsclone not found");
     }
-    malloc_string(command);
-    sprintf(command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
+    mr_asprintf(&command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
     res = run_program_and_log_output(command, 5);
-    paranoid_free(command);
+    mr_free(command);
     return (res);
 }