Changeset 2317 in MondoRescue

Timestamp:

Aug 18, 2009, 2:36:42 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3328@localhost: bruno | 2009-08-04 00:26:50 +0200
g_serial_string dynamically allocated

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-archive.c (modified) (2 diffs)
• libmondo-tools.c (modified) (3 diffs)

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

@@ -63 +63 @@
 extern bool g_cd_recovery;
 extern char *g_mondo_home;
-/*
-extern char *g_tmpfs_mountpt;
-*/
-extern char *g_serial_string;
+
+/**
+ * The serial string (used to differentiate between backups) of the current backup.
+ */
+char *g_serial_string = NULL;
+
 extern char *g_getfacl;
 extern char *g_getfattr;
@@ -1213 +1215 @@
     mr_asprintf(&data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
 
-    mr_asprintf(&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);
+    mr_asprintf(&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"));
+    mr_strip_spaces(g_serial_string);
     mr_strcat(g_serial_string, "...word.");
     log_msg(2, "g_serial_string = '%s'", g_serial_string);

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

@@ -34 +34 @@
 extern int g_current_media_number;
 extern char *MONDO_LOGFILE;
+extern char *g_serial_string;
 
 /* Reference to global bkpinfo */
@@ -56 +57 @@
  */
 char *g_mondo_home = NULL;
-
-/**
- * The serial string (used to differentiate between backups) of the current backup.
- */
-char *g_serial_string = NULL;
 
 /**
@@ -1383 +1379 @@
         malloc_string(g_boot_mountpt);
         malloc_string(g_mondo_home);
-        /*
-        malloc_string(g_tmpfs_mountpt);
-        */
         malloc_string(g_magicdev_command);
     } else {
         paranoid_free(g_boot_mountpt);
         paranoid_free(g_mondo_home);
-        /*
-        paranoid_free(g_tmpfs_mountpt);
-        */
+        paranoid_free(g_magicdev_command);
+
         mr_free(g_serial_string);
-        paranoid_free(g_magicdev_command);
-
     }
 }