Changeset 3613 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.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/mondo-rstr-tools.c (modified) (7 diffs)

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