Changeset 2211 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-raid.c

Timestamp:

Jun 3, 2009, 7:10:19 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3089@localhost: bruno | 2009-05-18 06:41:05 +0200

• move call to asprintf to call to mr_asprintf (suppress a compiler warning)
• remove all the most obvious bad call to strcat and replace by mr_strcat as appropriate

File:

• branches/2.2.9/mondo/src/common/libmondo-raid.c (modified) (8 diffs)

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

@@ -1 +1 @@
 /* libmondo-raid.c                                                subroutines for handling RAID
    $Id$
-.
-
-
-06/29
-- added create_raidtab_from_mdstat()
-- changed char[MAX_STR_LEN] to char*
-
-10/21/2003
-- get_next_raidtab_line() --- correctly handle multiple spaces
-  between label and value
-
-07/03
-- line 447 - changed assert()
-
-05/08
-- cleaned up some FreeBSd-specific stuff
-
-05/05
-- added Joshua Oreman's FreeBSD patches
-
-04/25
-- added a bunch of RAID utilities from mondorestore/mondo-restore.c
-
-04/24/2003
-- added some assert()'s and log_OS_error()'s
-
-10/19/2002
-- added some comments
-
-07/24
-- created
 */
 
@@ -49 +18 @@
 #include "libmondo-raid.h"
 #include "mr_string.h"
+#include "mr_mem.h"
 
 #ifdef __FreeBSD__
@@ -77 +47 @@
 #else
     /*@ buffer ********************************************************** */
-    char *command;
+    char *command = NULL;
     int res;
 
-    command = malloc(MAX_STR_LEN * 2);
-    strcpy(command, "grep \"");
+    mr_asprintf(&command, "grep \"");
     if (raidno == -1) {
-        strcat(command, "linear");
+        mr_strcat(command, "linear");
     } else {
-        sprintf(command + strlen(command), "raid%d", raidno);
-    }
-    strcat(command, "\" /proc/mdstat > /dev/null 2> /dev/null");
+        mr_strcat(command, "raid%d", raidno);
+    }
+    mr_strcat(command, "\" /proc/mdstat > /dev/null 2> /dev/null");
     log_it("Is raid %d registered? Command = '%s'", raidno, command);
     res = system(command);
     paranoid_free(command);
+
     if (res) {
         return (FALSE);
@@ -1043 +1013 @@
     pos = string;
     while (*pos == ' ') pos += 1;
-    asprintf(&strtmp, "%s", pos);
+    mr_asprintf(&strtmp, "%s", pos);
     strcpy(string, strtmp);
     paranoid_free(strtmp);
@@ -1064 +1034 @@
     token = mr_strtok (string, delims, &lastpos);
     // get RAID device name
-    asprintf(&strtmp,"%s%s", device_prefix, token);
+    mr_asprintf(&strtmp,"%s%s", device_prefix, token);
     strcpy(raidlist->el[raidlist->entries].raid_device, strtmp);
     paranoid_free(strtmp);
@@ -1123 +1093 @@
       case ' ': // normal data disks
         raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].index = atoi(pos + 1);
-        asprintf(&strtmp,"%s%s", device_prefix, token);
+        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp);
         paranoid_free(strtmp);
@@ -1130 +1100 @@
       case 'S': // spare disks
         raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].index = atoi(pos + 1);
-        asprintf(&strtmp,"%s%s", device_prefix, token);
+        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp);
         paranoid_free(strtmp);
@@ -1137 +1107 @@
       case 'F': // failed disks
         raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].index = atoi(pos + 1);
-        asprintf(&strtmp,"%s%s", device_prefix, token);
+        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp);
         paranoid_free(strtmp);