Changeset 3351 in MondoRescue for branches/3.2/mondo

Timestamp:

Feb 27, 2015, 3:18:42 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix #768 by canceling changes done in the loop computing number of slices, back to long instead of a new int.

Location:

branches/3.2/mondo/src/common

Files:

• libmondo-archive.c (modified) (8 diffs)
• libmondo-cli.c (modified) (3 diffs)

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

@@ -402 +402 @@
     assert(bkpinfo != NULL);
     set_g_cdrom_and_g_dvd_to_bkpinfo_value();
+
     if (bkpinfo->backup_media_type == dvd) {
 #ifdef DVDRWFORMAT
@@ -437 +438 @@
 
     copy_mondo_and_mindi_stuff_to_scratchdir(); // payload, too, if it exists
-#if __FreeBSD__ == 5
-    strcpy(bkpinfo->kernel_path, "/boot/kernel/kernel");
-#elif __FreeBSD__ == 4
-    strcpy(bkpinfo->kernel_path, "/kernel");
-#elif linux
-    if (figure_out_kernel_path_interactively_if_necessary
-        (bkpinfo->kernel_path)) {
-        fatal_error
-            ("Kernel not found. Please specify manually with the '-k' switch.");
-    }
-#else
-#error "I don't know about this system!"
-#endif
     if ((res = call_mindi_to_supply_boot_disks())) {
         fatal_error("Failed to generate boot+data disks");
@@ -1967 +1955 @@
     log_to_screen(tmp);
     noof_biggie_files = count_lines_in_file(biggielist_fname);
+    log_msg(1, "noof_biggie_files = %ld", noof_biggie_files);
     open_progress_form("Backing up big files", tmp, "Please wait. This may take some time.", "", estimated_total_noof_slices);
     mr_free(tmp);
@@ -2780 +2769 @@
     long slice_num = 0L;
     long i = 0L;
-    int j = 0;
     bool should_I_compress_slices = TRUE;
     char *suffix = NULL;                // for compressed slices
@@ -2899 +2887 @@
             return (1);
         }
-        if ((i == bkpinfo->optimal_set_size / 256L) && (totalread < 1.1 * totallength)) {
-            for (j = 0; j < (int) (bkpinfo->optimal_set_size / 256); j++) {
+        if ((i == bkpinfo->optimal_set_size / 256L) && (totalread < (off_t)1.1 * totallength)) {
+            for (i = 0L; i < (bkpinfo->optimal_set_size / 256L); i++) {
                 blksize = fread(tempblock, 1, 256 * 1024, fin);
-                if (blksize > 0) {
-                    totalread = totalread + blksize;
+                if (blksize > (size_t)0) {
+                    totalread = totalread + (off_t)blksize;
                     res = fwrite(tempblock, 1, blksize, fout);
                 } else {
@@ -2909 +2897 @@
                 }
             }
-            mr_free(tempblock);
         } else {
             i = 0L;
@@ -2956 +2943 @@
             g_current_progress++;
         } else {                /* if i==0 then ... */
-
             finished = TRUE;
             mr_asprintf(file_to_archive, "%s", curr_slice_fname_uncompressed);
@@ -2981 +2967 @@
         }
     }
+    mr_free(tempblock);
     mr_free(suffix);
     paranoid_fclose(fin);

branches/3.2/mondo/src/common/libmondo-cli.c

@@ -408 +408 @@
             mr_free(bkpinfo->netfs_remote_dir);
             mr_asprintf(bkpinfo->netfs_remote_dir, "/");
+            strncpy(bkpinfo->isodir, ".", MAX_STR_LEN / 4);
         }
         /* test for protocol */
@@ -461 +462 @@
         mr_free(tmp1);
 
+        log_msg(3, "proto = %s", bkpinfo->netfs_proto);
+        log_msg(3, "mount = %s", bkpinfo->netfs_mount);
+        if (bkpinfo->netfs_user) {
+            log_msg(3, "user = %s", bkpinfo->netfs_user);
+        }
+        log_msg(3, "isodir= %s", bkpinfo->isodir);
+
         if (strlen(bkpinfo->isodir) < 3) {
-            log_to_screen("Network share is not mounted. Trying to mount it for you.\n");
+            log_to_screen("Network share %s is not mounted. Trying to mount it for you.\n",bkpinfo->netfs_mount);
             if (bkpinfo->netfs_user) {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
@@ -505 +513 @@
             }
         }
-        log_msg(3, "proto = %s", bkpinfo->netfs_proto);
-        log_msg(3, "mount = %s", bkpinfo->netfs_mount);
-        if (bkpinfo->netfs_user) {
-            log_msg(3, "user = %s", bkpinfo->netfs_user);
-        }
-        log_msg(3, "isodir= %s", bkpinfo->isodir);
     }