Changeset 3300 in MondoRescue

Timestamp:

Jun 8, 2014, 10:51:42 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Change function which_format_command_do_i_need to allocate string (freed by caller), and also solve an assert issue during fedora tests

Location:

branches/3.2/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (6 diffs)
• mondoprep.h (modified) (1 diff)

branches/3.2/mondo/src/mondorestore/mondo-prep.c

@@ -695 +695 @@
         fprintf(g_fprep, "%s\n", program);
     }
+    mr_free(program);
     fin = fopen("/tmp/plexes", "r");
     while (fgets(line, MAX_STR_LEN - 1, fin)) {
@@ -754 +755 @@
         fprintf(g_fprep, "%s\n", program);
     }
+    mr_free(program);
 }
 paranoid_system("sync");
@@ -765 +767 @@
 if (!strcmp(format, "lvm")) {
     log_msg(1, "Don't format %s - it's part of an lvm volume", device);
-    mr_free(program);
     return (0);
 }
-res = which_format_command_do_i_need(format, program);
+program = which_format_command_do_i_need(format);
 mr_asprintf(tmp, "%s %s", program, device);
 if (strstr(program, "kludge")) {
@@ -2116 +2117 @@
  * @return 0 for success, nonzero for failure.
  */
-int which_format_command_do_i_need(char *format, char *program) {
-
-/** int *************************************************************/
-int res = 0;
-
-/** buffers *********************************************************/
-
-/** end ***************************************************************/
+char *which_format_command_do_i_need(char *format) {
 
 assert_string_is_neither_NULL_nor_zerolength(format);
-assert(program != NULL);
 
 if (strcmp(format, "swap") == 0) {
 #ifdef __FreeBSD__
-    strcpy(program, "true");
+    mr_asprintf(program, "true");
 #else
-    strcpy(program, "mkswap");
+    mr_asprintf(program, "mkswap");
 #endif
 } else if (strcmp(format, "vfat") == 0) {
-    strcpy(program, "format-and-kludge-vfat");
+    mr_asprintf(program, "format-and-kludge-vfat");
 #ifndef __FreeBSD__
 } else if (strcmp(format, "reiserfs") == 0) {
-    strcpy(program, "mkreiserfs -ff");
+    mr_asprintf(program, "mkreiserfs -ff");
 } else if (strcmp(format, "xfs") == 0) {
-    strcpy(program, "mkfs.xfs -f -q");
+    mr_asprintf(program, "mkfs.xfs -f -q");
 } else if (strcmp(format, "jfs") == 0) {
-    strcpy(program, "mkfs.jfs");
+    mr_asprintf(program, "mkfs.jfs");
 } else if (strcmp(format, "ext3") == 0) {
-    strcpy(program, "mkfs -t ext3 -F -q");
+    mr_asprintf(program, "mkfs -t ext3 -F -q");
 } else if (strcmp(format, "ext4") == 0) {
-    strcpy(program, "mkfs -t ext4 -F -q");
+    mr_asprintf(program, "mkfs -t ext4 -F -q");
 } else if (strcmp(format, "btrfs") == 0) {
-    strcpy(program, "mkfs.btrfs");
+    mr_asprintf(program, "mkfs.btrfs");
 } else if (strcmp(format, "minix") == 0) {
-    strcpy(program, "mkfs.minix");
+    mr_asprintf(program, "mkfs.minix");
 } else if (strcmp(format, "vmfs") == 0) {
-    strcpy(program, "mkfs -t vmfs");
+    mr_asprintf(program, "mkfs -t vmfs");
 } else if (strcmp(format, "ntfs") == 0) { 
     /* 
@@ -2158 +2151 @@
      * so the default "mkfs -t %s -c" command structure fails 
      */ 
-    strcpy(program, "mkfs -t ntfs");
+    mr_asprintf(program, "mkfs -t ntfs");
 } else if (strcmp(format, "ocfs2") == 0) {
     /*
@@ -2164 +2157 @@
      *
      */
-    strcpy(program, "mkfs -t ocfs2 -F");
+    mr_asprintf(program, "mkfs -t ocfs2 -F");
 #endif
 } else if (strcmp(format, "ext2") == 0) {
-    strcpy(program, "mke2fs -F -q");
+    mr_asprintf(program, "mke2fs -F -q");
 } else {
 #ifdef __FreeBSD__
-    sprintf(program, "newfs_%s", format);
+    mr_asprintf(program, "newfs_%s", format);
 #else
-    sprintf(program, "mkfs -t %s -c", format);  // -c checks for bad blocks
+    mr_asprintf(program, "mkfs -t %s -c", format);  // -c checks for bad blocks
 #endif
     log_it("Unknown format (%s) - assuming '%s' will do", format, program);
-    res = 0;
-}
-return (res);
+}
+return(program);
 }
 

branches/3.2/mondo/src/mondorestore/mondoprep.h

@@ -69 +69 @@
 int partition_everything(struct mountlist_itself *);
 int do_my_funky_lvm_stuff(bool, bool);
-int which_format_command_do_i_need(char *, char *);
+char *which_format_command_do_i_need(char *);
 int make_dummy_partitions(FILE *, char *, int);
 int make_list_of_drives(struct mountlist_itself *,