Changeset 2301 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

• g_serial_string is managed dynamically

Location:

branches/2.2.10

Files:

• mondo/src/common/libmondo-archive.c (modified) (2 diffs)
• mondo/src/common/libmondo-tools.c (modified) (4 diffs)
• tools/quality (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);

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

@@ -30 +30 @@
 
 extern int g_tape_buffer_size_MB;
-extern char *g_serial_string;
 extern bool g_text_mode;
 extern int g_currentY;
@@ -1376 +1375 @@
 
 /**
- * If @p y, malloc @p x, else free @p x.
- * @bug This function seems orphaned. Please remove.
- */
-#define do_alloc_or_free_depending(x,y) { if(y) {x=malloc(MAX_STR_LEN);} else {paranoid_free(x);} }
-
-/**
  * Allocate or free important globals, depending on @p mal.
  * @param mal If TRUE, malloc; if FALSE, free.
@@ -1393 +1386 @@
         malloc_string(g_tmpfs_mountpt);
         */
-        malloc_string(g_serial_string);
         malloc_string(g_magicdev_command);
     } else {
@@ -1401 +1393 @@
         paranoid_free(g_tmpfs_mountpt);
         */
-        paranoid_free(g_serial_string);
+        mr_free(g_serial_string);
         paranoid_free(g_magicdev_command);
 
     }
-
-    /*
-       char**list_of_arrays[] = {
-       &g_boot_mountpt,
-       &g_mondo_home,
-       &g_tmpfs_mountpt,
-       &g_serial_string,
-       &g_magicdev_command,
-       NULL};
-
-       char**ppcurr;
-       int i;
-
-       for(i=0;list_of_arrays[i];i++)
-       {
-       log_msg(5, "Allocating %d", i);
-       ppcurr = list_of_arrays[i];
-       if (mal)
-       { *ppcurr = malloc(MAX_STR_LEN); }
-       else
-       {
-       if (*ppcurr)
-       {
-       free(*ppcurr);
-       }
-       }
-       }
-       log_msg(5, "Returning");
-     */
 }
 

branches/2.2.10/tools/quality

@@ -29 +29 @@
 # How many sprintf/strcat/strcpy vs asprintf are they
 for s in asprintf mr_asprintf sprintf snprintf strcat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline MAX_STR_LEN getcwd goto free mr_free paranoid_free paranoid_system mr_system assert; do
-    echo "monodrescue $s usage : "
+    echo "mondorescue $s usage : "
     tot=0
     for i in `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|mindi-busybox' | xargs grep -r -c -w $s | egrep -v ":0$"`; do
@@ -42 +42 @@
 pbg -w asprintf | grep -vE 'monitas|mindi-busybox|quality|/\*|asprintf\(&' > /tmp/mondo.quality
 cat /tmp/mondo.quality
-echo "monodrescue uses : `cat /tmp/mondo.quality | wc -l` asprintf without &"
+echo "mondorescue uses : `cat /tmp/mondo.quality | wc -l` asprintf without &"
 pbg -w getline | grep -vE 'monitas|mindi-busybox|quality|/\*|getline\(&' > /tmp/mondo.quality
 cat /tmp/mondo.quality
-echo "monodrescue uses : `cat /tmp/mondo.quality | wc -l` getline without &"
+echo "mondorescue uses : `cat /tmp/mondo.quality | wc -l` getline without &"
 pbg mr_asprintf | grep -vE '"|FNAME|ISOFS|syscall_sprintf|mr_mem|quality' > /tmp/mondo.quality
 cat /tmp/mondo.quality
-echo "monodrescue uses : `cat /tmp/mondo.quality | wc -l` mr_aspritnf without \""
+echo "mondorescue uses : `cat /tmp/mondo.quality | wc -l` mr_aspritnf without \""
 echo " "
 echo "Splint: "