Changeset 3147 in MondoRescue for branches/3.1/mondo/src/common/libmondo-mountlist.c

Timestamp:

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

Author:

Bruno Cornec

Message:

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

File:

• branches/3.1/mondo/src/common/libmondo-mountlist.c (modified) (8 diffs)

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

@@ -50 +50 @@
     int pos = 0, npos = 0;
     int res = 0;
-    int mountpoint_copies = 0;
     int device_copies = 0;
     int i = 0;
@@ -112 +111 @@
             }
             /* does partition /dev/adXsYZ exist more than once in the mountlist? */
-            for (i = 0, mountpoint_copies = 0, device_copies = 0;
+            for (i = 0, device_copies = 0;
                  i < mountlist->entries; i++) {
                 if (!strcmp(device, mountlist->el[i].device)) {
@@ -214 +213 @@
             }
             /* does partition /dev/adXsY exist more than once in the mountlist? */
-            for (i = 0, mountpoint_copies = 0, device_copies = 0;
+            for (i = 0, device_copies = 0;
                  i < mountlist->entries; i++) {
                 if (!strcmp(device, mountlist->el[i].device)) {
@@ -277 +276 @@
                 }
                 /* does partition /dev/adXsYZ exist more than once in the mountlist? */
-                for (i = 0, mountpoint_copies = 0, device_copies = 0;
+                for (i = 0, device_copies = 0;
                      i < mountlist->entries; i++) {
                     if (!strcmp(device, mountlist->el[i].device)) {
@@ -384 +383 @@
     int pos = 0;
     int res = 0;
-    int mountpoint_copies = 0;
     int device_copies = 0;
     int i = 0;
@@ -461 +459 @@
 
         /* does partition /dev/hdNX exist more than once in the mountlist? */
-        for (i = 0, mountpoint_copies = 0, device_copies = 0;
+        for (i = 0, device_copies = 0;
              i < mountlist->entries; i++) {
             if (!strcmp(device, mountlist->el[i].device)) {
@@ -807 +805 @@
     char *tmp = NULL;
     char *p = NULL;
+    char *q = NULL;
 
     int items = 0;
@@ -926 +925 @@
     }
     paranoid_fclose(fout);
+    if (!(fout = fopen(MONDO_MNTLISTCHG, "w"))) {
+        log_OS_error("WMTD - Cannot openout "MONDO_MNTLISTCHG);
+        return (1);
+    }
+    fprintf(fout, "the mountlist was changed by mondorestore\n");
+    paranoid_fclose(fout);
     return (0);
 }