Changeset 2301 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

Timestamp:

Jul 23, 2009, 7:52:12 PM (15 years ago)

Author:

Bruno Cornec

Message:

• g_serial_string is managed dynamically

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (2 diffs)

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

@@ -1213 +1213 @@
     mr_asprintf(&data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
 
-    snprintf(g_serial_string, MAX_STR_LEN - 8, "%s",
-             call_program_and_get_last_line_of_output("dd \
-if=/dev/urandom bs=16 count=1 2> /dev/null | \
-hexdump | tr -s ' ' '0' | head -n1"));
+    mr_sprintf(&g_serial_string, "%s", call_program_and_get_last_line_of_output("dd if=/dev/urandom bs=16 count=1 2> /dev/null | hexdump | tr -s ' ' '0' | head -n1"));
     strip_spaces(g_serial_string);
-    strcat(g_serial_string, "...word.");
+    mr_strcat(g_serial_string, "...word.");
     log_msg(2, "g_serial_string = '%s'", g_serial_string);
-    assert(strlen(g_serial_string) < MAX_STR_LEN);
 
     mr_asprintf(&tmpfile, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
@@ -2764 +2760 @@
         run_program_and_log_output(szunmount, 1);
         log_msg(2, "paafcd: cd_number = %d", cd_number);
-        log_msg(2, "our serial str = %s; g_serial_string = %s",
-                our_serial_str, g_serial_string);
+        log_msg(2, "our serial str = %s; g_serial_string = %s", our_serial_str, g_serial_string);
         if (cd_number > 0 && !strcmp(our_serial_str, g_serial_string)) {
             mds = media_descriptor_string(g_backup_media_type);