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

Timestamp:

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

Author:

Bruno Cornec

Message:

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

Location:

branches/3.2/mondo/src/mondorestore

Files:

• mondo-rstr-compare.c (modified) (8 diffs)
• mondo-rstr-tools.c (modified) (7 diffs)
• mondorestore.c (modified) (5 diffs)

branches/3.2/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -6 +6 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_file.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -452 +453 @@
   /** needs malloc *********/
     char *tmp = NULL;
-    char *cwd, *new;
+    char *old_pwd = NULL;
     char *command = NULL;
     int resA = 0;
@@ -459 +460 @@
 
     malloc_string(tmp);
-    malloc_string(cwd);
-    malloc_string(new);
-
     assert(bkpinfo != NULL);
 
-    if (getcwd(cwd, MAX_STR_LEN - 1)) {
-        // FIXME
-    }
+    old_pwd = mr_getcwd();
     if (chdir(bkpinfo->restore_path)) {
         //FIXME
     }
-    if (getcwd(new, MAX_STR_LEN - 1)) {
-        // FIXME
-    }
     insist_on_this_cd_number(g_current_media_number);
     unlink(MONDO_CACHE"/changed.txt");
@@ -478 +471 @@
     resA = compare_all_tarballs();
     resB = compare_all_biggiefiles();
-    if (chdir(cwd)) {
+    if (chdir(old_pwd)) {
         // FIXME
     }
+    mr_free(old_pwd);
+
     noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt");
     if (noof_changed_files) {
@@ -494 +489 @@
         mr_free(tmp);
     }
-
-    paranoid_free(cwd);
-    paranoid_free(new);
-
     return (resA + resB);
 }
@@ -525 +516 @@
     long q;
     char *tmp = NULL;
-    char *new;
-    char *cwd;
-
-    malloc_string(new);
-    malloc_string(cwd);
+    char *old_pwd = NULL;
 
   /**************************************************************************
@@ -612 +599 @@
 
             log_msg(2, "calling popup_changelist_from_file()");
-            if (getcwd(cwd, MAX_STR_LEN - 1)) {
-                //FIXME
-            }
+            old_pwd = mr_getcwd();
             if (chdir(bkpinfo->restore_path)) {
                 // FIXME
             }
-            if (getcwd(new, MAX_STR_LEN - 1)) {
-                //FIXME
-            }
             popup_changelist_from_file(MONDO_CACHE"/changed.files");
-            if (chdir(cwd)) {
+            if (chdir(old_pwd)) {
                 // FIXME
             }
+            mr_free(old_pwd);
             log_msg(2, "Returning from popup_changelist_from_file()");
         }
@@ -634 +617 @@
 
     kill_petris();
-    paranoid_free(new);
-    paranoid_free(cwd);
     return (retval);
 }

branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -8 +8 @@
 #include "mr_mem.h"
 #include "mr_str.h"
+#include "mr_file.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -127 +128 @@
 FILE *fout;
 char *incoming = NULL;
+char *p = NULL;
 char *question = NULL;
 
@@ -1012 +1014 @@
 
 char *command = NULL;
-char *tmp;
+char *old_pwd = NULL;
 char *q;
 int res = 0;
@@ -1019 +1021 @@
 
 assert(bkpinfo != NULL);
-malloc_string(tmp);
 
 /* If those files already exist, do not overwrite them later on */
@@ -1035 +1036 @@
         "Filelist and biggielist already recovered from media. Yay!");
 } else {
-    if (getcwd(tmp, MAX_STR_LEN) == NULL) {
-        // FIXME
-    }
+    old_pwd = mr_getcwd();
     if (chdir(bkpinfo->tmpdir)) {
         // FIXME
@@ -1113 +1112 @@
     }
 
-    if (chdir(tmp)) {
+    if (chdir(old_pwd)) {
         // FIXME
     }
+    mr_free(old_pwd);
 
     if (!does_file_exist(g_biggielist_txt)) {
@@ -1192 +1192 @@
     }
 
-    paranoid_free(tmp);
     return (filelist);
 }

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);
 }