Changeset 1638 in MondoRescue for branches/stable/mondo/src/mondorestore

Timestamp:

Sep 19, 2007, 9:32:00 AM (18 years ago)

Author:

Bruno Cornec

Message:

Continue to use configuration file data (may not compile)

Location:

branches/stable/mondo/src/mondorestore

Files:

• mondo-rstr-compare.c (modified) (3 diffs)
• mondo-rstr-tools.c (modified) (1 diff)
• mondorestore.c (modified) (10 diffs)

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -230 +230 @@
     char *archiver_exe = NULL;
     char *compressor_exe = NULL;
+#ifdef __FreeBSD__
+    long BUFSIZE=512L;
+#else
+    long BUFSIZE=(1024L*1024L)/mr_conf->external_tape_blexternal_tape_blocksize;
+#endif
+
 
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
@@ -271 +277 @@
     }
 
-#ifdef __FreeBSD__
-#define BUFSIZE 512L
-#else
-#define BUFSIZE (1024L*1024L)/TAPE_BLOCK_SIZE
-#endif
-
     mr_asprintf(&logfile, "/tmp/afio.log.%d", current_tarball_number);
     if (use_star)               // doesn't use compressor_exe
@@ -287 +287 @@
                 "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s",
                 archiver_exe,
-                TAPE_BLOCK_SIZE,
+                mr_conf->external_tape_blocksize,
                 BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);
     }
-#undef BUFSIZE
     mr_free(archiver_exe);
     mr_free(compressor_exe);

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -886 +886 @@
                 bkpinfo->internal_tape_block_size);
     } else {
-        bkpinfo->internal_tape_block_size =
-            DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
-        mr_msg(1, "Internal tape block size = default (%ld)",
-                DEFAULT_INTERNAL_TAPE_BLOCK_SIZE);
+        bkpinfo->internal_tape_block_size = mr_conf->internal_tape_blocksize;
+        mr_msg(1, "Internal tape block size = default (%ld)", mr_conf->internal_tape_blocksize);
     }
 

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -438 +438 @@
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
     iamhere("Done loading config file; resizing ML");
+    mr_asprintf(&tmp,bkpinfo->prefix);
     if (popup_and_get_string
-        ("Prefix", "Prefix of your ISO images ?", bkpinfo->prefix, MAX_STR_LEN / 4)) {
+        ("Prefix", "Prefix of your ISO images ?", tmp, MAX_STR_LEN / 4)) {
+        mr_free(bkpinfo->prefix);
+        bkpinfo->prefix = tmp;
         mr_msg(1, "Prefix set to %s",bkpinfo->prefix);
     }
@@ -1038 +1041 @@
 
     pathname_of_last_file_restored[0] = '\0';
-    bigblk = mr_malloc(TAPE_BLOCK_SIZE);
+    bigblk = mr_malloc(mr_conf->external_tape_blocksize);
 
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
@@ -1249 +1252 @@
 
             while (!feof(fbzip2)) {
-                siz = fread(bigblk, 1, TAPE_BLOCK_SIZE, fbzip2);
+                siz = fread(bigblk, 1, mr_conf->external_tape_blocksize, fbzip2);
                 if (siz > 0) {
                     siz = fwrite(bigblk, 1, siz, fout);
@@ -1567 +1570 @@
     char *xattr_fname = NULL;
     char *acl_fname = NULL;
+#ifdef __FreeBSD__
+    long BUFSIZE=512L;
+#else
+    long BUFSIZE=(1024L*1024L)/mr_conf->external_tape_blocksize;
+#endif
+
 
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
@@ -1651 +1660 @@
             mr_free(tmp);
         }
-#ifdef __FreeBSD__
-#define BUFSIZE 512
-#else
-#define BUFSIZE (1024L*1024L)/TAPE_BLOCK_SIZE
-#endif
-
         if (use_star) {
             mr_asprintf(&command,
@@ -1668 +1671 @@
                 mr_asprintf(&command,
                         "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s",
-                        TAPE_BLOCK_SIZE,
+                        mr_conf->external_tape_blocksize,
                         BUFSIZE, executable, filelist_subset_fname,
                         tarball_fname);
@@ -1674 +1677 @@
                 mr_asprintf(&command,
                         "afio -i -b %ld -c %ld -M 8m %s %s",
-                        TAPE_BLOCK_SIZE,
+                        mr_conf->external_tape_blocksize,
                         BUFSIZE, executable, tarball_fname);
             }
@@ -1680 +1683 @@
         mr_free(executable);
 
-#undef BUFSIZE
         mr_asprintf(&temp_log, "/tmp/%d.%d", (int) (random() % 32768),
             (int) (random() % 32768));
@@ -1841 +1843 @@
         } else {
             use_star = FALSE;
-            mr_asprintf(&command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE,
+            mr_asprintf(&command, "afio -t -M 8m -b %ld %s %s", mr_conf->external_tape_blocksize,
                     executable, afio_fname);
         }
@@ -1883 +1885 @@
         // afio
         if (filelist) {
-            mr_asprintf(&command, "afio -i -M 8m -b %ld %s -w %s %s 2>> %s", TAPE_BLOCK_SIZE, executable, filelist_subset_fname, afio_fname, MONDO_LOGFILE);
+            mr_asprintf(&command, "afio -i -M 8m -b %ld %s -w %s %s 2>> %s", mr_conf->external_tape_blocksize, executable, filelist_subset_fname, afio_fname, MONDO_LOGFILE);
         } else {
-            mr_asprintf(&command, "afio -i -M 8m -b %ld %s %s 2>> %s", TAPE_BLOCK_SIZE, executable, afio_fname, MONDO_LOGFILE);
+            mr_asprintf(&command, "afio -i -M 8m -b %ld %s %s 2>> %s", mr_conf->external_tape_blocksize, executable, afio_fname, MONDO_LOGFILE);
         }
     }