Changeset 2214 in MondoRescue

Timestamp:

Jun 3, 2009, 7:10:28 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3094@localhost: bruno | 2009-06-03 17:25:25 +0200

Replaces strcpy in 5 source where no other impact by mr_asprintf. Improves quality report

Location:

branches/2.2.9/mondo

Files:

• TODO (modified) (1 diff)
• src/common/libmondo-archive.c (modified) (65 diffs)
• src/common/libmondo-cli.c (modified) (6 diffs)
• src/common/libmondo-devices.c (modified) (51 diffs)
• src/common/libmondo-fifo.c (modified) (2 diffs)

branches/2.2.9/mondo/TODO

@@ +1 @@
+NEW TODO
+
+list_of_NFS_devices_and_mounts  should allocate memory
+
+
 MONDO TODO            Hugo Rabson <hugorabson@msn.com>              07/04/2004
 

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

@@ -508 +508 @@
 {
     /*@ buffer ************************************************************ */
-    char *tmp;
+    char *tmp = NULL;
     char *tmp1 = NULL;
     char *tmp2 = NULL;
-    char *scratchdir;
     char *command = NULL;
-    char *use_lzo_sz;
-    char *use_gzip_sz;
-    char *use_comp_sz;
-    char *use_star_sz;
-    char *bootldr_str;
-    char *tape_device;
-    char *last_filelist_number;
-    char *broken_bios_sz;
-    char *cd_recovery_sz;
-    char *tape_size_sz;
-    char *devs_to_exclude;
-    char *use_lilo_sz;
-    char *value;
-    char *bootdev;
+    char *use_lzo_sz = NULL;
+    char *use_gzip_sz = NULL;
+    char *use_comp_sz = NULL;
+    char *use_star_sz = NULL;
+    char *bootldr_str = NULL;
+    char *tape_device = NULL;
+    char *last_filelist_number = NULL;
+    char *broken_bios_sz = NULL;
+    char *cd_recovery_sz = NULL;
+    char *tape_size_sz = NULL;
+    char *devs_to_exclude = NULL;
+    char *use_lilo_sz = NULL;   /* BCO: shared between LILO/ELILO */
+    char *value = NULL;
+    char *bootdev = NULL;
     char *ntapedev = NULL;
 
@@ -542 +541 @@
 
     assert(bkpinfo != NULL);
-    tmp = malloc(9*MAX_STR_LEN);
-    malloc_string(scratchdir);
-    malloc_string(use_lzo_sz);
-    malloc_string(use_gzip_sz);
-    malloc_string(use_star_sz);
-    malloc_string(use_comp_sz);
-    malloc_string(bootldr_str);
-    malloc_string(tape_device);
     malloc_string(last_filelist_number);
-    malloc_string(broken_bios_sz);
-    malloc_string(cd_recovery_sz);
-    malloc_string(tape_size_sz);
-    malloc_string(devs_to_exclude);
-    malloc_string(use_lilo_sz); /* BCO: shared between LILO/ELILO */
-    malloc_string(value);
-    malloc_string(bootdev);
-
-    strcpy(scratchdir, bkpinfo->scratchdir);
-    sprintf(tmp,
+
+    mr_asprintf(&tmp,
             "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
             bkpinfo->exclude_paths);
-    strcpy(devs_to_exclude, call_program_and_get_last_line_of_output(tmp));
-    sprintf(tmp, "devs_to_exclude = '%s'", devs_to_exclude);
+    mr_asprintf(&devs_to_exclude, "%s", call_program_and_get_last_line_of_output(tmp));
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "devs_to_exclude = '%s'", devs_to_exclude);
     log_msg(2, tmp);
+    mr_free(tmp);
+
     mvaddstr_and_log_it(g_currentY, 0,
                         "Calling MINDI to create boot+data disks");
-    sprintf(tmp, "%s/filelist.full", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/filelist.full", bkpinfo->tmpdir);
     if (!does_file_exist(tmp)) {
-        sprintf(tmp, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
+        mr_free(tmp);
+        mr_asprintf(&tmp, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
         if (!does_file_exist(tmp)) {
             fatal_error
@@ -577 +565 @@
     }
     lines_in_filelist = count_lines_in_file(tmp);
-    sprintf(tmp, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
-    strcpy(last_filelist_number, last_line_of_file(tmp));
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
+    mr_asprintf(&last_filelist_number, "%s", last_line_of_file(tmp));
+    mr_free(tmp);
+
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        sprintf(tape_size_sz, "%ld", bkpinfo->media_size[1]);
+        mr_asprintf(&tape_size_sz, "%ld", bkpinfo->media_size[1]);
         ntapedev = get_non_rewind_dev(bkpinfo->media_device);
         if ((bkpinfo->use_obdr) && (ntapedev != NULL)) {
@@ -590 +582 @@
         }
         paranoid_free(ntapedev);
-        strcpy(tape_device, bkpinfo->media_device);
+        mr_asprintf(&tape_device, "%s", bkpinfo->media_device);
     } else {
-        tape_size_sz[0] = '\0';
-        tape_device[0] = '\0';
+        mr_asprintf(&tape_size_sz, "%ld", 0L);;
+        mr_asprintf(&tape_device, "");
     }
     if (bkpinfo->use_lzo) {
-        strcpy(use_lzo_sz, "yes");
+        mr_asprintf(&use_lzo_sz, "yes");
     } else {
-        strcpy(use_lzo_sz, "no");
+        mr_asprintf(&use_lzo_sz, "no");
     }
     if (bkpinfo->use_gzip) {
-        strcpy(use_gzip_sz, "yes");
+        mr_asprintf(&use_gzip_sz, "yes");
     } else {
-        strcpy(use_gzip_sz, "no");
+        mr_asprintf(&use_gzip_sz, "no");
     }
     if (bkpinfo->use_star) {
-        strcpy(use_star_sz, "yes");
+        mr_asprintf(&use_star_sz, "yes");
     } else {
-        strcpy(use_star_sz, "no");
+        mr_asprintf(&use_star_sz, "no");
     }
 
     if (bkpinfo->compression_level > 0) {
-        strcpy(use_comp_sz, "yes");
+        mr_asprintf(&use_comp_sz, "yes");
     } else {
-        strcpy(use_comp_sz, "no");
-    }
-
-    strcpy(broken_bios_sz, "yes");  /* assume so */
+        mr_asprintf(&use_comp_sz, "no");
+    }
+
+    mr_asprintf(&broken_bios_sz, "yes");    /* assume so */
     if (g_cd_recovery) {
-        strcpy(cd_recovery_sz, "yes");
+        mr_asprintf(&cd_recovery_sz, "yes");
     } else {
-        strcpy(cd_recovery_sz, "no");
+        mr_asprintf(&cd_recovery_sz, "no");
     }
     if (bkpinfo->make_cd_use_lilo) {
-        strcpy(use_lilo_sz, "yes");
+        mr_asprintf(&use_lilo_sz, "yes");
     } else {
-        strcpy(use_lilo_sz, "no");
+        mr_asprintf(&use_lilo_sz, "no");
     }
 
@@ -634 +626 @@
 
 #ifdef __FreeBSD__
-        strcpy(bootdev, call_program_and_get_last_line_of_output
+        mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
                ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
         if (!bootdev[0]) {
-            strcpy(bootdev, call_program_and_get_last_line_of_output
+            mr_free(bootdev);
+            mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
                    ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
         }
@@ -643 +636 @@
         /* Linux */
 #ifdef __IA64__
-        strcpy(bootdev, call_program_and_get_last_line_of_output
+        mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
                ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
 #else
-        strcpy(bootdev, call_program_and_get_last_line_of_output
+        mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
                ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
 #endif
         if (strstr(bootdev, "/dev/cciss/")) {
+            mr_free(bootdev);
 #ifdef __IA64__
-            strcpy(bootdev, call_program_and_get_last_line_of_output
+            mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
                    ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
 #else
-            strcpy(bootdev, call_program_and_get_last_line_of_output
+            mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
                    ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
 #endif
         }
         if (!bootdev[0]) {
-            strcpy(bootdev, call_program_and_get_last_line_of_output
+            mr_free(bootdev);
+            mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
                    ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
             if (strstr(bootdev, "/dev/cciss/")) {
-                strcpy(bootdev, call_program_and_get_last_line_of_output
+                mr_free(bootdev);
+                mr_asprintf(&bootdev, call_program_and_get_last_line_of_output
                        ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
             }
@@ -673 +669 @@
             ch = 'U';
         if (bkpinfo->boot_loader != '\0') {
-            sprintf(tmp, "User specified boot loader. It is '%c'.",
+            mr_asprintf(&tmp, "User specified boot loader. It is '%c'.",
                     bkpinfo->boot_loader);
             log_msg(2, tmp);
+            mr_free(tmp);
         } else {
             bkpinfo->boot_loader = ch;
         }
         if (bkpinfo->boot_device[0] != '\0') {
-            sprintf(tmp, "User specified boot device. It is '%s'.",
+            mr_asprintf(&tmp, "User specified boot device. It is '%s'.",
                     bkpinfo->boot_device);
             log_msg(2, tmp);
+            mr_free(tmp);
         } else {
             strcpy(bkpinfo->boot_device, bootdev);
         }
     }
+    mr_free(bootdev);
 
     if (
@@ -702 +701 @@
     }
     if (bkpinfo->boot_loader == 'L') {
-        strcpy(bootldr_str, "LILO");
+        mr_asprintf(&bootldr_str, "LILO");
         if (!does_file_exist("/etc/lilo.conf")) {
             fatal_error
@@ -708 +707 @@
         }
     } else if (bkpinfo->boot_loader == 'G') {
-        strcpy(bootldr_str, "GRUB");
+        mr_asprintf(&bootldr_str, "GRUB");
         if (!does_file_exist("/boot/grub/menu.lst")
             && does_file_exist("/boot/grub/grub.conf")) {
@@ -719 +718 @@
         }
     } else if (bkpinfo->boot_loader == 'E') {
-        strcpy(bootldr_str, "ELILO");
+        mr_asprintf(&bootldr_str, "ELILO");
         /* BCO: fix it for Debian, Mandrake, ... */
         if (!does_file_exist("/etc/elilo.conf")
@@ -750 +749 @@
         }
     } else if (bkpinfo->boot_loader == 'R') {
-        strcpy(bootldr_str, "RAW");
+        mr_asprintf(&bootldr_str, "RAW");
     }
 #ifdef __FreeBSD__
     else if (bkpinfo->boot_loader == 'D') {
-        strcpy(bootldr_str, "DD");
+        mr_asprintf(&bootldr_str, "DD");
     }
 
     else if (bkpinfo->boot_loader == 'B') {
-        strcpy(bootldr_str, "BOOT0");
+        mr_asprintf(&bootldr_str, "BOOT0");
     }
 #endif
     else {
-        strcpy(bootldr_str, "unknown");
-    }
-    sprintf(tmp, "Your boot loader is %s and it boots from %s",
+        mr_asprintf(&bootldr_str, "unknown");
+    }
+    mr_asprintf(&tmp, "Your boot loader is %s and it boots from %s",
             bootldr_str, bkpinfo->boot_device);
     log_to_screen(tmp);
-    sprintf(tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, bkpinfo->boot_device)) {
         log_msg(1, "%ld: Unable to write one-liner boot device", __LINE__);
     }
+    mr_free(tmp);
+
     switch (bkpinfo->backup_media_type) {
     case cdr:
-        strcpy(value, "cdr");
+        mr_asprintf(&value, "cdr");
         break;
     case cdrw:
-        strcpy(value, "cdrw");
+        mr_asprintf(&value, "cdrw");
         break;
     case cdstream:
-        strcpy(value, "cdstream");
+        mr_asprintf(&value, "cdstream");
         break;
     case tape:
-        strcpy(value, "tape");
+        mr_asprintf(&value, "tape");
         break;
     case udev:
-        strcpy(value, "udev");
+        mr_asprintf(&value, "udev");
         break;
     case iso:
-        strcpy(value, "iso");
+        mr_asprintf(&value, "iso");
         break;
     case nfs:
-        strcpy(value, "nfs");
+        mr_asprintf(&value, "nfs");
         break;
     case dvd:
-        strcpy(value, "dvd");
+        mr_asprintf(&value, "dvd");
         break;
     case usb:
-        strcpy(value, "usb");
+        mr_asprintf(&value, "usb");
         break;
     default:
@@ -808 +811 @@
     }
 
-    sprintf(tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, value)) {
         res++;
@@ -814 +817 @@
                 __LINE__);
     }
-    sprintf(tmp, "%s/BOOTLOADER.NAME", bkpinfo->tmpdir);
+    mr_free(value);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/BOOTLOADER.NAME", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, bootldr_str)) {
         res++;
@@ -820 +826 @@
                 __LINE__);
     }
-    sprintf(tmp, "%s/DIFFERENTIAL", bkpinfo->tmpdir);
+    mr_free(bootldr_str);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/DIFFERENTIAL", bkpinfo->tmpdir);
     if (bkpinfo->differential) {
         res += write_one_liner_data_file(tmp, "1");
@@ -826 +835 @@
         res += write_one_liner_data_file(tmp, "0");
     }
+    mr_free(tmp);
 
     if (g_getfattr) {
@@ -861 +871 @@
     }
     paranoid_free(command);
-    sprintf(tmp, "BTW, I'm telling Mindi your kernel is '%s'",
-            bkpinfo->kernel_path);
-
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
 
@@ -892 +899 @@
             use_gzip_sz);       // parameter #20 (STRING)
 
+    mr_free(devs_to_exclude);
+    mr_free(last_filelist_number);
+    mr_free(tape_device);
+    mr_free(use_lzo_sz);
+    mr_free(use_gzip_sz);
+    mr_free(use_star_sz);
+    mr_free(use_comp_sz);
+    mr_free(broken_bios_sz);
+    mr_free(cd_recovery_sz);
+    mr_free(use_lilo_sz);
+    mr_free(tape_size_sz);
+
     if (bkpinfo->nonbootable_backup) {
         mr_strcat(command, " NONBOOTABLE");
@@ -928 +947 @@
             paranoid_free(command);
         } else {
-            sprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
+            mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
                 bkpinfo->tmpdir);
             if (system(tmp)) {
                 fatal_error("Cannot find all.tar.gz in tmpdir");
             }
+            mr_free(tmp);
         }
         if (res) {
@@ -942 +962 @@
         log_to_screen("Mindi failed to create your boot+data disks.");
         mr_asprintf(&command, "grep 'Fatal error' /var/log/mindi.log");
-        strcpy(tmp, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
 
@@ -948 +968 @@
             popup_and_OK(tmp);
         }
-    }
-    paranoid_free(tmp);
-    paranoid_free(use_lzo_sz);
-    paranoid_free(use_gzip_sz);
-    paranoid_free(scratchdir);
-    paranoid_free(use_comp_sz);
-    paranoid_free(bootldr_str);
-    paranoid_free(tape_device);
-    paranoid_free(last_filelist_number);
-    paranoid_free(broken_bios_sz);
-    paranoid_free(cd_recovery_sz);
-    paranoid_free(tape_size_sz);
-    paranoid_free(devs_to_exclude);
-    paranoid_free(use_lilo_sz);
-    paranoid_free(value);
-    paranoid_free(bootdev);
-    paranoid_free(use_star_sz);
+        mr_free(tmp);
+    }
     return (res);
 }
@@ -1352 +1357 @@
     char *storing_afioball_fname;
     char *tmp = NULL;
-    char *media_usage_comment;
+    char *media_usage_comment = NULL;
     pthread_t archival_thread[ARCH_THREADS];
     char *p_list_of_fileset_flags;
@@ -1370 +1375 @@
     malloc_string(curr_acl_list_fname);
     malloc_string(storing_filelist_fname);
-    malloc_string(media_usage_comment);
     malloc_string(storing_afioball_fname);
     transfer_block =
@@ -1434 +1438 @@
             misc_counter_that_is_not_important =
                 (misc_counter_that_is_not_important + 1) % 5;
+            /* BCO the media_usage_comment is not really initialized there !
             if (!misc_counter_that_is_not_important) {
                 update_progress_form(media_usage_comment);
+                */
             }
             sleep(1);
@@ -1462 +1468 @@
                 sleep(5);
             }
-            strcpy(media_usage_comment, percent_media_full_comment());
+            mr_asprintf(&media_usage_comment, "%s", percent_media_full_comment());
             /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -1503 +1509 @@
             g_current_progress++;
             update_progress_form(media_usage_comment);
+            mr_free(media_usage_comment);
             if (res) {
                 mr_asprintf(&tmp,
@@ -1537 +1544 @@
     paranoid_free(result_str);
     paranoid_free(storing_filelist_fname);
-    paranoid_free(media_usage_comment);
     paranoid_free(storing_afioball_fname);
     paranoid_free(curr_xattr_list_fname);
@@ -1980 +1986 @@
 bool is_dev_an_NTFS_dev(char *bigfile_fname)
 {
-    char *tmp;
-    char *command;
-    malloc_string(tmp);
-    malloc_string(command);
-    sprintf(command,
+    char *tmp = NULL;
+    char *command = NULL;
+    bool ret = TRUE;
+
+    mr_asprintf(&command,
             "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1",
             bigfile_fname);
     log_msg(1, "command = '%s'", command);
-    strcpy(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);
+
     log_msg(1, "--> tmp = '%s'", tmp);
     if (strstr(tmp, "NTFS")) {
         iamhere("TRUE");
-        return (TRUE);
+        ret = TRUE;
     } else {
         iamhere("FALSE");
-        return (FALSE);
-    }
+        ret = FALSE;
+    }
+    mr_free(tmp);
+    return(ret);
 }
 
@@ -2203 +2213 @@
     char *curr_acl_list_fname;
     char *tmp = NULL;
-    char *media_usage_comment;
+    char *media_usage_comment = NULL;
 
     malloc_string(curr_afioball_fname);
-    malloc_string(media_usage_comment);
     malloc_string(curr_filelist_fname);
     malloc_string(curr_xattr_list_fname);
@@ -2256 +2265 @@
         }
 
-        strcpy(media_usage_comment, percent_media_full_comment());
+        mr_asprintf(&media_usage_comment, "%s", percent_media_full_comment());
 
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
@@ -2294 +2303 @@
         g_current_progress++;
         update_progress_form(media_usage_comment);
+        mr_free(media_usage_comment);
 
         if (res) {
@@ -2315 +2325 @@
     paranoid_free(curr_filelist_fname);
     paranoid_free(curr_afioball_fname);
-    paranoid_free(media_usage_comment);
     paranoid_free(curr_xattr_list_fname);
     paranoid_free(curr_acl_list_fname);
@@ -2500 +2509 @@
 
     /*@ buffers ******************************************************** */
-    char *tmp, *curr_file, *cf;
+    char *tmp = NULL;
+    char *curr_file = NULL
+    char *cf;
 
     /*@ long ************************************************************ */
@@ -2507 +2518 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(curr_file);
-    tmp = malloc(1200);
     would_occupy = space_occupied_by_cd(bkpinfo->scratchdir);
     va_start(ap, files_to_add); // initialize the variable arguments
@@ -2515 +2524 @@
             continue;
         }
-        strcpy(curr_file, cf);
+        mr_asprintf(&curr_file, cf);
         if (!does_file_exist(curr_file)) {
             log_msg(1,
@@ -2524 +2533 @@
             would_occupy += length_of_file(curr_file) / 1024;
         }
+        mr_free(curr_file);
     }
     va_end(ap);
@@ -2543 +2553 @@
             continue;
         }
-        strcpy(curr_file, cf);
-
-        sprintf(tmp, "mv -f %s %s/archives/", curr_file,
-                bkpinfo->scratchdir);
+        mr_asprintf(&curr_file, cf);
+
+        mr_asprintf(&tmp, "mv -f %s %s/archives/", curr_file, bkpinfo->scratchdir);
+        mr_free(curr_file);
         res = run_program_and_log_output(tmp, 5);
         retval += res;
@@ -2554 +2564 @@
             log_msg(8, "Moved %s to CD OK", tmp);
         }
-        //      unlink (curr_file);
+        mr_free(tmp);
     }
     va_end(ap);
@@ -2562 +2572 @@
                 "Warning - errors occurred while I was adding files to CD dir");
     }
-    paranoid_free(tmp);
-    paranoid_free(curr_file);
     return (retval);
 }
@@ -2609 +2617 @@
     char start_chr;
     char stop_chr;
-    char *curr_file, *cf;
+    char *curr_file = NULL
+    char *cf;
     /*@ long long ****************************************************** */
     off_t length_of_incoming_file = (off_t)0;
@@ -2616 +2625 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(curr_file);
     va_start(ap, files_to_add);
     for (cf = files_to_add; cf != NULL; cf = va_arg(ap, char *)) {
@@ -2622 +2630 @@
             continue;
         }
-        strcpy(curr_file, cf);
+        mr_asprintf(&curr_file, cf);
         if (!does_file_exist(curr_file)) {
             log_msg(1,
@@ -2628 +2636 @@
                     curr_file);
         }
-/* create header chars */
+        /* create header chars */
         start_chr = BLK_START_AN_AFIO_OR_SLICE;
         stop_chr = BLK_STOP_AN_AFIO_OR_SLICE;
-/* ask for new tape if necessary */
+        /* ask for new tape if necessary */
         length_of_incoming_file = length_of_file(curr_file);
         write_header_block_to_stream(length_of_incoming_file, curr_file,
@@ -2645 +2653 @@
         retval += res;
         unlink(curr_file);
-/* write closing header */
+        mr_free(curr_file);
+        /* write closing header */
         write_header_block_to_stream((off_t)0, "finished-writing-file", stop_chr);
     }
@@ -2654 +2663 @@
                 "Warning - errors occurred while I was adding file to tape");
     }
-    paranoid_free(curr_file);
     return (retval);
 }
@@ -2678 +2686 @@
     char *tmp;
     int res = 0;
-    char *bkp;
+    char *bkp = NULL;
     char *cdrecord;
 
     malloc_string(tmp);
-    malloc_string(bkp);
     malloc_string(cdrecord);
-    strcpy(bkp, cdrw_dev);
+    mr_asprintf(&bkp, cdrw_dev);
     if (find_cdrw_device(cdrw_dev)) {
         strcpy(cdrw_dev, bkp);
@@ -2713 +2720 @@
         }
     }
+    mr_free(bkp);
+
 //  retract_CD_tray_and_defeat_autorun();
     paranoid_free(tmp);
     paranoid_free(cdrecord);
-    paranoid_free(bkp);
     return (res);
 }
@@ -2742 +2750 @@
     char *cdrom_dev;
     char *cdrw_dev;
-    char *our_serial_str;
+    char *our_serial_str = NULL;
     bool ok_go_ahead_burn_it;
     int cd_number = -1;
@@ -2758 +2766 @@
     malloc_string(szcdno);
     malloc_string(szserfname);
-    malloc_string(our_serial_str);
     malloc_string(szunmount);
 
@@ -2785 +2792 @@
         sprintf(szunmount, "umount %s", mtpt);
         cd_number = -1;
-        our_serial_str[0] = '\0';
         sprintf(tmp, "mount %s %s", cdrom_dev, mtpt);
+        mr_asprintf(&our_serial_str, "%s", "");
         if ((attempt_to_mount_returned_this =
              run_program_and_log_output(tmp, 1))) {
@@ -2812 +2819 @@
             cd_number = atoi(last_line_of_file(szcdno));
             sprintf(tmp, "cat %s 2> /dev/null", szserfname);
-            strcpy(our_serial_str,
+            mr_free(our_serial_str);
+            mr_asprintf(&our_serial_str, "%s",
                    call_program_and_get_last_line_of_output(tmp));
             // FIXME - should be able to use last_line_of_file(), surely?
@@ -2836 +2844 @@
             log_to_screen("...but not part of _our_ backup set.");
         }
+        mr_free(our_serial_str);
     } else {
         log_msg(2,
@@ -2883 +2892 @@
     paranoid_free(szcdno);
     paranoid_free(szserfname);
-    paranoid_free(our_serial_str);
     paranoid_free(szunmount);
     if (pmountable) {
@@ -2966 +2974 @@
     char *checksum_line, *command;
     char *tempblock;
-    char *curr_slice_fname_uncompressed;
-    char *curr_slice_fname_compressed;
-    char *file_to_archive;
+    char *curr_slice_fname_uncompressed = NULL;
+    char *curr_slice_fname_compressed = NULL;
+    char *file_to_archive = NULL;
     char *file_to_openin;
     /*@ pointers ************************************************** */
@@ -2983 +2991 @@
     long optimal_set_size;
     bool should_I_compress_slices;
-    char *suffix;               // for compressed slices
+    char *suffix = NULL;                // for compressed slices
 
     /*@ long long ************************************************** */
@@ -3001 +3009 @@
     assert_string_is_neither_NULL_nor_zerolength(biggie_filename);
     malloc_string(checksum_line);
-    malloc_string(curr_slice_fname_uncompressed);
-    malloc_string(curr_slice_fname_compressed);
-    malloc_string(file_to_archive);
-    malloc_string(suffix);
     command = malloc(MAX_STR_LEN * 8);
 
@@ -3015 +3019 @@
     if (is_this_file_compressed(biggie_filename)
         || bkpinfo->compression_level == 0) {
-        suffix[0] = '\0';
+        mr_asprintf(&suffix, "%s", "");
         //      log_it("%s is indeed compressed :-)", filename);
         should_I_compress_slices = FALSE;
     } else {
-        strcpy(suffix, bkpinfo->zip_suffix);
+        mr_asprintf(&suffix, "%s", bkpinfo->zip_suffix);
         should_I_compress_slices = TRUE;
     }
@@ -3050 +3054 @@
         if (!(fin = popen(command, "r"))) {
             log_OS_error("Unable to popen-in command");
+            mr_free(suffix);
             return (1);
         }
@@ -3072 +3077 @@
         log_msg(1, "Unable to open and write to %s\n", tmp);
         paranoid_free(tmp);
-        paranoid_free(suffix);
+        mr_free(suffix);
         return (1);
     }
@@ -3093 +3098 @@
         paranoid_free(checksum_line);
         paranoid_free(command);
+        mr_free(suffix);
         return (1);
     }
@@ -3106 +3112 @@
     i = bkpinfo->optimal_set_size / 256;
     for (slice_num = 1; !finished; slice_num++) {
-        strcpy(curr_slice_fname_uncompressed,
+        mr_asprintf(&curr_slice_fname_uncompressed, "%s",
                slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir,
                            ""));
-        strcpy(curr_slice_fname_compressed,
+        mr_asprintf(&curr_slice_fname_compressed, "%s",
                slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir,
                            suffix));
@@ -3119 +3125 @@
         if (!(fout = fopen(curr_slice_fname_uncompressed, "w"))) {
             log_OS_error(curr_slice_fname_uncompressed);
+            mr_free(suffix);
             return (1);
         }
@@ -3188 +3195 @@
             paranoid_free(tmp);
 
-            strcpy(file_to_archive, curr_slice_fname_compressed);
+            mr_asprintf(&file_to_archive, curr_slice_fname_compressed);
             g_current_progress++;
         } else {                /* if i==0 then ... */
 
             finished = TRUE;
-            strcpy(file_to_archive, curr_slice_fname_uncompressed);
+            mr_asprintf(&file_to_archive, curr_slice_fname_uncompressed);
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
                 break;
             }
         }
+        mr_free(curr_slice_fname_uncompressed);
+        mr_free(curr_slice_fname_compressed);
 
         if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -3208 +3217 @@
             res = move_files_to_cd(file_to_archive, NULL);
         }
+        mr_free(file_to_archive);
+
         retval += res;
         if (res) {
@@ -3219 +3230 @@
         }
     }
+    mr_free(suffix);
     paranoid_fclose(fin);
     mr_asprintf(&tmp, "Sliced bigfile #%ld", biggie_file_number + 1);
@@ -3232 +3244 @@
     paranoid_free(checksum_line);
     paranoid_free(command);
-    paranoid_free(curr_slice_fname_uncompressed);
-    paranoid_free(curr_slice_fname_compressed);
-    paranoid_free(file_to_archive);
-    paranoid_free(suffix);
     return (retval);
 }

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

@@ -98 +98 @@
         flag_set[i] = FALSE;
     }
-    //  strcpy (bkpinfo->scratchdir, "/home");
     for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
         bkpinfo->media_size[j] = 650;
@@ -669 +668 @@
 
     malloc_string(tmp);
-    malloc_string(psz);
 
     assert(bkpinfo != NULL);
@@ -1124 +1122 @@
     {
 //      strncpy(psz, list_of_NFS_devices_and_mounts(), MAX_STR_LEN);
-        strncpy(psz, list_of_NFS_mounts_only(), MAX_STR_LEN);
+        asprintf(&psz, "%s", list_of_NFS_mounts_only());
         if (bkpinfo->exclude_paths[0]) {
             strncat(bkpinfo->exclude_paths, " ", 4*MAX_STR_LEN);
         }
         strncat(bkpinfo->exclude_paths, psz, 4*MAX_STR_LEN);
+        mr_free(psz);
+
         log_msg(3, "-N means we're now excluding %s",
                 bkpinfo->exclude_paths);
@@ -1139 +1139 @@
 
     if (flag_set['b']) {
-        strcpy(psz, flag_val['b']);
+        mr_asprintf(&psz, flag_val['b']);
         log_msg(1, "psz = '%s'", psz);
         if (psz[strlen(psz) - 1] == 'k') {
@@ -1147 +1147 @@
             itbs = atol(psz);
         }
+        mr_free(psz);
         log_msg(1, "'%s' --> %ld", flag_val['b'], itbs);
         log_msg(1, "Internal tape block size is now %ld bytes", itbs);
@@ -1421 +1422 @@
 
     paranoid_free(tmp);
-    paranoid_free(psz);
     return (retval);
 }

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

@@ -107 +107 @@
 bool am_I_in_disaster_recovery_mode(void)
 {
-    char *tmp, *comment;
+    char *tmp = NULL;
+    char *comment;
     bool is_this_a_ramdisk = FALSE;
 
-    malloc_string(tmp);
     malloc_string(comment);
-    strcpy(tmp, where_is_root_mounted());
+    mr_asprintf(&tmp, "%s", where_is_root_mounted());
     sprintf(comment, "root is mounted at %s\n", tmp);
     log_msg(0, comment);
@@ -133 +133 @@
     }
 #endif
+    mr_free(tmp);
 
     if (is_this_a_ramdisk) {
@@ -144 +145 @@
         is_this_a_ramdisk = TRUE;
     }
-    paranoid_free(tmp);
     paranoid_free(comment);
     log_msg(1, "Is this a ramdisk? result = %d", is_this_a_ramdisk);
@@ -513 +513 @@
     /*@ buffers ************************ */
     char *comment;
-    char *tmp;
-    char *cdr_exe;
+    char *tmp = NULL;
+    char *cdr_exe = NULL;
     char *command;
 
     malloc_string(comment);
-    malloc_string(tmp);
-    malloc_string(cdr_exe);
     malloc_string(command);
     if (g_cdrw_drive_is_here[0]) {
@@ -525 +523 @@
         log_msg(3, "Been there, done that. Returning %s", cdrw_device);
         paranoid_free(comment);
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
         paranoid_free(command);
         return (0);
@@ -534 +530 @@
                 "This is dumb. You're calling find_cdrw_device() but you're backing up to DVD. WTF?");
         paranoid_free(comment);
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
         paranoid_free(command);
         return (1);
@@ -541 +535 @@
     run_program_and_log_output("insmod ide-scsi", -1);
     if (find_home_of_exe("cdrecord")) {
-        strcpy(cdr_exe, "cdrecord");
+        mr_asprintf(&cdr_exe, "cdrecord");
     } else {
-        strcpy(cdr_exe, "dvdrecord");
-    }
-    tmp[0] = '\0';
+        mr_asprintf(&cdr_exe, "dvdrecord");
+    }
     if (find_home_of_exe(cdr_exe)) {
         sprintf(command,
                 "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep CD | cut -d' ' -f2 | head -n1",
                 cdr_exe);
-        strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    }
-    if (strlen(tmp) < 2) {
+        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+    }
+    if ((tmp == NULL) || (strlen(tmp) < 2)) {
         paranoid_free(comment);
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
+        mr_free(tmp);
+        mr_free(cdr_exe);
         paranoid_free(command);
         return 1;
@@ -564 +557 @@
         strcpy(g_cdrw_drive_is_here, cdrw_device);
         paranoid_free(comment);
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
+        mr_free(tmp);
+        mr_free(cdr_exe);
         paranoid_free(command);
         return (0);
@@ -597 +590 @@
     /*@ buffers ***************************************************** */
     char *tmp;
-    char *cdr_exe;
+    char *tmp1 = NULL;
+    char *cdr_exe = NULL;
     char *phrase_one;
     char *phrase_two;
@@ -607 +601 @@
     /*@ intialize *************************************************** */
     malloc_string(tmp);
-    malloc_string(cdr_exe);
     malloc_string(phrase_one);
     malloc_string(phrase_two);
@@ -640 +633 @@
 
     if (find_home_of_exe("cdrecord")) {
-        strcpy(cdr_exe, "cdrecord");
+        mr_asprintf(&cdr_exe, "cdrecord");
     } else {
-        strcpy(cdr_exe, "dvdrecord");
+        mr_asprintf(&cdr_exe, "dvdrecord");
     }
     tmp[0] = '\0';
@@ -663 +656 @@
         log_msg(4, "command=%s", command);
         log_OS_error("Cannot popen command");
+        mr_free(cdr_exe);
         return (1);
     }
@@ -862 +856 @@
             cdr_exe, g_cdrw_drive_is_here);
     log_msg(1, "command=%s", command);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    if (tmp[0]) {
-        strcpy(output, tmp);
+    mr_asprintf(&tmp1, "%s", call_program_and_get_last_line_of_output(command));
+    if (strlen(tmp1) > 0) {
+        strcpy(output, tmp1);
         log_msg(4, "Finally found it at %s", output);
         retval = 0;
-        goto end_of_find_cdrom_device;
     } else {
         log_msg(4, "Still couldn't find it.");
         retval = 1;
-        goto end_of_find_cdrom_device;
-    }
+    }
+    mr_free(tmp1);
+
   end_of_find_cdrom_device:
     paranoid_free(tmp);
-    paranoid_free(cdr_exe);
+    mr_free(cdr_exe);
     paranoid_free(phrase_one);
     paranoid_free(phrase_two);
@@ -1103 +1097 @@
     /*@ buffers ***************************************************** */
     char *incoming;
-    char *device_with_tab;
-    char *device_with_space;
-    char *tmp;
-    int retval = 0;
+    char *device_with_tab = NULL;
+    char *device_with_space = NULL;
+    char *tmp = NULL;
+    bool retval = FALSE;
 
 #ifdef __FreeBSD__
@@ -1117 +1111 @@
 
     malloc_string(incoming);
-    malloc_string(device_with_tab);
-    malloc_string(device_with_space);
-    malloc_string(tmp);
     assert(device_raw != NULL);
 //  assert_string_is_neither_NULL_nor_zerolength(device_raw);
@@ -1125 +1116 @@
         log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
                 device_raw);
-        sprintf(tmp, "/%s", device_raw);
+        mr_asprintf(&tmp, "/%s", device_raw);
     } else {
-        strcpy(tmp, device_raw);
+        mr_asprintf(&tmp, "%s", device_raw);
     }
     log_msg(1, "Is %s mounted?", tmp);
@@ -1133 +1124 @@
         log_msg(1,
                 "I don't know how the heck /proc made it into the mountlist. I'll ignore it.");
-        return (0);
-    }
-    sprintf(device_with_tab, "%s\t", tmp);
-    sprintf(device_with_space, "%s ", tmp);
+        mr_free(tmp);
+        return(FALSE);
+    }
+    mr_asprintf(&device_with_tab, "%s\t", tmp);
+    mr_asprintf(&device_with_space, "%s ", tmp);
+    mr_free(tmp);
 
     if (!(fin = popen("mount", "r"))) {
         log_OS_error("Cannot popen 'mount'");
-        return (FALSE);
+        return(FALSE);
     }
     for ((void)fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
@@ -1148 +1141 @@
         {
             paranoid_pclose(fin);
-            retval = 1;
-            goto end_of_func;
-        }
-    }
+            paranoid_free(incoming);
+            return(TRUE);
+        }
+    }
+    mr_free(device_with_tab);
+    mr_free(device_with_space);
     paranoid_pclose(fin);
-    sprintf(tmp, "%s | grep -E \"^%s\" > /dev/null 2> /dev/null",
+    mr_asprintf(&tmp, "%s | grep -E \"^%s\" > /dev/null 2> /dev/null",
             SWAPLIST_COMMAND, device_with_space);
     log_msg(4, "tmp (command) = '%s'", tmp);
     if (!system(tmp)) {
-        retval = 1;
-        goto end_of_func;
-    }
-  end_of_func:
+        retval = TRUE;
+    }
+    mr_free(tmp);
     paranoid_free(incoming);
-    paranoid_free(device_with_tab);
-    paranoid_free(device_with_space);
-    paranoid_free(tmp);
-    return (retval);
+    return(retval);
 }
 
@@ -1245 +1236 @@
     /*@ buffer ****************************************************** */
     char *command;
-    char *dev;
     int retval;
 
     malloc_string(command);
-    malloc_string(dev);
     assert_string_is_neither_NULL_nor_zerolength(device);
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
@@ -1256 +1245 @@
     if (isdigit(device[0])) {
         return(1);
-    } else {
-        strcpy(dev, device);
     }
     log_msg(4, "(mount_USB_here --- device=%s, mountpoint=%s", device,
@@ -1276 +1263 @@
 
     paranoid_free(command);
-    paranoid_free(dev);
     return (retval);
 }
@@ -1482 +1468 @@
 // archiving_to_media is FALSE if I'm being called by mondorestore
 {
-    char *tmp;
+    char *tmp = NULL;
     char *tmp1 = NULL;
     char *sz_size;
@@ -1491 +1477 @@
     FILE *fin;
 
-    malloc_string(tmp);
     malloc_string(sz_size);
     malloc_string(command);
@@ -1553 +1538 @@
             if (bkpinfo->backup_media_type == dvd) {
                 find_dvd_device(bkpinfo->media_device, FALSE);
-                strcpy(tmp, "1");
+                mr_asprintf(&tmp, "1");
                 sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
                 log_msg(1, "Setting to DVD defaults");
             } else {
                 strcpy(bkpinfo->media_device, VANILLA_SCSI_CDROM);
-                strcpy(tmp, "4");
+                mr_asprintf(&tmp, "4");
                 strcpy(sz_size, "650");
                 log_msg(1, "Setting to CD defaults");
@@ -1569 +1554 @@
             }
             bkpinfo->cdrw_speed = atoi(tmp);    // if DVD then this shouldn't ever be used anyway :)
+            mr_free(tmp);
+
             sprintf(comment,
                     "How much data (in Megabytes) will each %s store?",
@@ -1620 +1607 @@
             if (bkpinfo->media_device[0]) {
                 if (bkpinfo->backup_media_type == usb) {
-                    sprintf(tmp,
+                    mr_asprintf(&tmp,
                         "I think your %s media corresponds to %s. Is this correct?",
                         media_descriptor_string(bkpinfo->backup_media_type),
                         bkpinfo->media_device);
                 } else {
-                    sprintf(tmp,
+                    mr_asprintf(&tmp,
                         "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)",
                         media_descriptor_string(bkpinfo->backup_media_type),
@@ -1633 +1620 @@
                     bkpinfo->media_device[0] = '\0';
                 }
+                mr_free(tmp);
             }
             if (!bkpinfo->media_device[0]) {
@@ -1691 +1679 @@
                 }
             }
-            sprintf(tmp,
-                    "I think I've found your tape streamer at %s; am I right on the money?",
-                    bkpinfo->media_device);
         }
         if (bkpinfo->media_device[0]) {
-            sprintf(tmp,
+            mr_asprintf(&tmp,
                     "I think I've found your tape streamer at %s; am I right on the money?",
                     bkpinfo->media_device);
@@ -1702 +1687 @@
                 bkpinfo->media_device[0] = '\0';
             }
+            mr_free(tmp);
         }
         if (!bkpinfo->media_device[0]) {
@@ -1712 +1698 @@
             }
         }
-        sprintf(tmp, "ls -l %s", bkpinfo->media_device);
+        mr_asprintf(&tmp, "ls -l %s", bkpinfo->media_device);
         if (run_program_and_log_output(tmp, FALSE)) {
             log_to_screen("User has not specified a valid /dev entry");
             finish(1);
         }
+        mr_free(tmp);
         log_msg(4, "sz_size = %s", sz_size);
         sz_size[0] = '\0';
-/*
-    if ((size_sz[0]=='\0' || atol(size_sz)==0) && archiving_to_media)
-      {
-        if (!popup_and_get_string("Tape size", "How much COMPRESSED data will one of your tape cartridges hold? (e.g. 4GB for 4 gigabytes)", size_sz, 16))
-          { log_to_screen("User has chosen not to backup the PC"); finish(1); }
-      }
-*/
+
         bkpinfo->use_obdr = ask_me_yes_or_no
             ("Do you want to activate OBDR support for your tapes ?");
@@ -1829 +1810 @@
             sprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
-            sprintf(tmp, "mount -t nfs -o nolock %s %s", bkpinfo->nfs_mount,
+            mr_asprintf(&tmp, "mount -t nfs -o nolock %s %s", bkpinfo->nfs_mount,
                     bkpinfo->isodir);
             run_program_and_log_output(tmp, 3);
+            mr_free(tmp);
+
             malloc_string(g_selfmounted_isodir);
             strcpy(g_selfmounted_isodir, bkpinfo->isodir);
@@ -1840 +1823 @@
             finish(1);
         }
-        strcpy(tmp, bkpinfo->nfs_remote_dir);
+        mr_asprintf(&tmp, bkpinfo->nfs_remote_dir);
         if (!popup_and_get_string
             ("Directory", "Which directory within that mountpoint?", tmp,
@@ -1848 +1831 @@
         }
         strcpy(bkpinfo->nfs_remote_dir, tmp);
+        mr_free(tmp);
+
         // check whether writable - we better remove surrounding spaces for this
         strip_spaces(bkpinfo->nfs_remote_dir);
@@ -1981 +1966 @@
             finish(1);
         }
-        strcpy(tmp, list_of_NFS_mounts_only());
+        mr_asprintf(&tmp, "%s", list_of_NFS_mounts_only());
         if (strlen(tmp) > 2) {
             if (bkpinfo->exclude_paths[0]) {
@@ -1988 +1973 @@
             strncpy(bkpinfo->exclude_paths, tmp, MAX_STR_LEN);
         }
+        mr_free(tmp);
 // NTFS 
-        strcpy(tmp,
+        mr_asprintf(&tmp, "%s",
                call_program_and_get_last_line_of_output
                ("parted2fdisk -l | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
@@ -2002 +1988 @@
             strncpy(bkpinfo->image_devs, tmp, MAX_STR_LEN / 4);
         }
+        mr_free(tmp);
 
 
@@ -2047 +2034 @@
 #else
     if (bkpinfo->backup_media_type == nfs) {
-        sprintf(tmp, "mount | grep \"%s\" | cut -d' ' -f3",
-                bkpinfo->nfs_mount);
-//      strcpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(tmp));
         log_msg(3, "I think the NFS mount is mounted at %s",
                 bkpinfo->isodir);
@@ -2078 +2062 @@
         }
     }
-    paranoid_free(tmp);
     paranoid_free(sz_size);
     paranoid_free(command);
@@ -2100 +2083 @@
 char *list_of_NFS_devices_and_mounts(void)
 {
-    char *exclude_these_devices;
-    char *exclude_these_directories;
+    char *exclude_these_devices = NULL;
+    char *exclude_these_directories = NULL;
     static char result_sz[1024];
 
-    malloc_string(exclude_these_devices);
-    malloc_string(exclude_these_directories);
-    strcpy(exclude_these_directories,list_of_NFS_mounts_only());
-    strcpy(exclude_these_devices,
+    mr_asprintf(exclude_these_directories,"%s",list_of_NFS_mounts_only());
+    mr_asprintf(exclude_these_devices,"%s",
            call_program_and_get_last_line_of_output
            ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|nfs4|smbfs|cifs|afs|gfs|ocfs|ocfs2|mvfs|nsspool|nsvol) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
-    sprintf(result_sz, "%s %s", exclude_these_directories,
-            exclude_these_devices);
-    paranoid_free(exclude_these_devices);
-    paranoid_free(exclude_these_directories);
+    snprintf(result_sz, "%s %s", exclude_these_directories,
+            exclude_these_devices, 1023);
+    mr_free(exclude_these_devices);
+    mr_free(exclude_these_directories);
     return (result_sz);
 }
@@ -2128 +2109 @@
 char *list_of_NFS_mounts_only(void)
 {
-    char *exclude_these_directories;
+    char *exclude_these_directories = NULL;
     static char result_sz[512];
 
-    malloc_string(exclude_these_directories);
-    strcpy(exclude_these_directories,
+    mr_asprintf(&exclude_these_directories,"%s",
            call_program_and_get_last_line_of_output
            ("mount -t coda,ncpfs,nfs,nfs4,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
-    sprintf(result_sz, "%s", exclude_these_directories);
-    paranoid_free(exclude_these_directories);
+    snprintf(result_sz, "%s", exclude_these_directories, 511);
+    mr_free(exclude_these_directories);
     return (result_sz);
 }
@@ -2183 +2163 @@
 {
     char *tmp = NULL; 
-    char *command, *sz;
-
-    malloc_string(command);
-    malloc_string(sz);
+    char *command = NULL;
+    char *sz = NULL;
+
     assert(bkpinfo != NULL);
 
@@ -2200 +2179 @@
 
     if (tmp[0] != '/') {
-        strcpy(sz, tmp);
+        mr_asprintf(&sz, tmp);
         paranoid_free(tmp);
         mr_asprintf(&tmp, "/%s", sz);
+        mr_free(sz);
     }
     if (!tmp[0]) {
@@ -2214 +2194 @@
     log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
 
-    sprintf(command, "rm -Rf %s/tmp.mondo.* %s/mondo.scratch.*", tmp, tmp);
+    mr_asprintf(&command, "rm -Rf %s/tmp.mondo.* %s/mondo.scratch.*", tmp, tmp);
     paranoid_free(tmp);
 
     paranoid_system(command);
-    paranoid_free(command);
-    paranoid_free(sz);
+    mr_free(command);
 }
 
@@ -2559 +2538 @@
     char *command;
     char *curr_fname;
-    char *scratch;
-    char *tmp;
+    char *scratch = NULL;
+    char *tmp = NULL;
     char *p;
 
     struct stat statbuf;
     command = malloc(1000);
-    malloc_string(tmp);
-    malloc_string(scratch);
     malloc_string(curr_fname);
     if (!does_file_exist(incoming)) {
@@ -2578 +2555 @@
             log_msg(1, "curr_fname = %s", curr_fname);
             sprintf(command, "file %s", curr_fname);
-            strcpy(tmp, call_program_and_get_last_line_of_output(command));
+            mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
             for (p = tmp + strlen(tmp); p != tmp && *p != '`' && *p != ' ';
                  p--);
             p++;
-            strcpy(scratch, p);
+            mr_asprintf(&scratch, p);
             for (p = scratch; *p != '\0' && *p != '\''; p++);
             *p = '\0';
-            log_msg(0, "curr_fname %s --> '%s' --> %s", curr_fname, tmp,
-                    scratch);
+            log_msg(0, "curr_fname %s --> '%s' --> %s", curr_fname, tmp, scratch);
+            mr_free(tmp);
+
             if (scratch[0] == '/') {
                 strcpy(curr_fname, scratch);    // copy whole thing because it's an absolute softlink
@@ -2599 +2577 @@
                 strcpy(p, scratch);
             }
+            mr_free(scratch);
             lstat(curr_fname, &statbuf);
         }
@@ -2606 +2585 @@
     paranoid_free(command);
     paranoid_free(curr_fname);
-    paranoid_free(tmp);
     return (output);
 }
@@ -2619 +2597 @@
 {
     static char output[4];
-    char *tmp;
+    char *tmp = NULL;
     char *command;
     char *fdisk;
@@ -2625 +2603 @@
     struct stat buf;
 #endif
-    malloc_string(tmp);
     malloc_string(command);
     malloc_string(fdisk);
@@ -2632 +2609 @@
     log_msg(1, "Using %s", fdisk);
     sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
     if (strstr(tmp, "GPT") == NULL) {
         strcpy(output, "MBR");
@@ -2638 +2615 @@
         strcpy(output, "GPT");
     }
+    mr_free(tmp);
+
     log_msg(0, "Found %s partition table format type", output);
     paranoid_free(command);
-    paranoid_free(tmp);
     paranoid_free(fdisk);
     return (output);

branches/2.2.9/mondo/src/common/libmondo-fifo.c

@@ -155 +155 @@
 void kill_buffer()
 {
-    char *tmp;
-    char *command;
+    char *tmp = NULL;
+    char *command = NULL;
 
     if (g_sz_call_to_buffer == NULL) {
@@ -164 +164 @@
         return;
     }
-    malloc_string(tmp);
-    malloc_string(command);
     paranoid_system("sync");
-    sprintf(command,
+    mr_asprintf(&command,
             "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
     log_msg(2, "kill_buffer() --- command = %s", command);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    sprintf(command, "kill %s", tmp);
+    mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
+    mr_asprintf(&command, "kill %s", tmp);
     log_msg(2, "kill_buffer() --- command = %s", command);
     if (strlen(tmp) > 0) {
         run_program_and_log_output(command, TRUE);
     }
-    paranoid_free(tmp);
-    paranoid_free(command);
+    mr_free(tmp);
+    mr_free(command);
 }