Changeset 3192 in MondoRescue for branches/3.0/mondo/src/common/libmondo-cli.c

Timestamp:

Sep 25, 2013, 9:03:25 AM (11 years ago)

Author:

Bruno Cornec

Message:

• revert r3188 & r3189 as I started to work on branch 3.0 before deciding it was much better to do it in 3.2. This will allow some small maintenance work on 3.0 if needed, while pushing all the rest to 3.2 and providing early access to it.

File:

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

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

@@ -97 +97 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            log_msg(3, "-%c %s", i, flag_val[i]);
+            mr_asprintf(tmp, "-%c %s", i, flag_val[i]);
+            log_msg(3, tmp);
+            mr_free(tmp);
         }
     }
@@ -148 +150 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
-    char *tmp2 = NULL;
     char *psz = NULL;
     char *p = NULL;
@@ -207 +208 @@
             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.");
         }
     }
@@ -217 +219 @@
         }
         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.");
         }
     }
@@ -231 +234 @@
 
     if (flag_set['I']) {
-        if (bkpinfo->include_paths && bkpinfo->include_paths[0] == '-') {
+        if (bkpinfo->include_paths[0] == '-') {
             retval++;
             log_to_screen("Please supply a sensible value with '-I'\n");
@@ -265 +268 @@
             }
         }
-        mr_free(tmp1);
+        paranoid_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.");
     }
 
@@ -278 +283 @@
         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;
-        mr_asprintf(bkpinfo->include_paths, "%s", flag_val['J']);
+        strcpy(bkpinfo->include_paths, 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';
@@ -311 +326 @@
             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']);
@@ -320 +336 @@
 
             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");
             }
         }
@@ -328 +345 @@
         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;
-        log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
+        sprintf(tmp,
+                "You didn't specify a tape streamer device. I'm assuming %s",
+                flag_val['d']);
+        log_to_screen(tmp);
     }
 
@@ -337 +358 @@
     {
         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)) {
@@ -347 +369 @@
     {
         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']) {
@@ -356 +379 @@
         }
         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'])) {
@@ -405 +440 @@
 
     if (flag_set['n']) {
-        mr_free(bkpinfo->netfs_mount);
-        mr_asprintf(bkpinfo->netfs_mount, "%s", flag_val['n']);
+        strncpy(bkpinfo->netfs_mount, flag_val['n'], MAX_STR_LEN);
         if (!flag_set['d']) {
-            mr_free(bkpinfo->netfs_remote_dir);
-            mr_asprintf(bkpinfo->netfs_remote_dir, "/");
+            strncpy(bkpinfo->netfs_remote_dir, "/", MAX_STR_LEN);
         }
         /* test for protocol */
@@ -440 +473 @@
         /* Store the 2 values */
         /*  using memmove instead of strcpy as per #584 */
-        /* memmove(bkpinfo->netfs_mount, p, MAX_STR_LEN); */
-        bkpinfo->netfs_mount = p;
+        memmove(bkpinfo->netfs_mount, p, MAX_STR_LEN); 
 
         /* test if we specified a user */
@@ -447 +479 @@
         if (p != NULL) {
             /* User found. Store the 2 values */
-            bkpinfo->netfs_user = bkpinfo->netfs_mount;
             p++;
             /* new netfs mount */
-            mr_asprintf(bkpinfo->netfs_mount, "%s", p);
-            /* now that user is computed, create the right value by removing end of string */
+            strcpy(tmp,p);
             p--;
             *p = '\0';
-        }
-        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);
-
+            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);
         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")) {
-                    mr_asprintf(tmp1, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                    sprintf(tmp, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                    mr_asprintf(tmp1, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
+                    sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
-                    mr_asprintf(tmp1, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                    sprintf(tmp, "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);
@@ -474 +508 @@
             } else {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(tmp1, "sshfs %s", bkpinfo->netfs_mount);
+                    sprintf(tmp, "sshfs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                    mr_asprintf(tmp1, "mount -t cifs %s", bkpinfo->netfs_mount);
+                    sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
-                    mr_asprintf(tmp1, "mount %s", bkpinfo->netfs_mount);
+                    sprintf(tmp, "mount %s", bkpinfo->netfs_mount);
                 } else {
                     log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
@@ -484 +518 @@
                 }
             }
-            i = system(tmp1);
-            mr_free(tmp1);
-
-            if (i) {
+            if (system(tmp)) {
                 log_to_screen("Unable to mount Network share %s. Please mount manually.\n", bkpinfo->netfs_mount);
                 retval++;
             } else {
                 if (bkpinfo->netfs_user) {
-                    mr_asprintf(tmp1, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                    sprintf(tmp, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user,
+                        bkpinfo->netfs_mount);
                 } else {
-                    mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
+                    sprintf(tmp, "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++;
@@ -590 +624 @@
             }
         }
-        mr_free(tmp1);
+        paranoid_free(tmp1);
 
         mr_make_devlist_from_pathlist(flag_val['E'], 'E');
@@ -634 +668 @@
         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;
@@ -643 +678 @@
 //      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");
         }
     }
@@ -666 +702 @@
             && !does_file_exist(bkpinfo->kernel_path)) {
             retval++;
-            log_to_screen("You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path);
+            sprintf(tmp,
+                    "You specified kernel '%s', which does not exist\n",
+                    bkpinfo->kernel_path);
+            log_to_screen(tmp);
         }
     }
@@ -684 +723 @@
             }
         } else if (flag_set['n']) {
-            mr_free(bkpinfo->netfs_remote_dir);
-            mr_asprintf(bkpinfo->netfs_remote_dir, "%s", flag_val['d']);
+            strncpy(bkpinfo->netfs_remote_dir, flag_val['d'], MAX_STR_LEN);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
             strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
@@ -694 +732 @@
         mr_asprintf(tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->netfs_remote_dir);
         if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
-            mr_asprintf(tmp2, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
+            sprintf(tmp, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
         } else {
-            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);
+            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);
         }
         unlink(tmp1);
-        mr_free(tmp1);
-    }
-
-    if (!flag_set['d'] && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
+        paranoid_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
@@ -730 +769 @@
         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.");
     }
 
@@ -741 +781 @@
     if (flag_set['S']) {
         setup_scratchdir(flag_val['S']);
-        mr_asprintf(tmp1, "touch %s/.foo.dat", bkpinfo->scratchdir);
-        if (run_program_and_log_output(tmp1, 1)) {
-            retval++;
-            mr_free(tmp1);
+        sprintf(tmp, "touch %s/.foo.dat", bkpinfo->scratchdir);
+        if (run_program_and_log_output(tmp, 1)) {
+            retval++;
             log_to_screen("Please specify a scratchdir which I can write to. :)");
             fatal_error("I cannot write to the scratchdir you specified.");
         }
-        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);
+        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->scratchdir, bkpinfo->scratchdir);
+        if (run_program_and_log_output(tmp, 1)) {
+            retval++;
             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']);
-        mr_asprintf(tmp1, "touch %s/.foo.dat", bkpinfo->tmpdir);
-        i = run_program_and_log_output(tmp1, 1);
-        mr_free(tmp1);
-
-        if (i) {
+        sprintf(tmp, "touch %s/.foo.dat", bkpinfo->tmpdir);
+        if (run_program_and_log_output(tmp, 1)) {
             retval++;
             log_to_screen("Please specify a tempdir which I can write to. :)");
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        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) {
+        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
+        if (run_program_and_log_output(tmp, 1)) {
             retval++;
             log_to_screen("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
@@ -804 +833 @@
 #  endif
 #endif
-        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");
+        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");
         }
 #undef BOOT_LOADER_CHARS
@@ -812 +845 @@
 
     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);
     }
 
@@ -830 +866 @@
         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");
         }
     }
@@ -843 +880 @@
         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");
-        }
-    }
-
-    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");
+            log_to_screen
+                ("Please install gzip. You can't use '-G' until you do.\n");
         }
     }
@@ -867 +897 @@
     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");
@@ -897 +932 @@
 
     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");
     }
 
@@ -937 +973 @@
  * @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;
@@ -954 +994 @@
         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;
-                log_to_screen("Switch -%c previously defined as %s\n", opt, flag_val[opt]);
+                mr_asprintf(tmp, "Switch -%c previously defined as %s\n", opt, flag_val[opt]);
+                log_to_screen(tmp);
+                paranoid_free(tmp);
             } else {
                 flag_set[opt] = TRUE;
@@ -974 +1019 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            log_to_screen("-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
+                            mr_asprintf(tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
+                            log_to_screen(tmp);
+                            paranoid_free(tmp);
                             bad_switches = TRUE;
                         }
@@ -985 +1032 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        log_to_screen("Invalid arg -- %s\n", argv[i]);
+        mr_asprintf(tmp, "Invalid arg -- %s\n", argv[i]);
+        log_to_screen(tmp);
+        paranoid_free(tmp);
     }
     return (bad_switches);
@@ -1048 +1097 @@
     mr_strcat(tmp, " signal received from OS");
     log_to_screen(tmp);
-    mr_free(tmp);
+    paranoid_free(tmp);
 
     log_to_screen(tmp2);
-    mr_free(tmp2);
+    paranoid_free(tmp2);
     if (sig == SIGABRT) {
         sleep(10);
@@ -1059 +1108 @@
     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
 }
@@ -1072 +1122 @@
 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;