Changeset 45 in MondoRescue for trunk/mondo/mondo/common/libmondo-string.c

Timestamp:

Oct 5, 2005, 12:51:47 AM (19 years ago)

Author:

bcornec

Message:

asprint and getline now added

File:

• trunk/mondo/mondo/common/libmondo-string.c (modified) (10 diffs)

trunk/mondo/mondo/common/libmondo-string.c

@@ -66 +66 @@
 
 
-
 /**
  * Pad a string on both sides so it appears centered.
@@ -101 +100 @@
 
 
-
-
 inline void turn_wildcard_chars_into_literal_chars(char *sout, char *sin)
 {
@@ -114 +111 @@
     *q = *p;                    // for the final '\0'
 }
-
 
 
@@ -127 +123 @@
     char *pos_w_commas;
     static char output[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
+    char *tmp;
     int j;
 
     assert(input != NULL);
 
-    strcpy(tmp, input);
+    asprintf(tmp, "%s", input);
     if (strlen(tmp) > 6) {
         asprintf(&pos_w_commas, "%s", tmp);
@@ -151 +147 @@
     strcpy(output, pos_w_commas);
     paranoid_free(pos_w_commas);
+    paranoid_free(tmp);
     return (output);
 }
@@ -169 +166 @@
 
     /*@ buffers ********************************************************** */
-    static char output[MAX_STR_LEN];
+    char *output;
 
     assert(disklist != NULL);
 
-    sprintf(output, "%-24s %8d", disklist->el[lino].device,
-            disklist->el[lino].index);
+    asprintf(&output, "%-24s %8d", disklist->el[lino].device,
+             disklist->el[lino].index);
     return (output);
 }
-
-
-
 
 
@@ -214 +208 @@
     outval = atol(tmp);
     paranoid_free(tmp);
+
     if (ch == 'g' || ch == 'G') {
         outval = outval * 1024;
@@ -563 +558 @@
 
 
-
-
 /**
  * Wrap @p flaws_str across three lines. The first two are no more than 74 characters wide.
@@ -614 +607 @@
     }
 }
-
 
 
@@ -852 +844 @@
     char *output;
 
-
-
     if (raid_level >= 0) {
         asprintf(&output, " RAID %-2d ", raid_level);