Changeset 3831 in MondoRescue for branches

Timestamp:

Mar 4, 2024, 5:47:08 PM (15 months ago)

Author:

Bruno Cornec

Message:

Fix compilation warnings

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-devices.c (modified) (2 diffs)
• mondorestore/mondorestore.c (modified) (4 diffs)

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

@@ -2719 +2719 @@
         }
         bkpinfo->boot_loader = i;
-        /* TODO: Check consisytency of boot type and boot loader */
+        /* TODO: Check consistency of boot type and boot loader */
 
         if (bkpinfo->include_paths) {
@@ -2815 +2815 @@
         bkpinfo->backup_data = TRUE;
         if (strcmp(compression_type,"lzo") == 0) {
-            strcpy(bkpinfo->zip_exe, "lzop");
-            strcpy(bkpinfo->zip_suffix, "lzo");
+            mr_asprintf(bkpinfo->zip_exe, "%s", "lzop");
+            mr_asprintf(bkpinfo->zip_suffix, "%s", "lzo");
         } else if (strcmp(compression_type,"gzip") == 0) {
-            strcpy(bkpinfo->zip_exe, "gzip");
-            strcpy(bkpinfo->zip_suffix, "gz");
+            mr_asprintf(bkpinfo->zip_exe, "%s", "gzip");
+            mr_asprintf(bkpinfo->zip_suffix, "%s", "gz");
         } else if (strcmp(compression_type,"lzma") == 0) {
-            //strcpy(bkpinfo->zip_exe, "xy");
-            //strcpy(bkpinfo->zip_suffix, "xy");
+            mr_asprintf(bkpinfo->zip_exe, "%s", "xz");
+            mr_asprintf(bkpinfo->zip_suffix, "%s", "xz");
         } else if (strcmp(compression_type,"bzip2") == 0) {
-            strcpy(bkpinfo->zip_exe, "bzip2");
-            strcpy(bkpinfo->zip_suffix, "bz2");
+            mr_asprintf(bkpinfo->zip_exe, "%s", "bzip2");
+            mr_asprintf(bkpinfo->zip_suffix, "%s", "bz2");
         } else {
-            bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
+            mr_free(bkpinfo->zip_exe);
+            mr_free(bkpinfo->zip_suffix);
         }
 #if __FreeBSD__ == 5
-        strcpy(bkpinfo->kernel_path, "/boot/kernel/kernel");
+        mr_asprintf(bkpinfo->kernel_path, "%s", "/boot/kernel/kernel");
 #elif __FreeBSD__ == 4
-        strcpy(bkpinfo->kernel_path, "/kernel");
+        mr_asprintf(bkpinfo->kernel_path, "%s", "/kernel");
 #elif linux
         if (figure_out_kernel_path_interactively_if_necessary(bkpinfo->kernel_path)) {

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -23 +23 @@
 
 extern void wait_until_software_raids_are_prepped(char *, int);
+extern char *mr_popup_and_get_string(char *, char *, char *);
 
 extern void twenty_seconds_til_yikes(void);
@@ -1991 +1992 @@
                 gotos_suck:
                 // (NB: MNT_RESTORING is where your filesystem is mounted now, by default)
-                tmp = mr_popup_and_get_string("Restore path", "Restore files to where?", old_restpath);
-                if (tmp != NULL) {
-                    if (!strcmp(tmp, "/")) {
+                tmp1 = mr_popup_and_get_string("Restore path", "Restore files to where?", old_restpath);
+                if (tmp1 != NULL) {
+                    if (!strcmp(tmp1, "/")) {
                         if (!ask_me_yes_or_no("Are you sure?")) {
-                            mr_free(tmp);
+                            mr_free(tmp1);
                             goto gotos_suck;
                         }
-                        mr_asprintf(tmp, "%s", ""); // so we restore to [blank]/file/name :)
+                        mr_free(tmp1);
+                        mr_asprintf(tmp1, "%s", "");    // so we restore to [blank]/file/name :)
                     }
-                    mr_asprintf(bkpinfo->restore_path, "%s", tmp);
+                    mr_asprintf(bkpinfo->restore_path, "%s", tmp1);
                     log_msg(1, "Restoring subset");
                     retval += restore_everything(filelist);
@@ -2007 +2009 @@
                     mr_asprintf(bkpinfo->restore_path, "%s", old_restpath);
                 }
+                mr_free(tmp1);
                 free_filelist(filelist);
                 if (!ask_me_yes_or_no("Restore another subset of your backup?")) {
@@ -2064 +2067 @@
                             "Warning - errors occurred during the restore phase.");
     }
-  end_of_func:
     log_it("Leaving interactive_mode()");
     return (retval);