Changeset 3831 in MondoRescue for branches/3.3/mondo/src/common

Timestamp:

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

Author:

Bruno Cornec

Message:

Fix compilation warnings

File:

• branches/3.3/mondo/src/common/libmondo-devices.c (modified) (2 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)) {