Changeset 2357 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-mountlist.c

Timestamp:

Aug 29, 2009, 3:22:10 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Some more fgets => mr_getline transformations
• XWIN define is gone

File:

• branches/2.2.10/mondo/src/common/libmondo-mountlist.c (modified) (6 diffs)

branches/2.2.10/mondo/src/common/libmondo-mountlist.c

@@ -821 +821 @@
         return (1);
     }
-    malloc_string(incoming);
     malloc_string(siz);
-    (void) fgets(incoming, MAX_STR_LEN - 1, fin);
     log_it("Loading mountlist...");
+    mr_getline(incoming, fin);
     while (!feof(fin)) {
 #if linux
-        res = sscanf(incoming,
-               "%s %s %s %s %s",
-               mountlist->el[items].device,
-               mountlist->el[items].mountpoint,
-               mountlist->el[items].format,
-               siz, mountlist->el[items].label);
+        res = sscanf(incoming, "%s %s %s %s %s", mountlist->el[items].device, mountlist->el[items].mountpoint, mountlist->el[items].format, siz, mountlist->el[items].label);
         if (res < 5) {
             /* no label found */
@@ -839 +833 @@
         }
 #elif __FreeBSD__
-        res = sscanf(incoming,
-               "%s %s %s %s",
-               mountlist->el[items].device,
-               mountlist->el[items].mountpoint,
-               mountlist->el[items].format, siz);
+        res = sscanf(incoming, "%s %s %s %s", mountlist->el[items].device, mountlist->el[items].mountpoint, mountlist->el[items].format, siz);
         strcpy(mountlist->el[items].label,"");
 #endif
@@ -854 +844 @@
             !strcmp(mountlist->el[items].device, "devpts")
             ) {
-            log_msg(1,
-                    "Ignoring %s in mountlist - not loading that line :) ",
-                    mountlist->el[items].device);
-            (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+            log_msg(1, "Ignoring %s in mountlist - not loading that line :) ", mountlist->el[items].device);
+            mr_free(incoming);
+            mr_getline(incoming, fin);
             continue;
         }
@@ -880 +869 @@
                     *(p + 2) = *(p + 3);
                 }
-                log_it("It was %s; it is now %s",
-                       mountlist->el[items].device, tmp);
+                log_it("It was %s; it is now %s", mountlist->el[items].device, tmp);
                 strcpy(mountlist->el[items].device, tmp);
             }
             paranoid_free(tmp);
 
-            log_it("%s %s %s %lld %s",
-                     mountlist->el[items].device,
-                     mountlist->el[items].mountpoint,
-                     mountlist->el[items].format,
-                     mountlist->el[items].size,
-                     mountlist->el[items].label);
+            log_it("%s %s %s %lld %s", mountlist->el[items].device, mountlist->el[items].mountpoint, mountlist->el[items].format, mountlist->el[items].size, mountlist->el[items].label);
             items++;
             if (items >= MAX_MOUNTLIST_ENTRIES) {
@@ -898 +881 @@
             }
         }
-        (void) fgets(incoming, MAX_STR_LEN - 1, fin);
-    }
+        mr_free(incoming);
+        mr_getline(incoming, fin);
+    }
+    mr_free(incoming);
     paranoid_fclose(fin);
     mountlist->entries = items;
@@ -906 +891 @@
     log_it("%d entries in mountlist", items);
 
-    paranoid_free(incoming);
     paranoid_free(siz);
     return (0);