Changeset 2521 in MondoRescue

Timestamp:

Jan 4, 2010, 7:42:31 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3231@localhost (orig r2265): bruno | 2009-07-12 02:04:40 +0200

r3206@localhost: bruno | 2009-07-06 23:29:05 +0200

• Replace sprintf by mr_asprintf in libmondo-filelist.c

File:

• branches/2.2.9/mondo/src/common/libmondo-filelist.c (modified) (37 diffs)

branches/2.2.9/mondo/src/common/libmondo-filelist.c

@@ -78 +78 @@
 {
     /*@ buffers *********************** */
-    char *dev;
-    char *filelist;
-    char *tempfile;
-    char *cksumlist;
-    char *tmp;
+    char *dev = NULL;
+    char *filelist = NULL;
+    char *tempfile = NULL;
     long noof_sets;
 
@@ -92 +90 @@
     int i, retval = 0;
 
-    malloc_string(dev);
-    malloc_string(filelist);
-    malloc_string(tempfile);
-    malloc_string(cksumlist);
-    malloc_string(tmp);
     mvaddstr_and_log_it(g_currentY, 0, "Dividing filelist into sets");
 
     log_to_screen("Dividing filelist into sets. Please wait.");
     i = 0;
-    sprintf(filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
-    sprintf(cksumlist, "%s/cklist.full", bkpinfo->tmpdir);
+    mr_asprintf(&filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
     if (!does_file_exist(filelist)) {
         log_it("filelist %s not found", filelist);
+        mr_free(filelist);
         fatal_error("call_filelist_chopper() -- filelist not found!");
     }
 
-    noof_sets =
-        chop_filelist(filelist, bkpinfo->tmpdir,
-                      bkpinfo->optimal_set_size);
+    noof_sets = chop_filelist(filelist, bkpinfo->tmpdir, bkpinfo->optimal_set_size);
+    mr_free(filelist);
     estimate_noof_media_required(noof_sets);    // for cosmetic purposes
 
-    sprintf(tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(&tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
     if (!(fout = fopen(tempfile, "a"))) {
         log_OS_error("Cannot append to biggielist");
         retval++;
-        goto end_of_func;
-    }
+        mr_free(tempfile);
+        return (retval);
+    }
+    mr_free(tempfile);
+
     log_it(bkpinfo->image_devs);
 
     ptr = bkpinfo->image_devs;
 
+    malloc_string(dev);
     while (ptr && *ptr) {
         strcpy(dev, ptr);
@@ -140 +136 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
 
-  end_of_func:
-    paranoid_free(filelist);
-    paranoid_free(tempfile);
-    paranoid_free(cksumlist);
     paranoid_free(dev);
-    paranoid_free(tmp);
     return (retval);
 }
@@ -153 +144 @@
 int sort_file(char *orig_fname)
 {
-    char *tmp_fname;
-    char *command;
+    char *tmp_fname = NULL;
+    char *command = NULL;
     int retval = 0;
 
     log_msg(5, "Sorting file %s", orig_fname);
-    malloc_string(tmp_fname);
-    malloc_string(command);
-    sprintf(tmp_fname, "%s/sortfile", bkpinfo->tmpdir);
 
     if (!does_file_exist(orig_fname)) {
@@ -167 +155 @@
     }                           // no sense in trying to sort an empty file
 
-    sprintf(command, "sort %s > %s 2>> %s", orig_fname, tmp_fname,
-            MONDO_LOGFILE);
+    mr_asprintf(&tmp_fname, "%s/sortfile", bkpinfo->tmpdir);
+
+    mr_asprintf(&command, "sort %s > %s 2>> %s", orig_fname, tmp_fname, MONDO_LOGFILE);
     retval = system(command);
+    mr_free(command);
+
     if (retval) {
         log_msg(2, "Failed to sort %s - oh dear", orig_fname);
     } else {
-        log_msg(5, "Sorted %s --> %s OK. Copying it back to %s now",
-                orig_fname, tmp_fname, orig_fname);
-        sprintf(command, "mv -f %s %s", tmp_fname, orig_fname);
+        log_msg(5, "Sorted %s --> %s OK. Copying it back to %s now", orig_fname, tmp_fname, orig_fname);
+        mr_asprintf(&command, "mv -f %s %s", tmp_fname, orig_fname);
         retval += run_program_and_log_output(command, 5);
+        mr_free(command);
+
         if (retval) {
-            log_msg(2, "Failed to copy %s back to %s - oh dear", tmp_fname,
-                    orig_fname);
+            log_msg(2, "Failed to copy %s back to %s - oh dear", tmp_fname, orig_fname);
         } else {
             log_msg(5, "%s was sorted OK.", orig_fname);
         }
     }
-    paranoid_free(tmp_fname);
-    paranoid_free(command);
+    mr_free(tmp_fname);
     log_msg(5, "Finished sorting file %s", orig_fname);
     return (retval);
@@ -218 +208 @@
 
     /*@ buffers ************************************* */
-    char *outfname;
-    char *biggie_fname;
+    char *outfname = NULL;
+    char *biggie_fname = NULL;
     char *incoming;
-    char *tmp;
-    char *acl_fname;
-    char *xattr_fname;
+    char *tmp = NULL;
 
     /*@ pointers *********************************** */
@@ -233 +221 @@
     struct stat buf;
     int err = 0;
-
-    malloc_string(outfname);
-    malloc_string(biggie_fname);
-    incoming = malloc(MAX_STR_LEN * 2);
-    malloc_string(tmp);
-    malloc_string(acl_fname);
-    malloc_string(xattr_fname);
 
     assert_string_is_neither_NULL_nor_zerolength(filelist);
@@ -259 +240 @@
     curr_set_no = 0;
     curr_set_size = 0;
-    sprintf(outfname, "%s/filelist.%ld", outdir, curr_set_no);
-    sprintf(biggie_fname, "%s/biggielist.txt", outdir);
+    mr_asprintf(&outfname, "%s/filelist.%ld", outdir, curr_set_no);
+    mr_asprintf(&biggie_fname, "%s/biggielist.txt", outdir);
     log_it("outfname=%s; biggie_fname=%s", outfname, biggie_fname);
     if (!(fbig = fopen(biggie_fname, "w"))) {
         log_OS_error("Cannot openout biggie_fname");
         err++;
-        goto end_of_func;
+        mr_free(outfname);
+        mr_free(biggie_fname);
+        return (curr_set_no + 1);
     }
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error("Cannot openout outfname");
         err++;
-        goto end_of_func;
-    }
+        mr_free(outfname);
+        mr_free(biggie_fname);
+        return (curr_set_no + 1);
+    }
+    incoming = malloc(MAX_STR_LEN * 2);
+
     (void) fgets(incoming, MAX_STR_LEN * 2 - 1, fin);
     while (!feof(fin)) {
@@ -294 +281 @@
             siz = (long) (buf.st_size >> 10);
         }
-        if (siz > max_sane_size_for_a_file)
-// && strcmp(incoming+strlen(incoming)-4, ".bz2") && strcmp(incoming+strlen(incoming)-4, ".tbz"))
-        {
+        if (siz > max_sane_size_for_a_file) {
             fprintf(fbig, "%s\n", incoming);
         } else {
@@ -304 +289 @@
                 paranoid_fclose(fout);
                 sort_file(outfname);
+                mr_free(outfname);
                 curr_set_no++;
                 curr_set_size = 0;
-                sprintf(outfname, "%s/filelist.%ld", outdir, curr_set_no);
+
+                mr_asprintf(&outfname, "%s/filelist.%ld", outdir, curr_set_no);
                 if (!(fout = fopen(outfname, "w"))) {
                     log_OS_error("Unable to openout outfname");
                     err++;
-                    goto end_of_func;
+                    mr_free(outfname);
+                    mr_free(biggie_fname);
+                    paranoid_free(incoming);
+                    return (curr_set_no + 1);
                 }
-                sprintf(tmp, "Fileset #%ld chopped ", curr_set_no - 1);
                 update_evalcall_form((int) (lino * 100 / noof_lines));
-                /*              if (!g_text_mode) {newtDrawRootText(0,22,tmp);newtRefresh();} else {log_it(tmp);} */
             }
         }
         (void) fgets(incoming, MAX_STR_LEN * 2 - 1, fin);
     }
+    paranoid_free(incoming);
     paranoid_fclose(fin);
     paranoid_fclose(fout);
@@ -329 +318 @@
     g_noof_sets = curr_set_no;
     sort_file(outfname);
+    mr_free(outfname);
+
     sort_file(biggie_fname);
-    sprintf(outfname, "%s/LAST-FILELIST-NUMBER", outdir);
-    sprintf(tmp, "%ld", curr_set_no);
+    mr_free(biggie_fname);
+
+    mr_asprintf(&outfname, "%s/LAST-FILELIST-NUMBER", outdir);
+    mr_asprintf(&tmp, "%ld", curr_set_no);
     if (write_one_liner_data_file(outfname, tmp)) {
         log_OS_error
@@ -337 +330 @@
         err = 1;
     }
+    mr_free(tmp);
+    mr_free(outfname);
+
     if (curr_set_no == 0) {
-        sprintf(tmp, "Only one fileset. Fine.");
+        mr_asprintf(&tmp, "Only one fileset. Fine.");
     } else {
-        sprintf(tmp, "Filelist divided into %ld sets", curr_set_no + 1);
+        mr_asprintf(&tmp, "Filelist divided into %ld sets", curr_set_no + 1);
     }
     log_msg(1, tmp);
+    mr_free(tmp);
     close_evalcall_form();
     /* This is to work around an obscure bug in Newt; open a form, close it,
@@ -356 +353 @@
     }
 #endif
-  end_of_func:
-    paranoid_free(outfname);
-    paranoid_free(biggie_fname);
-    paranoid_free(incoming);
-    paranoid_free(tmp);
-    paranoid_free(acl_fname);
-    paranoid_free(xattr_fname);
     return (err ? 0 : curr_set_no + 1);
 }
@@ -452 +442 @@
     FILE *fin;
     FILE *pout;
-    char *pout_command;
+    char *pout_command = NULL;
     char *syscall;
     char *file_to_analyze;
@@ -463 +453 @@
         return (1);
     }
-    malloc_string(pout_command);
-    sprintf(pout_command, "gzip -c1 > %s", auxlist_fname);
+    mr_asprintf(&pout_command, "gzip -c1 > %s", auxlist_fname);
     if (!(pout = popen(pout_command, "w"))) {
         log_msg(1, "Cannot openout auxlist_fname %s", auxlist_fname);
         fclose(fin);
-        paranoid_free(pout_command);
+        mr_free(pout_command);
         return (4);
     }
+    mr_free(pout_command);
+
     malloc_string(file_to_analyze);
     for ((void)fgets(file_to_analyze, MAX_STR_LEN, fin); !feof(fin);
@@ -490 +481 @@
     paranoid_pclose(pout);
     paranoid_free(file_to_analyze);
-    paranoid_free(pout_command);
     return (0);
 }
@@ -497 +487 @@
 int get_acl_list(char *filelist, char *facl_fname)
 {
-    char *command;
+    char *command = NULL;
     int retval = 0;
 
     if (g_getfacl != NULL) {
-        malloc_string(command);
-        sprintf(command, "touch %s", facl_fname);
+        mr_asprintf(&command, "touch %s", facl_fname);
         run_program_and_log_output(command, 8);
-//      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
-        sprintf(command,
+        mr_free(command);
+
+        mr_asprintf(&command,
                 "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s",
                 filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
         log_it("%s",command);
         retval = system(command);
-        paranoid_free(command);
+        mr_free(command);
     }
     return (retval);
@@ -522 +512 @@
 
     if (g_getfattr != NULL) {
-        malloc_string(command);
-        sprintf(command, "touch %s", fattr_fname);
+        mr_asprintf(&command, "touch %s", fattr_fname);
         run_program_and_log_output(command, 8);
-        paranoid_free(command);
-//      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
+        mr_free(command);
         retval =
             gen_aux_list(filelist, "getfattr --en=hex -P -m - -d \"%s\"",
@@ -539 +527 @@
 {
     const int my_depth = 8;
-    char *command, *syscall_pin, *syscall_pout, *incoming;
-    char *current_subset_file, *current_master_file, *masklist;
+    char *command = NULL; 
+    char *syscall_pin = NULL;
+    char *syscall_pout = NULL;
+    char *incoming;
+    char *current_subset_file, *current_master_file;
+    char *masklist = NULL;
     int retval = 0;
     int i;
@@ -546 +538 @@
     FILE *pin, *pout, *faclin;
 
-    malloc_string(command);
     log_msg(1, "set_EXAT_list(%s, %s, %s)", orig_msklist,
             original_exat_fname, executable);
     if (!orig_msklist || !orig_msklist[0]
         || !does_file_exist(orig_msklist)) {
-        log_msg(1,
-                "No masklist provided. I shall therefore set ALL attributes.");
-        sprintf(command, "gzip -dc %s | %s --restore - 2>> %s",
-                original_exat_fname, executable, MONDO_LOGFILE);
+        log_msg(1, "No masklist provided. I shall therefore set ALL attributes.");
+        mr_asprintf(&command, "gzip -dc %s | %s --restore - 2>> %s", original_exat_fname, executable, MONDO_LOGFILE);
         log_msg(1, "command = %s", command);
         retval = system(command);
-        paranoid_free(command);
+        mr_free(command);
         log_msg(1, "Returning w/ retval=%d", retval);
         return (retval);
@@ -565 +554 @@
                 "original_exat_fname %s is empty or missing, so no need to set EXAT list",
                 original_exat_fname);
-        paranoid_free(command);
         return (0);
     }
     malloc_string(incoming);
-    malloc_string(masklist);
     malloc_string(current_subset_file);
     malloc_string(current_master_file);
-    malloc_string(syscall_pin);
-    malloc_string(syscall_pout);
-    sprintf(masklist, "%s/masklist", bkpinfo->tmpdir);
-    sprintf(command, "cp -f %s %s", orig_msklist, masklist);
+    mr_asprintf(&masklist, "%s/masklist", bkpinfo->tmpdir);
+    mr_asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
     run_program_and_log_output(command, 1);
+    mr_free(command);
+
     sort_file(masklist);
     current_subset_file[0] = current_master_file[0] = '\0';
-    sprintf(syscall_pin, "gzip -dc %s", original_exat_fname);
-    sprintf(syscall_pout, "%s --restore - 2>> %s", executable,
-            MONDO_LOGFILE);
-
-    log_msg(1, "syscall_pin = %s", syscall_pin);
+
+    mr_asprintf(&syscall_pout, "%s --restore - 2>> %s", executable, MONDO_LOGFILE);
     log_msg(1, "syscall_pout = %s", syscall_pout);
     pout = popen(syscall_pout, "w");
+    mr_free(syscall_pout);
+
     if (!pout) {
         log_it("Unable to openout to syscall_pout");
+        mr_free(masklist);
         return (1);
     }
+
+    mr_asprintf(&syscall_pin, "gzip -dc %s", original_exat_fname);
+    log_msg(1, "syscall_pin = %s", syscall_pin);
     pin = popen(syscall_pin, "r");
+    mr_free(syscall_pin);
+
     if (!pin) {
         pclose(pout);
@@ -601 +593 @@
         pclose(pout);
         log_it("Unable to openin masklist");
+        mr_free(masklist);
         return (1);
     }
@@ -674 +667 @@
 
     unlink(masklist);
+    mr_free(masklist);
+
     paranoid_free(current_subset_file);
     paranoid_free(current_master_file);
-    paranoid_free(syscall_pout);
-    paranoid_free(syscall_pin);
-    paranoid_free(masklist);
     paranoid_free(incoming);
-    paranoid_free(command);
     return (retval);
 }
@@ -718 +709 @@
     /*@ buffers ***************************************************** */
     char val_sz[MAX_STR_LEN];
-    char cfg_fname[MAX_STR_LEN];
-/*  char tmp[MAX_STR_LEN]; remove stan benoit apr 2002 */
+    char *cfg_fname = NULL;
 
     /*@ long ******************************************************** */
@@ -729 +719 @@
 
     strcpy(val_sz,"");
-    sprintf(cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
+    mr_asprintf(&cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
     read_cfg_var(cfg_fname, "last-filelist-number", val_sz);
+    mr_free(cfg_fname);
+
     val_i = atoi(val_sz);
     if (val_i <= 0) {
@@ -870 +862 @@
 
     /*@ buffers **************************************************** */
-    char command_to_open_fname[MAX_STR_LEN];
+    char *command_to_open_fname = NULL;
     char fname[MAX_STR_LEN];
     char tmp[MAX_STR_LEN];
+    char *tmp1 = NULL;
     int pos_in_fname;
     /*@ int ******************************************************** */
@@ -888 +881 @@
     }
     log_to_screen("Loading filelist");
-    sprintf(command_to_open_fname, "gzip -dc %s", filelist_fname);
-    sprintf(tmp, "zcat %s | wc -l", filelist_fname);
-    log_msg(6, "tmp = %s", tmp);
-    lines_in_filelist =
-        atol(call_program_and_get_last_line_of_output(tmp));
+    mr_asprintf(&tmp1, "zcat %s | wc -l", filelist_fname);
+    log_msg(6, "tmp1 = %s", tmp1);
+    lines_in_filelist = atol(call_program_and_get_last_line_of_output(tmp1));
+    mr_free(tmp1);
+
     if (lines_in_filelist < 3) {
         log_to_screen("Warning - surprisingly short filelist.");
@@ -907 +900 @@
     (filelist->down)->right = (filelist->down)->down = FALSE;
     (filelist->down)->expanded = (filelist->down)->selected = FALSE;
+
+    mr_asprintf(&command_to_open_fname, "gzip -dc %s", filelist_fname);
     if (!(pin = popen(command_to_open_fname, "r"))) {
         log_OS_error("Unable to openin filelist_fname");
+        mr_free(command_to_open_fname);
         return (NULL);
     }
+    mr_free(command_to_open_fname);
+
     open_evalcall_form("Loading filelist from disk");
     for ((void)fgets(fname, MAX_STR_LEN, pin); !feof(pin);
@@ -1205 +1203 @@
     /*@ buffers ***************************************************** */
     static char current_filename[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN + 2];
 
     /*@ end vars *************************************************** */
@@ -1225 +1222 @@
                      pathname[j] != '\0'
                      && pathname[j] == current_filename[j]; j++);
-                if (current_filename[j] == '/'
-                    || current_filename[j] == '\0') {
-                    node->selected = on_or_off;
-                    sprintf(tmp, "%s is now %s\n", current_filename,
-                            (on_or_off ? "ON" : "OFF"));
+                    if (current_filename[j] == '/'
+                        || current_filename[j] == '\0') {
+                        node->selected = on_or_off;
                 }
             }
@@ -1530 +1525 @@
     int i;
     FILE *fout;
-    char *command;
+    char *command = NULL;
     time_t time_of_last_full_backup = 0;
     struct stat statbuf;
@@ -1536 +1531 @@
     char *tmp2 = NULL;
 
-    malloc_string(command);
     malloc_string(tmp);
     malloc_string(g_skeleton_filelist);
@@ -1548 +1542 @@
     }
 // make hole for filelist
-    sprintf(command, "mkdir -p %s/archives", scratchdir);
+    mr_asprintf(&command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
+    mr_free(command);
+
     mr_asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
     make_hole_for_file(sz_filelist);
@@ -1555 +1551 @@
     if (differential == 0) {
         // restore last good datefile if it exists
-        sprintf(command, "cp -f %s.aborted %s", sz_datefile, sz_datefile);
+        mr_asprintf(&command, "cp -f %s.aborted %s", sz_datefile, sz_datefile);
         run_program_and_log_output(command, 3);
+        mr_free(command);
+
         // backup last known good datefile just in case :)
         if (does_file_exist(sz_datefile)) {
-            sprintf(command, "mv -f %s %s.aborted", sz_datefile,
+            mr_asprintf(&command, "mv -f %s %s.aborted", sz_datefile,
                     sz_datefile);
             paranoid_system(command);
+            mr_free(command);
         }
         make_hole_for_file(sz_datefile);
@@ -1583 +1582 @@
                 "Using the user-specified filelist - %s - instead of calculating one",
                 userdef_filelist);
-        sprintf(command, "cp -f %s %s", userdef_filelist, sz_filelist);
+        mr_asprintf(&command, "cp -f %s %s", userdef_filelist, sz_filelist);
         if (run_program_and_log_output(command, 3)) {
+            mr_free(command);
             fatal_error("Failed to copy user-specified filelist");
         }
+        mr_free(command);
     } else {
         log_msg(2, "include_paths = '%s'", include_paths);
@@ -1639 +1640 @@
     }
     log_msg(2, "Copying new filelist to scratchdir");
-    sprintf(command, "mkdir -p %s/archives", scratchdir);
+    mr_asprintf(&command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
-    sprintf(command, "cp -f %s %s/archives/", sz_filelist, scratchdir);
+    mr_free(command);
+
+    mr_asprintf(&command, "cp -f %s %s/archives/", sz_filelist, scratchdir);
     paranoid_system(command);
-    sprintf(command, "mv -f %s %s", sz_filelist, tmpdir);
+    mr_free(command);
+
+    mr_asprintf(&command, "mv -f %s %s", sz_filelist, tmpdir);
     paranoid_system(command);
+    mr_free(command);
+
     paranoid_free(sz_filelist);
     log_msg(2, "Freeing variables");
-    paranoid_free(command);
     paranoid_free(exclude_paths);
     paranoid_free(tmp);
@@ -1822 +1828 @@
         }
 
-/*
-      if (strlen(fname)>3 && fname[strlen(fname)-1]=='/') { fname[strlen(fname)-1] = '\0'; }
-      if (strlen(fname)==0) { continue; }
-      sprintf(temporary_string, "echo \"Looking for '%s'\" >> /tmp/looking.txt", fname);
-      system(temporary_string);
-*/
-
         log_msg(5, "Looking for '%s'", fname);
         found_node = find_string_at_node(filelist, fname);
         if (found_node) {
             if (found_node->selected) {
-//              if (use_star)
                 if (fname[0] == '/') {
                     strcpy(tmp, fname + 1);