Changeset 2277 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

Timestamp:

Jul 13, 2009, 2:34:39 AM (15 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

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (5 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);
 }