Changeset 2205 in MondoRescue

Timestamp:

May 14, 2009, 3:10:51 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Cleanups
• Fix test on return value for open (-1 is the right value to test not 0)
• Improve asprintf usage for mountlist

Location:

branches/2.2.9/mondo/src

Files:

• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-mountlist.c (modified) (4 diffs)
• common/libmondo-tools.c (modified) (4 diffs)
• mondorestore/mondo-prep.c (modified) (1 diff)

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

@@ -992 +992 @@
 #if linux
         fileid = open(drive, O_RDONLY);
-        if (fileid) {
+        if (fileid != -1) {
             if (ioctl(fileid, HDIO_GETGEO, &hdgeo) != -1) {
                 if (hdgeo.cylinders && hdgeo.heads && hdgeo.sectors) {

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

@@ -658 +658 @@
         asprintf(&drive, "%s", mountlist->el[lino].device);
         if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
-            log_msg(8, "Not putting %s in list of drives: it's a virtual drive",
-                    drive);
+            log_msg(8, "Not putting %s in list of drives: it's a virtual drive", drive);
+            paranoid_free(drive);
             continue;
         }
@@ -665 +665 @@
         size = mountlist->el[lino].size;
         if (size == 0) {
-            log_msg(8,
-                    "Not putting %s in list of drives: it has zero size (maybe an LVM volume)",
-                    drive);
+            log_msg(8, "Not putting %s in list of drives: it has zero size (maybe an LVM volume)", drive);
+            paranoid_free(drive);
             continue;
         }
 
-        log_msg(8, "Putting %s with size %lli in list of drives",
-                drive, size);
+        log_msg(8, "Putting %s with size %lli in list of drives", drive, size);
 
         (void) truncate_to_drive_name(drive);
         for (j = 0;
              j < noof_drives
-             && strcmp(drivelist->el[j].device, drive) != 0; j++)
+             && strcmp(drivelist->el[j].device, drive) != 0; j++) {
+            paranoid_free(drive);
             continue;
+        }
         if (j == noof_drives) {
             strcpy(drivelist->el[noof_drives++].device, drive);
         }
+        paranoid_free(drive);
     }
     drivelist->entries = noof_drives;
@@ -816 +817 @@
         if (res < 5) {
             /* no label found */
-            asprintf(&(mountlist->el[items].label), "%s", "");
+            asprintf(&tmp, "%s", "");
+            mountlist->el[items].label = tmp;
         }
 #elif __FreeBSD__
@@ -824 +826 @@
                mountlist->el[items].mountpoint,
                mountlist->el[items].format, siz);
-        asprintf(&(mountlist->el[items].label), "%s", "");
+        asprintf(&tmp, "%s", "");
+        mountlist->el[items].label = tmp;
 #endif
 

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

@@ -1337 +1337 @@
     int i;
     static int depth = 0;
-    char *tmp;
     FILE *fout;
 
@@ -1345 +1344 @@
     }
     depth++;
-
-    malloc_string(tmp);
 
     if (debug_level <= g_loglevel) {
@@ -1359 +1356 @@
                 fprintf(fout, "\t");
             if (getpid() == g_main_pid)
-                fprintf(fout, "[Main] %s->%s#%d: ", szFile, szFunction,
-                        nLine);
+                fprintf(fout, "[Main] %s->%s#%d: ", szFile, szFunction, nLine);
             else if (getpid() == g_buffer_pid && g_buffer_pid > 0)
-                fprintf(fout, "[Buff] %s->%s#%d: ", szFile, szFunction,
-                        nLine);
+                fprintf(fout, "[Buff] %s->%s#%d: ", szFile, szFunction, nLine);
             else
-                fprintf(fout, "[TH=%d] %s->%s#%d: ", getpid(), szFile,
-                        szFunction, nLine);
+                fprintf(fout, "[TH=%d] %s->%s#%d: ", getpid(), szFile, szFunction, nLine);
         }
         vfprintf(fout, fmt, args);
@@ -1380 +1374 @@
     }
     depth--;
-    paranoid_free(tmp);
 }
 

branches/2.2.9/mondo/src/mondorestore/mondo-prep.c

@@ -1596 +1596 @@
 //          if (run_program_and_log_output(tmp, TRUE)) {
             file = open(drivename, O_WRONLY);
-            if (!file) {
+            if (file != -1) {
                 sprintf(tmp,
                         "Warning - unable to open %s for wiping it's partition table",