Changeset 2190 in MondoRescue

Timestamp:

May 5, 2009, 3:56:10 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix lack of formating (discovered by the new Mandriva build process, and adopted here as well as it's good practice).

Location:

branches/2.2.9

Files:

• mindi/mindi (modified) (1 diff)
• mondo/configure.in (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (3 diffs)
• mondo/src/common/libmondo-cli.c (modified) (6 diffs)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/libmondo-filelist.c (modified) (5 diffs)
• mondo/src/common/libmondo-raid.c (modified) (1 diff)
• mondo/src/common/libmondo-string.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-prep.c (modified) (2 diffs)

branches/2.2.9/mindi/mindi

@@ -1425 +1425 @@
         MindiExit -1
     fi
+    echo "The USB device $USBDEVICE now looks like this:" >> $LOGFILE
+    $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
     echo -en "."
     echo "Creating a vfat filesystem on $USBPART" >> $LOGFILE

branches/2.2.9/mondo/configure.in

@@ -72 +72 @@
         AC_CHECK_LIB(pthread, pthread_create, true, [echo "*** Cannot find -lpthread."; echo "*** Please make sure you have the linuxthreads glibc add-on installed."; exit 1])
         PTHREAD="-lpthread"
-        CFLAGS="$CFLAGS -Wall -Wno-return-type -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
+        CFLAGS="$CFLAGS -Wall -Wno-return-type -Werror=format-security -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
         ;;
     *)

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

@@ -641 +641 @@
         }
 #else
+        /* Linux */
 #ifdef __IA64__
         strcpy(bootdev, call_program_and_get_last_line_of_output
@@ -665 +666 @@
             }
         }
+        /* Linux */
 #endif
         if (bootdev[0])
@@ -1221 +1223 @@
     sprintf(data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
 
-    snprintf(g_serial_string, MAX_STR_LEN - 1,
+    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 | \

branches/2.2.9/mondo/src/common/libmondo-cli.c

@@ -395 +395 @@
       "fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
     log_msg(4, "Executing: %s", command);
-    asprintf(&partition_list, call_program_and_get_last_line_of_output(command));
+    asprintf(&partition_list, "%s", call_program_and_get_last_line_of_output(command));
     paranoid_free(command);
     log_msg(4, "Partition list for %s: %s", dsf, partition_list);
@@ -498 +498 @@
                       VG, VG);
                     log_msg(4, "  Running: %s", command);
-                    asprintf(&mount_list, call_program_and_get_last_line_of_output(command));
+                    asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
                     paranoid_free(command);
                     log_msg(4, "  VG %s mount_list: %s", VG, mount_list);
@@ -519 +519 @@
                         "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
                     log_msg (5, "Running: %s", command);
-                    asprintf(&mount_list, call_program_and_get_last_line_of_output(command));
+                    asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
                     paranoid_free(command);
                     log_msg(4, "  Software raid device list: %s", mount_list);   
@@ -571 +571 @@
          "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
         log_msg (5, "  Running: %s", command);
-        asprintf(&mount_list, call_program_and_get_last_line_of_output(command));
+        asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
         log_msg(4, "  Software raid device list: %s", mount_list);   
@@ -756 +756 @@
         }
         
-        asprintf(&tmp1, flag_val['I']);
+        asprintf(&tmp1, "%s", flag_val['I']);
         p = tmp1;
         q = tmp1;
@@ -1055 +1055 @@
             strcat(bkpinfo->exclude_paths, " ");
         }
-        asprintf(&tmp1, flag_val['E']);
+        asprintf(&tmp1, "%s", flag_val['E']);
 
         p = tmp1;

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

@@ -902 +902 @@
     }
 
-    sprintf(tmp, call_program_and_get_last_line_of_output
+    sprintf(tmp, "%s", call_program_and_get_last_line_of_output
             ("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
         );
     log_msg(5, "tmp = '%s'", tmp);
     if (!tmp[0])
-        sprintf(tmp, call_program_and_get_last_line_of_output
+        sprintf(tmp, "%s", call_program_and_get_last_line_of_output
                 ("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
             );

branches/2.2.9/mondo/src/common/libmondo-filelist.c

@@ -26 +26 @@
 #include <errno.h>
 #include <stdio.h>
-
-
-/**
- * The maximum depth of directories to put in the skeleton filelist.
- * This is a balance between performance and a good progress indicator.
- */
-#define MAX_SKEL_DEPTH 3
 
 
@@ -1406 +1399 @@
         asprintf(&strtmp,
              "find %s -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o %s -type d -print > %s 2> /dev/null",
-             dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
+             dir, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
         asprintf(&strtmp,
-             "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null",
-                dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
+             "find %s -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null",
+                dir, find_excludes, g_skeleton_filelist);
 #endif
         paranoid_free(find_excludes);
@@ -1427 +1420 @@
         log_msg(5, "entries = %ld", g_skeleton_entries);
         percentage = 0;
-    } else if (depth <= MAX_SKEL_DEPTH) // update evalcall form if appropriate
+    } else  // update evalcall form if appropriate
     {
         sprintf(find_skeleton_marker,
@@ -1650 +1643 @@
         log_msg(2, "include_paths = '%s'", include_paths);
         log_msg(1, "Calculating filelist");
-        asprintf(&tmp2, call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
+        asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
         if (strlen(tmp2) < 1) {
             asprintf(&tmp1," ");
@@ -1657 +1650 @@
             asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
             paranoid_free(tmp2);
-            asprintf(&tmp2, call_program_and_get_last_line_of_output(tmp1));
+            asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
             log_msg(2, "Found windows files: %s",tmp2);
         }

branches/2.2.9/mondo/src/common/libmondo-raid.c

@@ -1043 +1043 @@
     pos = string;
     while (*pos == ' ') pos += 1;
-    asprintf(&strtmp, pos);
+    asprintf(&strtmp, "%s", pos);
     strcpy(string, strtmp);
     paranoid_free(strtmp);

branches/2.2.9/mondo/src/common/libmondo-string.c

@@ -875 +875 @@
     } else {
         /* Some full devices like this /dev/mapper/mpath0
-        * /dev/cciss/c0d0 may be used as partition names */
+           /dev/cciss/c0d0 may be used as partition names */
         if ((strstr(partition,"/dev/mapper/mpath") != NULL) ||
             (strstr(partition,"/dev/cciss/c") != NULL) ||

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

@@ -232 +232 @@
 
     uname(&utsn);
-    asprintf(&tmp, utsn.machine);
+    asprintf(&tmp, "%s", utsn.machine);
     return (tmp);
 }

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

@@ -596 +596 @@
   }
   // create device list from normal disks followed by spare ones
-  asprintf(&devices, raidlist->el[i].data_disks.el[0].device);
+  asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
   for (j = 1; j < raidlist->el[i].data_disks.entries; j++) {
     asprintf(&strtmp, "%s", devices);
@@ -2151 +2151 @@
             } else {
                 res = 0;
-                fprintf(fout, output);
+                fprintf(fout, "%s", output);
                 paranoid_pclose(fout);
             }