Changeset 1138 in MondoRescue for branches/stable/mondo

Timestamp:

Feb 11, 2007, 3:08:34 PM (18 years ago)

Author:

Bruno Cornec

Message:

mr_getline should test for feof as getline returns also -1 in that case.

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (13 diffs)
• common/libmondo-fork.c (modified) (2 diffs)
• lib/mr_mem.c (modified) (1 diff)

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

@@ -1716 +1716 @@
 
     /*@ buffers ****************************************** */
-    char *tmp;
+    char *tmp = NULL;
     char *old_pwd;
-    char *result_sz;
-    char *message_to_screen;
-    char *sz_blank_disk;
+    char *result_sz = NULL;
+    char *message_to_screen = NULL;
+    char *sz_blank_disk = NULL;
     char *tmp2 = NULL;
     char *tmp3 = NULL;
@@ -1726 +1726 @@
 
     malloc_string(old_pwd);
-    malloc_string(result_sz);
-    malloc_string(message_to_screen);
-    malloc_string(sz_blank_disk);
-    tmp = mr_malloc(1200);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(destfile);
 
-    sprintf(tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
+    mr_asprintf(&tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
     mr_asprintf(&tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
     if (does_file_exist(tmp)) {
@@ -1746 +1742 @@
     }
     mr_free(tmp2);
+    mr_free(tmp);
+
     if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
         popup_and_OK(_("Please insert new media and press Enter."));
@@ -1754 +1752 @@
     /* BERLIOS: Do not ignore getcwd result */
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    sprintf(tmp, "chmod 744 %s", bkpinfo->scratchdir);
+    mr_asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
     chdir(bkpinfo->scratchdir);
 
     if (bkpinfo->call_before_iso[0] != '\0') {
-        sprintf(message_to_screen, "Running pre-ISO call for CD#%d",
+        mr_asprintf(&message_to_screen, "Running pre-ISO call for CD#%d",
                 g_current_media_number);
-        res =
-            eval_call_to_make_ISO(bkpinfo, bkpinfo->call_before_iso,
-                                  destfile, g_current_media_number,
-                                  MONDO_LOGFILE, message_to_screen);
+        res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_before_iso,
+                                destfile, g_current_media_number,
+                                MONDO_LOGFILE, message_to_screen);
         if (res) {
-            strcat(message_to_screen, "...failed");
+            log_to_screen("%s...failed", message_to_screen);
         } else {
-            strcat(message_to_screen, "...OK");
-        }
-        log_to_screen(message_to_screen);
+            log_to_screen("%s...OK", message_to_screen);
+        }
+        mr_free(message_to_screen);
         retval += res;
     }
@@ -1776 +1774 @@
     if (bkpinfo->call_make_iso[0] != '\0') {
         mr_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
-        sprintf(tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
-        sprintf(message_to_screen, "Making an ISO (%s #%d)",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
-
-        pause_and_ask_for_cdr(2, &cd_is_mountable); /* if g_current_media_number >= 2 then pause & ask */
+        mr_asprintf(&message_to_screen, "Making an ISO (%s #%d)",
+                 bkpinfo->backup_media_string,
+                 g_current_media_number);
+
+        /* if g_current_media_number >= 2 then pause & ask */
+        pause_and_ask_for_cdr(2, &cd_is_mountable);
         if (retval) {
             log_to_screen
                 ("Serious error(s) occurred already. I shan't try to write to media.");
         } else {
-            res =
-                eval_call_to_make_ISO(bkpinfo, bkpinfo->call_make_iso,
-                                      bkpinfo->scratchdir,
-                                      g_current_media_number,
-                                      MONDO_LOGFILE, message_to_screen);
+            res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_make_iso,
+                                        bkpinfo->scratchdir,
+                                        g_current_media_number,
+                                        MONDO_LOGFILE, message_to_screen);
             if (res) {
                 log_to_screen("%s...failed to write", message_to_screen);
@@ -1804 +1801 @@
             retval += res;
 #ifdef DVDRWFORMAT
-            sprintf(tmp,
-                    "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'",
-                    MONDO_LOGFILE);
+            mr_asprintf(&tmp,
+                     "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'",
+                     MONDO_LOGFILE);
             if (g_backup_media_type == dvd
                 && (res || !run_program_and_log_output(tmp, 1))) {
@@ -1822 +1819 @@
                 }
                 pause_for_N_seconds(5, "Letting DVD drive settle");
-                sprintf(sz_blank_disk, "dvd+rw-format -force %s",
-                        bkpinfo->media_device);
+                mr_asprintf(&sz_blank_disk, "dvd+rw-format -force %s",
+                         bkpinfo->media_device);
                 mr_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
-                res =
-                    run_external_binary_with_percentage_indicator_NEW
+                res = run_external_binary_with_percentage_indicator_NEW
                     ("Blanking DVD disk", sz_blank_disk);
                 if (res) {
@@ -1833 +1829 @@
                     pause_for_N_seconds(5,
                                         "Letting DVD drive settle... and trying again.");
-                    res =
-                        run_external_binary_with_percentage_indicator_NEW
+                    res = run_external_binary_with_percentage_indicator_NEW
                         ("Blanking DVD disk", sz_blank_disk);
                     if (res) {
@@ -1843 +1838 @@
                         ("Format succeeded. Sleeping for 5 seconds to take a breath...");
                 }
+                mr_free(sz_blank_disk);
                 pause_for_N_seconds(5, "Letting DVD drive settle");
                 if (!bkpinfo->please_dont_eject) {
@@ -1868 +1864 @@
                 }
             }
+            mr_free(tmp);
 #endif
             if (g_backup_media_type == dvd && !bkpinfo->please_dont_eject) {
@@ -1873 +1870 @@
             }
         }
-    } else {
-        sprintf(message_to_screen, "Running mkisofs to make %s #%d",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+        mr_free(message_to_screen);
+    } else {
+        mr_asprintf(&message_to_screen, "Running mkisofs to make %s #%d",
+                 bkpinfo->backup_media_string,
+                 g_current_media_number);
         mr_msg(1, message_to_screen);
         sprintf(result_sz, "Call to mkisofs to make ISO (%s #%d) ",
@@ -1917 +1915 @@
 // and add ' .' at end
                 mr_msg(1, "Non-ia64 --> lilo");
-                res =
-                    eval_call_to_make_ISO(bkpinfo,
-                                          "mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
-                                          destfile, g_current_media_number,
-                                          MONDO_LOGFILE,
-                                          message_to_screen);
+                res = eval_call_to_make_ISO(bkpinfo,
+                                            "mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
+                                            destfile,
+                                            g_current_media_number,
+                                            MONDO_LOGFILE,
+                                            message_to_screen);
 #endif
             } else {
@@ -1935 +1933 @@
             }
         }
+        mr_free(message_to_screen);
         if (res) {
-            strcat(result_sz, "...failed");
+            log_to_screen("%s...failed", result_sz);
         } else {
-            strcat(result_sz, "...OK");
-        }
-        log_to_screen(result_sz);
+            log_to_screen("%s...OK", result_sz);
+        }
         retval += res;
     }

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

@@ -192 +192 @@
 
     /*@ pointers *************************************************** */
-    FILE *fin;
-    char *p;
+    FILE *fin = NULL;
+    char *p = NULL;
 
     /*@ end vars *************************************************** */
@@ -280 +280 @@
         }
     }
-//  else
-//    { mr_msg (0, "-------------------------------ran w/ res=%d------------------------------", res); }
     return (res);
 }

branches/stable/mondo/src/lib/mr_mem.c

@@ -54 +54 @@
 
 /* encapsulation function for getline */
-void mr_getline_int(char **lineptr, size_t *n, FILE *stream, int line, const char *file) {
+void mr_getline_int(char **lineptr, size_t *n, FILE *fd, int line, const char *file) {
     
     ssize_t ret;
 
-    ret = getline(lineptr,n,stream);
-    if (ret == -1) {
+    ret = getline(lineptr,n,fd);
+    if ((ret == -1) && (! feof(fd))) {
         mr_msg_int(1,line,file,"Unable to alloc memory in mr_getline\nExiting...");
         mr_exit(-1,"Unable to alloc memory in mr_getline");