Changeset 2375 in MondoRescue

Timestamp:

Sep 9, 2009, 12:00:56 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix a bad strncpy call
• Fix bas mr_asprintf call (quality)

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-devices.c (modified) (1 diff)
• libmondo-fork.c (modified) (1 diff)

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

@@ -2241 +2241 @@
 
 #ifdef __FreeBSD__
-    mr_asprintf(output, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1"));
+    mr_asprintf(output, "%s", call_program_and_get_last_line_of_output("mount | grep ' on / ' | cut -d' ' -f1"));
 #else
-    mr_asprintf(output, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | sed s/[0-9]// | sed s/[0-9]//"));
+    mr_asprintf(output, "%s", call_program_and_get_last_line_of_output("mount | grep ' on / ' | cut -d' ' -f1 | sed 's/[0-9]//' | sed 's/[0-9]//'"));
     if (strstr(output, "/dev/cciss/")) {
         mr_free(output);
-        mr_asprintf(output, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | cut -dp -f1"));
+        mr_asprintf(output, "%s", call_program_and_get_last_line_of_output("mount | grep ' on / ' | cut -d' ' -f1 | cut -dp -f1"));
     }
     if (strstr(output, "/dev/md")) {
         mr_free(output);
-        mr_asprintf(output, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1"));
+        mr_asprintf(output, "%s", call_program_and_get_last_line_of_output("mount | grep ' on / ' | cut -d' ' -f1"));
     }
 #endif

branches/2.2.10/mondo/src/common/libmondo-fork.c

@@ -52 +52 @@
         for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
             if (strlen(tmp) > 1) {
-                strncpy(result, 511, tmp);
+                strncpy(result, tmp, 511);
             }
             mr_free(tmp);