Changeset 1152 in MondoRescue for branches/stable/mondo/src/mondoarchive/main.c

Timestamp:

Feb 12, 2007, 11:49:41 PM (17 years ago)

Author:

Bruno Cornec

Message:

More memory updates around mondoarchive (addition of mr_setenv) (based on ideas sent as patches by Michel)

File:

• branches/stable/mondo/src/mondoarchive/main.c (modified) (13 diffs)

branches/stable/mondo/src/mondoarchive/main.c

@@ -157 +157 @@
     struct s_bkpinfo *bkpinfo;
     struct stat stbuf;
-    char *tmp;
+    char *tmp = NULL;
     int res, retval;
     char *say_at_end;
@@ -178 +178 @@
 
     malloc_libmondo_global_strings();
-    malloc_string(tmp);
     malloc_string(say_at_end);
 
@@ -194 +193 @@
     bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
 
-    /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
-    strncpy(tmp, getenv("PATH"), MAX_STR_LEN - 1);
-    tmp[MAX_STR_LEN - 1] = '\0';
-    if (strlen(tmp) >= MAX_STR_LEN - 33) {
-        fatal_error
-            ("Your PATH environmental variable is too long. Please shorten it.");
-    }
-    strcat(tmp, ":/sbin:/usr/sbin:/usr/local/sbin");
-    setenv("PATH", tmp, 1);
-
     /* Add the ARCH environment variable for ia64 purposes */
-    strncpy(tmp, get_architecture(), MAX_STR_LEN - 1);
-    tmp[MAX_STR_LEN - 1] = '\0';
-    setenv("ARCH", tmp, 1);
+    setenv("ARCH", get_architecture(), 1);
 
     /* Add MONDO_SHARE + others environment variable for mindi */
-    setenv_mondo_share();
+    setenv_mondo_var();
 
     if (stat(MONDO_CACHE, &stbuf) != 0) {
@@ -247 +234 @@
     if (argc == 4 && !strcmp(argv[1], "setfattr")) {
         g_loglevel = 10;
-//      chdir("/tmp");
         g_text_mode = TRUE;
         setup_newt_stuff();
@@ -257 +243 @@
         g_text_mode = TRUE;
         setup_newt_stuff();
+        malloc_string(tmp);
         turn_wildcard_chars_into_literal_chars(tmp, argv[2]);
         printf("in=%s; out=%s\n", argv[2], tmp);
+        mr_free(tmp);
         finish(1);
     }
@@ -276 +264 @@
     if (argc == 4 && !strcmp(argv[1], "setfacl")) {
         g_loglevel = 10;
-//      chdir("/tmp");
         g_text_mode = TRUE;
         setup_newt_stuff();
@@ -286 +273 @@
         g_text_mode = TRUE;
         setup_newt_stuff();
+        malloc_string(tmp);
         if (find_cdrw_device(tmp)) {
             printf("Failed to find CDR-RW drive\n");
@@ -297 +285 @@
             printf("CD-ROM is at %s\n", tmp);
         }
+        mr_free(tmp);
         finish(0);
     }
@@ -304 +293 @@
         g_text_mode = TRUE;
         setup_newt_stuff();
+        malloc_string(tmp);
         if (find_dvd_device(tmp, atoi(argv[2]))) {
             printf("Failed to find DVD drive\n");
@@ -309 +299 @@
             printf("DVD is at %s\n", tmp);
         }
+        mr_free(tmp);
         finish(0);
     }
@@ -380 +371 @@
         res = verify_data(bkpinfo);
         if (res < 0) {
-            sprintf(tmp, "%d difference%c found.", -res,
+            mr_asprintf(&tmp, "%d difference%c found.", -res,
                     (-res != 1) ? 's' : ' ');
             strcat(say_at_end, tmp);
             log_to_screen(tmp);
+            mr_free(tmp);
             res = 0;
         }
@@ -427 +419 @@
     }
     log_to_screen(say_at_end);
-    sprintf(tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, TRUE);
+    mr_free(tmp);
     run_program_and_log_output(g_erase_tmpdir_and_scratchdir, TRUE);
 
@@ -447 +440 @@
     free_libmondo_global_strings();
     mr_free(say_at_end);
-    mr_free(tmp);
     mr_free(bkpinfo);