Changeset 1142 in MondoRescue

Timestamp:

Feb 12, 2007, 3:02:08 AM (18 years ago)

Author:

Bruno Cornec

Message:

Better mindi screen mesages
Still working on libmondo-archive.c (I know it's late :-)

Location:

branches/stable

Files:

• mindi/mindi (modified) (4 diffs)
• mondo/src/common/libmondo-archive.c (modified) (14 diffs)

branches/stable/mindi/mindi

@@ -2754 +2754 @@
     find $mountpoint -name CVS -exec rm -rf '{}' \;
     # Determine what filesystem to use for initrd image
-    LogIt "Call GetInitrdFilesystemToUse() with parameter ${kernelpath} to get filesystem to use for initrd.\n"
+    echo "Call GetInitrdFilesystemToUse() with parameter ${kernelpath} to get filesystem to use for initrd." >> $LOGFILE
     gvFileSystem=`GetInitrdFilesystemToUse ${kernelpath}`
     [ -z  gvFileSystem ] && Die "GetFilesystemToUse() failed. Terminating."
@@ -2760 +2760 @@
     "ext2fs")
         # say what will be used
-            LogIt "Creating an ext2 initrd image..."
+        echo "Creating an ext2 initrd image..." >> $LOGFILE
         # kernel expects linuxrc in ext2 filesystem
-        ( cd $mountpoint && ln -s sbin/init linuxrc )
+        ( cd $mountpoint && ln -sf sbin/init linuxrc )
         # unmount loop filesystem and create image file using the standard approach
         umount $mountpoint || Die "Cannot unmount $tempfile"
         dd if=$tempfile bs=1k 2> /dev/null | gzip -v9 > $rdz_fname 2> /dev/null
         # log that we are done
-            LogIt "done.\n"
+        echo "...done." >> $LOGFILE
     ;;
     "initramfs")
         # say what will be used
-            LogIt "Creating a gzip'ed cpio (AKA initramfs) initrd image..."
+        echo "Creating a gzip'ed cpio (AKA initramfs) initrd image..." >> $LOGFILE
         # make sure that cpio is there
         which cpio &> /dev/null; [ $? -eq 0 ] || Die "cpio not found. Please install package cpio and try again."
@@ -2777 +2777 @@
         cd $mountpoint
         # kernel expects init in cpio filesystem
-        ln -s sbin/init init
+        ln -sf sbin/init init
         # create cpio image file and unmount loop filesystem
         find . -print | cpio -o -H newc | gzip -9 > $old_pwd/$rdz_fname 2> /dev/null
@@ -2783 +2783 @@
         umount $mountpoint || Die "Cannot unmount $tempfile"
         # log that we are done
-            LogIt "done.\n"
+        echo "...done." >> $LOGFILE
     ;;
     *)

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

@@ -2039 +2039 @@
 
     /*@ pointers ******************************************* */
-    FILE *fin;
-    char *p;
+    FILE *fin = NULL;
+    char *p = NULL;
 
     /*@ buffers ******************************************** */
-    char *tmp;
+    char *tmp = NULL;
     char *bigfile_fname = NULL;
-    char *sz_devfile;
+    char *sz_devfile = NULL;
     char *ntfsprog_fifo = NULL;
     /*@ long *********************************************** */
@@ -2065 +2065 @@
     assert_string_is_neither_NULL_nor_zerolength(biggielist_fname);
 
-    malloc_string(tmp);
-    malloc_string(bigfile_fname);
-    malloc_string(sz_devfile);
     estimated_total_noof_slices =
         size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
@@ -2081 +2078 @@
         return (0);
     }
-    sprintf(tmp, "I am now backing up all large files.");
+    mr_asprintf(&tmp, "I am now backing up all large files.");
     log_to_screen(tmp);
     noof_biggie_files = count_lines_in_file(biggielist_fname);
@@ -2087 +2084 @@
                        "Please wait. This may take some time.", "",
                        estimated_total_noof_slices);
+    mr_free(tmp);
+
     if (!(fin = fopen(biggielist_fname, "r"))) {
         log_OS_error("Unable to openin biggielist");
         return (1);
     }
-    for (fgets(bigfile_fname, MAX_STR_LEN, fin); !feof(fin);
-         fgets(bigfile_fname, MAX_STR_LEN, fin), biggie_file_number++) {
+    for (mr_getline(&bigfile_fname, &n, fin); !feof(fin);
+         mr_getline(&bigfile_fname, &n, fin), biggie_file_number++) {
         use_ntfsprog = FALSE;
         if (bigfile_fname[strlen(bigfile_fname) - 1] < 32) {
@@ -2103 +2102 @@
             ftmp = fopen(bigfile_fname, "w");
             paranoid_fclose(ftmp);
-            sprintf(tmp, "bigfile %s was deleted - creating a dummy",
-                    bigfile_fname);
             delete_when_done = TRUE;
         } else {
@@ -2117 +2114 @@
                         "Calling ntfsclone in background because %s is an NTFS partition",
                         bigfile_fname);
-                sprintf(sz_devfile, "%s/%d.%d.000",
+                mr_asprintf(&sz_devfile, "%s/%d.%d.000",
                         bkpinfo->tmpdir,
                         (int) (random() % 32768),
@@ -2131 +2128 @@
                             bigfile_fname, sz_devfile);
                     res = feed_into_ntfsprog(bigfile_fname, sz_devfile);
+                    mr_free(sz_devfile);
                     exit(res);
                     break;
@@ -2137 +2135 @@
                             "feed_into_ntfsprog() called in background --- pid=%ld",
                             (long int) (pid));
+                    mr_free(sz_devfile);
+                    break;
                 }
             }
-// Otherwise, use good old 'dd' and 'bzip2'
+            // Otherwise, use good old 'dd' and 'bzip2'
             else {
-                sz_devfile[0] = '\0';
                 ntfsprog_fifo = NULL;
             }
 
-// Whether partition or biggiefile, just do your thang :-)
-            sprintf(tmp, "Bigfile #%ld is '%s' (%ld KB)",
+            // Whether partition or biggiefile, just do your thang :-)
+            mr_msg(5, "Bigfile #%ld is '%s' (%ld KB)",
                     biggie_file_number + 1, bigfile_fname,
                     (long) biggie_fsize >> 10);
@@ -2172 +2171 @@
                 p = bigfile_fname;
             }
-            sprintf(tmp, "Archiving %s ... ", bigfile_fname);
             if (res) {
-                strcat(tmp, "Failed!");
+                mr_asprintf(&tmp, "Archiving %s ... Failed!", bigfile_fname);
             } else {
-                strcat(tmp, "OK");
-            }
+                mr_asprintf(&tmp, "Archiving %s ... OK!", bigfile_fname);
+            }
+            mr_msg(4,tmp);
+            mr_free(tmp);
             if (delete_when_done) {
                 unlink(bigfile_fname);
@@ -2183 +2183 @@
             }
         }
-#ifndef _XWIN
         if (!g_text_mode) {
             newtDrawRootText(0, g_noof_rows - 2, tmp);
             newtRefresh();
         }
-#endif
-    }
+    }
+    mr_free(bigfile_fname);
+    paranoid_fclose(fin);
+
     mr_msg(1, "Finished backing up bigfiles");
     mr_msg(1, "estimated slices = %ld; actual slices = %ld",
             estimated_total_noof_slices, g_current_progress);
     close_progress_form();
-    paranoid_fclose(fin);
-    mr_free(tmp);
-    mr_free(bigfile_fname);
-    mr_free(sz_devfile);
     return (retval);
 }
-
-
 
 
@@ -2217 +2212 @@
 
     /*@ buffers ********************************************** */
-    char *curr_filelist_fname;
-    char *curr_afioball_fname;
-    char *curr_xattr_list_fname;
-    char *curr_acl_list_fname;
-    char *tmp;
-    char *media_usage_comment;
-
-    malloc_string(curr_afioball_fname);
+    char *curr_filelist_fname = NULL;
+    char *curr_afioball_fname = NULL;
+    char *curr_xattr_list_fname = NULL;
+    char *curr_acl_list_fname = NULL;
+    char *media_usage_comment = NULL;
+    char *tmp= mr_malloc(MAX_STR_LEN * 2);
+
+    /* BERLIOS: Useless ?
+       mr_asprintf(&tmp, "%s/archives/filelist.full", bkpinfo->scratchdir);
+     */
     malloc_string(media_usage_comment);
-    malloc_string(curr_filelist_fname);
-    malloc_string(curr_xattr_list_fname);
-    malloc_string(curr_acl_list_fname);
-
-    tmp = mr_malloc(MAX_STR_LEN * 2);
-
-    sprintf(tmp, "%s/archives/filelist.full", bkpinfo->scratchdir);
-
     log_to_screen("Archiving regular files");
 
-    open_progress_form("Backing up filesystem",
-                       "I am backing up your live filesystem now.",
-                       "Please wait. This may take a couple of hours.",
-                       "Working...",
+    open_progress_form(_("Backing up filesystem"),
+                       _("I am backing up your live filesystem now."),
+                       _("Please wait. This may take a couple of hours."),
+                       _("Working..."),
                        get_last_filelist_number(bkpinfo) + 1);
 
-    sprintf(curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir,
-            0L);
-
-    for (curr_set_no = 0; does_file_exist(curr_filelist_fname);
-         sprintf(curr_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                 bkpinfo->tmpdir, ++curr_set_no)) {
+    mr_asprintf(&curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir,
+             0L);
+
+    curr_set_no = 0;
+    while (does_file_exist(curr_filelist_fname)) {
         /* backup this set of files */
-        sprintf(curr_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, curr_set_no);
-        sprintf(curr_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, curr_set_no, bkpinfo->zip_suffix);
+        mr_asprintf(&curr_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
+                 bkpinfo->tmpdir, curr_set_no, bkpinfo->zip_suffix);
 
         mr_msg(1, "EXAT'g set %ld", curr_set_no);
         if (g_getfattr) {
-            sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+            mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
                 bkpinfo->tmpdir, curr_set_no);
             get_fattr_list(curr_filelist_fname, curr_xattr_list_fname);
         }
         if (g_getfacl) {
-            sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+            mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
                 bkpinfo->tmpdir, curr_set_no);
             get_acl_list(curr_filelist_fname, curr_acl_list_fname);
@@ -2267 +2253 @@
 
         mr_msg(1, "Archiving set %ld", curr_set_no);
-        res =
-            archive_this_fileset(bkpinfo, curr_filelist_fname,
+        res = archive_this_fileset(bkpinfo, curr_filelist_fname,
                                  curr_afioball_fname, curr_set_no);
         retval += res;
         if (res) {
-            sprintf(tmp,
-                    "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?",
-                    curr_set_no);
+            mr_asprintf(&tmp,
+                     "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?",
+                     curr_set_no);
             log_to_screen(tmp);
+            mr_free(tmp);
         }
 
@@ -2287 +2273 @@
                                                    curr_afioball_fname);
             iamhere("Writing EXAT files");
-            res +=
-                write_EXAT_files_to_tape(bkpinfo, curr_xattr_list_fname,
-                                         curr_acl_list_fname);
-// archives themselves
+            res += write_EXAT_files_to_tape(bkpinfo, curr_xattr_list_fname,
+                                            curr_acl_list_fname);
+            // archives themselves
             res = move_files_to_stream(bkpinfo, curr_afioball_fname, NULL);
         } else {
@@ -2320 +2305 @@
 
         if (res) {
-            sprintf(tmp, "Failed to add archive %ld's files to CD dir\n",
-                    curr_set_no);
+            mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n",
+                     curr_set_no);
             log_to_screen(tmp);
+            mr_free(tmp);
             fatal_error
                 ("Is your hard disk is full? If not, please send the author the logfile.");
         }
-    }
+        mr_free(curr_filelist_fname);
+        mr_free(curr_afioball_fname);
+        mr_free(curr_xattr_list_fname);
+        mr_free(curr_acl_list_fname);
+        mr_asprintf(&curr_filelist_fname, FILELIST_FNAME_RAW_SZ,
+                 bkpinfo->tmpdir, ++curr_set_no);
+    }
+    mr_free(curr_filelist_fname);
     close_progress_form();
-    sprintf(tmp, "Your regular files have been archived ");
     if (retval) {
-        strcat(tmp, "(with errors).");
-    } else {
-        strcat(tmp, "successfully.");
-    }
-    log_to_screen(tmp);
-    mr_free(tmp);
-    mr_free(curr_filelist_fname);
-    mr_free(curr_afioball_fname);
+        log_to_screen
+            ("Your regular files have been archived (with errors).");
+    } else {
+        log_to_screen
+            ("Your regular files have been archived successfully.");
+    }
     mr_free(media_usage_comment);
-    mr_free(curr_xattr_list_fname);
-    mr_free(curr_acl_list_fname);
     return (retval);
 }