Changeset 2357 in MondoRescue for branches/2.2.10/mondo/src/mondorestore

Timestamp:

Aug 29, 2009, 3:22:10 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Some more fgets => mr_getline transformations
• XWIN define is gone

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (26 diffs)
• mondo-rstr-compare.c (modified) (1 diff)
• mondo-rstr-newt.c (modified) (4 diffs)
• mondo-rstr-tools.c (modified) (7 diffs)

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

@@ -188 +188 @@
 {
     /**  buffers **********************************************/
-    char *tmp;
+    char *tmp = NULL;
     char *tmp1 = NULL;
-    char *incoming;
+    char *incoming = NULL;
     char *command;
     char *lvscan_sz = NULL;
@@ -225 +225 @@
     }
 
-    malloc_string(tmp);
-    malloc_string(incoming);
     command = malloc(1024);
 
@@ -271 +269 @@
     log_msg(1, "OK, rewound i-want-my-lvm. Doing funky stuff...");
     rewind(fin);
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin); fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
         fgetpos(fin, &orig_pos);
         if (incoming[0] != '#') {
+            mr_free(incoming);
             continue;
         }
@@ -284 +283 @@
         if ((p = strstr(incoming, "vgcreate"))) {
             // include next line(s) if they end in /dev (cos we've got a broken i-want-my-lvm)
-            for (fgets(tmp, MAX_STR_LEN - 1, fin); !feof(fin); fgets(tmp, MAX_STR_LEN - 1, fin)) {
+            for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
                 if (tmp[0] == '#') {
                     fsetpos(fin, &orig_pos);
@@ -290 +289 @@
                 } else {
                     fgetpos(fin, &orig_pos);
-                    strcat(incoming, tmp);
+                    mr_strcat(incoming, tmp);
                 }
-            }
+                mr_free(tmp);
+            }
+            mr_free(tmp);
+
             for (q = incoming; *q != '\0'; q++) {
                 if (*q < 32) {
@@ -298 +300 @@
                 }
             }
-            strcpy(tmp, p + strlen("vgcreate") + 1);
+            mr_asprintf(tmp, "%s", p + strlen("vgcreate") + 1);
             for (q = tmp; *q > 32; q++);
             *q = '\0';
             log_msg(1, "Deleting old entries at /dev/%s", tmp);
             mr_asprintf(tmp1, "rm -Rf /dev/%s", tmp);
+            mr_free(tmp);
+
             run_program_and_log_output(tmp1, 1);
             mr_free(tmp1);
@@ -308 +312 @@
             run_program_and_log_output(vgscan_sz, 1);
             run_program_and_log_output(pvscan_sz, 1);
-            log_msg(3,
-                    "After working around potentially broken i-want-my-lvm, incoming[] is now '%s'",
-                    incoming);
+            log_msg(3, "After working around potentially broken i-want-my-lvm, incoming[] is now '%s'", incoming);
         }
         for (p = incoming + 1; *p == ' '; p++);
+        mr_free(incoming);
+
         strcpy(command, p);
         for (p = command; *p != '\0'; p++);
@@ -330 +334 @@
             if (strstr(command, "lvm lvcreate"))
                 lvmversion = 2;
-            log_it("%s... so I'll get creative.", tmp);
             if (lvmversion == 2) {
                 mr_asprintf(tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
-                strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
+                mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(tmp1));
                 mr_free(tmp1);
             } else {
                 mr_asprintf(tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
-                strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
+                mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(tmp1));
                 mr_free(tmp1);
             }
@@ -343 +346 @@
             extents = atol(p);
             log_msg(5, "p='%s' --> extents=%ld", p, extents);
+            mr_free(tmp);
+
             p = strstr(command, "-L");
             if (!p) {
@@ -395 +400 @@
         sleep(1);
     }
+    mr_free(incoming);
     mr_free(vgscan_sz);
     mr_free(pvscan_sz);
@@ -401 +407 @@
     log_msg(1, "Closed i-want-my-lvm. Finished doing funky stuff.");
     }
-    paranoid_free(tmp);
-    paranoid_free(incoming);
     paranoid_free(command);
     system("sync");
@@ -440 +444 @@
 
     /** buffers **********************************************************/
-    char *incoming;
+    char *incoming = NULL;
 
     /** pointers *********************************************************/
@@ -450 +454 @@
     /** end **************************************************************/
 
-    malloc_string(incoming);
     assert(new_mountlist != NULL);
     assert(old_mountlist != NULL);
 
 #ifdef __FreeBSD__
-    log_to_screen
-        ("I don't know how to extrapolate the mountlist on FreeBSD. Sorry.");
+    log_to_screen("I don't know how to extrapolate the mountlist on FreeBSD. Sorry.");
     return (1);
 #endif
@@ -472 +474 @@
                 finish(1);
             }
-            for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin)
-                 && !strstr(incoming, old_mountlist->el[lino].device);
-                 fgets(incoming, MAX_STR_LEN - 1, fin));
+            mr_getline(incoming, fin);
+            while (feof(fin) && !strstr(incoming, old_mountlist->el[lino].device)) {
+                mr_free(incoming);
+                mr_getline(incoming, fin);
+            }
+            mr_free(incoming);
+            
             if (!feof(fin)) {
                 log_it("Investigating %s", old_mountlist->el[lino].device);
 
-                for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin)
-                     && !strstr(incoming, "raiddev");
-                     fgets(incoming, MAX_STR_LEN - 1, fin)) {
-                    if (strstr(incoming, OSSWAP("device", "drive"))
-                        && !strchr(incoming, '#')) {
-                        for (p = incoming + strlen(incoming);
-                             *(p - 1) <= 32; p--);
+                for (mr_getline(incoming, fin); !feof(fin) && !strstr(incoming, "raiddev"); mr_getline(incoming, fin)) {
+                    if (strstr(incoming, OSSWAP("device", "drive")) && !strchr(incoming, '#')) {
+                        for (p = incoming + strlen(incoming); *(p - 1) <= 32; p--);
                         *p = '\0';
                         for (p--; p > incoming && *(p - 1) > 32; p--);
+
                         log_it("Extrapolating %s", p);
 
-                        for (j = 0;
-                             j < new_mountlist->entries
-                             && strcmp(new_mountlist->el[j].device, p);
-                             j++);
+                        for (j = 0; j < new_mountlist->entries && strcmp(new_mountlist->el[j].device, p); j++);
                         if (j >= new_mountlist->entries) {
-                            strcpy(new_mountlist->
-                                   el[new_mountlist->entries].device, p);
-                            strcpy(new_mountlist->
-                                   el[new_mountlist->entries].mountpoint,
-                                   "raid");
-                            strcpy(new_mountlist->
-                                   el[new_mountlist->entries].format,
-                                   "raid");
-                            new_mountlist->el[new_mountlist->entries].
-                                size = old_mountlist->el[lino].size;
+                            strcpy(new_mountlist->el[new_mountlist->entries].device, p);
+                            strcpy(new_mountlist->el[new_mountlist->entries].mountpoint, "raid");
+                            strcpy(new_mountlist->el[new_mountlist->entries].format, "raid");
+                            new_mountlist->el[new_mountlist->entries].size = old_mountlist->el[lino].size;
                             new_mountlist->entries++;
                         } else {
                             log_it("Not adding %s to mountlist: it's already there", p);
                         }
+                        mr_free(incoming);
                     }
                 }
+                mr_free(incoming);
             }
             paranoid_fclose(fin);
@@ -656 +652 @@
 #ifdef __FreeBSD__
     static bool vinum_started_yet = FALSE;
+    char *line = NULL;
+    char *status;
 #endif
 
@@ -710 +708 @@
         if (vinum_started_yet) {
             FILE *fin;
-            char line[MAX_STR_LEN];
 
             log_to_screen("Initializing Vinum device %s (this may take a *long* time)", device);
@@ -723 +720 @@
 
             fin = fopen("/tmp/plexes", "r");
-            while (fgets(line, MAX_STR_LEN - 1, fin)) {
+            /* BERLIOS: doesn't work */
+            while (mr_getline(line, fin)) {
                 if (strchr(line, '\n'))
                     *(strchr(line, '\n')) = '\0';   // get rid of the \n on the end
@@ -740 +738 @@
                     mr_free(tmp);
 
-                    char status[MAX_STR_LEN / 4];
-                    fgets(status, MAX_STR_LEN / 4 - 1, pin);
+                    mr_getline(status, pin);
                     pclose(pin);
 
                     if (!strcmp(status, "up")) {
+                        mr_free(status);
                         break;  /* it's done */
                     }
                     update_evalcall_form(atoi(status));
                     usleep(250000);
+                    mr_free(status);
                 }
                 close_evalcall_form();
-            }
+                mr_free(line);
+            }
+            mr_free(line);
             fclose(fin);
             unlink("/tmp/plexes");
@@ -1721 +1722 @@
         fput_string_one_char_at_a_time(pout_to_fdisk, output);
         fput_string_one_char_at_a_time(pout_to_fdisk, "\n\np\n");
-        mr_asprintf(tmp, "%s", last_line_of_file(FDISK_LOG));
+        tmp = last_line_of_file(FDISK_LOG);
         if (strstr(tmp, " (m ")) {
             log_msg(1, "Successfully created partition %d on %s", partno, drive);
@@ -1912 +1913 @@
     char *output = NULL;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *partcode = NULL;
 
@@ -1981 +1983 @@
             res = 0;
             fput_string_one_char_at_a_time(pout_to_fdisk, "t\n");
-            if (partno > 1
-                || strstr(last_line_of_file(FDISK_LOG), " (1-4)")) {
+            tmp1 = last_line_of_file(FDISK_LOG);
+            if (partno > 1 || strstr(tmp1, " (1-4)")) {
                 log_msg(5, "Specifying partno (%d) - yay", partno);
                 mr_asprintf(tmp, "%d\n", partno);
@@ -1988 +1990 @@
                 mr_free(tmp);
 
-                log_msg(5, "A - last line = '%s'",
-                        last_line_of_file(FDISK_LOG));
-            }
+                mr_free(tmp1);
+                tmp1 = last_line_of_file(FDISK_LOG);
+                log_msg(5, "A - last line = '%s'", tmp1);
+            }
+            mr_free(tmp1);
 
             mr_asprintf(tmp, "%s\n", partcode);
@@ -1996 +2000 @@
             mr_free(tmp);
 
-            log_msg(5, "B - last line = '%s'",
-                    last_line_of_file(FDISK_LOG));
+            tmp1 = last_line_of_file(FDISK_LOG);
+            log_msg(5, "B - last line = '%s'", tmp1);
+            mr_free(tmp1);
+
             fput_string_one_char_at_a_time(pout_to_fdisk, "\n");
-            log_msg(5, "C - last line = '%s'",
-                    last_line_of_file(FDISK_LOG));
-
-            mr_asprintf(tmp, "%s", last_line_of_file(FDISK_LOG));
-            if (!strstr(tmp, " (m ")) {
-                log_msg(1, "last line = '%s'; part type set failed", tmp);
+            tmp1 = last_line_of_file(FDISK_LOG);
+            log_msg(5, "C - last line = '%s'", tmp1);
+            mr_free(tmp1);
+
+            tmp1 = last_line_of_file(FDISK_LOG);
+            if (!strstr(tmp1, " (m ")) {
+                log_msg(1, "last line = '%s'; part type set failed", tmp1);
                 res++;
                 fput_string_one_char_at_a_time(pout_to_fdisk, "\n");
             }
-            mr_free(tmp);
+            mr_free(tmp1);
 
             fput_string_one_char_at_a_time(pout_to_fdisk, "p\n");
         } else {
             mr_asprintf(output, "t\n%d\n%s\nw\n", partno, partcode);
-            mr_asprintf(command, "parted2fdisk %s >> %s 2>> %s", drive,
-                    MONDO_LOGFILE, MONDO_LOGFILE);
+            mr_asprintf(command, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
             log_msg(5, "output = '%s'", output);
             log_msg(5, "partno=%d; partcode=%s", partno, partcode);
@@ -2157 +2163 @@
     /** int *************************************************************/
     int retval = 0;
+
+    /** char ************************************************************/
+    char *incoming = NULL;
 #ifndef __FreeBSD__
+    char *dev;
+    char *p;
     int res;
 #endif
 
-    /** char ************************************************************/
-    char *incoming;
-#ifndef __FreeBSD__
-    char *dev;
-#endif
     /** pointers ********************************************************/
-#ifndef __FreeBSD__
-    char *p;
-#endif
     FILE *fin;
     int i;
@@ -2175 +2178 @@
     /** end ****************************************************************/
 
-    malloc_string(dev);
-    malloc_string(incoming);
     assert(mountlist != NULL);
 
     for (i = 0; i < 3; i++) {
 #ifdef __FreeBSD__
-        fin =
-            popen
-            ("vinum list | grep '^[PVS]' | sed 's/S/1/;s/P/2/;s/V/3/' | sort | cut -d' ' -f2",
-             "r");
+        fin = popen("vinum list | grep '^[PVS]' | sed 's/S/1/;s/P/2/;s/V/3/' | sort | cut -d' ' -f2", "r");
         if (!fin) {
-            paranoid_free(dev);
-            paranoid_free(incoming);
             return (1);
         }
-        for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-             fgets(incoming, MAX_STR_LEN - 1, fin)) {
+        for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
             retval += stop_raid_device(incoming);
-        }
+            mr_free(incoming);
+        }
+        mr_free(incoming);
 #else
         fin = fopen("/proc/mdstat", "r");
         if (!fin) {
             log_OS_error("/proc/mdstat");
-            paranoid_free(dev);
-            paranoid_free(incoming);
             return (1);
         }
-        for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-             fgets(incoming, MAX_STR_LEN - 1, fin)) {
-            for (p = incoming;
-                 *p != '\0' && (*p != 'm' || *(p + 1) != 'd'
-                                || !isdigit(*(p + 2))); p++);
+        for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+            for (p = incoming; *p != '\0' && (*p != 'm' || *(p + 1) != 'd' || !isdigit(*(p + 2))); p++);
             if (*p != '\0') {
-                sprintf(dev, "/dev/%s", p);
+                mr_asprintf(dev, "/dev/%s", p);
                 for (p = dev; *p > 32; p++);
                 *p = '\0';
                 res = stop_raid_device(dev);
-            }
-        }
+                mr_free(dev);
+            }
+            mr_free(incoming);
+        }
+        mr_free(incoming);
 #endif
     }
@@ -2220 +2215 @@
         log_msg(1, "Warning - unable to stop some RAID devices");
     }
-    paranoid_free(dev);
-    paranoid_free(incoming);
     system("sync");
     system("sync");

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

@@ -670 +670 @@
     mr_free(bkpinfo->media_device);
     if (bkpinfo->disaster_recovery && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-        mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+        bkpinfo->media_device = last_line_of_file("/tmp/CDROM-LIVES-HERE");
     } else {
         bkpinfo->media_device = find_cdrom_device(FALSE);

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

@@ -533 +533 @@
 
     system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
-    mr_asprintf(personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
+    personalities = last_line_of_file("/tmp/raid-personalities.txt");
     mr_asprintf(prompt, "Please enter the RAID level you want. %s", personalities);
     mr_free(personalities);
@@ -2291 +2291 @@
     if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
         mr_free(idev);
-        mr_asprintf(idev, "%s", last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
+        idev = last_line_of_file("/tmp/NFS-SERVER-MOUNT");
         mr_asprintf(isodir_format, "nfs");
         mr_free(isodir_path);
-        mr_asprintf(isodir_path, "%s", last_line_of_file("/tmp/NFS-SERVER-PATH"));
+        isodir_path = last_line_of_file("/tmp/NFS-SERVER-PATH");
     }
 
@@ -2861 +2861 @@
   /** char *************************************************************/
     char output = '\0';
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
   /** newt *************************************************************/
@@ -2873 +2873 @@
 
     if (g_text_mode) {
-        for (output = 'z'; !strchr("AICE", output); output = tmp[0]) {
-            printf
-                ("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
-            fgets(tmp, MAX_STR_LEN - 1, stdin);
+        while (!strchr("AICE", output)) {
+            printf("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
+            mr_getline(tmp, stdin);
+            output = tmp[0];
+            free(tmp);
         }
         return (output);
     }
 
-    newtPushHelpLine
-        ("   Do you want to 'nuke' your system, restore interactively, or just compare?");
+    newtPushHelpLine("   Do you want to 'nuke' your system, restore interactively, or just compare?");
     newtOpenWindow(24, 3, 32, 17, "How should I restore?");
     b1 = newtButton(7, 1, "Automatically");

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

@@ -107 +107 @@
 * @ingroup restoreUtilityGroup
 */
-void ask_about_these_imagedevs(char *infname, char *outfname)
-{
+void ask_about_these_imagedevs(char *infname, char *outfname) {
+
 FILE *fin;
 FILE *fout;
-/************************************************************************
-* allocate memory regions. test and set  -sab 16 feb 2003              *
-************************************************************************/
-char *incoming_ptr;
-char *question_ptr = NULL;
-
-char incoming[MAX_STR_LEN] = "\0";
+char *incoming = NULL;
+char *question = NULL;
 
 assert_string_is_neither_NULL_nor_zerolength(infname);
 assert_string_is_neither_NULL_nor_zerolength(outfname);
 
-incoming_ptr = malloc(sizeof(incoming));
-if (incoming_ptr == NULL) {
-fprintf(stderr, "Out of Memory\n");
-exit(EXIT_FAILURE);
-}
-
-memset(incoming_ptr, '\0', sizeof(incoming));
-
 if (!(fin = fopen(infname, "r"))) {
-fatal_error("Cannot openin infname");
+    fatal_error("Cannot openin infname");
 }
 if (!(fout = fopen(outfname, "w"))) {
-fatal_error("Cannot openin outfname");
-}
-for (fgets(incoming_ptr, MAX_STR_LEN, fin);
- !feof(fin); fgets(incoming_ptr, MAX_STR_LEN, fin)) {
-strip_spaces(incoming_ptr);
-
-if (incoming[0] == '\0') {
-    continue;
-}
-
-mr_asprintf(question_ptr, "Should I restore the image of %s ?", incoming_ptr);
-
-if (ask_me_yes_or_no(question_ptr)) {
-    fprintf(fout, "%s\n", incoming_ptr);
-}
-}
-
-/*** free memory ***********/
-paranoid_free(incoming_ptr);
-incoming_ptr = NULL;
-mr_free(question_ptr);
+    fatal_error("Cannot openin outfname");
+}
+for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+    mr_strip_spaces(incoming);
+
+    if (incoming[0] == '\0') {
+        mr_free(incoming);
+        continue;
+    }
+
+    mr_asprintf(question, "Should I restore the image of %s ?", incoming);
+    
+    if (ask_me_yes_or_no(question)) {
+        fprintf(fout, "%s\n", incoming);
+    }
+    mr_free(incoming);
+}
+mr_free(incoming);
+mr_free(question);
 paranoid_fclose(fout);
 paranoid_fclose(fin);
@@ -619 +604 @@
         mr_free(bkpinfo->media_device);
         if (bkpinfo->disaster_recovery && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-            mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+            bkpinfo->media_device = last_line_of_file("/tmp/CDROM-LIVES-HERE");
         } else {
             bkpinfo->media_device = find_cdrom_device(TRUE);
@@ -1119 +1104 @@
 char *command = NULL;
 char *tmp;
+char *tmp1 = NULL;
 int res = 0;
 pid_t pid;
@@ -1260 +1246 @@
     if (g_text_mode) {
         printf("Restore which directory? --> ");
-        fgets(tmp, sizeof(tmp), stdin);
-        toggle_path_selection(filelist, tmp, TRUE);
-        if (strlen(tmp) == 0) {
+        mr_getline(tmp1, stdin);
+        toggle_path_selection(filelist, tmp1, TRUE);
+        if (strlen(tmp1) == 0) {
             res = 1;
         } else {
             res = 0;
         }
+        mr_free(tmp1);
     } else {
         res = edit_filelist(filelist);
@@ -1938 +1925 @@
     FILE *fin;
     FILE *fout;
-  /** malloc **/
-    char *incoming;
+    char *incoming = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(output_file);
     assert_string_is_neither_NULL_nor_zerolength(input_file);
-    malloc_string(incoming);
 
     if (!(fin = fopen(input_file, "r"))) {
@@ -1952 +1937 @@
         fatal_error("cannot open output_file");
     }
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
         if (strncmp(incoming, "etc/adjtime", 11)
             && strncmp(incoming, "etc/mtab", 8)
@@ -1962 +1946 @@
             && strncmp(incoming, "var/", 4))
             fprintf(fout, "%s", incoming);  /* don't need \n here, for some reason.. */
-    }
+        mr_free(incoming);
+    }
+    mr_free(incoming);
     paranoid_fclose(fout);
     paranoid_fclose(fin);
-    paranoid_free(incoming);
 }