Changeset 2214 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-devices.c

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

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (51 diffs)

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);