Changeset 161 in MondoRescue

Timestamp:

Dec 8, 2005, 11:37:26 AM (18 years ago)

Author:

andree

Message:

Avoid overwriting the already correctly determined disk size by moving
the relevant code inside the if clause that checks the validity of the
previously calculated disk size.

File:

• branches/2.05/mondo/mondo/common/libmondo-devices.c (modified) (3 diffs)

branches/2.05/mondo/mondo/common/libmondo-devices.c

@@ -1209 +1209 @@
     if (outvalB <= 0) {
         log_msg(1, "Error getting size of %s: %s", drive, strerror(errno));
-    }
 #if linux
-    fileid = open(drive, O_RDONLY);
-    if (fileid) {
-        if (ioctl(fileid, HDIO_GETGEO, &hdgeo) != -1) {
-            if (hdgeo.cylinders && hdgeo.heads && hdgeo.sectors) {
-                cylindersleft = cylinders = hdgeo.cylinders;
-                cylindersize = hdgeo.heads * hdgeo.sectors / 2;
-                outvalA = cylindersize * cylinders / 1024;
-                log_msg(2, "Got Harddisk geometry, C:%d, H:%d, S:%d",
-                        hdgeo.cylinders, hdgeo.heads, hdgeo.sectors);
-                gotgeo = 1;
+        fileid = open(drive, O_RDONLY);
+        if (fileid) {
+            if (ioctl(fileid, HDIO_GETGEO, &hdgeo) != -1) {
+                if (hdgeo.cylinders && hdgeo.heads && hdgeo.sectors) {
+                    cylindersleft = cylinders = hdgeo.cylinders;
+                    cylindersize = hdgeo.heads * hdgeo.sectors / 2;
+                    outvalA = cylindersize * cylinders / 1024;
+                    log_msg(2, "Got Harddisk geometry, C:%d, H:%d, S:%d",
+                            hdgeo.cylinders, hdgeo.heads, hdgeo.sectors);
+                    gotgeo = 1;
+                } else {
+                    log_msg(1, "Harddisk geometry wrong");
+                }
             } else {
-                log_msg(1, "Harddisk geometry wrong");
-            }
+                log_msg(1,
+                        "Error in ioctl() getting new hard disk geometry (%s), resizing in unsafe mode",
+                        strerror(errno));
+            }
+            close(fileid);
         } else {
-            log_msg(1,
-                    "Error in ioctl() getting new hard disk geometry (%s), resizing in unsafe mode",
+            log_msg(1, "Failed to open %s for reading: %s", drive,
                     strerror(errno));
         }
-        close(fileid);
-    } else {
-        log_msg(1, "Failed to open %s for reading: %s", drive,
-                strerror(errno));
-    }
-    if (!gotgeo) {
-        log_msg(1, "Failed to get harddisk geometry, using old mode");
-    }
+        if (!gotgeo) {
+            log_msg(1, "Failed to get harddisk geometry, using old mode");
+        }
 /*  
   if ((fd = open (drive, O_RDONLY)) != -1) {
@@ -1249 +1248 @@
  */
 #endif
-
+    }
 // OLDER DISKS will give ridiculously low value for outvalB (so outvalA is returned) :)
 // NEWER DISKS will give sane value for outvalB (close to outvalA, in other words) :)
@@ -2901 +2900 @@
     struct stat buf;
 #endif
-
     malloc_string(tmp);
     malloc_string(command);