Changeset 3856 in MondoRescue

Timestamp:

Mar 6, 2024, 5:29:44 PM (2 months ago)

Author:

Bruno Cornec

Message:

remove snprintf usage and use bkpinfo for serial_string

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-archive.c (modified) (4 diffs)
• common/libmondo-tools.c (modified) (3 diffs)
• common/mondostructures.h (modified) (1 diff)
• common/newt-specific.c (modified) (1 diff)
• mondorestore/mondo-rstr-newt.c (modified) (4 diffs)

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

@@ -67 +67 @@
 extern bool g_cd_recovery;
 extern char *g_mondo_home;
-
-/**
- * The serial string (used to differentiate between backups) of the current backup.
- */
-char *g_serial_string = NULL;
 
 extern char *g_getfacl;
@@ -1124 +1119 @@
  * - @c scratchdir
  * - @c tmpdir
+ * - @c serial_string
  * @return The number of errors encountered (0 for success).
  * @ingroup MLarchiveGroup
@@ -1140 +1136 @@
     mr_asprintf(data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
 
-        tmp = 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");
-    snprintf(g_serial_string, MAX_STR_LEN - 8, "%s", tmp);
-        mr_free(tmp);
-    strip_spaces(g_serial_string);
-    strcat(g_serial_string, "...word.");
-    log_msg(2, "g_serial_string = '%s'", g_serial_string);
-    assert(strlen(g_serial_string) < MAX_STR_LEN);
+    tmp = 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");
+    bkpinfo->serial_string = mr_strip_spaces(tmp);
+    mr_free(tmp);
+    mr_strcat(bkpinfo->serial_string, "...word.");
+    log_msg(2, "bkpinfo->serial_string = '%s'", bkpinfo->serial_string);
 
     mr_asprintf(tmpfile, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
-    if (write_one_liner_data_file(tmpfile, g_serial_string)) {
+    if (write_one_liner_data_file(tmpfile, bkpinfo->serial_string)) {
         log_msg(1, "%ld: Failed to write serial string", __LINE__);
     }
@@ -2584 +2578 @@
 
         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);
-        if (cd_number > 0 && !strcmp(our_serial_str, g_serial_string)) {
+        log_msg(2, "our serial str = %s; bkpinfo->serial_string = %s", our_serial_str, bkpinfo->serial_string);
+        if (cd_number > 0 && !strcmp(our_serial_str, bkpinfo->serial_string)) {
             mds = media_descriptor_string(g_backup_media_type);
             log_msg(2, "This %s is part of this backup set!", mds);

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

@@ -56 +56 @@
  */
 extern char *g_mondo_home;
-
-/**
- * The serial string (used to differentiate between backups) of the current backup.
- */
-extern char *g_serial_string;
 
 /**
@@ -1359 +1354 @@
         malloc_string(g_boot_mountpt);
         malloc_string(g_mondo_home);
-        malloc_string(g_serial_string);
         malloc_string(g_magicdev_command);
     } else {
@@ -1365 +1359 @@
         paranoid_free(g_mondo_home);
         paranoid_free(g_magicdev_command);
-
-        mr_free(g_serial_string);
     }
 }

branches/3.3/mondo/src/common/mondostructures.h

@@ -654 +654 @@
     t_boot boot_type;
 
+    /**
+     * The serial string (used to differentiate between backups) 
+     * of the current backup.
+    */
+    char *serial_string;
 };
 

branches/3.3/mondo/src/common/newt-specific.c

@@ -442 +442 @@
         mr_free(bkpinfo->prefix);
         mr_free(bkpinfo->isodir);
+        mr_free(bkpinfo->serial_string);
         /* Then free the structure */
         paranoid_free(bkpinfo);

branches/3.3/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1436 +1436 @@
     for (;;) {
         int i;
-        char headerstr[MAX_STR_LEN];
-        snprintf(headerstr, MAX_STR_LEN, "%-14s %-8s  %11s  %8s",
-                 "Plex", "Level", "Stripe Size", "Subdisks");
+        char *headerstr = NULL;
+        mr_asprintf(headerstr, "%-14s %-8s  %11s  %8s", "Plex", "Level", "Stripe Size", "Subdisks");
 
         bOK = newtCompactButton(2, 13, "  OK  ");
@@ -1449 +1448 @@
             newtListbox(2, 3, 9, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
         plexesHeader = newtLabel(2, 2, headerstr);
+        mr_free(headerstr);
         editraidForm = newtForm(NULL, NULL, 0);
 
@@ -1455 +1455 @@
             keylist[i] = (void *) i;
             if (i < raidrec->plexes) {
-                char pname[64], entry[MAX_STR_LEN];
+                char *pname;
+                char *entry;
                 switch (raidrec->plex[i].raidlevel) {
                 case -1:
@@ -1476 +1477 @@
                     mr_asprintf(chunksize, "%dk", raidrec->plex[i].stripesize);
                 }
-                snprintf(pname, 64, "%s.p%i", raidrec->volname, i);
-                snprintf(entry, MAX_STR_LEN, "%-14s %-8s  %11s  %8d",
-                         pname, raidlevel, chunksize,
-                         raidrec->plex[i].subdisks);
+                mr_asprintf(pname, "%s.p%i", raidrec->volname, i);
+                mr_asprintf(entry, "%-14s %-8s  %11s  %8d", pname, raidlevel, chunksize, raidrec->plex[i].subdisks);
+                mr_free(pname);
                 mr_free(raidlevel);
                 mr_free(chunksize);
 
                 newtListboxAppendEntry(plexesListbox, entry, keylist[i]);
+                mr_free(entry);
             }
         }