Changeset 3612 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

Addition of a new mr_getcwd function

Location:

branches/3.2/mondo/src

Files:

• include/mr_file.h (modified) (2 diffs)
• lib/mr_file.c (modified) (2 diffs)

branches/3.2/mondo/src/include/mr_file.h

@@ -21 +21 @@
 #define mr_fclose(x)            mr_fclose_int((FILE **)&x, __LINE__,__FILE__)
 #define mr_mkdir(x,y)           mr_mkdir_int((const char *)x,(mode_t)y,__LINE__,__FILE__)
+#define mr_getcwd()         mr_getcwd_int(__LINE__,__FILE__)
 
 extern FILE *mr_fopen_int(const char *path, const char *mode,int line, char *file);
@@ -26 +27 @@
 extern void mr_fclose_int(FILE **fd, int line, char *file);
 extern void mr_mkdir_int(const char *pathname, mode_t mode, int line, char *file);
+extern char *mr_mkdir_int(int line, char *file);
 
 #endif                          /* MR_FILE_H */

branches/3.2/mondo/src/lib/mr_file.c

@@ -13 +13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
 
 #include "mr_err.h"
@@ -68 +71 @@
     }
 }
+
+/* Version of getcwd using dynamically allocated memory. Cf: man 3p getcwd */
+char *mr_getcwd_int(int line, char *file) {
+
+long path_max;
+size_t size;
+char *buf;
+char *ptr;
+
+path_max = pathconf(".", _PC_PATH_MAX);
+if (path_max == -1) {
+    size = (size_t)512;
+} else if (path_max > 10240) {
+    size = (size_t)10240;
+} else {
+    size = (size_t)path_max;
+}
+
+for (buf = ptr = NULL; ptr == NULL; size *= 2) {
+    if ((buf = realloc(buf, size)) == NULL) {
+        mr_msg_int(1,line,file,"mr_getcwd","Unable to realloc memory");
+        mr_exit(-1,"Exiting");
+    }
+
+    ptr = getcwd(buf, size);
+    if (ptr == NULL && errno != ERANGE) {
+        mr_msg_int(1,line,file,"mr_getcwd","Unable to get current working directory");
+        mr_exit(-1,"Exiting");
+    }
+return(buf);
+}
+}