Changeset 3613 in MondoRescue for branches/3.2/mondo/src/common/libmondo-archive.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/common/libmondo-archive.c (modified) (8 diffs)

branches/3.2/mondo/src/common/libmondo-archive.c

@@ -15 +15 @@
 #include "mr_str.h"
 #include "mr_sys.h"
+#include "mr_file.h"
 #include "mondostructures.h"
 #include "libmondo-string-EXT.h"
@@ -1450 +1451 @@
     char *result_sz = NULL;
     char *message_to_screen = NULL;
-    char *old_pwd;
+    char *old_pwd = NULL;
     char *mds = NULL;
 
-    malloc_string(old_pwd);
     assert(bkpinfo != NULL);
 
     log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
-    tmp1 = getcwd(old_pwd, MAX_STR_LEN - 1);
+    old_pwd = mr_getcwd();
     mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
@@ -1533 +1533 @@
         // FIXME
     }
+    mr_free(old_pwd);
     if (retval) {
         log_msg(1, "WARNING - make_usb_fs returned an error");
     }
-    paranoid_free(old_pwd);
-    return (retval);
+    return(retval);
 }
 
@@ -1558 +1558 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_iso_fs(char *destfile)
-{
+int make_iso_fs(char *destfile) {
     /*@ int ********************************************** */
     int retval = 0;
@@ -1566 +1565 @@
     /*@ buffers ****************************************** */
     char *tmp = NULL;
-    char *tmp2 = NULL;
-    char *old_pwd;
+    char *old_pwd = NULL;
     char *result_sz = NULL;
     char *message_to_screen = NULL;
     char *sz_blank_disk = NULL;
-    char *fnam = NULL;
     char *isofs_cmd = NULL;
     char *full_isofs_cmd = NULL;
@@ -1578 +1575 @@
     bool cd_is_mountable;
 
-    malloc_string(old_pwd);
-    malloc_string(fnam);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(destfile);
@@ -1588 +1583 @@
 
     log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s", bkpinfo->scratchdir, destfile);
-    tmp2 = getcwd(old_pwd, MAX_STR_LEN - 1);
-    if (! tmp2) {
-        //FIXME
-    }
+    old_pwd = mr_getcwd();
     mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
@@ -1825 +1817 @@
         // FIXME
     }
+    mr_free(old_pwd);
     if (retval) {
         log_msg(1, "WARNING - make_iso_fs returned an error");
     }
-    paranoid_free(old_pwd);
-    paranoid_free(fnam);
-    paranoid_free(tmp);
     return (retval);
 }