Changeset 2277 in MondoRescue

Timestamp:

Jul 13, 2009, 2:34:39 AM (16 years ago)

Author:

Bruno Cornec

Message:

r3263@localhost: bruno | 2009-07-13 02:25:52 +0200

• Fix printing bug in text mode during afio backup
• Fix a wrong tmp usage after mr_asprintf migration in libmondo-archive.c

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-archive.c (modified) (5 diffs)
• newt-specific.c (modified) (9 diffs)

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

@@ -1034 +1034 @@
     bkpinfo_bis = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET);
 
-    sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
-            bkpinfo->tmpdir, 0L);
+    sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, 0L);
     for (archiving_set_no = 0; does_file_exist(archiving_filelist_fname);
-         sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                 bkpinfo->tmpdir, archiving_set_no)) {
+         sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no)) {
         if (g_exiting) {
             fatal_error("Execution run aborted (pthread)");
         }
         if (archiving_set_no >= MAX_NOOF_SETS_HERE) {
-            fatal_error
-                ("Maximum number of filesets exceeded. Adjust MAX_NOOF_SETS_HERE, please.");
+            fatal_error("Maximum number of filesets exceeded. Adjust MAX_NOOF_SETS_HERE, please.");
         }
         if (!semaphore_p()) {
@@ -1059 +1056 @@
 
         /* backup this set of files */
-        sprintf(archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
-        sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no);
+        sprintf(archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
+        sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
         if (!does_file_exist(archiving_filelist_fname)) {
             log_msg(3,
@@ -1071 +1066 @@
         }
 
-        mr_asprintf(&tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir,
-                archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
+        mr_asprintf(&tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
         if (does_file_exist(tmp)) {
             log_msg(4, "%s[%d:%d] - waiting for storer", FORTY_SPACES,
@@ -3427 +3421 @@
             mr_asprintf(&tmp1, "Failed to create %s #%d. Retry?", mds, g_current_media_number);
             mr_free(mds);
-            res = ask_me_yes_or_no(tmp);
+            res = ask_me_yes_or_no(tmp1);
             mr_free(tmp1);
 
@@ -3465 +3459 @@
 
     bkpinfo->verify_data = orig_vfy_flag_val;
+    mr_free(tmp);
     return (0);
 }

branches/2.2.10/mondo/src/common/newt-specific.c

@@ -96 +96 @@
     long g_maximum_progress = 999;  ///< The maximum amount of progress (100%) for the currently opened progress form.
     long g_current_progress = -999; ///< The current amount of progress (filelist #, etc.) for the currently opened progress form.
-    long g_start_time = 0;      ///< The time (in seconds since the epoch) that the progress form was opened.
+    long g_start_time = 0L;     ///< The time (in seconds since the epoch) that the progress form was opened.
     bool g_text_mode = TRUE;    ///< If FALSE, use a newt interface; if TRUE, use an ugly (but more compatible) dumb terminal interface.
     char g_xmondo_stdin[MAX_NEWT_COMMENT_LEN],  ///< ... @bug Unneeded w/current XMondo.
@@ -979 +979 @@
 
         /*@ long ************************************************************ */
-        long current_time = 0;
-        long time_taken = 0;
-        long time_total_est = 0;
-        long time_remaining = 0;
+        long current_time = 0L;
+        long time_taken = 0L;
+        long time_total_est = 0L;
+        long time_remaining = 0L;
 
         /*@ buffers ********************************************************** */
@@ -1006 +1006 @@
             time_remaining = time_total_est - time_taken;
         } else {
-            time_remaining = 0;
+            time_remaining = 0L;
         }
         if (!g_text_mode) {
@@ -1017 +1017 @@
             || percentage > g_isoform_old_progress) {
             g_isoform_old_progress = percentage;
-            mr_asprintf(&timeline_str,
-                    "%2ld:%02ld taken            %2ld:%02ld remaining",
-                    time_taken / 60, time_taken % 60, time_remaining / 60,
-                    time_remaining % 60);
+            mr_asprintf(&timeline_str, "%2ld:%02ld taken            %2ld:%02ld remaining", (long) time_taken / 60, (long) time_taken % 60, 
+                            (long) time_remaining / 60, (long) time_remaining % 60);
             if (percentage < 3) {
                 mr_asprintf(&pcline_str, " Working");
@@ -1043 +1041 @@
                 }
                 if (percentage >= 3) {
-                    mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage,
-                            time_remaining / 60, time_remaining % 60);
-                    printf("---evalcall---1--- %s\n",
-                           g_isoform_header_str);
+                    mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage, time_remaining / 60, time_remaining % 60);
+                    printf("---evalcall---1--- %s\n", g_isoform_header_str);
                     printf("---evalcall---2--- %s\n", taskprogress);
                     printf("---evalcall---E---\n");
                 }
-                paranoid_free(taskprogress);
+                mr_free(taskprogress);
             } else {
                 newtScaleSet(g_isoform_scale,
@@ -1110 +1106 @@
      update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
         /*@ long ***************************************************** */
-        long current_time = 0;
-        long time_taken = 0;
-        long time_remaining = 0;
-        long time_total_est = 0;
+        long current_time = 0L;
+        long time_taken = 0L;
+        long time_remaining = 0L;
+        long time_total_est = 0L;
 
         /*@ int ******************************************************* */
@@ -1146 +1142 @@
                 g_current_progress = g_maximum_progress;
             }
-            percentage =
-                (int) ((g_current_progress * 100L) / g_maximum_progress);
+            percentage = (int) ((g_current_progress * 100L) / g_maximum_progress);
         }
         if (percentage < 1) {
@@ -1156 +1151 @@
         }
         if (g_current_progress) {
-            time_total_est =
-                time_taken * (long) g_maximum_progress /
-                (long) (g_current_progress);
+            time_total_est = time_taken * (long) g_maximum_progress / (long) g_current_progress;
             time_remaining = time_total_est - time_taken;
         } else {
-            time_remaining = 0;
+            time_remaining = 0L;
         }
         g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
@@ -1179 +1172 @@
                 log_msg(2, "percentage = %d", percentage);
             }
-            mr_strcat(taskprogress, "] %3d%c", percentage, '%');
-            mr_strcat(taskprogress, " done; %2ld:%02ld to go",
-                    time_remaining / 60, time_remaining % 60);
+            mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage, (long) time_remaining / 60, (long) time_remaining % 60);
             printf("---progress-form---4--- %s\n", taskprogress);
             paranoid_free(taskprogress);
         } else {
-            mr_asprintf(&timeline_str,
-                "%2ld:%02ld taken               %2ld:%02ld remaining  ",
-                time_taken / 60, time_taken % 60, time_remaining / 60,
-                time_remaining % 60);
-            mr_asprintf(percentline_str, " %3d%% done                 %3d%% to go",
-                percentage, 100 - percentage);
+            mr_asprintf(&timeline_str, "%2ld:%02ld taken               %2ld:%02ld remaining  ",
+                (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
+            mr_asprintf(percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
 
             center_string(blurb1, 54);