Changeset 2334 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-tools.c

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

File:

• branches/2.2.10/mondo/src/common/libmondo-tools.c (modified) (17 diffs)

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