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

Timestamp:

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

Author:

Bruno Cornec

Message:

r3089@localhost: bruno | 2009-05-18 06:41:05 +0200

• move call to asprintf to call to mr_asprintf (suppress a compiler warning)
• remove all the most obvious bad call to strcat and replace by mr_strcat as appropriate

File:

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

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

@@ -9 +9 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-files-EXT.h"
@@ -327 +328 @@
     char *program;
     char *incoming;
-    char *searchstr;
+    char *searchstr = NULL;
     char *tmp;
 
@@ -1040 +1041 @@
 bool is_this_a_valid_disk_format(char *format)
 {
-    char *good_formats;
+    char *good_formats = NULL;
     char *command;
     char *format_sz;
@@ -1288 +1289 @@
 {
     /*@ buffer ****************************************************** */
-    char *command;
-    char *dev;
-    char *options;
+    char *command = NULL;
     int retval;
 
-    malloc_string(command);
-    malloc_string(dev);
-    malloc_string(options);
     assert_string_is_neither_NULL_nor_zerolength(device);
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
 
     make_hole_for_dir(mountpoint);
-    strcpy(options, "ro");
+
+#ifndef __FreeBSD__
+    char *dev = NULL;
+    char *options = NULL;
+    mr_asprintf(&options, "ro");
+#endif
+
     if (isdigit(device[0])) {
         find_cdrom_device(device, FALSE);
-    } else {
-        strcpy(dev, device);
     }
     if (g_ISO_restore_mode) {
 
 #ifdef __FreeBSD__
-        strcpy(dev, make_vn(device));
+        mr_asprintf(&dev, make_vn(device));
         if (!dev) {
-            sprintf(command, "Unable to mount ISO (make_vn(%s) failed)",
-                    device);
+            mr_asprintf(&command, "Unable to mount ISO (make_vn(%s) failed)", device);
             fatal_error(command);
         }
         strcpy(device, dev);
+        paranoid_free(dev);
 #else
-        strcat(options, ",loop");
+        mr_strcat(options, ",loop");
 #endif
 
@@ -1326 +1326 @@
 
 #ifdef __FreeBSD__
-    sprintf(command, "mount_cd9660 -r %s %s 2>> %s",
+    mr_asprintf(&command, "mount_cd9660 -r %s %s 2>> %s",
             device, mountpoint, MONDO_LOGFILE);
 
 #else
-    sprintf(command, "mount %s -o %s -t iso9660 %s 2>> %s",
+    mr_asprintf(&command, "mount %s -o %s -t iso9660 %s 2>> %s",
             device, options, mountpoint, MONDO_LOGFILE);
+    paranoid_free(options);
 #endif
 
@@ -1340 +1341 @@
     retval = system(command);
     log_msg(1, "system(%s) returned %d", command, retval);
-
     paranoid_free(command);
-    paranoid_free(dev);
-    paranoid_free(options);
+
     return (retval);
 }
@@ -2183 +2182 @@
 void sensibly_set_tmpdir_and_scratchdir()
 {
-    char *tmp, *command, *sz;
-
-    malloc_string(tmp);
+    char *tmp = NULL; 
+    char *command, *sz;
+
     malloc_string(command);
     malloc_string(sz);
@@ -2191 +2190 @@
 
 #ifdef __FreeBSD__
-    strcpy(tmp,
+    mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
            ("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,ntfs-3g,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
-    strcpy(tmp,
+    mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
            ("LANGUAGE=C df -m -P -x nfs -x nfs4 -x vfat -x ntfs -x ntfs-3g -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660| sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
@@ -2202 +2201 @@
     if (tmp[0] != '/') {
         strcpy(sz, tmp);
-        strcpy(tmp, "/");
-        strcat(tmp, sz);
+        paranoid_free(tmp);
+        mr_asprintf(&tmp, "/%s", sz);
     }
     if (!tmp[0]) {
@@ -2216 +2215 @@
 
     sprintf(command, "rm -Rf %s/tmp.mondo.* %s/mondo.scratch.*", tmp, tmp);
+    paranoid_free(tmp);
+
     paranoid_system(command);
-    paranoid_free(tmp);
     paranoid_free(command);
     paranoid_free(sz);
@@ -2282 +2282 @@
 {
     int cd_number = -1;
-    char *mountdev;
-    char *tmp;
-
-    malloc_string(mountdev);
-    malloc_string(tmp);
+    char *mountdev = NULL;
+    char *tmp = NULL;
+
     assert(bkpinfo != NULL);
 //  log_it("Asking what_number_cd_is_this");
     if (g_ISO_restore_mode) {
-        sprintf(tmp, "mount | grep iso9660 | awk '{print $3;}'");
-//      log_it("tmp = %s", tmp);
-
-        strcpy(mountdev, call_program_and_get_last_line_of_output(tmp));
-        strcat(mountdev, "/archives/THIS-CD-NUMBER");
-//      log_it("mountdev = %s", mountdev);
+        mr_asprintf(&tmp, "mount | grep iso9660 | awk '{print $3;}'");
+
+        mr_asprintf(&mountdev, "%s%s", call_program_and_get_last_line_of_output(tmp), "/archives/THIS-CD-NUMBER");
         cd_number = atoi(last_line_of_file(mountdev));
-//      log_it("cd_number = %d", cd_number);
         paranoid_free(mountdev);
         paranoid_free(tmp);
+
         return (cd_number);
     }
 
-    strcpy(mountdev, bkpinfo->media_device);
+    mr_asprintf(&mountdev, bkpinfo->media_device);
     if (!mountdev[0]) {
         log_it
@@ -2316 +2311 @@
         }
     }
-    cd_number =
-        atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));
-//  log_it("cd_number..later.. = %d", cd_number);
     paranoid_free(mountdev);
-    paranoid_free(tmp);
+
+    cd_number = atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));
     return (cd_number);
 }