Changeset 1125 in MondoRescue

Timestamp:

Feb 10, 2007, 12:38:20 AM (18 years ago)

Author:

Bruno Cornec

Message:

Still linker fixes (grrr)

Location:

branches/stable/mondo/src

Files:

• common/libmondo-devices.c (modified) (19 diffs)
• mondorestore/mondo-restore.c (modified) (1 diff)
• mondorestore/mondo-rstr-compare.c (modified) (1 diff)
• mondorestore/mondo-rstr-newt.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

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

@@ -316 +316 @@
 {
     /*@ buffers **************************************************** */
-    char *program;
+    char *program = NULL;
     char *incoming = NULL;
-    char *searchstr;
-    char *tmp = NULL;
+    char *searchstr = NULL;
 
     /*@ ints ******************************************************* */
@@ -335 +334 @@
     malloc_string(incoming);
     malloc_string(searchstr);
-    malloc_string(tmp);
 
 #ifdef __FreeBSD__
@@ -342 +340 @@
     mr_asprintf(&program, "ls %s >/dev/null 2>&1", drive,
             build_partition_name(tmp, drive, partno));
-    return system(program);
-#else
-    tmp[0] = '\0';
-#endif
-
-    sprintf(program, "parted2fdisk -l %s 2> /dev/null", drive);
+    res = system(program);
+    mr_free(program);
+    return(res);
+#endif
+
+    mr_asprintf(&program, "parted2fdisk -l %s 2> /dev/null", drive);
     fin = popen(program, "r");
     if (!fin) {
         log_it("program=%s", program);
         log_OS_error("Cannot popen-in program");
+        mr_free(program);
         return (0);
     }
+    mr_free(program);
+
     (void) build_partition_name(searchstr, drive, partno);
     strcat(searchstr, " ");
@@ -361 +362 @@
         }
     }
+    mr_free(incoming);
+
     if (pclose(fin)) {
         log_OS_error("Cannot pclose fin");
     }
-    mr_free(program);
-    mr_free(incoming);
     mr_free(searchstr);
-    mr_free(tmp);
     return (res);
 }
-
-
-
 
 
@@ -384 +381 @@
 {
     /*@ buffers **************************************************** */
-    char *command;
+    char *command = NULL;
 
     /*@ end vars *************************************************** */
-    int i;
+    int ret;
 
     assert_string_is_neither_NULL_nor_zerolength(dev);
     assert_string_is_neither_NULL_nor_zerolength(str);
 
-    malloc_string(command);
-    sprintf(command,
+    mr_asprintf(&command,
             "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
             dev, str);
-    i = system(command);
+    ret = system(command);
     mr_free(command);
-    if (i) {
+    if (ret) {
         return (FALSE);
     } else {
@@ -404 +400 @@
     }
 }
+
 
 /**
@@ -415 +412 @@
 {
     /*@ buffers **************************************************** */
-    char *command;
+    char *command = NULL;
     /*@ end vars *************************************************** */
-    int i;
-
-    malloc_string(command);
-    sprintf(command,
+    int ret;
+
+    mr_asprintf(&command,
             "dd if=%s bs=512 count=%i 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
             dev, n, str);
-    i = system(command);
+    ret = system(command);
     mr_free(command);
-    if (i) {
+
+    if (ret) {
         return (FALSE);
     } else {
@@ -431 +428 @@
     }
 }
-
 
 
@@ -448 +444 @@
     /*@ int's  ****************************************************** */
     int res;
-    char *dev;
+    char *dev = NULL;
 
     /*@ end vars **************************************************** */
@@ -482 +478 @@
     }
     if (res) {
-        mr_msg(1, "mount failed");
-    } else {
-        mr_msg(1, "mount succeeded with %s", dev);
+        mr_msg(1, _("mount failed"));
+    } else {
+        mr_msg(1, _("mount succeeded with %s"), dev);
     }
     mr_free(dev);
-    return (res);
-}
-
-
-
+    return(res);
+}
 
 
@@ -989 +982 @@
         mr_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;
-                    mr_msg(2, "Got Harddisk geometry, C:%d, H:%d, S:%d",
-                            hdgeo.cylinders, hdgeo.heads, hdgeo.sectors);
-                    gotgeo = 1;
-                } else {
-                    mr_msg(1, "Harddisk geometry wrong");
-                }
+    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;
+                mr_msg(2, "Got Harddisk geometry, C:%d, H:%d, S:%d",
+                        hdgeo.cylinders, hdgeo.heads, hdgeo.sectors);
+                gotgeo = 1;
             } else {
                 mr_msg(1,
@@ -1041 +1031 @@
 }
 
-/* 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);
-    }
-    mr_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);
-            mr_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) {
-                    mr_free(tmp);
-                    mr_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) {
-        mr_free(tmp);
-        mr_free(command);
-        return (atol(tmp));
-    }
-
-    /* else, do it the old-fashioned way */
-    p = strrchr(drive, (int) '/');
-    if (p) {
-        strcpy(tmp, p + 1);
-    } else {
-        mr_free(tmp);
-        mr_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"))) {
-        mr_msg(3, "Cannot find %s's size: dmesg isn't helping either.",
-                drive);
-        mr_free(tmp);
-        mr_free(command);
-        return (-1);
-    }
-    for (; !isdigit(*(p - 1)); p--);
-    *p = '\0';
-    for (p--; isdigit(*(p - 1)); p--);
-    outL = atol(p);
-    if (outL <= 0) {
-        mr_free(tmp);
-        mr_free(command);
-        return (-1);
-    }
-    if (strstr(tmp, "GB")) {
-        outL = outL * 1024;
-    }
-    mr_free(tmp);
-    mr_free(command);
-    return (outL * 19 / 20);
-#endif
-}
-#endif                          /* 0 */
-
-
-
-
 
 /**
@@ -1197 +1040 @@
 bool is_this_a_valid_disk_format(char *format)
 {
-    char *good_formats;
-    char *command;
-    char *format_sz;
-
-    FILE *pin;
-    int retval;
-    malloc_string(good_formats);
-    malloc_string(command);
-    malloc_string(format_sz);
-
+    char *good_formats = NULL;
+    char *command = NULL;
+    char *tmp = NULL;
+    char *format_sz = NULL;
+
+    FILE *pin = NULL;
+    bool retval;
+    size_t n = 0;
     assert_string_is_neither_NULL_nor_zerolength(format);
 
-    sprintf(format_sz, "%s ", format);
+    mr_asprintf(&format_sz, "%s ", format);
 
 #ifdef __FreeBSD__
-    sprintf(command,
+    mr_asprintf(&command,
             "lsvfs | tr -s '\t' ' ' | grep -v Filesys | grep -v -- -- | cut -d' ' -f1 | tr -s '\n' ' '");
 #else
-    sprintf(command,
+    mr_asprintf(&command,
             "grep -v nodev /proc/filesystems | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
 #endif
 
     pin = popen(command, "r");
+    mr_free(command);
+
     if (!pin) {
         log_OS_error("Unable to read good formats");
-        retval = 0;
-    } else {
-        strcpy(good_formats, " ");
-        (void) fgets(good_formats + 1, MAX_STR_LEN, pin);
+        retval = FALSE;
+    } else {
+        mr_getline(&good_formats, &n , pin);
         if (pclose(pin)) {
             log_OS_error("Cannot pclose good formats");
         }
         strip_spaces(good_formats);
-        strcat(good_formats, " swap lvm raid ntfs 7 "); // " ntfs 7 " -- um, cheating much? :)
+        // " ntfs 7 " -- um, cheating much? :)
+        mr_asprintf(&tmp, " %s swap lvm raid ntfs 7 ",good_formats);
+        mr_free(good_formats);
+        good_formats = tmp;
+
         if (strstr(good_formats, format_sz)) {
-            retval = 1;
+            retval = TRUE;
         } else {
-            retval = 0;
-        }
-    }
-    mr_free(good_formats);
-    mr_free(command);
+            retval = FALSE;
+        }
+        mr_free(good_formats);
+    }
     mr_free(format_sz);
     return (retval);
@@ -1258 +1103 @@
 
     /*@ buffers ***************************************************** */
-    char *incoming;
-    char *device_with_tab;
-    char *device_with_space;
-    char *tmp;
-    int retval = 0;
+    char *incoming = NULL;
+    char *device_with_tab = NULL;
+    char *device_with_space = NULL;
+    char *tmp = NULL;
+    size_t n = 0;
 
 #ifdef __FreeBSD__
@@ -1272 +1117 @@
     /*@ end vars **************************************************** */
 
-    malloc_string(incoming);
-    malloc_string(device_with_tab);
-    malloc_string(device_with_space);
-    malloc_string(tmp);
     assert(device_raw != NULL);
 //  assert_string_is_neither_NULL_nor_zerolength(device_raw);
@@ -1281 +1122 @@
         mr_msg(1, "%s needs to have a '/' prefixed - I'll do it",
                 device_raw);
-        sprintf(tmp, "/%s", device_raw);
-    } else {
-        strcpy(tmp, device_raw);
+        mr_asprintf(&tmp, "/%s", device_raw);
+    } else {
+        mr_asprintf(&tmp, device_raw);
     }
     mr_msg(1, "Is %s mounted?", tmp);
@@ -1289 +1130 @@
         mr_msg(1,
                 "I don't know how the heck /proc made it into the mountlist. I'll ignore it.");
-        return (0);
-    }
-    sprintf(device_with_tab, "%s\t", tmp);
-    sprintf(device_with_space, "%s ", tmp);
+        return (FALSE);
+    }
+    mr_asprintf(&device_with_tab, "%s\t", tmp);
+    mr_asprintf(&device_with_space, "%s ", tmp);
+    mr_free(tmp);
 
     if (!(fin = popen("mount", "r"))) {
@@ -1298 +1140 @@
         return (FALSE);
     }
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (mr_getline(&incoming, &n, fin); !feof(fin);
+         mr_getline(&incoming, &n, fin)) {
         if (strstr(incoming, device_with_space) //> incoming
             || strstr(incoming, device_with_tab))   // > incoming)
         {
             paranoid_pclose(fin);
-            retval = 1;
-            goto end_of_func;
-        }
-    }
+            return(TRUE);
+        }
+    }
+    mr_free(incoming);
+    mr_free(device_with_tab);
     paranoid_pclose(fin);
-    sprintf(tmp, "%s | grep -E \"^%s\" > /dev/null 2> /dev/null",
+
+    mr_asprintf(&tmp, "%s | grep -E \"^%s\" > /dev/null 2> /dev/null",
             SWAPLIST_COMMAND, device_with_space);
+    mr_free(device_with_space);
+
     mr_msg(4, "tmp (command) = '%s'", tmp);
     if (!system(tmp)) {
-        retval = 1;
-        goto end_of_func;
-    }
-  end_of_func:
-    mr_free(incoming);
-    mr_free(device_with_tab);
-    mr_free(device_with_space);
+        mr_free(tmp);
+        return(TRUE);
+    }
     mr_free(tmp);
-    return (retval);
-}
+    return (FALSE);
+}
+
 
 #ifdef __FreeBSD__
@@ -1333 +1176 @@
 char *make_vn(char *fname)
 {
-    char *device = (char *) malloc(MAX_STR_LEN);
-    char *mddevice = (char *) malloc(32);
+    char *device = NULL;
+    char *mddevice = NULL;
     char command[MAX_STR_LEN];
     int vndev = 2;

branches/stable/mondo/src/mondorestore/mondo-restore.c

@@ -21 +21 @@
 #include "mondo-rstr-tools-EXT.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
 
 extern void twenty_seconds_til_yikes(void);

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -9 +9 @@
 #include "../common/libmondo.h"
 //#include "../../config.h"
+#include "mr_msg.h"
 #include "mr-externs.h"
 #include "mondo-rstr-compare.h"

branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -4 +4 @@
 
 #include "mr_mem.h"
+#include "mr_msg.h"
 
 extern char *g_mondo_cfg_file;  // where m*ndo-restore.cfg (the config file) is stored

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -13 +13 @@
 #include "mondo-rstr-tools.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
 
 extern bool g_sigpipe_caught;