Changeset 3191 in MondoRescue for branches/3.2/mondo/src/common/libmondo-tools.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-tools.c (modified) (57 diffs)

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

@@ -30 +30 @@
 
 extern int g_tape_buffer_size_MB;
-extern char *g_serial_string;
 extern bool g_text_mode;
 extern int g_currentY;
 extern int g_current_media_number;
 extern char *MONDO_LOGFILE;
+extern char *g_serial_string;
 
 /* Reference to global bkpinfo */
@@ -113 +113 @@
         return;
     }
-#ifndef _XWIN
     if (!g_text_mode)
         newtSuspend();
-#endif
     printf("ASSERTION FAILED: `%s'\n", exp);
     printf("\tat %s:%d in %s\n\n", file, line, function);
@@ -163 +161 @@
     getchar();                  // skip \n
 
-#ifndef _XWIN
     if (!g_text_mode)
         newtResume();
-#endif
 }
 
@@ -175 +171 @@
 void clean_up_KDE_desktop_if_necessary(void)
 {
-    char *tmp;
-
-    malloc_string(tmp);
-    strcpy(tmp,
-           "for i in `find /root /home -maxdepth 2 -type d -name Desktop`; do \
-file=$i/.directory; if [ -f \"$file\" ] ; then mv -f $file $file.old ; \
-awk '{if (index($0, \"rootimagesmindi\")) { while (length($0)>2) { getline;} ; } \
-else { print $0;};}' $file.old  > $file ; fi ; done");
+    char *tmp = NULL;
+
+    mr_asprintf(tmp, "for i in `find /root /home -maxdepth 2 -type d -name Desktop -maxdepth 2`; do file=$i/.directory; if [ -f \"$file\" ] ; then mv -f $file $file.old ; awk '{if (index($0, \"rootimagesmindi\")) { while (length($0)>2) { getline;} ; } else { print $0;};}' $file.old  > $file ; fi ; done");
     run_program_and_log_output(tmp, 5);
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -232 +223 @@
 double get_kernel_version(void)
 {
-    char *p, tmp[200];
+    char *p = NULL;
+    char *tmp = NULL;
     double d;
 #ifdef __FreeBSD__
@@ -238 +230 @@
     d = 5.2;                    // :-)
 #else
-    strcpy(tmp, call_program_and_get_last_line_of_output("uname -r"));
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("uname -r"));
     p = strchr(tmp, '.');
     if (p) {
@@ -249 +241 @@
         }
     }
-//  log_msg(1, "tmp = '%s'", tmp);
     d = atof(tmp);
+    mr_free(tmp);
 #endif
     log_msg(1, "g_kernel_version = %f", d);
@@ -257 +249 @@
 
 
-
-
-
 /**
  * Get the current time.
@@ -268 +257 @@
     return (long) time((void *) 0);
 }
-
-
-
-
-
 
 
@@ -368 +352 @@
     char *mondo_mkisofs_sz = NULL;
     char *command = NULL;
-    char *mtpt;
-    char *hostname;
+    char *hostname = NULL;
     char *isofs_cmd = NULL;
     char *ip_address = NULL;
     int retval = 0;
     char *colon;
-    char *cdr_exe;
+    char *cdr_exe = NULL;
     char *tmp = NULL;
-    char call_before_iso_user[MAX_STR_LEN] = "\0";
-    /*
-    long avm = 0;
-    int rdsiz_MB;
-    */
+    char *p = NULL;
+    char *call_before_iso_user = NULL;
     char *iso_dev = NULL;
     char *iso_mnt = NULL;
@@ -387 +367 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(mtpt);
-    malloc_string(hostname);
-    malloc_string(cdr_exe);
+
     bkpinfo->optimal_set_size =
         (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) *
@@ -400 +378 @@
         }
         log_msg(1, "Tape");
+        if (bkpinfo->media_device == NULL) {
+            return(1);
+        }
         mr_asprintf(tmp, "mt -f %s status", bkpinfo->media_device);
         log_msg(1, "tmp = '%s'", tmp);
@@ -429 +410 @@
         strcpy(bkpinfo->zip_exe, "gzip");
         strcpy(bkpinfo->zip_suffix, "gz");
+    } else if (bkpinfo->use_lzma) {
+        strcpy(bkpinfo->zip_exe, "lzma");
+        strcpy(bkpinfo->zip_suffix, "lzma");
     } else if (bkpinfo->compression_level != 0) {
         strcpy(bkpinfo->zip_exe, "bzip2");
@@ -440 +424 @@
     if (bkpinfo->backup_media_type == dvd) {
         if (find_home_of_exe("growisofs")) {
-            strcpy(cdr_exe, "growisofs");
+            mr_asprintf(cdr_exe, "growisofs");
         }                       // unlikely to be used
         else {
@@ -462 +446 @@
     }
 #endif
-        else
-        {
+        else {
             mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
-            paranoid_free(mondo_mkisofs_sz);
             fatal_error("Manual CD tray + DVD not supported yet.");
             // -m isn't supported by growisofs, BTW...
@@ -475 +457 @@
                     mondo_mkisofs_sz,
                     "", bkpinfo->media_device);
-            paranoid_free(mondo_mkisofs_sz);
-        }
+        }
+        mr_free(mondo_mkisofs_sz);
         if (getenv ("SUDO_COMMAND")) {
             mr_asprintf(command, "strings `which growisofs` | grep -c SUDO_COMMAND");
@@ -486 +468 @@
             mr_free(command);
         }
-        log_msg(2, "call_make_iso (DVD res) is ... %s",
-                bkpinfo->call_make_iso);
+        log_msg(2, "call_make_iso (DVD res) is ... %s", bkpinfo->call_make_iso);
     }                           // end of DVD code
 
@@ -504 +485 @@
         }
         if (find_home_of_exe("cdrecord")) {
-            strcpy(cdr_exe, "cdrecord");
+            mr_asprintf(cdr_exe, "cdrecord");
         } else if (find_home_of_exe("dvdrecord")) {
-            strcpy(cdr_exe, "dvdrecord");
+            mr_asprintf(cdr_exe, "dvdrecord");
         } else {
             fatal_error("Please install either cdrecord or dvdrecord.");
@@ -544 +525 @@
                         mondo_mkisofs_sz, bkpinfo->tmpdir);
                 } else {
-                strncpy(call_before_iso_user, bkpinfo->call_before_iso, MAX_STR_LEN);
-                sprintf (bkpinfo->call_before_iso,
-                                    "( %s -o %s/"MONDO_TMPISOS" . 2>> _ERR_ ; %s )",
-                        mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
+                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);
+                mr_free(call_before_iso_user);
             }
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
-            sprintf(bkpinfo->call_make_iso,
-                    "%s %s -v %s fs=4m dev=%s speed=%d %s/"MONDO_TMPISOS,
-                    cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject",
-                    extra_cdrom_params, bkpinfo->media_device,
-                    bkpinfo->cdrw_speed, bkpinfo->tmpdir);
+            sprintf(bkpinfo->call_make_iso, "%s %s -v %s fs=4m dev=%s speed=%d %s/"MONDO_TMPISOS, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device, bkpinfo->cdrw_speed, bkpinfo->tmpdir);
         } else {
-            sprintf(bkpinfo->call_make_iso,
-                    "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s speed=%d -",
-                    mondo_mkisofs_sz, cdr_exe,
-                    (bkpinfo->please_dont_eject) ? " " : "-eject",
-                    extra_cdrom_params, bkpinfo->media_device,
-                    bkpinfo->cdrw_speed);
-        }
-        paranoid_free(mondo_mkisofs_sz);
-        paranoid_free(extra_cdrom_params);
+            sprintf(bkpinfo->call_make_iso, "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s speed=%d -", mondo_mkisofs_sz, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device, bkpinfo->cdrw_speed);
+        }
+        mr_free(cdr_exe);
+        mr_free(mondo_mkisofs_sz);
+        mr_free(extra_cdrom_params);
     }                           // end of CD code
 
@@ -577 +549 @@
 
         log_it("isodir = %s", bkpinfo->isodir);
-        mr_asprintf(command, "df -P %s | tail -n1 | cut -d' ' -f1",
-                bkpinfo->isodir);
+        mr_asprintf(command, "df -P %s | tail -n1 | cut -d' ' -f1", bkpinfo->isodir);
         log_it("command = %s", command);
-        log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
         mr_asprintf(iso_dev, "%s", call_program_and_get_last_line_of_output(command));
+        log_it("res of it = %s", iso_dev);
         mr_asprintf(tmp, "%s/ISO-DEV", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, call_program_and_get_last_line_of_output(command));
+        write_one_liner_data_file(tmp, iso_dev);
         mr_free(tmp);
         mr_free(command);
@@ -591 +562 @@
 
         log_it("command = %s", command);
-        log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
         mr_asprintf(iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
+        log_it("res of it = %s", iso_mnt);
         mr_asprintf(tmp, "%s/ISO-MNT", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, call_program_and_get_last_line_of_output(command));
+        write_one_liner_data_file(tmp, iso_mnt);
         mr_free(tmp);
         mr_free(command);
@@ -612 +583 @@
             }
         }
+        mr_free(iso_mnt);
         mr_free(iso_tmp);
-        mr_free(iso_mnt);
 
         mr_asprintf(tmp, "%s/ISODIR", bkpinfo->tmpdir);
@@ -632 +603 @@
 
     if (bkpinfo->backup_media_type == netfs) {
-        strcpy(hostname, bkpinfo->netfs_mount);
+        if (bkpinfo->netfs_mount) {
+            mr_asprintf(hostname, "%s", bkpinfo->netfs_mount);
+        } else {
+            log_it("netfs_mount is NULL");
+            retval++;
+            mr_asprintf(hostname, "");
+        }
         colon = strchr(hostname, ':');
         if (!colon) {
@@ -651 +628 @@
             }
             if (!hent) {
-                log_it("Can't resolve Network mount (%s): %s", hostname,
-                       hstrerror(h_errno));
+                log_it("Can't resolve Network mount (%s): %s", hostname, hstrerror(h_errno));
                 retval++;
             } else {
@@ -658 +634 @@
                 mr_strcat(ip_address, strchr(bkpinfo->netfs_mount, ':'));
                 strcpy(bkpinfo->netfs_mount, ip_address);
-                paranoid_free(ip_address);
+                mr_free(ip_address);
             }
         }
+        mr_free(hostname);
         store_netfs_config();
     }
@@ -668 +645 @@
         fprintf(stderr, "Type 'man mondoarchive' for help.\n");
     }
-    if (strlen(bkpinfo->tmpdir) < 2 || strlen(bkpinfo->scratchdir) < 2) {
-        log_it("tmpdir or scratchdir are blank/missing");
-        retval++;
-    }
-    if (bkpinfo->include_paths[0] == '\0') {
-        //      fatal_error ("Why no backup path?");
-        strcpy(bkpinfo->include_paths, "/");
-    }
-    chmod(bkpinfo->scratchdir, 0700);
+    if (bkpinfo->include_paths == NULL) {
+        mr_asprintf(bkpinfo->include_paths, "/");
+    }
     g_backup_media_type = bkpinfo->backup_media_type;
-    paranoid_free(mtpt);
-    paranoid_free(hostname);
-    paranoid_free(cdr_exe);
     return (retval);
 }
@@ -704 +672 @@
     if (bkpinfo->disaster_recovery) {
         if (!does_nonMS_partition_exist()) {
-            fatal_error
-                ("I am in disaster recovery mode\nPlease don't run mondoarchive.");
+            fatal_error("I am in disaster recovery mode\nPlease don't run mondoarchive.");
         }
     }
@@ -713 +680 @@
     paranoid_free(tmp);
     if (find_and_store_mondoarchives_home(g_mondo_home)) {
-        fprintf(stderr,
-                "Cannot find Mondo's homedir. I think you have >1 'mondo' directory on your hard disk. Please delete the superfluous 'mondo' directories and try again\n");
+        fprintf(stderr, "Cannot find Mondo's homedir. I think you have >1 'mondo' directory on your hard disk. Please delete the superfluous 'mondo' directories and try again\n");
         res++;
         return (res);
@@ -723 +689 @@
     }
     g_current_media_number = 1;
-    bkpinfo->postnuke_tarball[0] = bkpinfo->netfs_mount[0] = '\0';
+    bkpinfo->postnuke_tarball[0] = '\0';
     return (res);
 }
@@ -772 +738 @@
     if (p == NULL) {
         log_it("Failed to create global tmp directory %s for Mondo.",tmp);
+        mr_free(tmp);
         finish(-1);
     }
+    mr_free(tmp);
+
     strcpy(bkpinfo->tmpdir,p);
-    paranoid_free(tmp);
+    log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
 
     mr_asprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
@@ -817 +786 @@
     }
     strcpy(bkpinfo->scratchdir,p);
+    log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
     paranoid_free(tmp);
 
@@ -832 +802 @@
 {
     int i;
-
-    log_msg(1, "Hi");
+    log_msg(1, "Initializing bkpinfo");
+
     assert(bkpinfo != NULL);
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
@@ -847 +817 @@
     bkpinfo->use_lzo = FALSE;
     bkpinfo->use_gzip = FALSE;
-    bkpinfo->do_not_compress_these[0] = '\0';
+    bkpinfo->use_lzma = FALSE;
     bkpinfo->verify_data = FALSE;
     bkpinfo->backup_data = FALSE;
@@ -853 +823 @@
     bkpinfo->use_star = FALSE;
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
-    bkpinfo->disaster_recovery =
-        (am_I_in_disaster_recovery_mode()? TRUE : FALSE);
+    
+/*  We need tmpdir as early as possible for further function calls */
+    bkpinfo->tmpdir = NULL;         // Really setup after
+    setup_tmpdir(NULL);
+    setup_scratchdir(NULL);
+
+    bkpinfo->disaster_recovery = am_I_in_disaster_recovery_mode();
     if (bkpinfo->disaster_recovery) {
         strcpy(bkpinfo->isodir, "/");
@@ -861 +836 @@
     }
     strcpy(bkpinfo->prefix, STD_PREFIX);
-    setup_tmpdir(NULL);
-    setup_scratchdir(NULL);
-
     bkpinfo->optimal_set_size = 0;
-    strcpy(bkpinfo->include_paths, "/");
+    bkpinfo->backup_media_type = none;
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
-    bkpinfo->include_paths[0] = '\0';
+    bkpinfo->exclude_paths = NULL;
+    bkpinfo->include_paths = NULL;
     bkpinfo->exclude_devs = NULL;
     bkpinfo->restore_path[0] = '\0';
@@ -879 +852 @@
     bkpinfo->netfs_user = NULL;
     bkpinfo->netfs_remote_dir[0] = '\0';
-    bkpinfo->exclude_paths = NULL;
+    bkpinfo->postnuke_tarball[0] = '\0';
     bkpinfo->subdir = NULL;
-    bkpinfo->postnuke_tarball[0] = '\0';
     bkpinfo->wipe_media_first = FALSE;
     bkpinfo->differential = 0;
@@ -894 +866 @@
 
 
-
-
 /**
  * Get the remaining free space (in MB) on @p partition.
@@ -916 +886 @@
     mr_free(command);
 
-    mr_asprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
-            partition);
+    mr_asprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4", partition);
     mr_asprintf(out_sz, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -957 +926 @@
     if (system("which mkfs.vfat 2> /dev/null 1> /dev/null")
         && !system("which mkfs.msdos 2> /dev/null 1> /dev/null")) {
-        log_it
-            ("OK, you've got mkfs.msdos but not mkfs.vfat; time for the fairy to wave her magic wand...");
-        run_program_and_log_output
-            ("ln -sf `which mkfs.msdos` /sbin/mkfs.vfat", FALSE);
-    }
-    mr_asprintf(tmp, "%s",
-           call_program_and_get_last_line_of_output
-           ("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
+        log_it("OK, you've got mkfs.msdos but not mkfs.vfat; time for the fairy to wave her magic wand...");
+        run_program_and_log_output("ln -sf `which mkfs.msdos` /sbin/mkfs.vfat", FALSE);
+    }
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
     if (atol(tmp) < 35000) {
         retval++;
@@ -970 +935 @@
     }
     if (atol(tmp) < 66000) {
-        log_to_screen
-            ("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
+        log_to_screen("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
     }
     mr_free(tmp);
@@ -1026 +990 @@
         whine_if_not_found("cmp");
     }
-    run_program_and_log_output
-        ("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
-    mr_asprintf(tmp, "%s",
-           call_program_and_get_last_line_of_output
-           ("mount | grep -E \"cdr(om|w)\""));
+    run_program_and_log_output("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("mount | grep -E \"cdr(om|w)\""));
     if (strcmp("", tmp)) {
         if (strstr(tmp, "autofs")) {
@@ -1104 +1065 @@
     /*@ buffer ****************************************************** */
     char *command = NULL;
-    char *tmp = NULL;
 
     /*@ end vars *************************************************** */
@@ -1111 +1071 @@
     assert_string_is_neither_NULL_nor_zerolength(label);
     if (!does_file_exist(config_file)) {
-        mr_asprintf(tmp, "(read_cfg_var) Cannot find %s config file",
-                config_file);
-        log_to_screen(tmp);
-        mr_free(tmp);
-
+        log_to_screen("(read_cfg_var) Cannot find %s config file", config_file);
         value[0] = '\0';
         return (1);
@@ -1127 +1083 @@
         mr_free(command);
 
+        log_msg(4, "Configuration item %s is %s", label, value);
         if (strlen(value) == 0) {
             return (1);
@@ -1242 +1199 @@
  * If this is a distribution like Gentoo that doesn't keep /boot mounted, mount it.
  */
-void mount_boot_if_necessary()
-{
+void mount_boot_if_necessary() {
     char *tmp = NULL;
     char *command = NULL;
@@ -1251 +1207 @@
     g_boot_mountpt[0] = '\0';
     log_msg(4, "Done. Great. Seeting command to something");
-    mr_asprintf(command, "%s",
-           "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
+    mr_asprintf(command, "%s", "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. Command = '%s'", command);
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
@@ -1258 +1213 @@
 
     log_msg(4, "tmp = '%s'", tmp);
-    if (tmp[0]) {
-        log_it("/boot is at %s according to /etc/fstab", tmp);
-        mr_asprintf(command, "mount | grep -Ew '/boot'");
-        mr_free(tmp);
-        mr_asprintf(tmp, call_program_and_get_last_line_of_output(command));
-        mr_free(command);
-
-        if (!strcmp(tmp,"")) {
-            if (((strstr(tmp, "LABEL=") != NULL) || (strstr(tmp,"UUID=")) != NULL)) {
-                if (!run_program_and_log_output("mount /boot", 5)) {
-                    strcpy(g_boot_mountpt, "/boot");
-                    log_msg(1, "Mounted /boot");
-                } else {
-                    log_it("...ignored cos it's a label or uuid :-)");
+    log_it("/boot is at %s according to /etc/fstab", tmp);
+    mr_asprintf(command, "mount | grep -Ew '/boot'");
+    mr_free(tmp);
+
+    mr_asprintf(tmp, call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
+    if (!strcmp(tmp,"")) {
+        if ((strstr(tmp, "LABEL=") != NULL) || (strstr(tmp,"UUID=") != NULL)) {
+            if (!run_program_and_log_output("mount /boot", 5)) {
+                strcpy(g_boot_mountpt, "/boot");
+                log_msg(1, "Mounted /boot");
+            } else {
+                log_it("...ignored cos it's a label or uuid :-)");
+            }
+        } else {
+            mr_asprintf(command, "mount | grep -E '^%s'", tmp);
+            log_msg(3, "command = %s", command);
+            if (run_program_and_log_output(command, 5)) {
+                strcpy(g_boot_mountpt, tmp);
+                mr_free(tmp);
+                log_it("%s (your /boot partition) is not mounted. I'll mount it before backing up", g_boot_mountpt);
+
+                mr_asprintf(tmp, "mount %s", g_boot_mountpt);
+                if (run_program_and_log_output(tmp, 5)) {
+                    g_boot_mountpt[0] = '\0';
+                    log_msg(1, "Plan B");
+                    if (!run_program_and_log_output("mount /boot", 5)) {
+                        strcpy(g_boot_mountpt, "/boot");
+                        log_msg(1, "Plan B worked");
+                    } else {
+                        log_msg(1,
+                            "Plan B failed. Unable to mount /boot for backup purposes. This probably means /boot is mounted already, or doesn't have its own partition.");
+                    }
                 }
-            } else {
-                mr_asprintf(command, "mount | grep -E '^%s'", tmp);
-                log_msg(3, "command = %s", command);
-                if (run_program_and_log_output(command, 5)) {
-                    strcpy(g_boot_mountpt, tmp);
-                    mr_free(tmp);
-                    mr_asprintf(tmp,
-                            "%s (your /boot partition) is not mounted. I'll mount it before backing up",
-                            g_boot_mountpt);
-                    log_it(tmp);
-                    mr_free(tmp);
-
-                    mr_asprintf(tmp, "mount %s", g_boot_mountpt);
-                    if (run_program_and_log_output(tmp, 5)) {
-                        g_boot_mountpt[0] = '\0';
-                        log_msg(1, "Plan B");
-                        if (!run_program_and_log_output("mount /boot", 5)) {
-                            strcpy(g_boot_mountpt, "/boot");
-                            log_msg(1, "Plan B worked");
-                        } else {
-                            log_msg(1,
-                                "Plan B failed. Unable to mount /boot for backup purposes. This probably means /boot is mounted already, or doesn't have its own partition.");
-                        }
-                    }
-                    mr_free(tmp);
-                }
-                mr_free(command);
             }
-        }
-    }
+            mr_free(command);
+        }
+    }
+    mr_free(tmp);
     log_msg(1, "Ended sub");
 }
@@ -1340 +1290 @@
     char *command = NULL;
     char *tempfile = NULL;
-    char *tmp = NULL;
 
 
@@ -1348 +1297 @@
     assert(value != NULL);
     if (!does_file_exist(config_file)) {
-        mr_asprintf(tmp, "(write_cfg_file) Cannot find %s config file",
-                config_file);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("(write_cfg_file) Cannot find %s config file", config_file);
         return (1);
     }
     mr_asprintf(tempfile, "%s/mojo-jojo.blah", bkpinfo->tmpdir);
     if (does_file_exist(config_file)) {
-        mr_asprintf(command, "grep -vE '^%s .*$' %s > %s",
-                label, config_file, tempfile);
+        mr_asprintf(command, "grep -vE '^%s .*$' %s > %s", label, config_file, tempfile);
         paranoid_system(command);
         mr_free(command);
@@ -1378 +1323 @@
  * information to the logfile.
  */
-void standard_log_debug_msg(int debug_level, const char *szFile,
-                            const char *szFunction, int nLine,
-                            const char *fmt, ...)
-{
+void standard_log_debug_msg(int debug_level, const char *szFile, const char *szFunction, int nLine, const char *fmt, ...) {
+
     va_list args;
-    int i;
     static int depth = 0;
     FILE *fout;
@@ -1396 +1338 @@
         if (!(fout = fopen(MONDO_LOGFILE, "a"))) {
             return;
-        }       // fatal_error("Failed to openout to logfile - sheesh..."); }
+        }
 
         // add tabs to distinguish log levels
         if (debug_level > 0) {
-            for (i = 1; i < debug_level; i++)
-                fprintf(fout, "\t");
+            fprintf(fout, "DBG%d: ", debug_level);
             if (getpid() == g_main_pid)
                 fprintf(fout, "[Main] %s->%s#%d: ", szFile, szFunction, nLine);
@@ -1408 +1349 @@
             else
                 fprintf(fout, "[TH=%d] %s->%s#%d: ", getpid(), szFile, szFunction, nLine);
+        } else {
+            fprintf(fout, "INFO: ");
         }
         va_start(args, fmt);
@@ -1413 +1356 @@
         va_end(args);
 
-        // do not slow down the progran if standard debug level
-        // must be enabled: if no flush, the log won't be up-to-date if there
-        // is a segfault
-        //if (g_dwDebugLevel != 1)
-
         fprintf(fout, "\n");
         paranoid_fclose(fout);
@@ -1430 +1368 @@
                        ...) = standard_log_debug_msg;
 
-
-/**
- * If @p y, malloc @p x, else free @p x.
- * @bug This function seems orphaned. Please remove.
- */
-#define do_alloc_or_free_depending(x,y) { if(y) {x=malloc(MAX_STR_LEN);} else {paranoid_free(x);} }
 
 /**
@@ -1446 +1378 @@
         malloc_string(g_boot_mountpt);
         malloc_string(g_mondo_home);
-        /*
-        malloc_string(g_tmpfs_mountpt);
-        */
         malloc_string(g_serial_string);
         malloc_string(g_magicdev_command);
@@ -1454 +1383 @@
         paranoid_free(g_boot_mountpt);
         paranoid_free(g_mondo_home);
-        /*
-        paranoid_free(g_tmpfs_mountpt);
-        */
-        paranoid_free(g_serial_string);
         paranoid_free(g_magicdev_command);
 
-    }
-
-    /*
-       char**list_of_arrays[] = {
-       &g_boot_mountpt,
-       &g_mondo_home,
-       &g_tmpfs_mountpt,
-       &g_serial_string,
-       &g_magicdev_command,
-       NULL};
-
-       char**ppcurr;
-       int i;
-
-       for(i=0;list_of_arrays[i];i++)
-       {
-       log_msg(5, "Allocating %d", i);
-       ppcurr = list_of_arrays[i];
-       if (mal)
-       { *ppcurr = malloc(MAX_STR_LEN); }
-       else
-       {
-       if (*ppcurr)
-       {
-       free(*ppcurr);
-       }
-       }
-       }
-       log_msg(5, "Returning");
-     */
+        mr_free(g_serial_string);
+    }
 }
 
@@ -1518 +1415 @@
 void stop_magicdev_if_necessary()
 {
-    strcpy(g_magicdev_command,
-           call_program_and_get_last_line_of_output
-           ("ps ax | grep -w magicdev | grep -v grep | tr -s '\t' ' '| cut -d' ' -f6-99"));
+    strcpy(g_magicdev_command, call_program_and_get_last_line_of_output("ps ax | grep -w magicdev | grep -v grep | tr -s '\t' ' '| cut -d' ' -f6-99"));
     if (g_magicdev_command[0]) {
         log_msg(1, "g_magicdev_command = '%s'", g_magicdev_command);