Changeset 2351 in MondoRescue for branches

Timestamp:

Aug 28, 2009, 2:41:30 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Replacement of some fgets by mr_getline to allow for dyn. memory management.
• Backport of SElinux fix from 2.2.9

Location:

branches/2.2.10

Files:

• mindi/analyze-my-lvm (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (10 diffs)
• mondo/src/common/libmondo-devices.c (modified) (25 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (23 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (7 diffs)
• tools/myval (modified) (1 diff)

branches/2.2.10/mindi/analyze-my-lvm

@@ -86 +86 @@
     current_VG=$1
     VG_info_file=$MINDI_TMP/$$.vg-info.txt
-    $LVMCMD vgdisplay $current_VG > $VG_info_file
+    # We use cat here as a way to avoid SElinux to prevent us from writing in $VG_info_file
+    $LVMCMD vgdisplay $current_VG | cat > $VG_info_file
     max_logical_volumes=`GetValueFromField "$VG_info_file" "MAX LV"`
     [ $max_logical_volumes -ge 256 ] && max_logical_volumes=255

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

@@ -1927 +1927 @@
 
     /*@ pointers ******************************************* */
-    FILE *fin;
-    char *p;
+    FILE *fin = NULL;
 
     /*@ buffers ******************************************** */
     char *tmp = NULL;
-    char *bigfile_fname;
+    char *bigfile_fname = NULL;
     char *sz_devfile = NULL;
     char *ntfsprog_fifo = NULL;
@@ -1976 +1975 @@
     }
 
-    malloc_string(bigfile_fname);
-    for (fgets(bigfile_fname, MAX_STR_LEN, fin); !feof(fin);
-         fgets(bigfile_fname, MAX_STR_LEN, fin), biggie_file_number++) {
+    for (mr_getline(bigfile_fname, fin); !feof(fin); mr_getline(bigfile_fname, fin), biggie_file_number++) {
         use_ntfsprog = FALSE;
         if (bigfile_fname[strlen(bigfile_fname) - 1] < 32) {
@@ -1991 +1988 @@
                 log_msg(3, "Unable to write to %s", bigfile_fname);
                 // So skip it as it doesn't exist
+                mr_free(bigfile_fname);
                 continue;
             } else {
@@ -2001 +1999 @@
             log_msg(2, "bigfile_fname = %s", bigfile_fname);
             use_ntfsprog = FALSE;
-            if (!strncmp(bigfile_fname, "/dev/", 5)
-                && is_dev_an_NTFS_dev(bigfile_fname)) {
+            if (!strncmp(bigfile_fname, "/dev/", 5) && is_dev_an_NTFS_dev(bigfile_fname)) {
                 use_ntfsprog = TRUE;
                 log_msg(2, "Calling ntfsclone in background because %s is an NTFS partition", bigfile_fname);
@@ -2010 +2007 @@
                 switch (pid = fork()) {
                 case -1:
+                    mr_free(bigfile_fname);
                     mr_free(sz_devfile);
                     fatal_error("Fork failure");
@@ -2032 +2030 @@
             // Whether partition or biggiefile, just do your thang :-)
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-                write_header_block_to_stream(biggie_fsize, bigfile_fname,
-                                             use_ntfsprog ?
-                                             BLK_START_A_PIHBIGGIE :
-                                             BLK_START_A_NORMBIGGIE);
+                write_header_block_to_stream(biggie_fsize, bigfile_fname, use_ntfsprog ?  BLK_START_A_PIHBIGGIE : BLK_START_A_NORMBIGGIE);
             }
             res = slice_up_file_etc(bigfile_fname, ntfsprog_fifo, biggie_file_number, noof_biggie_files, use_ntfsprog);
@@ -2042 +2037 @@
             }
             retval += res;
-            p = strrchr(bigfile_fname, '/');
-            if (p) {
-                p++;
-            } else {
-                p = bigfile_fname;
-            }
             mr_asprintf(tmp, "Archiving %s ... ", bigfile_fname);
             if (res) {
@@ -2059 +2048 @@
             }
         }
+        mr_free(bigfile_fname);
 #ifndef _XWIN
         if (!g_text_mode) {
@@ -2067 +2057 @@
         mr_free(tmp);
     }
+    mr_free(bigfile_fname);
+
     log_msg(1, "Finished backing up bigfiles");
     log_msg(1, "estimated slices = %ld; actual slices = %ld",
@@ -2072 +2064 @@
     close_progress_form();
     paranoid_fclose(fin);
-    paranoid_free(bigfile_fname);
     return (retval);
 }

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

@@ -313 +313 @@
     /*@ buffers **************************************************** */
     char *program = NULL;
-    char *incoming;
+    char *incoming = NULL;
     char *searchstr = NULL;
     char *tmp = NULL;
@@ -327 +327 @@
     assert_string_is_neither_NULL_nor_zerolength(drive);
     assert(partno >= 0 && partno < 999);
-
-    malloc_string(incoming);
 
 #ifdef __FreeBSD__
@@ -356 +354 @@
     searchstr = build_partition_name(drive, partno);
     mr_strcat(searchstr, " ");
-    for (res = 0; !res && fgets(incoming, MAX_STR_LEN - 1, fin);) {
+    for (res = 0, mr_getline(incoming, fin); !res && !feof(fin) ; mr_getline(incoming, fin)) {
         if (strstr(incoming, searchstr)) {
             res = 1;
         }
-    }
+        mr_free(incoming);
+    }
+    mr_free(incoming);
     mr_free(searchstr);
 
@@ -366 +366 @@
         log_OS_error("Cannot pclose fin");
     }
-    paranoid_free(incoming);
     return (res);
 }
@@ -567 +566 @@
     /*@ buffers ***************************************************** */
     char *tmp = NULL;
-    char *tmp1 = NULL;
     char *output = NULL;
     char *cdr_exe = NULL;
@@ -634 +632 @@
     }
 
-    malloc_string(tmp);
-    tmp[0] = '\0';
-    for ((void)fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-         (void)fgets(tmp, MAX_STR_LEN, fin)) {
+    for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
         p = strchr(tmp, '\'');
         if (p) {
@@ -657 +652 @@
             }
         }
-    }
+        mr_free(tmp);
+    }
+    mr_free(tmp);
     paranoid_pclose(fin);
 
@@ -671 +668 @@
             log_msg(4, "Cannot run 2nd command - non-fatal, fortunately");
         } else {
-            for ((void)fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-                 (void)fgets(tmp, MAX_STR_LEN, fin)) {
+            for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
                 log_msg(5, "--> '%s'", tmp);
                 if (tmp[0] != ' ' && tmp[1] != ' ') {
@@ -688 +684 @@
                     }
                 }
+                mr_free(tmp);
             }
             paranoid_pclose(fin);
+            mr_free(tmp);
         }
     }
     mr_free(phrase_two);
-    paranoid_free(tmp);
 
 #endif
@@ -725 +722 @@
 
     if (found_it) {
-        mr_asprintf(tmp1, "grep \"%s=ide-scsi\" " CMDLINE " &> /dev/null", strrchr(output, '/') + 1);
-        if (system(tmp1) == 0) {
+        mr_asprintf(tmp, "grep \"%s=ide-scsi\" " CMDLINE " &> /dev/null", strrchr(output, '/') + 1);
+        if (system(tmp) == 0) {
             log_msg(4, "%s is not right. It's being SCSI-emulated. Continuing.", output);
             found_it = FALSE;
             mr_free(output);
         }
-        mr_free(tmp1);
+        mr_free(tmp);
     }
 
@@ -772 +769 @@
             mr_free(output);
         } else {
-            mr_asprintf(tmp1, "%s/archives", mountpoint);
+            mr_asprintf(tmp, "%s/archives", mountpoint);
             if (!does_file_exist(tmp)) {
                 log_msg(4, "[Cardigans] I'll take it back");
@@ -784 +781 @@
                 log_msg(4, "I'm confident the Mondo CD is in %s", output);
             }
-            mr_free(tmp1);
+            mr_free(tmp);
         }
     }
@@ -808 +805 @@
 
     log_msg(1, "command=%s", command);
-    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     mr_free(output);
-    if (strlen(tmp1) > 0) {
-        mr_asprintf(output, "%s", tmp1);
+    if (strlen(tmp) > 0) {
+        mr_asprintf(output, "%s", tmp);
         log_msg(4, "Finally found it at %s", output);
     } else {
         log_msg(4, "Still couldn't find it.");
     }
-    mr_free(tmp1);
+    mr_free(tmp);
 
     return (output);
@@ -1026 +1023 @@
 
     /*@ buffers ***************************************************** */
-    char *incoming;
+    char *incoming = NULL;
     char *device_with_tab = NULL;
     char *device_with_space = NULL;
@@ -1044 +1041 @@
     }
 
-    malloc_string(incoming);
     if (device_raw[0] != '/' && !strstr(device_raw, ":/")) {
         log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
@@ -1067 +1063 @@
         return(FALSE);
     }
-    for ((void)fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         (void)fgets(incoming, MAX_STR_LEN - 1, fin)) {
-        if (strstr(incoming, device_with_space) //> incoming
-            || strstr(incoming, device_with_tab))   // > incoming)
-        {
+
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+        if (strstr(incoming, device_with_space) || strstr(incoming, device_with_tab)) {
             paranoid_pclose(fin);
-            paranoid_free(incoming);
+            mr_free(incoming);
             return(TRUE);
         }
-    }
+        mr_free(incoming);
+    }
+    mr_free(incoming);
     mr_free(device_with_tab);
     mr_free(device_with_space);
@@ -1086 +1082 @@
     }
     mr_free(tmp);
-    paranoid_free(incoming);
     return(retval);
 }
@@ -2308 +2303 @@
     char *list_drives_cmd = NULL;
     char *tmp = NULL;
-    char *current_drive;
+    char *current_drive = NULL;
 
     /*@ pointers *************************************************** */
-    FILE *pdrives;
+    FILE *pdrives = NULL;
 
     /*@ int ******************************************************** */
@@ -2338 +2333 @@
     }
 
-    malloc_string(current_drive);
-    for ((void)fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
-         (void)fgets(current_drive, MAX_STR_LEN, pdrives)) {
-        strip_spaces(current_drive);
+    for (mr_getline(current_drive, pdrives); !feof(pdrives); mr_getline(current_drive, pdrives)) {
+        mr_strip_spaces(current_drive);
         log_it("looking at drive %s's MBR", current_drive);
         if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
@@ -2349 +2342 @@
             mr_asprintf(which_device, "%s", current_drive);
             */
+            mr_free(current_drive);
             break;
         }
@@ -2357 +2351 @@
             mr_asprintf(which_device, "%s", current_drive);
             */
+            mr_free(current_drive);
             break;
         }
-    }
+        mr_free(current_drive);
+    }
+    mr_free(current_drive);
+
     if (pclose(pdrives)) {
         log_OS_error("Cannot pclose pdrives");
@@ -2365 +2363 @@
     log_it("%d grubs and %d lilos\n", count_grubs, count_lilos);
     if (count_grubs && !count_lilos) {
-        paranoid_free(current_drive);
         return ('G');
     } else if (count_lilos && !count_grubs) {
-        paranoid_free(current_drive);
         return ('L');
     } else if (count_grubs == 1 && count_lilos == 1) {
         log_it("I'll bet you used to use LILO but switched to GRUB...");
-        paranoid_free(current_drive);
         return ('G');
     } else {
@@ -2382 +2377 @@
             log_OS_error("Unable to open list of drives");
             mr_free(list_drives_cmd);
-            paranoid_free(current_drive);
             return ('\0');
         }
         mr_free(list_drives_cmd);
 
-        for ((void)fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
-            (void)fgets(current_drive, MAX_STR_LEN, pdrives)) {
-            strip_spaces(current_drive);
+        for (mr_getline(current_drive, pdrives); !feof(pdrives); mr_getline(current_drive, pdrives)) {
+            mr_strip_spaces(current_drive);
             log_it("looking at partition %s's BR", current_drive);
             if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
@@ -2397 +2390 @@
                 mr_asprintf(which_device, "%s", current_drive);
                 */
+                mr_free(current_drive);
                 break;
             }
@@ -2405 +2399 @@
                 mr_asprintf(which_device, "%s", current_drive);
                 */
+                mr_free(current_drive);
                 break;
             }
-        }
+            mr_free(current_drive);
+        }
+        mr_free(current_drive);
+
         if (pclose(pdrives)) {
             log_OS_error("Cannot pclose pdrives");
         }
         log_it("%d grubs and %d lilos\n", count_grubs, count_lilos);
-        paranoid_free(current_drive);
         if (count_grubs && !count_lilos) {
             return ('G');

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

@@ -414 +414 @@
 int call_exe_and_pipe_output_to_fd(char *syscall, FILE * pout)
 {
-    FILE *pattr;
-    char *tmp;
+    FILE *pattr = NULL;
+    char *tmp = NULL;
+
     pattr = popen(syscall, "r");
     if (!pattr) {
@@ -426 +427 @@
         return (2);
     }
-    malloc_string(tmp);
-    for ((void)fgets(tmp, MAX_STR_LEN, pattr); !feof(pattr);
-         (void)fgets(tmp, MAX_STR_LEN, pattr)) {
+    for (mr_getline(tmp, pattr); !feof(pattr); mr_getline(tmp, pattr)) {
         fputs(tmp, pout);
-    }
+        mr_free(tmp);
+    }
+    mr_free(tmp);
     paranoid_pclose(pattr);
-    paranoid_free(tmp);
     return (0);
 }
@@ -441 +441 @@
                  char *auxlist_fname)
 {
-    FILE *fin;
-    FILE *pout;
+    FILE *fin = NULL;
+    FILE *pout = NULL;
     char *pout_command = NULL;
-    char *syscall;
-    char *file_to_analyze;
+    char *syscall = NULL;
+    char *file_to_analyze = NULL;
     char *strtmp = NULL;
     char *tmp = NULL;
@@ -463 +463 @@
     mr_free(pout_command);
 
-    malloc_string(file_to_analyze);
-    for ((void)fgets(file_to_analyze, MAX_STR_LEN, fin); !feof(fin);
-         (void)fgets(file_to_analyze, MAX_STR_LEN, fin)) {
+    for (mr_getline(file_to_analyze, fin); !feof(fin); mr_getline(file_to_analyze, fin)) {
         i = strlen(file_to_analyze);
         if (i > 0 && file_to_analyze[i - 1] < 32) {
@@ -478 +476 @@
         call_exe_and_pipe_output_to_fd(syscall, pout);
         mr_free(syscall);
-    }
+        mr_free(file_to_analyze);
+    }
+    mr_free(file_to_analyze);
     paranoid_fclose(fin);
     paranoid_pclose(pout);
-    paranoid_free(file_to_analyze);
     return (0);
 }
@@ -529 +528 @@
     char *syscall_pin = NULL;
     char *syscall_pout = NULL;
-    char *incoming;
-    char *current_subset_file;
+    char *incoming = NULL;
+    char *current_subset_file = NULL;
     char *current_master_file = NULL;
     char *masklist = NULL;
@@ -553 +552 @@
         return (0);
     }
-    malloc_string(incoming);
-    malloc_string(current_subset_file);
     mr_asprintf(masklist, "%s/masklist", bkpinfo->tmpdir);
     mr_asprintf(command, "cp -f %s %s", orig_msklist, masklist);
@@ -561 +558 @@
 
     sort_file(masklist);
-    current_subset_file[0] = '\0';
 
     mr_asprintf(syscall_pout, "%s --restore - 2>> %s", executable, MONDO_LOGFILE);
@@ -594 +590 @@
 //  printf("Hi there. Starting the loop\n");
 
-    (void)fgets(current_subset_file, MAX_STR_LEN, faclin);
-    (void)fgets(incoming, MAX_STR_LEN, pin);
+    mr_getline(current_subset_file, faclin);
+    mr_getline(incoming, pin);
     while (!feof(pin) && !feof(faclin)) {
         mr_asprintf(current_master_file, "%s", incoming + 8);
@@ -625 +621 @@
         if (i < 0) {            // read another subset file in.
             log_msg(my_depth, "Reading next subset line in\n\n");
-            (void)fgets(current_subset_file, MAX_STR_LEN, faclin);
+            mr_free(current_subset_file);
+            mr_getline(current_subset_file, faclin);
             continue;
         }
@@ -632 +629 @@
             fputs(incoming, pout);
         }
-        (void)fgets(incoming, MAX_STR_LEN, pin);
+        mr_free(incoming);
+        mr_getline(incoming, pin);
         if (!i) {
             log_msg(my_depth, "Copying master %s", q);
@@ -641 +639 @@
                 fputs(incoming, pout);
             }
-            (void)fgets(incoming, MAX_STR_LEN, pin);
+            mr_free(incoming);
+            mr_getline(incoming, pin);
         }
         if (!i) {
-            (void)fgets(current_subset_file, MAX_STR_LEN, faclin);
+            mr_free(current_subset_file);
+            mr_getline(current_subset_file, faclin);
         }
         mr_free(current_master_file);
     }
-    while (!feof(pin)) {
-        (void)fgets(incoming, MAX_STR_LEN, pin);
-    }
+    mr_free(current_subset_file);
+    mr_free(incoming);
     fclose(faclin);
     pclose(pin);
     pclose(pout);
 
-//  printf("OK, loop is done\n");
-
     unlink(masklist);
     mr_free(masklist);
 
-    paranoid_free(current_subset_file);
-    paranoid_free(incoming);
     return (retval);
 }
@@ -772 +767 @@
     noof_chars = strlen(string_to_add) + 1; /* we include the '\0' */
 
-/* walk across tree if necessary */
+    /* walk across tree if necessary */
     node = startnode;
     char_to_add = string_to_add[0];
@@ -781 +776 @@
     }
 
-/* walk down tree if appropriate */
+    /* walk down tree if appropriate */
     if (node->down != NULL && node->ch == char_to_add) {
         log_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_add);
@@ -795 +790 @@
     }
 
-/* add here */
+    /* add here */
     if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
         log_to_screen("failed to malloc");
@@ -866 +861 @@
     /*@ buffers **************************************************** */
     char *command_to_open_fname = NULL;
-    char fname[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
-    char *tmp1 = NULL;
+    char *fname = NULL;
+    char *tmp = NULL;
     int pos_in_fname;
     /*@ int ******************************************************** */
@@ -884 +878 @@
     }
     log_to_screen("Loading filelist");
-    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);
+    mr_asprintf(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_free(tmp);
 
     if (lines_in_filelist < 3) {
@@ -913 +907 @@
 
     open_evalcall_form("Loading filelist from disk");
-    for ((void)fgets(fname, MAX_STR_LEN, pin); !feof(pin);
-         (void)fgets(fname, MAX_STR_LEN, pin)) {
-        if ((fname[strlen(fname) - 1] == 13
-             || fname[strlen(fname) - 1] == 10) && strlen(fname) > 0) {
+    for (mr_getline(fname, pin); !feof(pin); mr_getline(fname, pin)) {
+        if ((strlen(fname) > 0) && (fname[strlen(fname) - 1] == 13 || fname[strlen(fname) - 1] == 10)) {
             fname[strlen(fname) - 1] = '\0';
         }
-//      strip_spaces (fname);
         if (!strlen(fname)) {
+            mr_free(fname);
             continue;
         }
@@ -927 +919 @@
                 continue;
             }
-            strcpy(tmp, fname);
+            mr_asprintf(tmp, "%s", fname);
             tmp[pos_in_fname] = '\0';
             if (strlen(tmp)) {
                 add_string_at_node(filelist, tmp);
             }
+            mr_free(tmp);
         }
         add_string_at_node(filelist, fname);
+        mr_free(fname);
+
         if (!(++lino % 1111)) {
             percentage = (int) (lino * 100 / lines_in_filelist);
@@ -939 +934 @@
         }
     }
+    mr_free(fname);
+
     paranoid_pclose(pin);
     close_evalcall_form();
@@ -1835 +1832 @@
                                   char *list_of_files_fname, bool flag_em)
 {
-    FILE *fin;
-    char *tmp;
-    struct s_node *nod;
-
-    malloc_string(tmp);
+    FILE *fin = NULL;
+    char *tmp = NULL;
+    struct s_node *nod = NULL;
+
     log_msg(3, "Adding %s to filelist", list_of_files_fname);
     if (!(fin = fopen(list_of_files_fname, "r"))) {
@@ -1845 +1841 @@
         return (1);
     }
-    for ((void)fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-         (void)fgets(tmp, MAX_STR_LEN, fin)) {
+    for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
         if (!tmp[0]) {
+            mr_free(tmp);
             continue;
         }
-        if ((tmp[strlen(tmp) - 1] == 13 || tmp[strlen(tmp) - 1] == 10)
-            && strlen(tmp) > 0) {
+        if ((strlen(tmp) > 0) && (tmp[strlen(tmp) - 1] == 13 || tmp[strlen(tmp) - 1] == 10)) {
             tmp[strlen(tmp) - 1] = '\0';
         }
         log_msg(2, "tmp = '%s'", tmp);
         if (!tmp[0]) {
+            mr_free(tmp);
             continue;
         }
@@ -1869 +1865 @@
             log_msg(5, "Flagged '%s'", tmp);
         }
-    }
+        mr_free(tmp);
+    }
+    mr_free(tmp);
     paranoid_fclose(fin);
-    paranoid_free(tmp);
     return (0);
 }

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

@@ -298 +298 @@
 
     mr_strcat(mount_isodir_command, " -o ro %s", bkpinfo->isodir);
-    run_program_and_log_output("df -m", FALSE);
-    log_msg(1, 
-        "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
-        mount_isodir_command);
+    run_program_and_log_output("df -m -P", FALSE);
+    log_msg(1, "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?", mount_isodir_command);
     if (run_program_and_log_output(mount_isodir_command, FALSE)) {
         popup_and_OK
@@ -472 +470 @@
  * @return The number of errors encountered (0 for success).
  */
-int mount_all_devices(struct mountlist_itself
-                      *p_external_copy_of_mountlist, bool writeable)
+int mount_all_devices(struct mountlist_itself *p_external_copy_of_mountlist, bool writeable)
 {
 int retval = 0, lino, res;
@@ -488 +485 @@
 
     mvaddstr_and_log_it(g_currentY, 0, "Mounting devices         ");
-    open_progress_form("Mounting devices",
-               "I am now mounting all the drives.",
-               "This should not take long.",
-               "", mountlist->entries);
+    open_progress_form("Mounting devices", "I am now mounting all the drives.", "This should not take long.", "", mountlist->entries);
 
     mr_asprintf(these_failed, "");
     for (lino = 0; lino < mountlist->entries; lino++) {
         if (!strcmp(mountlist->el[lino].device, "/proc")) {
-            log_msg(1,
-                "Again with the /proc - why is this in your mountlist?");
+            log_msg(1, "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
             log_to_screen("%s is already mounted", mountlist->el[lino].device);
@@ -519 +512 @@
     if (retval) {
         if (g_partition_table_locked_up > 0) {
-            log_to_screen
-                ("fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
-            log_to_screen
-                ("lock up the partition table. You might have to reboot and use Interactive Mode to");
-            log_to_screen
-                ("format and restore *without* partitioning first. Sorry for the inconvenience.");
+            log_to_screen("fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
+            log_to_screen("lock up the partition table. You might have to reboot and use Interactive Mode to");
+            log_to_screen("format and restore *without* partitioning first. Sorry for the inconvenience.");
         }
         mr_asprintf(tmp, "Could not mount device(s) %s- shall I abort?", these_failed);
@@ -530 +520 @@
         if (!ask_me_yes_or_no(tmp)) {
             retval = 0;
-            log_to_screen
-                ("Continuing, although some device(s) failed to be mounted");
+            log_to_screen("Continuing, although some device(s) failed to be mounted");
             mvaddstr_and_log_it(g_currentY++, 74, "Done.");
         } else {
             mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-            log_to_screen
-        ("Unable to mount some or all of your partitions.");
+            log_to_screen("Unable to mount some or all of your partitions.");
         }
         mr_free(tmp);
@@ -548 +536 @@
     (void)mount_device("/proc","/proc","proc",TRUE);
     (void)mount_device("/sys","/sys","sysfs",TRUE);
-    run_program_and_log_output("df -m", 3);
+    run_program_and_log_output("df -m -P", 3);
     paranoid_free(mountlist);
     return (retval);
@@ -2036 +2024 @@
     sort_mountlist_by_mountpoint(mountlist, 0);
 
-    run_program_and_log_output("df -m", 3);
+    run_program_and_log_output("df -m -P", 3);
     mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
     open_progress_form("Unmounting devices",

branches/2.2.10/tools/myval

@@ -6 +6 @@
 sudo valgrind --log-file=/tmp/valg.log --show-reachable=yes --track-origins=yes --leak-check=full /home/bruno/local/pb/projects/mondorescue/build/BUILD/mondo-2.2.10/src/mondoarchive/mondoarchive -K 99 -Oi -g -G -I "/etc /var/lib/rpm"  -E /etc/init.d -d /home
 sudo valgrind --log-file=/tmp/valm.log --tool=massif --heap=yes --stacks=yes --alloc-fn=mr_malloc --massif-out-file=/tmp/valm.out /home/bruno/local/pb/projects/mondorescue/build/BUILD/mondo-2.2.10/src/mondoarchive/mondoarchive -K 99 -Oi -g -G -I "/etc /var/lib/rpm"  -E /etc/init.d -d /home
-sudo valgrind --log-file=/tmp/valc.log --tool=callgrind --callgrind-out-file=/tmp/valc.out /home/bruno/local/pb/projects/mondorescue/build/BUILD/mondo-2.2.10/src/mondoarchive/mondoarchive -K 99 -Oi -g -Y -I "/etc /var/lib/rpm"  -E /etc/init.d -d /home
+sudo valgrind --log-file=/tmp/valc.log --tool=callgrind --callgrind-out-file=/tmp/valc.out /home/bruno/local/pb/projects/mondorescue/build/BUILD/mondo-2.2.10/src/mondoarchive/mondoarchive -K 99 -Oi -g -Y -I "/etc /var/lib/rpm"  -T /tmp -S /var/spool/mondo -E /etc/init.d -d /home