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

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/common

Files:

• libmondo-archive.c (modified) (8 diffs)
• libmondo-files.c (modified) (4 diffs)
• libmondo-stream.c (modified) (4 diffs)
• libmondo-tools.c (modified) (3 diffs)
• libmondo-verify.c (modified) (1 diff)

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

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

@@ -11 +11 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_file.h"
 #include "mondostructures.h"
 #include "libmondo-files.h"
@@ -1013 +1014 @@
     char *command = NULL;
     char *tmp = NULL;
-    char old_pwd[MAX_STR_LEN];
+    char *old_pwd = NULL;
     int res = 0;
 
@@ -1035 +1036 @@
     if (does_file_exist(tmp)) {
         log_it("Untarring payload %s to scratchdir %s", tmp, bkpinfo->scratchdir);
-        if (getcwd(old_pwd, MAX_STR_LEN - 1)) {
-            // FIXME
-        }
+        old_pwd = mr_getcwd();
         if (chdir(bkpinfo->scratchdir)) {
             // FIXME
@@ -1052 +1051 @@
             // FIXME
         }
+        mr_free(old_pwd);
     }
     mr_free(tmp);

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

@@ -14 +14 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_file.h"
 #include "mondostructures.h"
 #include "libmondo-devices.h"
@@ -764 +765 @@
     char *datablock;
     char *tmp = NULL;
-    char old_cwd[MAX_STR_LEN];
+    char *old_pwd = NULL;
     char *outfname = NULL;
     /*@ int ******************************************************* */
@@ -865 +866 @@
     close_evalcall_form();
     log_it("Saved all.tar.gz to '%s'", outfname);
-    if (getcwd(old_cwd, MAX_STR_LEN)) {
-        // FIXME
-    }
+    old_pwd = mr_getcwd();
     if (chdir(bkpinfo->tmpdir)) {
         // FIXME
@@ -876 +875 @@
 
     paranoid_system("cp -f tmp/mondorestore.cfg . 2> /dev/null");
-    if (chdir(old_cwd)) {
+    if (chdir(old_pwd)) {
         // FIXME
     }
+    mr_free(old_pwd);
     unlink(outfname);
     mr_free(outfname);

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

@@ -107 +107 @@
     bool is_valid = TRUE;
 
-    log_it("ASSERTION FAILED: `%s' at %s:%d in %s", exp, file, line,
-           function);
+    log_it("ASSERTION FAILED: `%s' at %s:%d in %s", exp, file, line, function);
     if (ignoring_assertions) {
         log_it("Well, the user doesn't care...");
@@ -143 +142 @@
              */
         case '\n':
-            printf
-                ("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
+            printf("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
             break;
         default:
@@ -938 +936 @@
     if (system("which " MKE2FS_OR_NEWFS " > /dev/null 2> /dev/null")) {
         retval++;
-        log_to_screen
-            ("Unable to find " MKE2FS_OR_NEWFS " in system path.");
-        fatal_error
-            ("Please use \"su -\", not \"su\" to become root. OK? ...and please don't e-mail the mailing list or me about this. Just read the message. :)");
+        log_to_screen("Unable to find " MKE2FS_OR_NEWFS " in system path.");
+        fatal_error("Please use \"su -\", not \"su\" to become root. OK?\n...and please don't e-mail the mailing list about this. Just read the message. :)");
     }
 #ifndef __FreeBSD__
-    if (run_program_and_log_output
-        ("grep ramdisk /proc/devices", FALSE)) {
+    if (run_program_and_log_output("grep ramdisk /proc/devices", FALSE)) {
         /* Some SuSE have ramdisk as modules, so insert it first, then test again */
         run_program_and_log_output("modprobe brd 2> /dev/null > /dev/null",FALSE);

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

@@ -418 +418 @@
     /*@ long *********************************************************** */
     long diffs = 0;
-    /*  getcwd(old_pwd,MAX_STR_LEN-1); */
 
     assert(bkpinfo != NULL);