Changeset 1137 in MondoRescue

Timestamp:

Feb 11, 2007, 2:38:01 PM (18 years ago)

Author:

Bruno Cornec

Message:

Always fixing typos

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (5 diffs)
• common/libmondo-files.c (modified) (1 diff)
• include/mr_file.h (modified) (1 diff)

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

@@ -1721 +1721 @@
     char *message_to_screen;
     char *sz_blank_disk;
-    char *fnam;
-    char *tmp2;
-    char *tmp3;
+    char *tmp2 = NULL;
+    char *tmp3 = NULL;
     bool cd_is_mountable;
 
@@ -1730 +1729 @@
     malloc_string(message_to_screen);
     malloc_string(sz_blank_disk);
-    malloc_string(fnam);
     tmp = mr_malloc(1200);
-    tmp2 = mr_malloc(1200);
-    tmp3 = mr_malloc(1200);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(destfile);
 
     sprintf(tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
-    sprintf(tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
+    mr_asprintf(&tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
     if (does_file_exist(tmp)) {
-        sprintf(tmp3, "cp -f %s %s", tmp, tmp2);
+        mr_asprintf(&tmp3, "cp -f %s %s", tmp, tmp2);
         paranoid_system(tmp3);
+        mr_free(tmp3);
     }
     if (!does_file_exist(tmp) && does_file_exist(tmp2)) {
-        sprintf(tmp3, "cp -f %s %s", tmp2, tmp);
+        mr_asprintf(&tmp3, "cp -f %s %s", tmp2, tmp);
         paranoid_system(tmp3);
-    }
-    /*
-       if (!does_file_exist(tmp))
-       {
-       mr_msg (2, "Silly bug in Mindi.pl; workaround in progress...");
-       strcpy(fnam, call_program_and_get_last_line_of_output("locate isolinux.bin | tail -n1"));
-       if (strlen(fnam)>0 && does_file_exist(fnam))
-       {
-       sprintf(tmp, "cp -f %s %s", fnam, bkpinfo->scratchdir);
-       res = run_program_and_log_output(tmp, FALSE);
-       }
-       else
-       {
-       res = 1;
-       }
-       if (res)
-       {
-       mr_msg (2, "Could not work around silly bug in Mindi.pl - sorry! Isolinux.bin missing");
-       }
-       }
-     */
+        mr_free(tmp3);
+    }
     mr_free(tmp2);
-    mr_free(tmp3);
     if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
         popup_and_OK(_("Please insert new media and press Enter."));
@@ -1950 +1927 @@
                 mr_msg(1, "make_cd_use_lilo = FALSE");
                 mr_msg(1, "Isolinux");
-                res =
-                    eval_call_to_make_ISO(bkpinfo,
-                                          "mkisofs -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -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 -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -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);
             }
         }
@@ -2022 +1999 @@
     mr_free(message_to_screen);
     mr_free(sz_blank_disk);
-    mr_free(fnam);
-    mr_free(tmp);
     return (retval);
 }
@@ -2033 +2008 @@
     char *command;
     malloc_string(tmp);
-
-    malloc_string(command);
-    sprintf(command,
-            "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1",
-            bigfile_fname);
+    bool ret = TRUE;
+    mr_asprintf(&command,
+             "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1",
+             bigfile_fname);
     mr_msg(1, "command = '%s'", command);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
     mr_msg(1, "--> tmp = '%s'", tmp);
+    mr_free(command);
     if (strstr(tmp, "NTFS")) {
         iamhere("TRUE");
-        return (TRUE);
     } else {
         iamhere("FALSE");
-        return (FALSE);
-    }
+        ret = FALSE;
+    }
+    return(ret);
 }
 

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

@@ -211 +211 @@
 void exclude_nonexistent_files(char *inout)
 {
-    char infname[MAX_STR_LEN];
-    char outfname[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
-    char incoming[MAX_STR_LEN];
+    char *infname = NULL;
+    char *outfname = NULL;
+    char *tmp = NULL;
+    char *incoming = NULL;
 
     /*@ int ********************************************************* */

branches/stable/mondo/src/include/mr_file.h

@@ -19 +19 @@
 #define mr_fopen(x,y)           mr_fopen_int((const char *)x, (const char *)y,__LINE__,__FILE__)
 #define mr_fprintf(x,y,args...) mr_fprintf_int(x,__LINE__,__FILE__,y,## args)
-#define mr_fclose(x)            mr_fclose_int((FILE **)&fd, __LINE__,__FILE__)
-#define mr_mkdir(x)             mr_mkdir_int((const char *)pathname,(mode_t)mode,__LINE__,__FILE__)
+#define mr_fclose(x)            mr_fclose_int((FILE **)&x, __LINE__,__FILE__)
+#define mr_mkdir(x,y)           mr_mkdir_int((const char *)x,(mode_t)y,__LINE__,__FILE__)
 
 extern FILE *mr_fopen_int(const char *path, const char *mode,int line, char *file);