Changeset 873 in MondoRescue for branches/stable

Timestamp:

Oct 4, 2006, 3:35:47 PM (18 years ago)

Author:

Bruno Cornec

Message:

Patch from Andree tso that we create proper tmp var. to be used with getenv (avoids them to be freed later on)

File:

• branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -975 +975 @@
     char *value = NULL;
     char *tmp = NULL;
-    char *tmp1 = NULL;
+    char *envtmp1 = NULL;
+    char *envtmp2 = NULL;
     char *command = NULL;
     char *iso_mnt = NULL;
@@ -1047 +1048 @@
             /* We need to override prefix value in PXE mode as it's 
              * already done in start-nfs */
-            tmp = getenv("imgname");
-            if (tmp == NULL) {
+            envtmp1 = getenv("imgname");
+            if (envtmp1 == NULL) {
                 fatal_error("no imgname variable in environment");
             }
             if (strstr(call_program_and_get_last_line_of_output
                ("cat /proc/cmdline"), "pxe")) {
-                    strcpy(bkpinfo->prefix,tmp);
+                    strcpy(bkpinfo->prefix,envtmp1);
             }
 
@@ -1165 +1166 @@
         /* We need to override values in PXE mode as it's 
          * already done in start-nfs */
-        tmp = getenv("nfsmount");
-        if (tmp == NULL) {
+        envtmp1 = getenv("nfsmount");
+        if (envtmp1 == NULL) {
             fatal_error("no nfsmount variable in environment");
         }
-        tmp1 = getenv("dirimg");
-        if (tmp1 == NULL) {
+        envtmp2 = getenv("dirimg");
+        if (envtmp2 == NULL) {
             fatal_error("no dirimg variable in environment");
         }
         if (strstr(call_program_and_get_last_line_of_output
            ("cat /proc/cmdline"), "pxe")) {
-                strcpy(bkpinfo->nfs_mount,tmp);
-                strcpy(bkpinfo->nfs_remote_dir,tmp1);
+                strcpy(bkpinfo->nfs_mount,envtmp1);
+                strcpy(bkpinfo->nfs_remote_dir,envtmp2);
             }
     } else if (bkpinfo->backup_media_type == iso) {