Changeset 3191 in MondoRescue for branches/3.2/mondo/src/common/libmondo-cli.c

Timestamp:

Sep 25, 2013, 8:55:45 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Lots of memory management backports from 3.1 to 3.2 - still not finished, nor working ATM. the common subdir was done during travel, so this is essentially a backup !

File:

• branches/3.2/mondo/src/common/libmondo-cli.c (modified) (39 diffs)

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

@@ -97 +97 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            mr_asprintf(tmp, "-%c %s", i, flag_val[i]);
-            log_msg(3, tmp);
-            mr_free(tmp);
+            log_msg(3, "-%c %s", i, flag_val[i]);
         }
     }
@@ -150 +148 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+    char *tmp2 = NULL;
     char *psz = NULL;
     char *p = NULL;
@@ -208 +207 @@
             log_msg(1, "Using star instead of afio");
         } else {
-            fatal_error
-                ("Neither afio nor star is installed. Please install at least one.");
+            fatal_error("Neither afio nor star is installed. Please install at least one.");
         }
     }
@@ -219 +217 @@
         }
         if (!find_home_of_exe("star")) {
-            fatal_error
-                ("Please install 'star' RPM or tarball if you are going to use -R. Thanks.");
+            fatal_error("Please install 'star' RPM or tarball if you are going to use -R. Thanks.");
         }
     }
@@ -234 +231 @@
 
     if (flag_set['I']) {
-        if (bkpinfo->include_paths[0] == '-') {
+        if (bkpinfo->include_paths && bkpinfo->include_paths[0] == '-') {
             retval++;
             log_to_screen("Please supply a sensible value with '-I'\n");
@@ -268 +265 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
         mr_make_devlist_from_pathlist(flag_val['I'], 'I');
         log_msg(4, "Finished with the -I option");
     }
 
-    if (g_kernel_version >= 2.6 && !flag_set['d']
-        && (flag_set['c'] || flag_set['w']) && (! bkpinfo->restore_data)) {
-        fatal_error
-            ("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
+    if (g_kernel_version >= 2.6 && !flag_set['d'] && (flag_set['c'] || flag_set['w']) && (! bkpinfo->restore_data)) {
+        fatal_error("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
     }
 
@@ -283 +278 @@
         if (flag_set['I']) {
             retval++;
-            log_to_screen
-                ("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't muddy the waters by combining -J with -I. Thanks. :-)");
+            log_to_screen("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't muddy the waters by combining -J with -I. Thanks. :-)");
         }
         bkpinfo->make_filelist = FALSE;
-        strcpy(bkpinfo->include_paths, flag_val['J']);
+        mr_asprintf(bkpinfo->include_paths, "%s", flag_val['J']);
     }
 
     if ((flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r']) && (! bkpinfo->restore_data)) {
-        if (!flag_set['r'] && g_kernel_version <= 2.5
-            && strstr(flag_val['d'], "/dev/")) {
-            fatal_error
-                ("Please don't give a /dev entry. Give a SCSI node for the parameter of the -d flag.");
-        }
-        if (flag_set['r'] && g_kernel_version <= 2.5
-            && !strstr(flag_val['d'], "/dev/")) {
-            fatal_error
-                ("Please give a /dev entry, not a SCSI node, as the parameter of the -d flag.");
+        if (!flag_set['r'] && g_kernel_version <= 2.5 && strstr(flag_val['d'], "/dev/")) {
+            fatal_error("Please don't give a /dev entry. Give a SCSI node for the parameter of the -d flag.");
+        }
+        if (flag_set['r'] && g_kernel_version <= 2.5 && !strstr(flag_val['d'], "/dev/")) {
+            fatal_error("Please give a /dev entry, not a SCSI node, as the parameter of the -d flag.");
         }
         if (g_kernel_version >= 2.6 && !strstr(flag_val['d'], "/dev/")) {
-            log_to_screen
-                ("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
-        }
-
-        if (system("which cdrecord > /dev/null 2> /dev/null")
-            && system("which dvdrecord > /dev/null 2> /dev/null")) {
-            fatal_error
-                ("Please install dvdrecord/cdrecord and try again.");
+            log_to_screen("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
+        }
+
+        if (system("which cdrecord > /dev/null 2> /dev/null") && system("which dvdrecord > /dev/null 2> /dev/null")) {
+            fatal_error("Please install dvdrecord/cdrecord and try again.");
         }
         if (flag_set['C']) {
             bkpinfo->cdrw_speed = atoi(flag_val['C']);
             if (bkpinfo->cdrw_speed < 1) {
-                fatal_error
-                    ("You specified a silly speed for a CD-R[W] drive");
+                fatal_error("You specified a silly speed for a CD-R[W] drive");
             }
             if (!flag_set['L']) {
-                log_to_screen
-                    ("You must use -L with -C. Therefore I am setting it for you.");
+                log_to_screen("You must use -L with -C. Therefore I am setting it for you.");
                 flag_set['L'] = 1;
                 flag_val['L'][0] = '\0';
@@ -326 +311 @@
             log_msg(3, "flag_val['c'] = %s", flag_val['c']);
             log_msg(3, "flag_val['w'] = %s", flag_val['w']);
-//    log_msg(3, "flag_set['r'] = %i", flag_set['r'] );
             if (flag_set['c']) {
                 bkpinfo->cdrw_speed = atoi(flag_val['c']);
@@ -336 +320 @@
 
             if (bkpinfo->cdrw_speed < 1) {
-                fatal_error
-                    ("You specified a silly speed for a CD-R[W] drive");
+                fatal_error("You specified a silly speed for a CD-R[W] drive");
             }
         }
@@ -345 +328 @@
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
         if (find_tape_device_and_size(flag_val['d'], tmp)) {
-            fatal_error
-                ("Tape device not specified. I couldn't find it either.");
+            fatal_error("Tape device not specified. I couldn't find it either.");
         }
         flag_set['d'] = TRUE;
-        sprintf(tmp,
-                "You didn't specify a tape streamer device. I'm assuming %s",
-                flag_val['d']);
-        log_to_screen(tmp);
+        log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
     }
 
@@ -358 +337 @@
     {
         if (! flag_set['d']) {
-            fatal_error
-                ("You need to specify a device file with -d for bootable USB device usage");
+            fatal_error("You need to specify a device file with -d for bootable USB device usage");
         }
         if ((!flag_set['s']) && (! bkpinfo->restore_data)) {
@@ -369 +347 @@
     {
         if (flag_set['m']) {
-            fatal_error
-                ("Manual CD tray (-m) not yet supported in conjunction w/ DVD drives. Drop -m.");
+            fatal_error("Manual CD tray (-m) not yet supported in conjunction w/ DVD drives. Drop -m.");
         }
         if (!flag_set['d']) {
@@ -379 +356 @@
         }
         if (strchr(flag_val['d'], ',')) {
-            fatal_error
-                ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
+            fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
         if (! bkpinfo->restore_data) {
             if (!find_home_of_exe("growisofs")) {
-                fatal_error
-                    ("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+                fatal_error("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
             }
             if (!find_home_of_exe("dvd+rw-format")) {
-                fatal_error
-                    ("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+                fatal_error("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
             }
             if (!flag_set['s']) {
                 sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
                 strcat(flag_val['s'], "m");
-                log_to_screen
-                    ("You did not specify a size (-s) for DVD. I'm guessing %s.",
-                    flag_val['s']);
+                log_to_screen("You did not specify a size (-s) for DVD. I'm guessing %s.", flag_val['s']);
                 flag_set['s'] = 1;
             }
         }
-/*
-      if (flag_set['Z']) {
-      bkpinfo->blank_dvd_first = TRUE;
-      }
-*/
     }
 
     if (flag_set['t'] || flag_set['u']) {   /* tape size */
         if (strchr(flag_val['d'], ',')) {
-            fatal_error
-                ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
+            fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
         if ((flag_set['O']) && (! bkpinfo->restore_data)) {
             if (flag_set['s']) {
                 if (flag_set['t']) {
-                    fatal_error
-                        ("For the moment, please don't specify a tape size. Mondo should handle end-of-tape gracefully anyway.");
+                    fatal_error("For the moment, please don't specify a tape size. Mondo should handle end-of-tape gracefully anyway.");
                 }
                 if (process_the_s_switch(flag_val['s'])) {
@@ -440 +405 @@
 
     if (flag_set['n']) {
-        strncpy(bkpinfo->netfs_mount, flag_val['n'], MAX_STR_LEN);
+        mr_free(bkpinfo->netfs_mount);
+        mr_asprintf(bkpinfo->netfs_mount, "%s", flag_val['n']);
         if (!flag_set['d']) {
-            strncpy(bkpinfo->netfs_remote_dir, "/", MAX_STR_LEN);
+            mr_free(bkpinfo->netfs_remote_dir);
+            mr_asprintf(bkpinfo->netfs_remote_dir, "/");
         }
         /* test for protocol */
@@ -473 +440 @@
         /* Store the 2 values */
         /*  using memmove instead of strcpy as per #584 */
-        memmove(bkpinfo->netfs_mount, p, MAX_STR_LEN); 
+        /* memmove(bkpinfo->netfs_mount, p, MAX_STR_LEN); */
+        bkpinfo->netfs_mount = p;
 
         /* test if we specified a user */
@@ -479 +447 @@
         if (p != NULL) {
             /* User found. Store the 2 values */
+            bkpinfo->netfs_user = bkpinfo->netfs_mount;
             p++;
             /* new netfs mount */
-            strcpy(tmp,p);
+            mr_asprintf(bkpinfo->netfs_mount, "%s", p);
+            /* now that user is computed, create the right value by removing end of string */
             p--;
             *p = '\0';
-            mr_asprintf(q,"%s",bkpinfo->netfs_mount);
-            bkpinfo->netfs_user = q;
-            strcpy(bkpinfo->netfs_mount,tmp);
-        }
-        sprintf(tmp, "mount | grep -E \"^[a-z]*#*[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user,
-                bkpinfo->netfs_mount);
-        strncpy(bkpinfo->isodir,
-                call_program_and_get_last_line_of_output(tmp),
-                MAX_STR_LEN / 4);
+        }
+        mr_asprintf(tmp1, "mount | grep -E \"^[a-z]*#*[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+        strncpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(tmp), MAX_STR_LEN / 4);
+        mr_free(tmp1);
+
         if (strlen(bkpinfo->isodir) < 3) {
             log_to_screen("Network share is not mounted. Trying to mount it for you.\n");
             if (bkpinfo->netfs_user) {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    sprintf(tmp, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                    sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
+                    mr_asprintf(tmp1, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
-                    sprintf(tmp, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
                 } else {
                     log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
@@ -508 +474 @@
             } else {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    sprintf(tmp, "sshfs %s", bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "sshfs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                    sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "mount -t cifs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
-                    sprintf(tmp, "mount %s", bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "mount %s", bkpinfo->netfs_mount);
                 } else {
                     log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
@@ -518 +484 @@
                 }
             }
-            if (system(tmp)) {
+            i = system(tmp1);
+            mr_free(tmp1);
+
+            if (i) {
                 log_to_screen("Unable to mount Network share %s. Please mount manually.\n", bkpinfo->netfs_mount);
                 retval++;
             } else {
                 if (bkpinfo->netfs_user) {
-                    sprintf(tmp, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user,
-                        bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
                 } else {
-                    sprintf(tmp, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
                 }
-                strncpy(bkpinfo->isodir,
-                        call_program_and_get_last_line_of_output(tmp),
-                        MAX_STR_LEN / 4);
+                strncpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(tmp), MAX_STR_LEN / 4);
                 if (strlen(bkpinfo->isodir) < 3) {
                     retval++;
@@ -624 +590 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         mr_make_devlist_from_pathlist(flag_val['E'], 'E');
@@ -668 +634 @@
         log_msg(1, "Internal tape block size is now %ld bytes", itbs);
         if (itbs % 512 != 0 || itbs < 256 || itbs > 1024L * 1024) {
-            fatal_error
-                ("Are you nuts? Silly, your internal tape block size is. Abort, I shall.");
+            fatal_error("Are you nuts? Silly, your internal tape block size is. Abort, I shall.");
         }
         bkpinfo->internal_tape_block_size = itbs;
@@ -678 +643 @@
 //      bkpinfo->differential = atoi (flag_val['D']);
         if ((bkpinfo->differential < 1) || (bkpinfo->differential > 9)) {
-            fatal_error
-                ("The D option should be between 1 and 9 inclusive");
+            fatal_error("The D option should be between 1 and 9 inclusive");
         }
     }
@@ -702 +666 @@
             && !does_file_exist(bkpinfo->kernel_path)) {
             retval++;
-            sprintf(tmp,
-                    "You specified kernel '%s', which does not exist\n",
-                    bkpinfo->kernel_path);
-            log_to_screen(tmp);
+            log_to_screen("You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path);
         }
     }
@@ -723 +684 @@
             }
         } else if (flag_set['n']) {
-            strncpy(bkpinfo->netfs_remote_dir, flag_val['d'], MAX_STR_LEN);
+            mr_free(bkpinfo->netfs_remote_dir);
+            mr_asprintf(bkpinfo->netfs_remote_dir, "%s", flag_val['d']);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
             strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
@@ -732 +694 @@
         mr_asprintf(tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->netfs_remote_dir);
         if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
-            sprintf(tmp, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
+            mr_asprintf(tmp2, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
         } else {
-            sprintf(tmp, "echo hi > %s", tmp1);
-        }
-        if (run_program_and_log_output(tmp, 2)) {
-            retval++;
-            sprintf(tmp,
-                    "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
-                    bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
-            log_to_screen(tmp);
+            mr_asprintf(tmp2, "echo hi > %s", tmp1);
+        }
+        i = run_program_and_log_output(tmp2, 2);
+        mr_free(tmp2);
+
+        if (i) {
+            retval++;
+            log_to_screen("Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
         }
         unlink(tmp1);
-        paranoid_free(tmp1);
-    }
-
-    if (!flag_set['d']
-        && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
+        mr_free(tmp1);
+    }
+
+    if (!flag_set['d'] && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
         if (g_kernel_version >= 2.6) {
             if (popup_and_get_string
@@ -769 +730 @@
         retval++;
         log_to_screen("Please specify the backup device/directory.\n");
-        fatal_error
-            ("You didn't use -d to specify the backup device/directory.");
+        fatal_error("You didn't use -d to specify the backup device/directory.");
     }
 
@@ -781 +741 @@
     if (flag_set['S']) {
         setup_scratchdir(flag_val['S']);
-        sprintf(tmp, "touch %s/.foo.dat", bkpinfo->scratchdir);
-        if (run_program_and_log_output(tmp, 1)) {
-            retval++;
+        mr_asprintf(tmp1, "touch %s/.foo.dat", bkpinfo->scratchdir);
+        if (run_program_and_log_output(tmp1, 1)) {
+            retval++;
+            mr_free(tmp1);
             log_to_screen("Please specify a scratchdir which I can write to. :)");
             fatal_error("I cannot write to the scratchdir you specified.");
         }
-        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->scratchdir, bkpinfo->scratchdir);
-        if (run_program_and_log_output(tmp, 1)) {
-            retval++;
+        mr_free(tmp1);
+
+        mr_asprintf(tmp1, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->scratchdir, bkpinfo->scratchdir);
+        if (run_program_and_log_output(tmp1, 1)) {
+            retval++;
+            mr_free(tmp1);
             log_to_screen("Please don't specify a SAMBA or VFAT or NFS scratchdir.");
             fatal_error("I cannot write to the scratchdir you specified.");
         }
+        mr_free(tmp1);
     }
 
     if (flag_set['T']) {
         setup_tmpdir(flag_val['T']);
-        sprintf(tmp, "touch %s/.foo.dat", bkpinfo->tmpdir);
-        if (run_program_and_log_output(tmp, 1)) {
+        mr_asprintf(tmp1, "touch %s/.foo.dat", bkpinfo->tmpdir);
+        i = run_program_and_log_output(tmp1, 1);
+        mr_free(tmp1);
+
+        if (i) {
             retval++;
             log_to_screen("Please specify a tempdir which I can write to. :)");
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
-        if (run_program_and_log_output(tmp, 1)) {
+        mr_asprintf(tmp1, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
+        i = run_program_and_log_output(tmp1, 1);
+        mr_free(tmp1);
+
+        if (i) {
             retval++;
             log_to_screen("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
@@ -833 +804 @@
 #  endif
 #endif
-        if (!strchr
-            (BOOT_LOADER_CHARS,
-             (bkpinfo->boot_loader = flag_val['l'][0]))) {
-            log_msg(1, "%c? WTF is %c? I need G, L, E or R.",
-                    bkpinfo->boot_loader, bkpinfo->boot_loader);
-            fatal_error
-                ("Please specify GRUB, LILO, ELILO  or RAW with the -l switch");
+        if (!strchr(BOOT_LOADER_CHARS, (bkpinfo->boot_loader = flag_val['l'][0]))) {
+            log_msg(1, "%c? What is %c? I need G, L, E or R.", bkpinfo->boot_loader, bkpinfo->boot_loader);
+            fatal_error("Please specify GRUB, LILO, ELILO  or RAW with the -l switch");
         }
 #undef BOOT_LOADER_CHARS
@@ -845 +812 @@
 
     if (flag_set['f']) {
-        strncpy(bkpinfo->boot_device,
-                resolve_softlinks_to_get_to_actual_device_file(flag_val
-                                                               ['f']),
-                MAX_STR_LEN / 4);
+        strncpy(bkpinfo->boot_device, resolve_softlinks_to_get_to_actual_device_file(flag_val['f']),MAX_STR_LEN / 4);
     }
 
@@ -866 +830 @@
         if (run_program_and_log_output("which lzop", 2)) {
             retval++;
-            log_to_screen
-                ("Please install LZOP. You can't use '-L' until you do.\n");
+            log_to_screen("Please install LZOP. You can't use '-L' until you do.\n");
         }
     }
@@ -880 +843 @@
         if (run_program_and_log_output("which gzip", 2)) {
             retval++;
-            log_to_screen
-                ("Please install gzip. You can't use '-G' until you do.\n");
+            log_to_screen("Please install gzip. You can't use '-G' until you do.\n");
+        }
+    }
+
+    if ((flag_set['Y']) && (! bkpinfo->restore_data)) {
+        bkpinfo->use_lzma = TRUE;
+        if (run_program_and_log_output("which lzma", 2)) {
+            retval++;
+            log_to_screen("Please install lzma. You can't use '-Y' until you do.\n");
         }
     }
@@ -897 +867 @@
     if ((!is_this_a_valid_disk_format("vfat")) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
-        log_to_screen
-            ("Your kernel appears not to support vfat filesystems. I am therefore");
-        log_to_screen
-            ("using LILO instead of SYSLINUX as the media boot loader.");
+        log_to_screen("Your kernel appears not to support vfat filesystems. I am therefore");
+        log_to_screen("using LILO instead of SYSLINUX as the media boot loader.");
     }
     if ((run_program_and_log_output("which mkfs.vfat", 2)) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
 #ifdef __IA32__
-        log_to_screen
-            ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
-        log_to_screen
-            ("your boot loader. I shall therefore use LILO instead.");
+        log_to_screen("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
+        log_to_screen("your boot loader. I shall therefore use LILO instead.");
 #endif
 #ifdef __IA64__
-        log_to_screen
-            ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
+        log_to_screen("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
         log_to_screen("environment correctly. Please install it.");
         fatal_error("Aborting");
@@ -932 +897 @@
 
     if ((! bkpinfo->restore_data) && (flag_set['Z'])) {
-            fatal_error
-                ("The -Z switch is only valid in restore mode");
+            fatal_error("The -Z switch is only valid in restore mode");
     }
 
@@ -973 +937 @@
  * @return The number of problems with the command line (0 for success).
  */
-int
-retrieve_switches_from_command_line(int argc, char *argv[],
-                                    char flag_val[128][MAX_STR_LEN],
-                                    bool flag_set[128])
+int retrieve_switches_from_command_line(int argc, char *argv[], char flag_val[128][MAX_STR_LEN], bool flag_set[128])
 {
     /*@ ints ** */
     int opt = 0;
-    char *tmp = NULL;
     int i = 0;
     int len;
@@ -994 +954 @@
         flag_set[i] = FALSE;
     }
-    while ((opt =
-            getopt(argc, argv, MONDO_OPTIONS))
-           != -1) {
+    while ((opt = getopt(argc, argv, MONDO_OPTIONS)) != -1) {
         if (opt == '?') {
             bad_switches = TRUE;
-            /*log_it("Invalid option: %c\n",optopt); */
         } else {
             if (flag_set[opt]) {
                 bad_switches = TRUE;
-                mr_asprintf(tmp, "Switch -%c previously defined as %s\n", opt, flag_val[opt]);
-                log_to_screen(tmp);
-                paranoid_free(tmp);
+                log_to_screen("Switch -%c previously defined as %s\n", opt, flag_val[opt]);
             } else {
                 flag_set[opt] = TRUE;
@@ -1019 +974 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            mr_asprintf(tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
-                            log_to_screen(tmp);
-                            paranoid_free(tmp);
+                            log_to_screen("-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
                             bad_switches = TRUE;
                         }
@@ -1032 +985 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        mr_asprintf(tmp, "Invalid arg -- %s\n", argv[i]);
-        log_to_screen(tmp);
-        paranoid_free(tmp);
+        log_to_screen("Invalid arg -- %s\n", argv[i]);
     }
     return (bad_switches);
@@ -1097 +1048 @@
     mr_strcat(tmp, " signal received from OS");
     log_to_screen(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     log_to_screen(tmp2);
-    paranoid_free(tmp2);
+    mr_free(tmp2);
     if (sig == SIGABRT) {
         sleep(10);
@@ -1108 +1059 @@
     free_MR_global_filenames();
 
-    fatal_error
-        ("MondoRescue is terminating in response to a signal from the OS");
+    fatal_error("MondoRescue is terminating in response to a signal from the OS");
     finish(254);                // just in case
 }
@@ -1122 +1072 @@
 void set_signals(int on)
 {
-    int signals[] =
-        { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 };
+    int signals[] = { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 };
     int i;