Changeset 2230 in MondoRescue

Timestamp:

Jun 17, 2009, 10:53:23 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Simplify log_it calls when possible (with just a fixed string)
• issue with truncate_to_drive_name reported by valgrind at restore time. Needs rewrite IMO

Location:

branches/2.2.9/mondo/src

Files:

• common/libmondo-archive.c (modified) (5 diffs)
• common/libmondo-filelist.c (modified) (3 diffs)
• common/libmondo-mountlist.c (modified) (2 diffs)
• common/libmondo-stream.c (modified) (3 diffs)
• common/libmondo-string.c (modified) (2 diffs)
• common/libmondo-tools.c (modified) (3 diffs)
• common/libmondo-verify.c (modified) (6 diffs)
• common/newt-specific.c (modified) (4 diffs)
• mondorestore/mondo-prep.c (modified) (4 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (3 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (4 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (18 diffs)

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

@@ -1475 +1475 @@
                     maintain_collection_of_recent_archives(bkpinfo->tmpdir,
                                                        storing_afioball_fname);
-                    log_it("%s","Writing EXAT files");
+                    log_it("Writing EXAT files");
                     res +=
                         write_EXAT_files_to_tape(curr_xattr_list_fname,
@@ -1999 +1999 @@
     log_msg(1, "--> tmp = '%s'", tmp);
     if (strstr(tmp, "NTFS")) {
-        log_it("%s","TRUE");
+        log_it("TRUE");
         ret = TRUE;
     } else {
-        log_it("%s","FALSE");
+        log_it("FALSE");
         ret = FALSE;
     }
@@ -2271 +2271 @@
             register_in_tape_catalog(fileset, curr_set_no, -1, curr_afioball_fname);
             maintain_collection_of_recent_archives(bkpinfo->tmpdir, curr_afioball_fname);
-            log_it("%s","Writing EXAT files");
+            log_it("Writing EXAT files");
             res +=
                 write_EXAT_files_to_tape(curr_xattr_list_fname,
@@ -3450 +3450 @@
                  media_descriptor_string(g_backup_media_type));
             chdir("/");
-            log_it("%s","Before calling verification of image()");
+            log_it("Before calling verification of image()");
             if (bkpinfo->backup_media_type == usb) {
                 res += verify_usb_image();
@@ -3456 +3456 @@
                 res += verify_cd_image();
             }
-            log_it("%s","After calling verification of image()");
+            log_it("After calling verification of image()");
         }
         if (!res) {

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

@@ -592 +592 @@
     pout = popen(syscall_pout, "w");
     if (!pout) {
-        log_it("%s","Unable to openout to syscall_pout");
+        log_it("Unable to openout to syscall_pout");
         return (1);
     }
@@ -598 +598 @@
     if (!pin) {
         pclose(pout);
-        log_it("%s","Unable to openin from syscall");
+        log_it("Unable to openin from syscall");
         return (1);
     }
@@ -605 +605 @@
         pclose(pin);
         pclose(pout);
-        log_it("%s","Unable to openin masklist");
+        log_it("Unable to openin masklist");
         return (1);
     }

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

@@ -652 +652 @@
     /*@ buffers ********************************************************* */
     char *drive = NULL;
+    char *truncdrive = NULL;
 
     long long size;
@@ -676 +677 @@
         log_msg(8, "Putting %s with size %lli in list of drives", drive, size);
 
-        (void) truncate_to_drive_name(drive);
-        log_msg(8, "drive truncated to %s", drive);
+        truncdrive = truncate_to_drive_name(drive);
+        log_msg(8, "drive truncated to %s", truncdrive);
 
         for (j = 0;
              j < noof_drives
-             && strcmp(drivelist->el[j].device, drive) != 0; j++) {
+             && strcmp(drivelist->el[j].device, truncdrive) != 0; j++) {
             continue;
         }
         if (j == noof_drives) {
-            strncpy(drivelist->el[noof_drives++].device, drive, 63);
+            strcpy(drivelist->el[noof_drives++].device, truncdrive);
         }
         paranoid_free(drive);
+        paranoid_free(truncdrive);
     }
     drivelist->entries = noof_drives;

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

@@ -555 +555 @@
     last = g_tapecatalog->entries - 1;
     if (last <= 0) {
-        log_it("%s","Too early to start deleting from collection.");
+        log_it("Too early to start deleting from collection.");
         return (0);
     }
@@ -568 +568 @@
     }
     if (curr < 0) {
-        log_it("%s","Not far enough into tape to start deleting old archives from collection.");
+        log_it("Not far enough into tape to start deleting old archives from collection.");
         return (0);
     }
@@ -1716 +1716 @@
                    g_tape_stream) / 1024;
         if (g_sigpipe) {
-            log_it("%s","Sigpipe occurred recently. I'll start a new tape.");
+            log_it("Sigpipe occurred recently. I'll start a new tape.");
             fclose(fin);
             g_sigpipe = FALSE;

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

@@ -841 +841 @@
     int i = strlen(partition) - 1;
     char *c;
+    char *trunc = NULL;
+
+    mr_asprintf(&trunc, "%s", partition);
 
 #ifdef __FreeBSD__
 
-    if (islower(partition[i]))  // BSD subpartition
+    if (islower(trunc[i]))  // BSD subpartition
         i--;
-    if (partition[i - 1] == 's') {
-        while (isdigit(partition[i]))
+    if (trunc[i-1] == 's') {
+        while (isdigit(trunc[i]))
             i--;
         i--;
     }
-    partition[i + 1] = '\0';
+    trunc[i+1] = '\0';
 
 #else
@@ -857 +860 @@
     assert_string_is_neither_NULL_nor_zerolength(partition);
     /* first see if it's a devfs style device */
-    c = strrchr(partition, '/');
+    c = strrchr(trunc, '/');
     if (c && strncmp(c, "/part", 5) == 0) {
         /* yup it's devfs, return the "disc" path */
         strcpy(c + 1, "disc");
-        return partition;
+        return trunc;
     }
     /* then see if it's a dm style device */
     if (c && strncmp(c, "/dm-", 4) == 0) {
         /* yup it's dm, return the full path */
-        return partition;
-    }
-
-
-    for (i = strlen(partition); isdigit(partition[i - 1]); i--)
+        return trunc;
+    }
+
+
+    for (i = strlen(trunc); isdigit(trunc[i-1]); i--)
         continue;
-    if (partition[i - 1] == 'p' && isdigit(partition[i - 2])) {
+    if (trunc[i-1] == 'p' && isdigit(trunc[i-2])) {
         i--;
     } else {
         /* Some full devices like this /dev/mapper/mpath0
            /dev/cciss/c0d0 may be used as partition names */
-        if ((strstr(partition,"/dev/mapper/mpath") != NULL) ||
-            (strstr(partition,"/dev/cciss/c") != NULL) ||
-            (strstr(partition,"/dev/rd/") != NULL)) {
-                return partition;
+        if ((strstr(trunc,"/dev/mapper/mpath") != NULL) ||
+            (strstr(trunc,"/dev/cciss/c") != NULL) ||
+            (strstr(trunc,"/dev/rd/") != NULL)) {
+                return trunc;
             }
     }
-    partition[i] = '\0';
+    trunc[i] = '\0';
 
 #endif
 
-    return partition;
+    return trunc;
 }
 

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

@@ -1345 +1345 @@
 
     if (debug_level <= g_loglevel) {
-        va_start(args, fmt);
         if (!(fout = fopen(MONDO_LOGFILE, "a"))) {
             return;
@@ -1361 +1360 @@
                 fprintf(fout, "[TH=%d] %s->%s#%d: ", getpid(), szFile, szFunction, nLine);
         }
+        va_start(args, fmt);
         vfprintf(fout, fmt, args);
+        va_end(args);
 
         // do not slow down the progran if standard debug level
@@ -1368 +1369 @@
         //if (g_dwDebugLevel != 1)
 
-        va_end(args);
         fprintf(fout, "\n");
         paranoid_fclose(fout);

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

@@ -281 +281 @@
     }
 
-    log_it("%s","before vsbf");
+    log_it("before vsbf");
     sprintf(tmp, "Verifying %s#%d's big files",
             media_descriptor_string(bkpinfo->backup_media_type),
             g_current_media_number);
     open_evalcall_form(tmp);
-    log_it("%s","after vsbf");
+    log_it("after vsbf");
     sprintf(mountpoint, "%s/archives", mtpt);
     if (last_bigfile_num == -1) {
@@ -780 +780 @@
     res = read_header_block_from_stream(&size, fname, &ctrl_chr);
     if (ctrl_chr != BLK_START_AFIOBALLS) {
-        log_it("%s","YOU SHOULD NOT GET HERE");
-        log_it("%s","Grabbing the EXAT files");
+        log_it("YOU SHOULD NOT GET HERE");
+        log_it("Grabbing the EXAT files");
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             res =
@@ -805 +805 @@
         }
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-            log_it("%s","Reading EXAT files from tape");
+            log_it("Reading EXAT files from tape");
             res =
                 read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
@@ -895 +895 @@
     if (ctrl_chr != BLK_START_BIGGIEFILES) {
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-            log_it("%s","Grabbing the EXAT biggiefiles");
+            log_it("Grabbing the EXAT biggiefiles");
             res =
                 read_EXAT_files_from_tape(&size, orig_fname,
@@ -1019 +1019 @@
     paranoid_free(tmp);
     verify_afioballs_on_CD(mountpoint);
-    log_it("%s","before verify_all_slices");
+    log_it("before verify_all_slices");
     verify_all_slices_on_CD(mountpoint);
 
@@ -1141 +1141 @@
     }
     verify_afioballs_on_CD(mountpoint);
-    log_it("%s","before verify_all_slices");
+    log_it("before verify_all_slices");
     verify_all_slices_on_CD(mountpoint);
 

branches/2.2.9/mondo/src/common/newt-specific.c

@@ -1400 +1400 @@
         assert_string_is_neither_NULL_nor_zerolength(source_file);
 
-        log_it("%s","entering");
+        log_it("entering");
         if (!(fin = fopen(source_file, "r"))) {
             log_OS_error(source_file);
@@ -1483 +1483 @@
         }
         paranoid_free(tmp);
-        log_it("%s","leaving");
+        log_it("leaving");
         return (0);
     }
@@ -1499 +1499 @@
         char *tmp = NULL;
 
-        log_it("%s","entering");
+        log_it("entering");
         assert(flentry != NULL);
         if (flentry->severity == 0) {
@@ -1515 +1515 @@
         paranoid_free(tmp);
 
-        log_it("%s","leaving");
+        log_it("leaving");
         return (comment);
     }

branches/2.2.9/mondo/src/mondorestore/mondo-prep.c

@@ -240 +240 @@
 
 //  do_this_last[0] = '\0';
-    log_it("%s","STARTING");
+    log_it("STARTING");
     log_msg(1, "OK, opened i-want-my-lvm. Shutting down LVM volumes...");
     if (find_home_of_exe("lvm"))    // found it :) cool
@@ -417 +417 @@
     system("sync");
     sleep(1);
-    log_it("%s","ENDING");
+    log_it("ENDING");
     if (retval > 2) {
         log_msg(1, "%d errors. I'm reporting this.", retval);
@@ -1613 +1613 @@
             system("sync");
 #else
-            log_it("%s","New, kernel-friendly partition remover");
+            log_it("New, kernel-friendly partition remover");
             for (i = 20; i > 0; i--) {
                 fprintf(pout_to_fdisk, "d\n%d\n", i);
@@ -2591 +2591 @@
         log_it("--- Hugo, 2002/11/20");
     }
-    log_it("%s","Resizing mountlist");
+    log_it("Resizing mountlist");
     make_list_of_drives_in_mountlist(mountlist, drivelist);
-    log_it("%s","Back from MLoDiM");
+    log_it("Back from MLoDiM");
     for (driveno = 0; driveno < drivelist->entries; driveno++) {
         resize_drive_proportionately_to_suit_new_drives(mountlist,

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -576 +576 @@
 
     /* edit_mountlist if wanted */
-    log_it("%s","About to edit mountlist");
+    log_it("About to edit mountlist");
     if (g_text_mode) {
         save_mountlist_to_disk(mountlist, g_mountlist_fname);
@@ -585 +585 @@
         res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
     }
-    log_it("%s","Finished editing mountlist");
+    log_it("Finished editing mountlist");
     if (res) {
         paranoid_MR_finish(1);
@@ -594 +594 @@
     g_current_media_number = 1;
     mvaddstr_and_log_it(1, 30, "Comparing Automatically");
-    log_it("%s","Pre-MAD");
+    log_it("Pre-MAD");
     retval = mount_all_devices(mountlist, FALSE);
-    log_it("%s","Post-MAD");
+    log_it("Post-MAD");
     if (retval) {
         unmount_all_devices(mountlist);

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -2067 +2067 @@
     int res = 0;
 
-    log_it("%s","entering eml");
+    log_it("entering eml");
 
     if (g_text_mode) {
@@ -2076 +2076 @@
         res = edit_mountlist_in_newt(mountlist_fname, mountlist, raidlist);
     }
-    log_it("%s","leaving eml");
+    log_it("leaving eml");
     return (res);
 }
@@ -2732 +2732 @@
     assert(disklist != NULL);
 
-    log_it("%s","malloc'ing");
+    log_it("malloc'ing");
     malloc_string(tmp);
     malloc_string(help_text);
@@ -2760 +2760 @@
            sizeof(struct list_of_disks));
 
-    log_it("%s","Post-malloc");
+    log_it("Post-malloc");
     strcpy(help_text,
            "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -2419 +2419 @@
 
     assert(wait_for_percentage <= 100);
-    log_it("%s","wait_until_software_raids_are_prepped");
+    log_it("wait_until_software_raids_are_prepped");
     while (unfinished_mdstat_devices > 0) {
             // FIXME: Prefix '/dev/' should really be dynamic!

branches/2.2.9/mondo/src/mondorestore/mondorestore.c

@@ -262 +262 @@
     int retval = 0;
 
-    log_it("%s","inside catchall");
+    log_it("inside catchall");
     assert(bkpinfo != NULL);
     assert(mountlist != NULL);
     assert(raidlist != NULL);
     malloc_string(tmp);
-    log_it("%s","pre wrm");
+    log_it("pre wrm");
     c = which_restore_mode();
-    log_it("%s","post wrm");
+    log_it("post wrm");
     if (c == 'I' || c == 'C') {
         interactively_obtain_media_parameters_from_user(FALSE);
@@ -286 +286 @@
     }
 
-    log_it("%s","post int");
+    log_it("post int");
 
     if (bkpinfo->backup_media_type == iso) {
@@ -465 +465 @@
     }
 
-    log_it("%s","About to load config file");
+    log_it("About to load config file");
     get_cfg_file_from_archive_or_bust();
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
-    log_it("%s","Done loading config file; resizing ML");
+    log_it("Done loading config file; resizing ML");
     if (bkpinfo->backup_media_type == nfs) {
         strcpy(tmp, bkpinfo->prefix);
@@ -493 +493 @@
     }
     for (done = FALSE; !done;) {
-        log_it("%s","About to edit mountlist");
+        log_it("About to edit mountlist");
         if (g_text_mode) {
             save_mountlist_to_disk(mountlist, g_mountlist_fname);
@@ -502 +502 @@
             res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
         }
-        log_it("%s","Finished editing mountlist");
+        log_it("Finished editing mountlist");
         if (res) {
             paranoid_MR_finish(1);
@@ -681 +681 @@
     }
 
-    log_it("%s","About to leave interactive_mode()");
+    log_it("About to leave interactive_mode()");
     if (retval) {
         mvaddstr_and_log_it(g_currentY++,
@@ -691 +691 @@
     paranoid_free(fstab_fname);
     paranoid_free(old_restpath);
-    log_it("%s","Leaving interactive_mode()");
+    log_it("Leaving interactive_mode()");
     return (retval);
 }
@@ -885 +885 @@
         return (retval);
     }
-    log_it("%s","Restoring everything");
+    log_it("Restoring everything");
     retval += restore_everything(NULL);
     clean_multipathconf();
@@ -1006 +1006 @@
                                  "Restore files to where? )",
                                  bkpinfo->restore_path, MAX_STR_LEN / 4)) {
-            log_it("%s","Restoring everything");
+            log_it("Restoring everything");
             retval += restore_everything(filelist);
             free_filelist(filelist);
@@ -2035 +2035 @@
 
         if (g_getfattr) {
-            log_it("%s","Restoring xattr stuff");
+            log_it("Restoring xattr stuff");
             res = set_fattr_list(filelist_subset_fname, xattr_fname);
             if (res) {
@@ -2046 +2046 @@
 
         if (g_getfacl) {
-            log_it("%s","Restoring acl stuff");
+            log_it("Restoring acl stuff");
             res = set_acl_list(filelist_subset_fname, acl_fname);
             if (res) {
@@ -2505 +2505 @@
         fclose(fbw);
         if (length_of_file(biggies_whose_EXATs_we_should_set) > 2) {
-            log_it("%s","Setting biggie-EXATs");
+            log_it("Setting biggie-EXATs");
             if (g_getfattr) {
                 if (length_of_file(xattr_fname) > 0) {
@@ -2522 +2522 @@
             }
         } else {
-            log_it("%s","No biggiefiles selected. So, no biggie-EXATs to set.");
+            log_it("No biggiefiles selected. So, no biggie-EXATs to set.");
         }
     }
@@ -2630 +2630 @@
         }
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-            log_it("%s","Reading EXAT files from tape");
+            log_it("Reading EXAT files from tape");
             res =
                 read_EXAT_files_from_tape(&tmp_size, tmp_fname,
@@ -2944 +2944 @@
     }
 
-    log_it("%s","what time is it");
+    log_it("what time is it");
 
     /* Process command-line parameters */
@@ -3127 +3127 @@
         log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
 
-        log_it("%s","About to call load_mountlist and load_raidtab");
+        log_it("About to call load_mountlist and load_raidtab");
         strcpy(bkpinfo->restore_path, MNT_RESTORING);
         read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
         retval = load_mountlist(mountlist, g_mountlist_fname);
         retval += load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-        log_it("%s","Returned from calling load_mountlist and load_raidtab successfully");
+        log_it("Returned from calling load_mountlist and load_raidtab successfully");
 
         // BCO:To be reviewed
@@ -3156 +3156 @@
 
         if (bkpinfo->restore_mode == nuke) {
-            log_it("%s","nuking");
+            log_it("nuking");
             retval += nuke_mode(mountlist, raidlist);
         } else if (bkpinfo->restore_mode == interactive) {
-            log_it("%s","catchall");
+            log_it("catchall");
             retval += catchall_mode(mountlist, raidlist);
         } else if (bkpinfo->restore_mode == compare) {
-            log_it("%s","compare");
+            log_it("compare");
             retval += compare_mode(mountlist, raidlist);
         } else if (bkpinfo->restore_mode == isoonly) {
-            log_it("%s","iso");
+            log_it("iso");
             retval = iso_mode(mountlist, raidlist, FALSE);
         } else if (bkpinfo->restore_mode == mbr) {
-            log_it("%s","mbr");
+            log_it("mbr");
             retval = mount_all_devices(mountlist, TRUE);
             if (!retval) {
@@ -3178 +3178 @@
             }
         } else if (bkpinfo->restore_mode == isonuke) {
-            log_it("%s","isonuke");
+            log_it("isonuke");
             retval = iso_mode(mountlist, raidlist, TRUE);
         } else {
-            log_it("%s","catchall (no mode specified in command-line call");
+            log_it("catchall (no mode specified in command-line call");
             retval += catchall_mode(mountlist, raidlist);
         }