Changeset 2052 in MondoRescue for branches/2.2.8/mondo/src/common/libmondo-devices.c

Timestamp:

Oct 23, 2008, 2:55:59 PM (15 years ago)

Author:

Bruno Cornec

Message:

Adds support for dm devices in truncate_to_drive_name

File:

• branches/2.2.8/mondo/src/common/libmondo-devices.c (modified) (2 diffs)

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

@@ -1017 +1017 @@
             log_msg(1, "Failed to get harddisk geometry, using old mode");
         }
-/*  
-  if ((fd = open (drive, O_RDONLY)) != -1) {
-      if (ioctl (fd, HDIO_GETGEO, &hdgeo) != -1)  {
-      close (fd);
-      log_msg (2, "Geometry of drive %s is C:%d, H:%d, S%d, its size is %d MB", drive, hdgeo.cylinders, hdgeo.heads, hdgeo.sectors, (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors / 2 / 1024));
-      if ( hdgeo.cylinders && hdgeo.heads && hdgeo.sectors ) {
-          outvalB = ((long) (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors / 2 / 1024));
-      }
-      }
-      close (fd);
- */
 #endif
     }
@@ -1042 +1031 @@
     return (outvalC);
 }
-
-/* The old version */
-#if 0
-long get_phys_size_of_drive(char *drive)
-{
-    /*@ pointers **************************************************** */
-#if linux
-    FILE *fin;
-    char *p;
-    char *q;
-    char *r;
-    /*@ buffers ***************************************************** */
-    char *tmp;
-    char *command;
-
-    /*@ long ******************************************************** */
-    long outL;
-    long tempLa;
-    long tempLb;
-    long tempLc;
-
-#endif
-
-    struct hd_geometry hdgeo;
-    int fd;
-
-#ifdef __FreeBSD__
-    off_t o;
-
-    if ((fd = open(drive, O_RDONLY)) != -1) {
-        if (ioctl(fd, DIOCGMEDIASIZE, &o) != -1) {
-            close(fd);
-            return (long) (o / (off_t) (1024 * 1024));
-        }
-        close(fd);
-    }
-    log_msg(4, "drive = %s, error = %s", drive, strerror(errno));
-    fatal_error("GPSOD: Unable to get size of drive");
-#else
-
-    malloc_string(tmp);
-    malloc_string(command);
-
-    if ((fd = open(drive, O_RDONLY)) != -1) {
-        if (ioctl(fd, HDIO_GETGEO, &hdgeo) != -1) {
-            close(fd);
-            log_msg(2,
-                    "Geometry of drive %s is C:%d, H:%d, S%d, its size is %d MB",
-                    drive, hdgeo.cylinders, hdgeo.heads, hdgeo.sectors,
-                    (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors / 2 /
-                     1024));
-            if (hdgeo.cylinders && hdgeo.heads && hdgeo.sectors) {
-                return ((long)
-                        (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors /
-                         2 / 1024));
-            }
-        }
-        close(fd);
-    }
-
-    assert_string_is_neither_NULL_nor_zerolength(drive);
-
-    sprintf(command,
-            "parted2fdisk -l %s | head -n4 | tr -s '\n' '\t' | tr -s ' ' '\t' | cut -f8,14,16",
-            drive);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    if (tmp[0]) {
-        p = tmp;
-        q = strchr(p, ' ');
-        if (q) {
-            *(q++) = '\0';
-            r = strchr(q, ' ');
-            if (r) {
-                *(r++) = '\0';
-                tempLa = atol(p);
-                tempLb = atol(q);
-                tempLc = atol(r);
-                outL = tempLa * tempLb / 1024 * tempLc / 1024;
-                if (outL > 100) {
-                    paranoid_free(tmp);
-                    paranoid_free(command);
-                    return (outL);
-                }
-            }
-        }
-    }
-
-    /* try to grep for 'Drive xxxx: yyy MB' */
-    sprintf(command,
-            "parted2fdisk -l %s | grep MB | tr -s ' ' '\t' | cut -f3",
-            drive);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    if (atol(tmp) > 0) {
-        paranoid_free(tmp);
-        paranoid_free(command);
-        return (atol(tmp));
-    }
-
-    /* else, do it the old-fashioned way */
-    p = strrchr(drive, (int) '/');
-    if (p) {
-        strcpy(tmp, p + 1);
-    } else {
-        paranoid_free(tmp);
-        paranoid_free(command);
-        return (-1);
-    }
-    sprintf(command, "dmesg | grep %s 2> /dev/null", tmp);
-    if (!(fin = popen(command, "r"))) {
-        log_OS_error("Cannot popen dmesg command");
-    } else {
-        fgets(tmp, MAX_STR_LEN - 1, fin);
-        while (!feof(fin) && !strstr(tmp, "GB") && !strstr(tmp, "MB")) {
-            fgets(tmp, MAX_STR_LEN - 1, fin);
-        }
-        if (pclose(fin)) {
-            log_OS_error("Cannot pclose dmesg fin");
-        }
-    }
-    if (!(p = strstr(tmp, "GB")) && !(p = strstr(tmp, "MB"))) {
-        log_msg(3, "Cannot find %s's size: dmesg isn't helping either.",
-                drive);
-        paranoid_free(tmp);
-        paranoid_free(command);
-        return (-1);
-    }
-    for (; !isdigit(*(p - 1)); p--);
-    *p = '\0';
-    for (p--; isdigit(*(p - 1)); p--);
-    outL = atol(p);
-    if (outL <= 0) {
-        paranoid_free(tmp);
-        paranoid_free(command);
-        return (-1);
-    }
-    if (strstr(tmp, "GB")) {
-        outL = outL * 1024;
-    }
-    paranoid_free(tmp);
-    paranoid_free(command);
-    return (outL * 19 / 20);
-#endif
-}
-#endif                          /* 0 */
-
-
-
-
 
 /**