Changeset 903 in MondoRescue for trunk/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Oct 25, 2006, 1:49:52 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r862:888 $SVN_M/branches/stable

File:

• trunk/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

trunk/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -793 +793 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+    char *envtmp1 = NULL;
+    char *envtmp2 = NULL;
     char *command = NULL;
     char *iso_mnt = NULL;
@@ -854 +856 @@
             /* We need to override prefix value in PXE mode as it's 
              * already done in start-nfs */
+            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,getenv("imgname"));
+                    mr_allocstr(bkpinfo->prefix,envtmp1);
             }
 
@@ -985 +991 @@
         /* We need to override values in PXE mode as it's 
          * already done in start-nfs */
+        envtmp1 = getenv("nfsmount");
+        if (envtmp1 == NULL) {
+            fatal_error("no nfsmount variable in environment");
+            }
+        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,getenv("nfsmount"));
-                strcpy(bkpinfo->nfs_remote_dir,getenv("dirimg"));
-            }
+                mr_allocstr(bkpinfo->nfs_mount,envtmp1);
+                mr_allocstr(bkpinfo->nfs_remote_dir,envtmp2);
+        }
     } else if (bkpinfo->backup_media_type == iso) {
         /* Patch by Conor Daly 23-june-2004