Changeset 3613 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondorestore.c

Timestamp:

Nov 18, 2016, 5:31:42 PM (7 years ago)

Author:

Bruno Cornec

Message:

Add function mr_getcwd and use it to allow use o dynamically allocated memory
instead of getcwd

File:

• branches/3.2/mondo/src/mondorestore/mondorestore.c (modified) (5 diffs)

branches/3.2/mondo/src/mondorestore/mondorestore.c

@@ -11 +11 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_file.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -1746 +1747 @@
 
   /** mallco ***/
-    char *cwd;
-    char *newpath;
+    char *old_pwd = NULL;
+    char *newpath = NULL;
     char *tmp = NULL;
     assert(bkpinfo != NULL);
 
-    malloc_string(cwd);
-    malloc_string(newpath);
     log_msg(2, "restore_everything() --- starting");
     g_current_media_number = 1;
-    if (getcwd(cwd, MAX_STR_LEN - 1)) {
-        // FIXME
-    }
+    old_pwd = mr_getcwd();
     mr_asprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
     run_program_and_log_output(tmp, FALSE);
@@ -1766 +1763 @@
         //FIXME
     }
-    if (getcwd(newpath, MAX_STR_LEN - 1)) {
-        // FIXME
-    }
+    newpath = mr_getcwd();
     log_msg(1, "path is now %s", newpath);
+    mr_free(newpath);
+
     log_msg(1, "restoring everything");
     if (!find_home_of_exe("petris") && !g_text_mode) {
@@ -1800 +1797 @@
         resB = restore_all_biggiefiles_from_CD(filelist);
     }
-    if (chdir(cwd)) {
+    if (chdir(old_pwd)) {
         //FIXME
     }
+    mr_free(old_pwd);
     if (resA + resB) {
         log_to_screen("Errors occurred while data was being restored.");
@@ -1813 +1811 @@
     kill_petris();
     log_msg(2, "restore_everything() --- leaving");
-    paranoid_free(cwd);
-    paranoid_free(newpath);
     return (resA + resB);
 }