Changeset 689 in MondoRescue for trunk/mondo/mondo/mondoarchive/mondo-cli.c

Timestamp:

Jul 17, 2006, 7:43:58 PM (18 years ago)

Author:

bcornec

Message:

Still other memory management improvements ( I hope :-)

File:

• trunk/mondo/mondo/mondoarchive/mondo-cli.c (modified) (5 diffs)

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -216 +216 @@
 
     /*@ buffers ** */
-    char *tmp;
-    char *tmp1;
-    char *psz;
-    char *p;
-    char *q;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *psz = NULL;
+    char *p = NULL;
+    char *q = NULL;
 
     long itbs;
@@ -263 +263 @@
     }
 
-    if (!find_home_of_exe("afio")) {
-        if (find_home_of_exe("star")) {
+    tmp = find_home_of_exe("afio");
+    tmp1 = find_home_of_exe("star");
+    if (!tmp) {
+        if (tmp1) {
             flag_set['R'] = TRUE;
             log_msg(1, "Using star instead of afio");
@@ -272 +274 @@
         }
     }
+    paranoid_free(tmp);
 
     if (flag_set['R']) {
@@ -278 +281 @@
             fatal_error("You may not use star and lzop at the same time.");
         }
-        if (!find_home_of_exe("star")) {
+        if (!tmp1) {
             fatal_error
                 ("Please install 'star' RPM or tarball if you are going to use -R. Thanks.");
         }
     }
+    paranoid_free(tmp1);
+
     if (flag_set['W']) {
         bkpinfo->nonbootable_backup = TRUE;
@@ -432 +437 @@
             }
         }
-        if (!find_home_of_exe("growisofs")) {
+        tmp = find_home_of_exe("growisofs");
+        if (!tmp) {
             fatal_error
                 ("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
         }
-        if (!find_home_of_exe("dvd+rw-format")) {
+        paranoid_free(tmp);
+
+        tmp = find_home_of_exe("dvd+rw-format");
+        if (!tmp) {
             fatal_error
                 ("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
         }
+        paranoid_free(tmp);
+
         if (strchr(flag_val['d'], ',')) {
             fatal_error