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

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

@@ -10 +10 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "lib-common-externs.h"
@@ -232 +233 @@
 
     uname(&utsn);
-    asprintf(&tmp, "%s", utsn.machine);
+    mr_asprintf(&tmp, "%s", utsn.machine);
     return (tmp);
 }
@@ -420 +421 @@
 int post_param_configuration()
 {
-    char *extra_cdrom_params;
-    char *mondo_mkisofs_sz;
+    char *extra_cdrom_params = NULL;
+    char *mondo_mkisofs_sz = NULL;
     char *command;
     char *mtpt;
-    char *hostname, *ip_address;
+    char *hostname;
+    char *ip_address = NULL;
     int retval = 0;
     char *colon;
@@ -440 +442 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(extra_cdrom_params);
-    malloc_string(mondo_mkisofs_sz);
     malloc_string(command);
     malloc_string(mtpt);
     malloc_string(hostname);
-    malloc_string(ip_address);
     malloc_string(cdr_exe);
     malloc_string(tmp);
@@ -497 +496 @@
 
     if (bkpinfo->backup_media_type == dvd) {
-        extra_cdrom_params[0] = '\0';
-        mondo_mkisofs_sz[0] = '\0';
         if (find_home_of_exe("growisofs")) {
             strcpy(cdr_exe, "growisofs");
@@ -506 +503 @@
         }
         if (bkpinfo->nonbootable_backup) {
-            strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
         } else if
 #ifdef __FreeBSD__
@@ -515 +512 @@
 #ifdef __IA64__
     {
-        strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);
     }
 #else
     {
-        strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
+            paranoid_free(mondo_mkisofs_sz);
             fatal_error("Manual CD tray + DVD not supported yet.");
             // -m isn't supported by growisofs, BTW...
@@ -533 +531 @@
                     "%s %s -Z %s . 2>> _ERR_",
                     mondo_mkisofs_sz,
-                    extra_cdrom_params, bkpinfo->media_device);
+                    "", bkpinfo->media_device);
+            paranoid_free(mondo_mkisofs_sz);
         }
         if (getenv ("SUDO_COMMAND")) {
@@ -549 +548 @@
     if (bkpinfo->backup_media_type == cdrw
         || bkpinfo->backup_media_type == cdr) {
-        extra_cdrom_params[0] = '\0';
         if (!bkpinfo->manual_cd_tray) {
-            strcat(extra_cdrom_params, "-waiti ");
+            mr_asprintf(&extra_cdrom_params, "-waiti ");
         }
         if (bkpinfo->backup_media_type == cdrw) {
-            strcat(extra_cdrom_params, "blank=fast ");
+            mr_asprintf(&extra_cdrom_params, "blank=fast ");
         }
         if (find_home_of_exe("cdrecord")) {
@@ -564 +562 @@
         }
         if (bkpinfo->nonbootable_backup) {
-            strcpy(mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
         } else if
 #ifdef __FreeBSD__
@@ -573 +571 @@
 #ifdef __IA64__
     {
-        strcat(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
     }
 #else
     {
-        strcpy(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            strcpy(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
@@ -609 +607 @@
                     bkpinfo->cdrw_speed);
         }
+        paranoid_free(mondo_mkisofs_sz);
+        paranoid_free(extra_cdrom_params);
     }                           // end of CD code
 
@@ -693 +693 @@
                 retval++;
             } else {
-                strcpy(ip_address, inet_ntoa
+                mr_asprintf(&ip_address, inet_ntoa
                        ((struct in_addr)
                         *((struct in_addr *) hent->h_addr)));
-                strcat(ip_address, strchr(bkpinfo->nfs_mount, ':'));
+                mr_strcat(ip_address, strchr(bkpinfo->nfs_mount, ':'));
                 strcpy(bkpinfo->nfs_mount, ip_address);
+                paranoid_free(ip_address);
             }
         }
@@ -718 +719 @@
     g_backup_media_type = bkpinfo->backup_media_type;
     paranoid_free(mtpt);
-    paranoid_free(extra_cdrom_params);
-    paranoid_free(mondo_mkisofs_sz);
     paranoid_free(command);
     paranoid_free(hostname);
-    paranoid_free(ip_address);
     paranoid_free(cdr_exe);
     paranoid_free(tmp);
@@ -758 +756 @@
 
     unlink(MONDO_TRACEFILE);
-    asprintf(&tmp,"rm -Rf %s/changed.files*",MONDO_CACHE);
+    mr_asprintf(&tmp,"rm -Rf %s/changed.files*",MONDO_CACHE);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -783 +781 @@
     if ((bkpinfo->tmpdir != NULL) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
         /* purging a potential old tmpdir */
-        asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
+        mr_asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
         system(tmp);
         paranoid_free(tmp);
@@ -789 +787 @@
 
     if (path != NULL) {
-        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
+        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
     } else if (getenv("TMPDIR")) {
-        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR"));
+        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR"));
     } else if (getenv("TMP")) {
-        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP"));
+        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP"));
     } else {
-        asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");
+        mr_asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");
     }
     p = mkdtemp(tmp);