Changeset 2334 in MondoRescue for branches/2.2.10/mondo/src/common

Timestamp:

Aug 18, 2009, 5:28:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3369@localhost: bruno | 2009-08-18 16:57:27 +0200

• Transform bout 100 strcpy in dyn. allocation. Quality is improving
• function figure_out_kernel_path_interactively_if_necessary now return a dynamically allocated string
• mondoarchive checked with valgrind in text an newt modes

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-archive-EXT.h (modified) (1 diff)
• libmondo-archive.c (modified) (3 diffs)
• libmondo-archive.h (modified) (1 diff)
• libmondo-cli.c (modified) (5 diffs)
• libmondo-devices.c (modified) (5 diffs)
• libmondo-files-EXT.h (modified) (1 diff)
• libmondo-files.c (modified) (6 diffs)
• libmondo-files.h (modified) (1 diff)
• libmondo-raid.c (modified) (3 diffs)
• libmondo-stream-EXT.h (modified) (1 diff)
• libmondo-stream.c (modified) (7 diffs)
• libmondo-stream.h (modified) (1 diff)
• libmondo-string.c (modified) (1 diff)
• libmondo-tools.c (modified) (17 diffs)
• libmondo-verify.c (modified) (6 diffs)
• newt-specific.c (modified) (16 diffs)

branches/2.2.10/mondo/src/common/libmondo-archive-EXT.h

@@ -10 +10 @@
 extern int do_that_initial_phase();
 extern int do_that_final_phase();
-extern int figure_out_kernel_path_interactively_if_necessary(char *kernel);
+extern char *figure_out_kernel_path_interactively_if_necessary(void);
 extern int make_those_slices_phase();
 extern int make_those_afios_phase();

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

@@ -441 +441 @@
 
     copy_mondo_and_mindi_stuff_to_scratchdir(); // payload, too, if it exists
+    mr_free(bkpinfo->kernel_path);
 #if __FreeBSD__ == 5
     mr_asprintf(bkpinfo->kernel_path, "/boot/kernel/kernel");
@@ -446 +447 @@
     mr_asprintf(bkpinfo->kernel_path, "/kernel");
 #elif linux
-    if (figure_out_kernel_path_interactively_if_necessary(bkpinfo->kernel_path)) {
+    if ((bkpinfo->kernel_path = figure_out_kernel_path_interactively_if_necessary()) == NULL) {
         fatal_error("Kernel not found. Please specify manually with the '-k' switch.");
     }
@@ -854 +855 @@
             use_gzip_sz);       // parameter #20 (STRING)
 
+    mr_free(tmp2);
     mr_free(devs_to_exclude);
     mr_free(last_filelist_number);

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

@@ -11 +11 @@
 int do_that_initial_phase();
 int do_that_final_phase();
-int figure_out_kernel_path_interactively_if_necessary(char *kernel);
+char *figure_out_kernel_path_interactively_if_necessary(void);
 bool get_bit_N_of_array(char *array, int N);
 int make_those_slices_phase();

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

@@ -886 +886 @@
     if ((flag_set['t'] && !flag_set['d']) && (! bkpinfo->restore_data)) {
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
-        if ((tmp1 = find_tape_device_and_size(NULL)) == NULL) {
+        if ((tmp1 = mr_find_tape_device()) == NULL) {
             fatal_error("Tape device not specified. I couldn't find it either.");
         }
@@ -1191 +1191 @@
 
     if (flag_set['x']) {
-        mr_asprintf(bkpinfo->image_devs, flag_val['x']);
+        mr_asprintf(bkpinfo->image_devs, "%s", flag_val['x']);
         if ((run_program_and_log_output("which ntfsclone", 2)) && (! bkpinfo->restore_data)) {
             fatal_error("Please install ntfsprogs package/tarball.");
@@ -1202 +1202 @@
 
     if ((flag_set['k']) && (! bkpinfo->restore_data)) {
+        mr_free(bkpinfo->kernel_path);
         mr_asprintf(bkpinfo->kernel_path, "%s", flag_val['k']);
         if (!strcmp(bkpinfo->kernel_path, "failsafe")) {
@@ -1552 +1553 @@
     case SIGKILL:
         mr_asprintf(tmp, "SIGKILL");
-        mr_asprintf(tmp2,
-               "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
+        mr_asprintf(tmp2, "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
         break;
     case SIGTERM:
@@ -1565 +1565 @@
     case SIGSEGV:
         mr_asprintf(tmp, "SIGSEGV");
-        mr_asprintf(tmp2,
-               "Internal programming error. Please send a backtrace as well as your log.");
+        mr_asprintf(tmp2, "Internal programming error. Please send a backtrace as well as your log.");
         break;
     case SIGPIPE:

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

@@ -131 +131 @@
     mr_free(tmp);
 
-    if (is_this_a_ramdisk) {
-        if (!does_file_exist("/THIS-IS-A-RAMDISK")) {
-            log_to_screen("Using /dev/root is stupid of you but I'll forgive you.");
-            is_this_a_ramdisk = FALSE;
-        }
-    }
-    if (does_file_exist("/THIS-IS-A-RAMDISK")) {
-        is_this_a_ramdisk = TRUE;
-    }
     log_msg(1, "Is this a ramdisk? result = %s", (is_this_a_ramdisk) ? "TRUE" : "FALSE");
     return (is_this_a_ramdisk);
@@ -515 +506 @@
 
     if (g_cdrw_drive_is_here[0]) {
-        mr_asprintf(cdrw_device, g_cdrw_drive_is_here);
+        mr_asprintf(cdrw_device, "%s", g_cdrw_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", cdrw_device);
         return(cdrw_device);
@@ -840 +831 @@
 
     if (g_dvd_drive_is_here[0]) {
-        mr_asprintf(output, g_dvd_drive_is_here);
+        mr_asprintf(output, "%s", g_dvd_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", output);
         return (output);
@@ -1599 +1590 @@
 
         mr_free(bkpinfo->media_device);
-        if ((!bkpinfo->restore_mode) && ((bkpinfo->media_device = find_tape_device_and_size(NULL)) == NULL)) {
+        if ((!bkpinfo->restore_mode) && ((bkpinfo->media_device = mr_find_tape_device()) == NULL)) {
             log_msg(3, "Ok, using vanilla scsi tape.");
             mr_asprintf(bkpinfo->media_device, "%s", VANILLA_SCSI_TAPE);
@@ -1641 +1632 @@
         mr_free(tmp);
 
-        bkpinfo->use_obdr = ask_me_yes_or_no
-            ("Do you want to activate OBDR support for your tapes ?");
+        bkpinfo->use_obdr = ask_me_yes_or_no("Do you want to activate OBDR support for your tapes ?");
         bkpinfo->media_size[0] = 0;
         log_msg(4, "media_size[0] = %ld", bkpinfo->media_size[0]);

branches/2.2.10/mondo/src/common/libmondo-files-EXT.h

@@ -11 +11 @@
 extern bool does_file_exist(char *filename);
 extern void exclude_nonexistent_files(char *inout);
-extern int figure_out_kernel_path_interactively_if_necessary(char *kernel);
+extern char *figure_out_kernel_path_interactively_if_necessary(void);
 extern char *find_home_of_exe(char *fname);
 extern int get_trackno_from_logfile(char *logfile);

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

@@ -269 +269 @@
  * @return 0 for success, 1 for failure.
  */
-int figure_out_kernel_path_interactively_if_necessary(char *kernel)
-{
+char *figure_out_kernel_path_interactively_if_necessary(void) {
+
     char *tmp = NULL;
     char *command = NULL;;
-
-    if (kernel == NULL) {
-        mr_asprintf(kernel, "%s", call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null"));
-    }
+    char *kernel = NULL;;
+
+    mr_asprintf(kernel, "%s", call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null"));
+    
     // If we didn't get anything back, check whether mindi raised a fatal error
     if (!kernel[0]) {
@@ -285 +285 @@
             mr_free(tmp);
             mr_free(command);
+            mr_free(kernel);
             fatal_error("Mindi gave a fatal error. Please check '/var/log/mindi.log'.");
         }
@@ -293 +294 @@
     while (!kernel[0]) {
         if (!ask_me_yes_or_no("Kernel not found or invalid. Choose another?")) {
-            return (1);
+            return (NULL);
         }
         tmp = popup_and_get_string("Kernel path", "What is the full path and filename of your kernel, please?", kernel);
@@ -304 +305 @@
         log_it("User says kernel is at %s", kernel);
     }
-    return (0);
+    return (kernel);
 }
 
@@ -1103 +1104 @@
     }
     *(p++) = '\0';
-    mr_asprintf(nfs_server_ipaddr, tmp);
-    mr_asprintf(nfs_mount, p);
+    mr_asprintf(nfs_server_ipaddr, "%s", tmp);
+    mr_asprintf(nfs_mount, "%s", p);
     mr_free(tmp);
 
@@ -1151 +1152 @@
         mr_free(nfs_dev);
 
-        mr_asprintf(nfs_dev, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(nfs_dev, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
 

branches/2.2.10/mondo/src/common/libmondo-files.h

@@ -14 +14 @@
 bool does_file_exist(char *filename);
 void exclude_nonexistent_files(char *inout);
-int figure_out_kernel_path_interactively_if_necessary(char *kernel);
+char *figure_out_kernel_path_interactively_if_necessary(void);
 char *find_home_of_exe(char *fname);
 int get_trackno_from_logfile(char *logfile);

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

@@ -334 +334 @@
 #ifdef __FreeBSD__
     int i, j;
+    char *org = NULL;
 
     fprintf(fout, "\nvolume %s\n", raidrec->volname);
     for (i = 0; i < raidrec->plexes; ++i) {
-        char org[24];
         switch (raidrec->plex[i].raidlevel) {
         case -1:
-            strcpy(org, "concat");
+            mr_asprintf(org, "concat");
             break;
         case 0:
-            strcpy(org, "striped");
+            mr_asprintf(org, "striped");
             break;
         case 5:
-            strcpy(org, "raid5");
+            mr_asprintf(org, "raid5");
             break;
         }
         fprintf(fout, "  plex org %s", org);
+        mr_free(org);
+
         if (raidrec->plex[i].raidlevel != -1) {
             fprintf(fout, " %ik", raidrec->plex[i].stripesize);
@@ -356 +358 @@
 
         for (j = 0; j < raidrec->plex[i].subdisks; ++j) {
-            fprintf(fout, "    sd drive %s size 0\n",
-                    raidrec->plex[i].sd[j].which_device);
+            fprintf(fout, "    sd drive %s size 0\n", raidrec->plex[i].sd[j].which_device);
         }
     }
@@ -501 +502 @@
 
             if (get_option_state(argc, argv, "hotspare")) {
-                strcpy(raidlist->spares.el[raidlist->spares.entries].name,
-                       drivename);
-                strcpy(raidlist->spares.el[raidlist->spares.entries].
-                       device, devname);
+                strcpy(raidlist->spares.el[raidlist->spares.entries].name, drivename);
+                strcpy(raidlist->spares.el[raidlist->spares.entries].  device, devname);
                 raidlist->spares.el[raidlist->spares.entries].index =
                     raidlist->disks.entries;
                 raidlist->spares.entries++;
             } else {
-                strcpy(raidlist->disks.el[raidlist->disks.entries].name,
-                       drivename);
-                strcpy(raidlist->disks.el[raidlist->disks.entries].device,
-                       devname);
+                strcpy(raidlist->disks.el[raidlist->disks.entries].name, drivename);
+                strcpy(raidlist->disks.el[raidlist->disks.entries].device, devname);
                 raidlist->disks.el[raidlist->disks.entries].index =
                     raidlist->disks.entries;

branches/2.2.10/mondo/src/common/libmondo-stream-EXT.h

@@ -5 +5 @@
 extern int closein_tape();
 extern int closeout_tape();
-extern char *find_tape_device_and_size(char *siz);
+extern char *mr_find_tape_device(void);
 extern void insist_on_this_tape_number(int tapeno);
 extern void log_tape_pos(void);

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

@@ -253 +253 @@
     char *dev = NULL;
     int res;
-    char *dev = NULL;
 
     log_to_screen("I am looking for your tape streamer. Please wait.");
@@ -260 +259 @@
     if (tmp) {
         mr_asprintf(cdr_exe, "cdrecord");
-
     } else {
         mr_asprintf(cdr_exe, "dvdrecord");
@@ -273 +271 @@
         log_it("Either too few or too many tape streamers for me to detect...");
         mr_asprintf(dev, "%s", VANILLA_SCSI_TAPE);
-        mr_free(tmp);
         mr_free(tmp);
         return(dev);
@@ -350 +347 @@
     } else {
         log_it("At this new point, dev is NULL and res = %d", res);
-        mr_free(tmp);
     }
 
@@ -531 +527 @@
     char *tmpdir = NULL;
     char *old_fname = NULL;
-    char *p;
-    char suffix[16];
 
     bufsize_K = (long long) (1024LL * (1 + g_tape_buffer_size_MB));
-    if ((p = strrchr(latest_fname, '.'))) {
-        strcpy(suffix, ++p);
-    } else {
-        suffix[0] = '\0';
-    }
     if (strstr(latest_fname, ".afio.") || strstr(latest_fname, ".star.")) {
         type = fileset;
@@ -1186 +1175 @@
                   g_tape_stream) / 1024;
     }
-/*  memcpy((char*)plength_of_incoming_file,(char*)tempblock+7001,sizeof(long long)); */
-/*  for(*plen=0,i=7;i>=0;i--) {*plen<<=8; *plen |= tempblock[7001+i];} */
     memcpy((char *) plen, tempblock + 7001, sizeof(long long));
     if (strcmp(tempblock + 6000 + *pcontrol_char, STR_HEADER)) {
@@ -1193 +1180 @@
     }
     strcpy(filename, tempblock + 1000);
-/*  strcpy(cksum,tempblock+5555);*/
-/*  log_it( "%s  (reading) fname=%s, filesize=%ld K",
-       marker_to_string (*pcontrol_char), filename,
-       (long) ((*plen) >> 10));
-*/
     if (*pcontrol_char == BLK_ABORTED_BACKUP) {
         log_to_screen("I can't verify an aborted backup.");

branches/2.2.10/mondo/src/common/libmondo-stream.h

@@ -7 +7 @@
 int closein_tape();
 int closeout_tape();
-char *find_tape_device_and_size(char *siz);
+char *mr_find_tape_device(void);
 void insist_on_this_tape_number(int tapeno);
 void log_tape_pos(void);

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

@@ -45 +45 @@
     assert(partno >= 0);
 
-    mr_asprintf(partition, drive);
+    mr_asprintf(partition, "%s", drive);
     /* is this a devfs device path? */
     c = strrchr(partition, '/');

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

@@ -170 +170 @@
 void clean_up_KDE_desktop_if_necessary(void)
 {
-    char *tmp;
-
-    malloc_string(tmp);
-    strcpy(tmp,
-           "for i in `find /root /home -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");
+    char *tmp = NULL;
+
+    mr_asprintf(tmp, "for i in `find /root /home -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);
 }
 
@@ -227 +222 @@
 double get_kernel_version(void)
 {
-    char *p, tmp[200];
+    char *p = NULL;
+    char *tmp = NULL;
     double d;
 #ifdef __FreeBSD__
@@ -233 +229 @@
     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) {
@@ -244 +240 @@
         }
     }
-//  log_msg(1, "tmp = '%s'", tmp);
     d = atof(tmp);
+    mr_free(tmp);
 #endif
     log_msg(1, "g_kernel_version = %f", d);
@@ -252 +248 @@
 
 
-
-
-
 /**
  * Get the current time.
@@ -263 +256 @@
     return (long) time((void *) 0);
 }
-
-
-
-
-
 
 
@@ -411 +399 @@
     char *command = NULL;
     char *mtpt;
-    char *hostname;
+    char *hostname = NULL;
     char *ip_address = NULL;
     int retval = 0;
     char *colon;
-    char *cdr_exe;
+    char *cdr_exe = NULL;
     char *tmp = NULL;
     char *p = NULL;
@@ -431 +419 @@
 
     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) *
@@ -496 +482 @@
         tmp = find_home_of_exe("growisofs");
         if (tmp) {
-            strcpy(cdr_exe, "growisofs");
+            mr_asprintf(cdr_exe, "growisofs");
         }                       // unlikely to be used
         else {
@@ -560 +546 @@
         tmp = find_home_of_exe("cdrecord");
         if (tmp) {
-            strcpy(cdr_exe, "cdrecord");
+            mr_asprintf(cdr_exe, "cdrecord");
         } else {
             mr_free(tmp);
             tmp = find_home_of_exe("dvdrecord");
             if (tmp) {
-                strcpy(cdr_exe, "dvdrecord");
+                mr_asprintf(cdr_exe, "dvdrecord");
             } else {
                 mr_free(tmp);
@@ -590 +576 @@
     }
 #endif
-        else
-        {
+        else {
             mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
         }
@@ -613 +598 @@
             mr_asprintf(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);
         paranoid_free(mondo_mkisofs_sz);
         paranoid_free(extra_cdrom_params);
@@ -654 +640 @@
             mr_asprintf(iso_path, "%s", iso_tmp + strlen(iso_mnt));
         }
+        mr_free(iso_mnt);
         mr_free(iso_tmp);
 
@@ -674 +661 @@
     if (bkpinfo->backup_media_type == nfs) {
         if (bkpinfo->nfs_mount) {
-            strcpy(hostname, bkpinfo->nfs_mount);
+            mr_asprintf(hostname, "%s", bkpinfo->nfs_mount);
         } else {
             log_it("nfs_mount is NULL");
             retval++;
-            strcpy(hostname, "");
+            mr_asprintf(hostname, "");
         }
         colon = strchr(hostname, ':');
@@ -699 +686 @@
             }
         }
+        mr_free(hostname);
         store_nfs_config();
     }
@@ -712 +700 @@
     g_backup_media_type = bkpinfo->backup_media_type;
     paranoid_free(mtpt);
-    paranoid_free(hostname);
-    paranoid_free(cdr_exe);
     return (retval);
 }
@@ -1254 +1240 @@
     mr_asprintf(command, "mount | grep -Ew '/boot'");
     mr_free(tmp);
-    mr_asprintf(tmp, call_program_and_get_last_line_of_output(command));
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 

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

@@ -623 +623 @@
     /*@ char ************************************************************ */
     char *test_file = NULL;
-    char *biggie_cksum;
-    char *orig_cksum;
+    char *biggie_cksum = NULL;
+    char *orig_cksum = NULL;
     char *tmp = NULL;
     char *slice_fnam;
@@ -634 +634 @@
     long long slice_siz;
 
-    malloc_string(biggie_cksum);
-    malloc_string(orig_cksum);
     malloc_string(slice_fnam);
     assert(bkpinfo != NULL);
@@ -651 +649 @@
          ctrl_chr != BLK_STOP_A_BIGGIE;
          res =
-         read_header_block_from_stream(&slice_siz, slice_fnam,
-                                       &ctrl_chr)) {
+         read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr)) {
         if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
@@ -659 +656 @@
         unlink(test_file);
         res =
-            read_header_block_from_stream(&slice_siz, slice_fnam,
-                                          &ctrl_chr);
+            read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
             log_msg(2, "test_file = %s", test_file);
@@ -668 +664 @@
         retval += res;
     }
-    strcpy(biggie_cksum, slice_fnam);
+    mr_asprintf(biggie_cksum, "%s", slice_fnam);
     if (biggie_cksum[0] != '\0') {
-        strcpy(orig_cksum, calc_checksum_of_file(biggie_fname));
+        mr_asprintf(orig_cksum, "%s", calc_checksum_of_file(biggie_fname));
         if (strcmp(biggie_cksum, orig_cksum)) {
             log_msg(2, "orig cksum=%s; curr cksum=%s", biggie_cksum, orig_cksum);
@@ -680 +676 @@
         }
     }
+    mr_free(biggie_cksum);
     mr_free(test_file);
-    paranoid_free(biggie_cksum);
-    paranoid_free(orig_cksum);
+    mr_free(orig_cksum);
     paranoid_free(slice_fnam);
     return (retval);

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

@@ -345 +345 @@
             log_msg(0, "-------FATAL ERROR---------");
             log_msg(0, error_string);
-            newtFinished();
         }
 
@@ -395 +394 @@
         }
         if (!g_text_mode) {
-            if (does_file_exist("/THIS-IS-A-RAMDISK")) {
-                log_msg(1, "Calling newtFinished()");
-                newtFinished();
-            } else {
-                log_msg(1, "Calling newtSuspend()");
-                newtSuspend();
-            }
+            log_msg(1, "Calling newtFinished()");
+            newtFinished();
         }
         printf("Execution run ended; result=%d\n", signal);
@@ -444 +438 @@
 
         /*@ buffers ********************************************************** */
-        char *command;
-        char *tmp;
+        char *command = NULL;
+        char *tmp = NULL;
 
         /*@ pointers ********************************************************* */
@@ -453 +447 @@
         int i = 0;
 
-        malloc_string(command);
-        malloc_string(tmp);
         assert_string_is_neither_NULL_nor_zerolength(filename);
         assert(grep_for_me != NULL);
 
         if (!does_file_exist(filename)) {
-            paranoid_free(command);
-            paranoid_free(tmp);
             return;
         }
         if (grep_for_me[0] != '\0') {
-            sprintf(command, "grep '%s' %s | tail -n%d",
-                    grep_for_me, filename, g_noof_log_lines);
-        } else {
-            sprintf(command, "tail -n%d %s", g_noof_log_lines,
-                    filename);
+            mr_asprintf(command, "grep '%s' %s | tail -n%d", grep_for_me, filename, g_noof_log_lines);
+        } else {
+            mr_asprintf(command, "tail -n%d %s", g_noof_log_lines, filename);
         }
         fin = popen(command, "r");
@@ -483 +471 @@
                     */
                     if (!strncmp(err_log_lines[i], "root:", 5)) {
-                        strcpy(tmp, err_log_lines[i] + 6);
+                        mr_asprintf(tmp, "%s", err_log_lines[i] + 6);
                         strcpy(err_log_lines[i], tmp);
+                        mr_free(tmp);
                     }
                     if (feof(fin)) {
@@ -493 +482 @@
             paranoid_pclose(fin);
         }
+        mr_free(command);
         refresh_log_screen();
-        paranoid_free(command);
-        paranoid_free(tmp);
     }
 
@@ -584 +572 @@
 
         /*@ buffers ********************************************************* */
-        char *title;
-        char *tmp;
+        char *title = NULL;
+        char *tmp = NULL;
 
         /*@ initialize ****************************************************** */
         g_isoform_old_progress = -1;
         g_mysterious_dot_counter = 0;
-        malloc_string(title);
+
+        assert(ttl != NULL);
         malloc_string(tmp);
-
-        assert(ttl != NULL);
-        strcpy(title, ttl);
+        mr_asprintf(title, "%s", ttl);
         strcpy(g_isoform_header_str, title);
         if (g_text_mode) {
@@ -620 +607 @@
         }
         update_evalcall_form(0);
+        mr_free(title);
         paranoid_free(tmp);
-        paranoid_free(title);
     }
 
@@ -641 +628 @@
         /*@ buffers ********************************************************* */
         char *b1c;
-        char *blurb1;
-        char *blurb2;
-        char *blurb3;
+        char *blurb1 = NULL;
+        char *blurb2 = NULL;
+        char *blurb3 = NULL;
 
         /*@ initialize ****************************************************** */
         g_mysterious_dot_counter = 0;
 
-        malloc_string(b1c);
         malloc_string(blurb1);
         malloc_string(blurb2);
         malloc_string(blurb3);
+        malloc_string(b1c);
 
         assert(title != NULL);
@@ -658 +645 @@
         assert(b3 != NULL);
 
-        strcpy(blurb1, b1);
-        strcpy(blurb2, b2);
-        strcpy(blurb3, b3);
+        strcpy(blurb1,  b1);
+        strcpy(blurb2,  b2);
+        strcpy(blurb3,  b3);
         strcpy(b1c, b1);
         center_string(b1c, 80);
@@ -695 +682 @@
         update_progress_form_full(blurb1, blurb2, blurb3);
         paranoid_free(b1c);
-        paranoid_free(blurb1);
-        paranoid_free(blurb2);
-        paranoid_free(blurb3);
+        mr_free(blurb1);
+        mr_free(blurb2);
+        mr_free(blurb3);
     }
 
@@ -1176 +1163 @@
 
         /*@ newt ************************************************************ */
-        char *title_sz;
-        char *minimsg_sz;
+        char *title_sz = NULL;
+        char *minimsg_sz = NULL;
         static t_bkptype possible_bkptypes[] =
             { none, cdr, cdrw, dvd, tape, cdstream, udev, nfs, iso };
@@ -1198 +1185 @@
         newtComponent myForm;
 
-        title_sz = malloc(MAX_NEWT_COMMENT_LEN);
-        minimsg_sz = malloc(MAX_NEWT_COMMENT_LEN);
         outstr = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
@@ -1217 +1202 @@
                 }
             }
-            paranoid_free(title_sz);
-            paranoid_free(minimsg_sz);
             paranoid_free(outstr);
             return (backup_type);
@@ -1224 +1207 @@
         newtDrawRootText(18, 0, WELCOME_STRING);
         if (restoring) {
-            strcpy(title_sz,
-                   "Please choose the backup media from which you want to read data.");
-            strcpy(minimsg_sz, "Read from:");
-        } else {
-            strcpy(title_sz,
-                   "Please choose the backup media to which you want to archive data.");
-            strcpy(minimsg_sz, "Backup to:");
+            mr_asprintf(title_sz, "Please choose the backup media from which you want to read data.");
+            mr_asprintf(minimsg_sz, "Read from:");
+        } else {
+            mr_asprintf(title_sz, "Please choose the backup media to which you want to archive data.");
+            mr_asprintf(minimsg_sz, "Backup to:");
         }
         newtPushHelpLine(title_sz);
@@ -1266 +1247 @@
         }
         newtPopHelpLine();
-        paranoid_free(title_sz);
-        paranoid_free(minimsg_sz);
+        mr_free(title_sz);
+        mr_free(minimsg_sz);
         paranoid_free(outstr);
         return (output);