Changeset 2211 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-stream.c

Timestamp:

Jun 3, 2009, 7:10:19 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3089@localhost: bruno | 2009-05-18 06:41:05 +0200

• move call to asprintf to call to mr_asprintf (suppress a compiler warning)
• remove all the most obvious bad call to strcat and replace by mr_strcat as appropriate

File:

• branches/2.2.9/mondo/src/common/libmondo-stream.c (modified) (7 diffs)

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

@@ -13 +13 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-devices.h"
@@ -369 +370 @@
         }
         if (strstr(fname, "xattr") == NULL) {
-            asprintf(&tmp,"Wrong order expected xattr, got %s, sunshine.", fname);
+            mr_asprintf(&tmp,"Wrong order expected xattr, got %s, sunshine.", fname);
             fatal_error(tmp);
         }
@@ -399 +400 @@
         }
         if (strstr(fname, "acl") == NULL) {
-            asprintf(&tmp,"Wrong order expected acl, got %s, sunshine.", fname);
+            mr_asprintf(&tmp,"Wrong order expected acl, got %s, sunshine.", fname);
             fatal_error(tmp);
         }
@@ -682 +683 @@
 
     log_it("Skipping OBDR headers");
-    asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
+    mr_asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
-    asprintf(&command, "mt -f %s fsf 2",bkpinfo->media_device);
+    mr_asprintf(&command, "mt -f %s fsf 2",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
@@ -709 +710 @@
     log_it("Creating OBDR headers");
     /* OBDR: First block 10 kB of zero bs = 512 */
-    asprintf(&command, "mt -f %s compression off",bkpinfo->media_device);
+    mr_asprintf(&command, "mt -f %s compression off",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
-    asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
+    mr_asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
     res += run_program_and_log_output(command, 1);
     paranoid_free(command);
@@ -719 +720 @@
     set_tape_block_size_with_mt(512);
 
-    asprintf(&command, "dd if=/dev/zero of=%s bs=512 count=20",bkpinfo->media_device);
+    mr_asprintf(&command, "dd if=/dev/zero of=%s bs=512 count=20",bkpinfo->media_device);
     res += run_program_and_log_output(command, 1);
     paranoid_free(command);
@@ -726 +727 @@
     set_tape_block_size_with_mt(2048);
 
-    asprintf(&command, "dd if=%s of=%s bs=2048",MINDI_CACHE"/mondorescue.iso",bkpinfo->media_device);
+    mr_asprintf(&command, "dd if=%s of=%s bs=2048",MINDI_CACHE"/mondorescue.iso",bkpinfo->media_device);
     res += run_program_and_log_output(command, 1);
     paranoid_free(command);