Changeset 2207 in MondoRescue

Timestamp:

May 15, 2009, 3:59:12 AM (16 years ago)

Author:

Bruno Cornec

Message:

-Preparation to integrate some stable functions

Location:

branches/2.2.9/mondo/src

Files:

• common/libmondo-mountlist.c (modified) (26 diffs)
• include (deleted)

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

@@ -10 +10 @@
 
 #include "my-stuff.h"
+#include "mr_str.h"
 #include "mondostructures.h"
 #include "libmondo-mountlist.h"
@@ -37 +38 @@
  * @param mountlist The mountlist to check.
  * @param drive The drive to check (e.g. @c /dev/hda).
- * @param flaws_str Where to put the found flaws (human-readable).
- * @return The number of flaws found (0 for success).
+ * @return The flaws string found (NULL for success) allocated to be freed
  * @see evaluate_mountlist
  */
-int evaluate_drive_within_mountlist(struct mountlist_itself *mountlist,
-                                    char *drive, char *flaws_str)
+char *evaluate_drive_within_mountlist(struct mountlist_itself *mountlist, char *drive)
 #ifdef __FreeBSD__
 {
@@ -71 +70 @@
 
     /*@ initialize ***************************************************** */
-    flaws_str[0] = '\0';
     prev_part_no = 0;
     tmp[0] = '\0';
@@ -80 +78 @@
     if (physical_drive_size < 0) {
         sprintf(tmp, " %s does not exist.", drive);
-        strcat(flaws_str, tmp);
+        asprintf(&flaws_str, "%s", tmp);
     } else {
         sprintf(tmp, "%s is %ld MB", drive, physical_drive_size);
@@ -105 +103 @@
                 sprintf(tmp, " Can only have up to 'h' in disklabel.");
                 log_it(tmp);
-                strcat(flaws_str, tmp);
+                mr_strcat(flaws_str, tmp);
                 res++;
             }
@@ -120 +118 @@
                 if (!strstr(flaws_str, tmp)) {
                     log_it(tmp);
-                    strcat(flaws_str, tmp);
+                    mr_strcat(flaws_str, tmp);
                     res++;
                 }
@@ -129 +127 @@
                 sprintf(tmp, " %s is tiny!", device);
                 log_it(tmp);
-                strcat(flaws_str, tmp);
+                mr_strcat(flaws_str, tmp);
                 res++;
             }
@@ -141 +139 @@
                 sprintf(tmp, " %s has a weird mountpoint.", device);
                 log_it(tmp);
-                strcat(flaws_str, tmp);
+                mr_strcat(flaws_str, tmp);
                 res++;
             }
@@ -148 +146 @@
                 sprintf(tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
                 log_it(tmp);
-                strcat(flaws_str, tmp);
+                mr_strcat(flaws_str, tmp);
                 res++;
             }
@@ -167 +165 @@
         }
         if (((pos >= 0) || npos) && foundsome) {
-            sprintf(flaws_str + strlen(flaws_str),
-                    " %s has both DD and PC-style partitions.", drive);
+            mr_strcat(flaws_str, " %s has both DD and PC-style partitions.", drive);
             return ++res;       // fatal error
         }
@@ -180 +177 @@
                     sprintf(tmp, " Gap prior to %s.", device);
                     log_it(tmp);
-                    strcat(flaws_str, tmp);
+                    mr_strcat(flaws_str, tmp);
                     res++;
                 } else if (curr_part_no > 5
@@ -187 +184 @@
                             prev_part_no, curr_part_no);
                     log_it(tmp);
-                    strcat(flaws_str, tmp);
+                    mr_strcat(flaws_str, tmp);
                     res++;
                 }
@@ -198 +195 @@
                 sprintf(tmp, " Partition %ss4 is occupied.", drive);
                 log_it(tmp);
-                strcat(flaws_str, tmp);
+                mr_strcat(flaws_str, tmp);
                 res++;
             }
@@ -213 +210 @@
                 if (!strstr(flaws_str, tmp)) {
                     log_it(tmp);
-                    strcat(flaws_str, tmp);
+                    mr_strcat(flaws_str, tmp);
                     res++;
                 }
@@ -222 +219 @@
                 sprintf(tmp, " %s is tiny!", device);
                 log_it(tmp);
-                strcat(flaws_str, tmp);
+                mr_strcat(flaws_str, tmp);
                 res++;
             }
@@ -234 +231 @@
                 sprintf(tmp, " %s has a weird mountpoint.", device);
                 log_it(tmp);
-                strcat(flaws_str, tmp);
+                mr_strcat(flaws_str, tmp);
                 res++;
             }
@@ -241 +238 @@
                 sprintf(tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
                 log_it(tmp);
-                strcat(flaws_str, tmp);
+                mr_strcat(flaws_str, tmp);
                 res++;
             }
@@ -257 +254 @@
                     sprintf(tmp, " Can only have up to 'h' in disklabel.");
                     log_it(tmp);
-                    strcat(flaws_str, tmp);
+                    mr_strcat(flaws_str, tmp);
                     res++;
                 }
@@ -272 +269 @@
                     if (!strstr(flaws_str, tmp)) {
                         log_it(tmp);
-                        strcat(flaws_str, tmp);
+                        mr_strcat(flaws_str, tmp);
                         res++;
                     }
@@ -281 +278 @@
                     sprintf(tmp, " %s is tiny!", device);
                     log_it(tmp);
-                    strcat(flaws_str, tmp);
+                    mr_strcat(flaws_str, tmp);
                     res++;
                 }
@@ -293 +290 @@
                     sprintf(tmp, " %s has a weird mountpoint.", device);
                     log_it(tmp);
-                    strcat(flaws_str, tmp);
+                    mr_strcat(flaws_str, tmp);
                     res++;
                 }
@@ -301 +298 @@
                     sprintf(tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
                     log_it(tmp);
-                    strcat(flaws_str, tmp);
+                    mr_strcat(flaws_str, tmp);
                     res++;
                 }
@@ -320 +317 @@
                 amount_allocated - physical_drive_size, drive);
         log_it(tmp);
-        strcat(flaws_str, tmp);
+        mr_strcat(flaws_str, tmp);
         res++;
     } else if (amount_allocated < physical_drive_size - 1) {    /* NOT AN ERROR, JUST A WARNING :-) */
@@ -326 +323 @@
                 physical_drive_size - amount_allocated, drive);
         log_it(tmp);
-        strcat(flaws_str, tmp);
+        mr_strcat(flaws_str, tmp);
     }
     if (res) {
@@ -517 +514 @@
 
     drivelist = malloc(sizeof(struct list_of_disks));
-    malloc_string(tmp);
     malloc_string(flaws_str);
     assert(mountlist != NULL);
@@ -533 +529 @@
             (drivelist->el[i].device,
              DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE)) {
-            sprintf(tmp, " Not evaluating %s (I don't know how yet)",
+            asprintf(&tmp, " Not evaluating %s (I don't know how yet)",
                     drivelist->el[i].device);
             log_it(tmp);
-            tmp[0] = '\0';
+            paranoid_free(tmp);
         } else {
-            if (!evaluate_drive_within_mountlist
-                (mountlist, drivelist->el[i].device, tmp)) {
-                res++;
-            }
-        }
-        strcat(flaws_str, tmp);
+            if ((tmp = evaluate_drive_within_mountlist(mountlist, drivelist->el[i].device)) == NULL) {
+                res++;
+            }
+        }
+        log_msg(8,"Entry: %d (%s)", i, drivelist->el[i].device);
+        log_msg(8,"Adding: %s to %s", tmp, flaws_str);
+        strncat(flaws_str, tmp, MAX_STR_LEN -1);
+        paranoid_free(tmp);
     }
     res += look_for_duplicate_mountpoints(mountlist, flaws_str);