Changeset 3205 in MondoRescue

Timestamp:

Dec 6, 2013, 3:40:47 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix mondoarchive which now works in text mode. GUI mode still not working and crashing on first update for backup. Needs more

investigation in newt-specific.c

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-archive.c (modified) (21 diffs)
• common/libmondo-cli.c (modified) (3 diffs)
• common/libmondo-devices.c (modified) (5 diffs)
• common/libmondo-filelist.c (modified) (6 diffs)
• common/libmondo-fork.c (modified) (2 diffs)
• common/libmondo-string.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (5 diffs)
• common/newt-specific.c (modified) (3 diffs)
• lib/mr_mem.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

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

@@ -526 +526 @@
 
     /*@ long     ********************************************************** */
-    long lines_in_filelist = 0;
+    long lines_in_filelist = 0L;
 
     /*@ int     ************************************************************* */
     int res = 0;
-    long estimated_total_noof_slices = 0;
+    long estimated_total_noof_slices = 0L;
 
     assert(bkpinfo != NULL);
@@ -608 +608 @@
 
     update_evalcall_form(2);
-    if (!bkpinfo->nonbootable_backup
-        && (bkpinfo->boot_loader == '\0'
-            || bkpinfo->boot_device[0] == '\0')) {
+    if (!bkpinfo->nonbootable_backup && (bkpinfo->boot_loader == '\0' || bkpinfo->boot_device[0] == '\0')) {
 
 #ifdef __FreeBSD__
-        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-               ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
+        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
         if (!bootdev[0]) {
             mr_free(bootdev);
-            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-                   ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
+            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
         }
 #else
         /* Linux */
 #ifdef __IA64__
-        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-               ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
 #else
-        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-               ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
 #endif
         if (strstr(bootdev, "/dev/cciss/")) {
             mr_free(bootdev);
 #ifdef __IA64__
-            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-                   ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
 #else
-            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-                   ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
 #endif
         }
         if (!bootdev[0]) {
             mr_free(bootdev);
-            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-                   ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
             if (strstr(bootdev, "/dev/cciss/")) {
                 mr_free(bootdev);
-                mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-                       ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+                mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
             }
         }
@@ -675 +665 @@
            bkpinfo->boot_loader != 'E' &&
 #endif
-           bkpinfo->boot_loader != 'L' && bkpinfo->boot_loader != 'G'
-           && bkpinfo->boot_loader != 'R'
-           && !bkpinfo->nonbootable_backup) {
-        fatal_error
-            ("Please specify your boot loader and device, e.g. -l GRUB -f /dev/hda. Type 'man mondoarchive' to read the manual.");
+           bkpinfo->boot_loader != 'L' && bkpinfo->boot_loader != 'G' && bkpinfo->boot_loader != 'R' && !bkpinfo->nonbootable_backup) {
+        fatal_error("Please specify your boot loader and device, e.g. -l GRUB -f /dev/hda. Type 'man mondoarchive' to read the manual.");
     }
     if (bkpinfo->boot_loader == 'L') {
         mr_asprintf(bootldr_str, "LILO");
         if (!does_file_exist("/etc/lilo.conf")) {
+            mr_free(bootldr_str);
             fatal_error("The de facto standard location for your boot loader's config file is /etc/lilo.conf but I cannot find it there. What is wrong with your Linux distribution?");
         }
@@ -692 +680 @@
         }
         if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg")) && (!does_file_exist("/boot/grub2/grub.cfg"))) {
+            mr_free(bootldr_str);
             fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
         }
@@ -697 +686 @@
     } else if (bkpinfo->boot_loader == 'E') {
         mr_asprintf(bootldr_str, "ELILO");
-        /* BCO: fix it for Debian, Mandrake, ... */
+        /* BCO: fix it for Debian, Mageia, ... */
         if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/redhat/elilo.conf")) {
             run_program_and_log_output("ln -sf /boot/efi/efi/redhat/elilo.conf /etc/elilo.conf", 5);
@@ -711 +700 @@
         }
         if (!does_file_exist("/etc/elilo.conf")) {
+            mr_free(bootldr_str);
             fatal_error("The de facto mondo standard location for your boot loader's config file is /etc/elilo.conf but I cannot find it there. What is wrong with your Linux distribution? Try finding it under /boot/efi and do 'ln -s /boot/efi/..../elilo.conf /etc/elilo.conf'");
         }
@@ -783 +773 @@
         log_msg(1, "%ld: Unable to write one-liner backup-media-type", __LINE__);
     }
-    mr_free(value);
     mr_free(tmp);
 
@@ -791 +780 @@
         log_msg(1, "%ld: Unable to write one-liner bootloader.name", __LINE__);
     }
-    mr_free(bootldr_str);
+    r_free(bootldr_str);
     mr_free(tmp);
 
@@ -814 +803 @@
         mr_asprintf(tmp1, "%s/XATTR", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
-            log_msg(1, "%ld: Unable to write one-liner XATTR",
-                __LINE__);
-        }
-        paranoid_free(tmp1);
+            log_msg(1, "%ld: Unable to write one-liner XATTR", __LINE__);
+        }
+        mr_free(tmp1);
     }
     if (g_getfacl) {
         mr_asprintf(tmp1, "%s/ACL", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
-            log_msg(1, "%ld: Unable to write one-liner ACL",
-                __LINE__);
-        }
-        paranoid_free(tmp1);
+            log_msg(1, "%ld: Unable to write one-liner ACL", __LINE__);
+        }
+        mr_free(tmp1);
     }
     if (bkpinfo->use_obdr) {
         mr_asprintf(tmp1, "%s/OBDR", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
-            log_msg(1, "%ld: Unable to write one-liner OBDR",
-                __LINE__);
-        }
-        paranoid_free(tmp1);
+            log_msg(1, "%ld: Unable to write one-liner OBDR", __LINE__);
+        }
+        mr_free(tmp1);
     }
 
@@ -876 +862 @@
             MONDO_LOGFILE);
 
+    mr_free(tmp2);
+    mr_free(tape_device);
+    mr_free(tape_size_sz);
+    mr_free(use_lzo_sz);
+    mr_free(cd_recovery_sz);
+    mr_free(broken_bios_sz);
     mr_free(last_filelist_number);
-    mr_free(tape_device);
-    mr_free(use_lzo_sz);
+    mr_free(use_comp_sz);
+    mr_free(use_lilo_sz);
+    mr_free(use_star_sz);
     mr_free(use_gzip_sz);
     mr_free(use_lzma_sz);
-    mr_free(use_star_sz);
-    mr_free(use_comp_sz);
-    mr_free(broken_bios_sz);
-    mr_free(cd_recovery_sz);
-    mr_free(use_lilo_sz);
-    mr_free(tape_size_sz);
+    mr_free(value);
 
     /* This parameter is always the last one and optional */
@@ -1183 +1171 @@
  * @ingroup MLarchiveGroup
  */
-int do_that_initial_phase()
-{
+int do_that_initial_phase() {
     /*@ int *************************************** */
     int retval = 0;
@@ -1229 +1216 @@
     mr_free(data_disks_file);
 
-    mr_asprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix);
+    if (bkpinfo->netfs_remote_dir != NULL) {
+        mr_asprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix);
+    } else {
+        mr_asprintf(command, "rm -f %s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->prefix);
+    }
     paranoid_system(command);
     mr_free(command);
@@ -1236 +1227 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        write_header_block_to_stream((off_t)0, "start-of-tape",
-                                     BLK_START_OF_TAPE);
-        write_header_block_to_stream((off_t)0, "start-of-backup",
-                                     BLK_START_OF_BACKUP);
+        write_header_block_to_stream((off_t)0, "start-of-tape", BLK_START_OF_TAPE);
+        write_header_block_to_stream((off_t)0, "start-of-backup", BLK_START_OF_BACKUP);
     }
     return (retval);
@@ -1355 +1344 @@
     srand((unsigned int) getpid());
     g_sem_key = 1234 + random() % 30000;
-    if ((g_sem_id =
-         semget((key_t) g_sem_key, 1,
-                IPC_CREAT | S_IREAD | S_IWRITE)) == -1) {
+    if ((g_sem_id = semget((key_t) g_sem_key, 1, IPC_CREAT | S_IREAD | S_IWRITE)) == -1) {
         fatal_error("MABAI - unable to semget");
     }
@@ -1366 +1353 @@
         log_msg(8, "Creating thread #%d", noof_threads);
         (*p_archival_threads_running)++;
-        if ((res =
-             pthread_create(&archival_thread[noof_threads], NULL,
-                            create_afio_files_in_background,
-                            (void *) transfer_block))) {
+        if ((res = pthread_create(&archival_thread[noof_threads], NULL, create_afio_files_in_background, (void *) transfer_block))) {
             fatal_error("Unable to create an archival thread");
         }
@@ -1381 +1365 @@
         if (*p_archival_threads_running == 0
             && *p_last_set_archived == storing_set_no - 1) {
-            log_msg(2,
-                    "No archival threads are running. The last stored set was %d and I'm looking for %d. Take off your make-up; the party's over... :-)",
-                    *p_last_set_archived, storing_set_no);
+            log_msg(2, "No archival threads are running. The last stored set was %d and I'm looking for %d. Take off your make-up; the party's over... :-)", *p_last_set_archived, storing_set_no);
             done_storing = TRUE;
         } else
-            if (!get_bit_N_of_array
-                (p_list_of_fileset_flags, storing_set_no)) {
-            misc_counter_that_is_not_important = (misc_counter_that_is_not_important + 1) % 5;
-            /* BCO the media_usage_comment is not really initialized there !
-            if (!misc_counter_that_is_not_important) {
-                update_progress_form(media_usage_comment);
-            }
-            */
-            sleep(1);
+            if (!get_bit_N_of_array(p_list_of_fileset_flags, storing_set_no)) {
+                misc_counter_that_is_not_important = (misc_counter_that_is_not_important + 1) % 5;
+                sleep(1);
             } else {
                 // store set N
@@ -1407 +1383 @@
 
                 log_msg(2, "Storing set %d", storing_set_no);
-                while (!does_file_exist(storing_filelist_fname)
-                    || !does_file_exist(storing_afioball_fname)) {
-                    log_msg(2,
-                            "Warning - either %s or %s doesn't exist yet. I'll pause 5 secs.",
-                        storing_filelist_fname, storing_afioball_fname);
+                while (!does_file_exist(storing_filelist_fname) || !does_file_exist(storing_afioball_fname)) {
+                    log_msg(2, "Warning - either %s or %s doesn't exist yet. I'll pause 5 secs.", storing_filelist_fname, storing_afioball_fname);
                     sleep(5);
                 }
                 /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
                 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-                    register_in_tape_catalog(fileset, storing_set_no, -1,
-                                         storing_afioball_fname);
+                    register_in_tape_catalog(fileset, storing_set_no, -1, storing_afioball_fname);
                     maintain_collection_of_recent_archives(bkpinfo->tmpdir, storing_afioball_fname);
                     log_it("Writing EXAT files");
-                    res +=
-                        write_EXAT_files_to_tape(curr_xattr_list_fname,
-                                             curr_acl_list_fname);
+                    res += write_EXAT_files_to_tape(curr_xattr_list_fname, curr_acl_list_fname);
                     // archives themselves
-                    res +=
-                        move_files_to_stream(storing_afioball_fname,
-                                         NULL);
+                    res += move_files_to_stream(storing_afioball_fname, NULL);
                 } else {
                     if (g_getfacl) {
                         if (g_getfattr) {
-                            res = move_files_to_cd(storing_filelist_fname,
-                                     curr_xattr_list_fname,
-                                     curr_acl_list_fname,
-                                     storing_afioball_fname, NULL);
+                            res = move_files_to_cd(storing_filelist_fname, curr_xattr_list_fname, curr_acl_list_fname, storing_afioball_fname, NULL);
                         } else {
-                            res = move_files_to_cd(storing_filelist_fname,
-                                    curr_acl_list_fname,
-                                    storing_afioball_fname, NULL);
+                            res = move_files_to_cd(storing_filelist_fname, curr_acl_list_fname, storing_afioball_fname, NULL);
                         }
                     } else {
                         if (g_getfattr) {
-                            res = move_files_to_cd(storing_filelist_fname,
-                                    curr_xattr_list_fname,
-                                    storing_afioball_fname, NULL);
+                            res = move_files_to_cd(storing_filelist_fname, curr_xattr_list_fname, storing_afioball_fname, NULL);
                         } else {
-                            res = move_files_to_cd(storing_filelist_fname,
-                                    storing_afioball_fname, NULL);
+                            res = move_files_to_cd(storing_filelist_fname, storing_afioball_fname, NULL);
                         }
                     }
@@ -1967 +1927 @@
     char *ntfsprog_fifo = NULL;
     /*@ long *********************************************** */
-    long biggie_file_number = 0;
-    long noof_biggie_files = 0;
-    long estimated_total_noof_slices = 0;
+    long biggie_file_number = 0L;
+    long noof_biggie_files = 0L;
+    long estimated_total_noof_slices = 0L;
 
     /*@ int ************************************************ */
@@ -1983 +1943 @@
     assert_string_is_neither_NULL_nor_zerolength(biggielist_fname);
 
-    estimated_total_noof_slices =
-        size_of_all_biggiefiles_K() / bkpinfo->optimal_set_size + 1;
-
-    log_msg(1, "size of all biggiefiles = %ld",
-            size_of_all_biggiefiles_K());
-    log_msg(1, "estimated_total_noof_slices = %ld KB / %ld KB = %ld",
-            size_of_all_biggiefiles_K(), bkpinfo->optimal_set_size,
-            estimated_total_noof_slices);
+    estimated_total_noof_slices = size_of_all_biggiefiles_K() / bkpinfo->optimal_set_size + 1L;
+
+    log_msg(1, "size of all biggiefiles = %ld", size_of_all_biggiefiles_K());
+    log_msg(1, "estimated_total_noof_slices = %ld KB / %ld KB = %ld", size_of_all_biggiefiles_K(), bkpinfo->optimal_set_size, estimated_total_noof_slices);
 
     if (length_of_file(biggielist_fname) < 6) {
@@ -2102 +2058 @@
 
     log_msg(1, "Finished backing up bigfiles");
-    log_msg(1, "estimated slices = %ld; actual slices = %ld",
-            estimated_total_noof_slices, g_current_progress);
+    log_msg(1, "estimated slices = %ld; actual slices = %ld", estimated_total_noof_slices, g_current_progress);
     close_progress_form();
     paranoid_fclose(fin);
@@ -2254 +2209 @@
     assert(bkpinfo != NULL);
 
-    mvaddstr_and_log_it(g_currentY, 0,
-                        "Archiving regular files to media          ");
+    mvaddstr_and_log_it(g_currentY, 0, "Archiving regular files to media          ");
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        write_header_block_to_stream((off_t)0, "start-of-afioballs",
-                                     BLK_START_AFIOBALLS);
+        write_header_block_to_stream((off_t)0, "start-of-afioballs", BLK_START_AFIOBALLS);
 #if __FreeBSD__ == 5
-        log_msg(1,
-                "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
+        log_msg(1, "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
         res = make_afioballs_and_images_OLD();
 #else

branches/3.2/mondo/src/common/libmondo-cli.c

@@ -236 +236 @@
         if (!strcmp(bkpinfo->include_paths, "/")) {
             log_msg(2, "'/' is pleonastic.");
-            bkpinfo->include_paths[0] = '\0';
+            mr_free(bkpinfo->include_paths);
         }
         if (bkpinfo->include_paths[0]) {
-            strcat(bkpinfo->include_paths, "|");
+            mr_strcat(bkpinfo->include_paths, "|");
         }
 
@@ -454 +454 @@
             *p = '\0';
         }
-        mr_asprintf(tmp1, "mount | grep -E \"^[a-z]*#*[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+        if (bkpinfo->netfs_user != NULL) {
+            mr_asprintf(tmp1, "mount | grep -E \"^[a-z]*#*[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+        } else {
+            mr_asprintf(tmp1, "mount | grep -E \"^[a-z]*#*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
+        }
         strncpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(tmp), MAX_STR_LEN / 4);
         mr_free(tmp1);
@@ -679 +683 @@
             sprintf(tmp, "ls -l %s", bkpinfo->isodir);
             if (run_program_and_log_output(tmp, 2)) {
-                fatal_error
-                    ("output folder does not exist - please create it");
+                fatal_error("output folder does not exist - please create it");
             }
         } else if (flag_set['n']) {

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

@@ -2561 +2561 @@
         }
         if (bkpinfo->netfs_remote_dir == NULL) {
-            fatal_error("bkpinfo->netfs_remote_dir shold not be NULL");
+            fatal_error("bkpinfo->netfs_remote_dir should not be NULL");
         }
         strcpy(tmp1, bkpinfo->netfs_remote_dir);
@@ -2584 +2584 @@
         }
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
-
         log_msg(3, "Just set netfs_remote_dir to %s", bkpinfo->netfs_remote_dir);
         log_msg(3, "isodir is still %s", bkpinfo->isodir);
@@ -2688 +2687 @@
         bkpinfo->boot_loader = i;
 
-        mr_free(bkpinfo->include_paths);
-        strcpy(tmp1, "/");
+        if (bkpinfo->include_paths) {
+            strcpy(tmp1, bkpinfo->include_paths);
+            mr_free(bkpinfo->include_paths);
+        } else {
+            strcpy(tmp1, "/");
+        }
         if (!popup_and_get_string
             ("Backup paths",
@@ -2831 +2834 @@
     log_it("compression = %ld", bkpinfo->compression_level);
     log_it("exclude_path = %s", bkpinfo->exclude_paths);
-    log_it("include_path = %s", bkpinfo->include_paths);
+    if (bkpinfo->include_paths) {
+        log_it("include_path = %s", bkpinfo->include_paths);
+    }
 
     /* Handle devices passed in bkpinfo and print result */
@@ -3010 +3015 @@
  * The mountpoint (where it's mounted) will obviously be '/'.
  */
-char *where_is_root_mounted()
-{
-    /*@ buffers **************** */
-    static char tmp[MAX_STR_LEN];
+char *where_is_root_mounted() {
+
+/*@ buffers **************** */
+static char tmp[MAX_STR_LEN];
 
 
 #ifdef __FreeBSD__
-    strcpy(tmp, call_program_and_get_last_line_of_output
-           ("mount | grep \" on / \" | cut -d' ' -f1"));
+    strcpy(tmp, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1"));
 #else
-    strcpy(tmp, call_program_and_get_last_line_of_output
-           ("mount | grep \" on / \" | cut -d' ' -f1 | sed s/[0-9]// | sed s/[0-9]//"));
+    strcpy(tmp, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | sed s/[0-9]// | sed s/[0-9]//"));
     if (strstr(tmp, "/dev/cciss/")) {
-        strcpy(tmp, call_program_and_get_last_line_of_output
-               ("mount | grep \" on / \" | cut -d' ' -f1 | cut -dp -f1"));
+        strcpy(tmp, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | cut -dp -f1"));
     }
     if (strstr(tmp, "/dev/md")) {
-        strcpy(tmp,
-               call_program_and_get_last_line_of_output
-               ("mount | grep \" on / \" | cut -d' ' -f1"));
-    }
-#endif
-
-    return (tmp);
+        strcpy(tmp, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1"));
+    }
+#endif
+
+return (tmp);
 }
 

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

@@ -1302 +1302 @@
     struct dirent *dit;
     struct stat statbuf;
-    char *new;
+    char *new = NULL;
     char *tmp = NULL;
     char *dir = NULL;
     static int percentage = 0;
     char *skip_these = NULL;
-    char *new_with_pipe;
+    char *new_with_pipe = NULL;
     char *strtmp = NULL;
     char *token = NULL;
@@ -1395 +1395 @@
         mr_free(find_skeleton_marker);
     }
+    mr_free(dir);
 
     depth++;
 
-//  log_msg(0, "Cataloguing %s", dir);
     mr_asprintf(skip_these, "|%s|", sth);
     
@@ -1455 +1455 @@
     mr_free(new_with_pipe);
     mr_free(skip_these);
-    mr_free(dir);
 
     if (dip) {
@@ -1583 +1582 @@
         if ((include_paths != NULL) && (strlen(include_paths) == 0)) {
             log_msg(1, "Including only '/' in %s", sz_filelist);
-            open_and_list_dir("/", exclude_paths, fout,
-                              time_of_last_full_backup);
+            open_and_list_dir("/", exclude_paths, fout, time_of_last_full_backup);
         } else {
             p = include_paths;
@@ -1590 +1588 @@
                 q = next_entry(p);
                 log_msg(1, "Including %s in filelist %s", q, sz_filelist);
-                open_and_list_dir(q, exclude_paths, fout,
-                                  time_of_last_full_backup);
+                open_and_list_dir(q, exclude_paths, fout, time_of_last_full_backup);
                 p += strlen(q);
                 paranoid_free(q);
@@ -1652 +1649 @@
 
     if (bkpinfo->make_filelist) {
-        res =
-            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir,
-                               bkpinfo->scratchdir, bkpinfo->include_paths,
-                               bkpinfo->exclude_paths,
-                               bkpinfo->differential, NULL);
+        res = mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir, bkpinfo->scratchdir, bkpinfo->include_paths, bkpinfo->exclude_paths, bkpinfo->differential, NULL);
     } else {
-        res =
-            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir,
-                               bkpinfo->scratchdir, NULL,
-                               bkpinfo->exclude_paths,
-                               bkpinfo->differential,
-                               bkpinfo->include_paths);
+        res = mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir, bkpinfo->scratchdir, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
     }
 

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

@@ -51 +51 @@
     assert_string_is_neither_NULL_nor_zerolength(call);
     if ((fin = popen(call, "r"))) {
-        for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
+        while (!feof(fin)) {
+            mr_getline(tmp, fin);
             if (strlen(tmp) > 1) {
                 strcpy(result, tmp);
@@ -62 +63 @@
     }
     strip_spaces(result);
-    mr_free(tmp);
     return(result);
 }

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

@@ -92 +92 @@
     for (p = in_out; *p == ' '; p++);
     strcpy(scratch, p);
-    strip_spaces (scratch);
+    strip_spaces(scratch);
     len = (int) strlen(scratch);
     mid = width / 2;

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

@@ -366 +366 @@
     assert(bkpinfo != NULL);
 
-    bkpinfo->optimal_set_size =
-        (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) *
-        1024;
+    bkpinfo->optimal_set_size = (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) * 1024;
 
     log_msg(1, "Post-param");
@@ -383 +381 @@
         if (run_program_and_log_output(tmp, 3)) {
             mr_free(tmp);
-            fatal_error
-                ("Unable to open tape device. If you haven't specified it with -d, do so. If you already have, check your parameter. I think it's wrong.");
+            fatal_error("Unable to open tape device. If you haven't specified it with -d, do so. If you already have, check your parameter. I think it's wrong.");
         }
         mr_free(tmp);
@@ -451 +448 @@
             // -m isn't supported by growisofs, BTW...
         } else {
-            sprintf(bkpinfo->call_make_iso,
-                    "%s %s -Z %s . 2>> _ERR_",
-                    mondo_mkisofs_sz,
-                    "", bkpinfo->media_device);
+            sprintf(bkpinfo->call_make_iso, "%s %s -Z %s . 2>> _ERR_", mondo_mkisofs_sz, "", bkpinfo->media_device);
         }
         mr_free(mondo_mkisofs_sz);
@@ -519 +513 @@
         if (bkpinfo->manual_cd_tray) {
             if (bkpinfo->call_before_iso[0] == '\0') {
-            sprintf(bkpinfo->call_before_iso,
-                        "%s -o %s/"MONDO_TMPISOS" . 2>> _ERR_",
-                        mondo_mkisofs_sz, bkpinfo->tmpdir);
-                } else {
+                sprintf(bkpinfo->call_before_iso, "%s -o %s/"MONDO_TMPISOS" . 2>> _ERR_", mondo_mkisofs_sz, bkpinfo->tmpdir);
+            } else {
                 mr_asprintf(call_before_iso_user, "%s", bkpinfo->call_before_iso);
                 sprintf(bkpinfo->call_before_iso, "( %s -o %s/"MONDO_TMPISOS" . 2>> _ERR_ ; %s )", mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
@@ -1058 +1050 @@
         return (0);
     } else {
-        mr_asprintf(command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
-                label, config_file);
+        mr_asprintf(command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5", label, config_file);
         strcpy(value, call_program_and_get_last_line_of_output(command));
         mr_free(command);

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

@@ -417 +417 @@
         mr_free(bkpinfo->netfs_user);
         mr_free(bkpinfo->netfs_proto);
+        mr_free(bkpinfo->netfs_remotedir);
         mr_free(bkpinfo->exclude_devs);
         mr_free(bkpinfo->exclude_paths);
@@ -650 +651 @@
         assert(b3 != NULL);
 
-        mr_asprintf(blurb1,  "%s", b1);
-        mr_asprintf(blurb2,  "%s", b2);
-        mr_asprintf(blurb3,  "%s", b3);
+        mr_asprintf(blurb1, "%s", b1);
+        mr_asprintf(blurb2, "%s", b2);
+        mr_asprintf(blurb3, "%s", b3);
 
         strcpy(b1c, b1);
@@ -964 +965 @@
         }
         g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
-        if ((percentage < 3 && g_isoform_old_progress < 3)
-            || percentage > g_isoform_old_progress) {
+        if ((percentage < 3 && g_isoform_old_progress < 3) || percentage > g_isoform_old_progress) {
             g_isoform_old_progress = percentage;
             mr_asprintf(timeline_str, "%2ld:%02ld taken            %2ld:%02ld remaining", (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);

branches/3.2/mondo/src/lib/mr_mem.c

@@ -74 +74 @@
     size_t n = 0;
 
+    /*  We reached end of file, allocating empty string */
+    if (feof(fd)) {
+        mr_asprintf_int(lineptr, line, file, "");
+        return;
+    }
     ret = getline(lineptr,&n,fd);
-    if ((ret == -1) && (! feof(fd))) {
+    if (ret == -1) {
         mr_msg_int(1,line,file,"Unable to alloc memory in mr_getline\nExiting...");
         mr_exit(-1,"Unable to alloc memory in mr_getline");
-    }
-    /*  We reached end of file, allocating empty string */
-    if (ret == -1) {
-        mr_asprintf_int(lineptr, line, file, "");
     }
 }

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

@@ -868 +868 @@
         mr_asprintf(bkpinfo->netfs_mount, "%s", value);
 
-        read_cfg_var(g_mondo_cfg_file, "netfs-server-path", value);
+        read_cfg_var(g_mondo_cfg_file, "netfs-server-path", value);
         mr_free(bkpinfo->netfs_remote_dir);
         mr_asprintf(bkpinfo->netfs_remote_dir, "%s", value);