Changeset 3147 in MondoRescue for branches/3.1/mondo/src/lib

Timestamp:

Jun 19, 2013, 8:34:46 AM (12 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

Location:

branches/3.1/mondo/src/lib

Files:

• mr_conf.c (modified) (2 diffs)
• mr_str.c (modified) (1 diff)

branches/3.1/mondo/src/lib/mr_conf.c

@@ -97 +97 @@
 int mr_conf_open(const char *filename) {
     size_t length;              /*length of the buffer/file */
-    size_t res = 0;
 
     /* check if mr_conf is already opened? */
@@ -126 +125 @@
     /*reading file in buffer (skip all 0 characters) */
 
-    res = fread(buffer, sizeof(char), length, CONF);
+    if (fread(buffer, sizeof(char), length, CONF)) {
+        // FIXME
+    }
     buffer[length] = (char) 0;  /*finalize the string */
 

branches/3.1/mondo/src/lib/mr_str.c

@@ -28 +28 @@
     size_t pos1 = 0;
     size_t pos2 = 0;
+
+    if (instr == NULL) {
+        *lastpos = 0;
+        return token;
+    }
+
+    if (delims == NULL) {
+        *lastpos = 0;
+        return token;
+    }
 
     if (strlen(instr) <= *lastpos) {