Changeset 2202 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-archive.c

Timestamp:

May 13, 2009, 4:34:00 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Remove useless function look_for_weird_formats
• Adds a test program for mountlist management to find a seg. fault bug when using a large mountlist file

File:

• branches/2.2.9/mondo/src/common/libmondo-archive.c (modified) (14 diffs)

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

@@ -803 +803 @@
     }
     if (bkpinfo->backup_media_type == usb) {
-        asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
+        (void)asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
     } else {
-        asprintf(&tmp2," ");
+        (void)asprintf(&tmp2," ");
     }
 
@@ -828 +828 @@
 
     if (g_getfattr) {
-        asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);
+        (void)asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
             log_msg(1, "%ld: Unable to write one-liner XATTR",
@@ -836 +836 @@
     }
     if (g_getfacl) {
-        asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);
+        (void)asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
             log_msg(1, "%ld: Unable to write one-liner ACL",
@@ -844 +844 @@
     }
     if (bkpinfo->use_obdr) {
-        asprintf(&tmp1, "%s/OBDR", bkpinfo->tmpdir);
+        (void)asprintf(&tmp1, "%s/OBDR", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
             log_msg(1, "%ld: Unable to write one-liner OBDR",
@@ -1581 +1581 @@
     log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
+    (void)asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
-    chdir(bkpinfo->scratchdir);
-
-    asprintf(&message_to_screen, "Copying data to make %s #%d",
+    (void)chdir(bkpinfo->scratchdir);
+
+    (void)asprintf(&message_to_screen, "Copying data to make %s #%d",
                 media_descriptor_string(bkpinfo->backup_media_type),
                 g_current_media_number);
     log_msg(1, message_to_screen);
 
-    asprintf(&tmp1, "%s1", bkpinfo->media_device);
+    (void)asprintf(&tmp1, "%s1", bkpinfo->media_device);
     if (is_this_device_mounted(tmp1)) {
         log_msg(1, "USB device mounted. Remounting it at the right place");
-        asprintf(&tmp, "umount %s", tmp1);
+        (void)asprintf(&tmp, "umount %s", tmp1);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
@@ -1601 +1601 @@
 
     log_msg(1, "Mounting USB device.");
-    asprintf(&tmp1, "%s/usb", bkpinfo->tmpdir);
-    asprintf(&tmp, "mkdir -p %s", tmp1);
+    (void)asprintf(&tmp1, "%s/usb", bkpinfo->tmpdir);
+    (void)asprintf(&tmp, "mkdir -p %s", tmp1);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
     /* Mindi always create one single parition on the USB dev */
-    asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, tmp1);
+    (void)asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, tmp1);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -1616 +1616 @@
 
         /* Command to execute */
-        asprintf(&tmp,"mv %s/* %s", bkpinfo->scratchdir, tmp1); 
+        (void)asprintf(&tmp,"mv %s/* %s", bkpinfo->scratchdir, tmp1); 
         res = eval_call_to_make_USB(tmp, message_to_screen);
         if (res) {
-            asprintf(&result_sz, "%s ...failed",tmp);
+            (void)asprintf(&result_sz, "%s ...failed",tmp);
         } else {
-            asprintf(&result_sz, "%s ...OK",tmp);
+            (void)asprintf(&result_sz, "%s ...OK",tmp);
         }
         log_to_screen(result_sz);
@@ -1632 +1632 @@
 
     if (is_this_device_mounted(bkpinfo->media_device)) {
-        asprintf(&tmp, "umount %s1", bkpinfo->media_device);
+        (void)asprintf(&tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
     }
 
-    chdir(old_pwd);
+    (void)chdir(old_pwd);
     if (retval) {
         log_msg(1, "WARNING - make_usb_fs returned an error");
@@ -1769 +1769 @@
                     ("Failed to write to disk. I shall blank it and then try again.");
                 sleep(5);
-                system("sync");
+                (void)system("sync");
                 pause_for_N_seconds(5, "Letting DVD drive settle");
 
@@ -2398 +2398 @@
     }
 
-    asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
+    (void)asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
             biggielist);
     paranoid_system(command);
     paranoid_free(command);
 
-    asprintf(&blah, "biggielist = %s", biggielist);
+    (void)asprintf(&blah, "biggielist = %s", biggielist);
     log_msg(2, blah);
     paranoid_free(blah);
@@ -2413 +2413 @@
     if (g_getfattr) {
         get_fattr_list(biggielist, xattr_fname);
-        asprintf(&command, "cp %s %s/archives/", xattr_fname,
+        (void)asprintf(&command, "cp %s %s/archives/", xattr_fname,
             bkpinfo->scratchdir);
         paranoid_system(command);
@@ -2420 +2420 @@
     if (g_getfacl) {
         get_acl_list(biggielist, acl_fname);
-        asprintf(&command, "cp %s %s/archives/", acl_fname,
+        (void)asprintf(&command, "cp %s %s/archives/", acl_fname,
              bkpinfo->scratchdir);
         paranoid_system(command);
@@ -2428 +2428 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         res += write_EXAT_files_to_tape(xattr_fname, acl_fname);
-        asprintf(&blah, "%ld", count_lines_in_file(biggielist));
+        (void)asprintf(&blah, "%ld", count_lines_in_file(biggielist));
         write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
         paranoid_free(blah);
@@ -3555 +3555 @@
                 "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
                 MONDO_LOGFILE, MONDO_CACHE);
-        system(tmp);
+        (void)system(tmp);
 
         sprintf(tmp,
                 "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
                 MONDO_LOGFILE, MONDO_CACHE);
-        system(tmp);
+        (void)system(tmp);
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
 //    if (bkpinfo->backup_media_type != iso && !bkpinfo->please_dont_eject_when_restoring)