Changeset 3147 in MondoRescue for branches/3.1/mondo/src/common/libmondo-archive.c

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/common/libmondo-archive.c (modified) (19 diffs)

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

@@ -213 +213 @@
     paranoid_free(tmp);
 
-    mr_asprintf(command, "star H=exustar list=%s -c " STAR_ACL_SZ " file=%s", filelist, fname);
+    mr_asprintf(command, "star H=exustar list=%s -c -sparse " STAR_ACL_SZ " file=%s", filelist, fname);
     if (bkpinfo->use_lzo) {
         mr_free(command);
@@ -511 +511 @@
     char *use_star_sz = NULL;
     char *bootldr_str = NULL;
+    char *bootldr_ver = NULL;
     char *tape_device = NULL;
     char *broken_bios_sz = NULL;
@@ -682 +683 @@
             run_program_and_log_output("ln -sf /boot/grub/grub.conf /boot/grub/menu.lst", 5);
         }
-        if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg"))) {
-            fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst or /boot/grub/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
-        }
+        if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg")) && (!does_file_exist("/boot/grub2/grub.cfg"))) {
+            fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
+        }
+        mr_asprintf(&bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version"));
     } else if (bkpinfo->boot_loader == 'E') {
         mr_asprintf(bootldr_str, "ELILO");
@@ -719 +721 @@
     }
     log_to_screen("Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
+    if (bootldr_ver != NULL) {
+        mr_asprintf(&tmp, "Boot loader version string: %s", bootldr_ver);
+        log_to_screen(tmp);
+        mr_free(tmp);
+    }
 
     mr_asprintf(tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir);
@@ -927 +934 @@
     char *curr_acl_list_fname = NULL;
 
-    struct s_bkpinfo *bkpinfo_bis;
     char *tmp = NULL;
     int res = 0, retval = 0;
@@ -940 +946 @@
     p_next_set_to_archive = (int *) (inbuf + 8);
     p_list_of_fileset_flags = (char *) (inbuf + 12);
-    bkpinfo_bis = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET);
 
     mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, 0L);
@@ -1474 +1479 @@
 
     log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
-    (void) getcwd(old_pwd, MAX_STR_LEN - 1);
+    tmp1 = getcwd(old_pwd, MAX_STR_LEN - 1);
     mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
-    (void)chdir(bkpinfo->scratchdir);
+    if (chdir(bkpinfo->scratchdir)) {
+        // FIXME
+    }
 
     mds = media_descriptor_string(bkpinfo->backup_media_type);
@@ -1542 +1549 @@
     }
 
-    (void)chdir(old_pwd);
+    if (chdir(old_pwd)) {
+        // FIXME
+    }
     if (retval) {
         log_msg(1, "WARNING - make_usb_fs returned an error");
@@ -1599 +1608 @@
 
     log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s", bkpinfo->scratchdir, destfile);
-    (void) getcwd(old_pwd, MAX_STR_LEN - 1);
+    tmp2 = getcwd(old_pwd, MAX_STR_LEN - 1);
     mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
 
-    chdir(bkpinfo->scratchdir);
+    if (chdir(bkpinfo->scratchdir)) {
+        // FIXME
+    }
 
     if (bkpinfo->call_before_iso) {
@@ -1813 +1824 @@
     }
 
-    chdir(old_pwd);
+    if (chdir(old_pwd)) {
+        // FIXME
+    }
     if (retval) {
         log_msg(1, "WARNING - make_iso_fs returned an error");
@@ -1866 +1879 @@
     /*@ pointers ******************************************* */
     FILE *fin = NULL;
+    char *q;
 
     /*@ buffers ******************************************** */
@@ -2411 +2425 @@
     /*@ long long ****************************************************** */
     off_t length_of_incoming_file = (off_t)0;
-    t_archtype type;
     va_list ap;
 
@@ -2433 +2446 @@
         write_header_block_to_stream(length_of_incoming_file, curr_file,
                                      start_chr);
-        if (strstr(curr_file, ".afio.") || strstr(curr_file, ".star.")) {
-            type = fileset;
-        } else if (strstr(curr_file, "slice")) {
-            type = biggieslice;
-        } else {
-            type = other;
-        }
         res = write_file_to_stream_from_file(curr_file);
         retval += res;
@@ -2798 +2804 @@
     mr_free(tmp);
 
-    (void) fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
-    fclose(fout);
-
+    res = fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
+    if (fout != NULL) {
+        paranoid_fclose(fout);
+    }
     log_msg(1, "Opening in %s; slicing it and writing to CD/tape", file_to_openin);
     if (!(fin = fopen(file_to_openin, "r"))) {
@@ -2839 +2846 @@
                 if (blksize > 0) {
                     totalread = totalread + blksize;
-                    (void) fwrite(tempblock, 1, blksize, fout);
+                    res = fwrite(tempblock, 1, blksize, fout);
                 } else {
                     break;
@@ -3131 +3138 @@
             log_to_screen("Please reboot from the 1st %s in Compare Mode, as a precaution.", mds);
             mr_free(mds);
-            chdir("/");
+            if (chdir("/")) {
+                // FIXME
+            }
             log_it("Before calling verification of image()");
             if (bkpinfo->backup_media_type == usb) {
@@ -3209 +3218 @@
     assert(bkpinfo != NULL);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        chdir("/");
+        if (chdir("/")) {
+            // FIXME
+        }
         mvaddstr_and_log_it(g_currentY, 0,
                             "Verifying archives against live filesystem");
@@ -3232 +3243 @@
             bkpinfo->media_device = find_cdrom_device(FALSE);   // replace 0,0,0 with /dev/cdrom
         }
-        chdir("/");
+        if (chdir("/")) {
+            // FIXME
+        }
         for (cdno = 1; cdno < 99 && bkpinfo->verify_data; cdno++) {
             if (cdno != g_current_media_number) {
@@ -3253 +3266 @@
         }
         mr_asprintf(tmp, "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE);
-        (void)system(tmp);
+        res = system(tmp);
         mr_free(tmp);
 
         mr_asprintf(tmp, "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE);
-        (void)system(tmp);
+        res = system(tmp);
         mr_free(tmp);
         run_program_and_log_output("umount " MNT_CDROM, FALSE);