Changeset 3614 in MondoRescue for branches/3.2/mondo/src/lib/mr_str.c

Timestamp:

Nov 18, 2016, 5:31:43 PM (7 years ago)

Author:

Bruno Cornec

Message:

mr_strip_spaces now returns a dynamically allocated string

File:

• branches/3.2/mondo/src/lib/mr_str.c (modified) (3 diffs)

branches/3.2/mondo/src/lib/mr_str.c

@@ -25 +25 @@
  * @note this function allocates memory that needs to be freed by caller
  **/
-char *mr_strtok(char *instr, const char *delims, int *lastpos)
-{
-
-    char *token = NULL;
-    char *strptr = NULL;
-    size_t pos1 = 0;
-    size_t pos2 = 0;
-
-    if (instr == NULL) {
-        *lastpos = 0;
-        return token;
-    }
-
-    if (delims == NULL) {
-        *lastpos = 0;
-        return token;
-    }
-
-    if (strlen(instr) <= *lastpos) {
-        *lastpos = 0;
-        return token;
-    }
-
-    strptr = instr + *lastpos;
-    pos2 = strspn(strptr, delims);
-    strptr += pos2;
-    pos1 = strcspn(strptr, delims);
-    token = (char *)mr_malloc(sizeof(*token) * (pos1 + 1));
-    strncpy(token, strptr, pos1);
-    token[pos1] = '\0';
-    *lastpos = *lastpos + pos1 + pos2 + 1;
-
+char *mr_strtok(char *instr, const char *delims, int *lastpos) {
+
+char *token = NULL;
+char *strptr = NULL;
+size_t pos1 = 0;
+size_t pos2 = 0;
+
+if (instr == NULL) {
+    *lastpos = 0;
     return token;
+}
+
+if (delims == NULL) {
+    *lastpos = 0;
+    return token;
+}
+
+if (strlen(instr) <= *lastpos) {
+    *lastpos = 0;
+    return token;
+}
+
+strptr = instr + *lastpos;
+pos2 = strspn(strptr, delims);
+strptr += pos2;
+pos1 = strcspn(strptr, delims);
+token = (char *)mr_malloc(sizeof(*token) * (pos1 + 1));
+strncpy(token, strptr, pos1);
+token[pos1] = '\0';
+*lastpos = *lastpos + pos1 + pos2 + 1;
+
+return token;
 }
 
@@ -71 +70 @@
  **/
 char *mr_stresc(char *instr, char *toesc, const char escchr, const char specialchr) {
-    char *inptr = NULL;
-    char *retstr = NULL;
-    char *retptr = NULL;
-    char *escptr = NULL;
-    int cnt = 0;
-    bool found = FALSE;
-
-    inptr = instr;
-    // Count how many characters need escaping.
-    while (*inptr != '\0') {
-        escptr = toesc;
-        while (*escptr != '\0') {
-            if (*inptr == *escptr) {
-                // Found it, skip the rest.
-                cnt++;
-                // if specialchar (' or ") then replace it with '\'' or "\"" so adds 2 chars
-                if (*inptr == specialchr) {
-                    cnt += 2;
-                }
-                break;
+
+char *inptr = NULL;
+char *retstr = NULL;
+char *retptr = NULL;
+char *escptr = NULL;
+int cnt = 0;
+bool found = FALSE;
+
+inptr = instr;
+// Count how many characters need escaping.
+while (*inptr != '\0') {
+    escptr = toesc;
+    while (*escptr != '\0') {
+        if (*inptr == *escptr) {
+            // Found it, skip the rest.
+            cnt++;
+            // if specialchar (' or ") then replace it with '\'' or "\"" so adds 2 chars
+            if (*inptr == specialchr) {
+                cnt += 2;
             }
-            escptr++;
+            break;
         }
-        inptr++;
-    }
-
-    inptr = instr;
-    retstr = (char *) mr_malloc(strlen(inptr) + cnt + 1);
-    retptr = retstr;
-
-    // Prepend specified characters with escape character.
-    while (*inptr != '\0') {
-        escptr = toesc;
-        while (*escptr != '\0') {
-            if (*inptr == *escptr) {
-                // Found it, skip the rest.
-                // if specialchar (' or ") then replace it with '\'' or "\"" so adds 2 chars
-                if (*inptr == specialchr) {
-                    *retptr = specialchr;
-                    retptr++;
-                    *retptr = escchr;
-                    retptr++;
-                    found = TRUE;
-                } else {
-                    *retptr = escchr;
-                    retptr++;
-                }
-                break;
+        escptr++;
+    }
+    inptr++;
+}
+
+inptr = instr;
+retstr = (char *) mr_malloc(strlen(inptr) + cnt + 1);
+retptr = retstr;
+
+// Prepend specified characters with escape character.
+while (*inptr != '\0') {
+    escptr = toesc;
+    while (*escptr != '\0') {
+        if (*inptr == *escptr) {
+            // Found it, skip the rest.
+            // if specialchar (' or ") then replace it with '\'' or "\"" so adds 2 chars
+            if (*inptr == specialchr) {
+                *retptr = specialchr;
+                retptr++;
+                *retptr = escchr;
+                retptr++;
+                found = TRUE;
+            } else {
+                *retptr = escchr;
+                retptr++;
             }
-            escptr++;
+            break;
         }
-        *retptr = *inptr;
+        escptr++;
+    }
+    *retptr = *inptr;
+    retptr++;
+    inptr++;
+    if (found) {
+        // finish to put the remaining specialchr
+        *retptr = specialchr;
         retptr++;
-        inptr++;
-        if (found) {
-            // finish to put the remaining specialchr
-            *retptr = specialchr;
-            retptr++;
-            found = FALSE;
-        }
-    }
-    *retptr = '\0';
-
-    return retstr;
+        found = FALSE;
+    }
+}
+*retptr = '\0';
+
+return(retstr);
 }
 
 /* Return a string containing the date */
 char *mr_date(void) {
-    
-    time_t tcurr;
-
-    tcurr = time(NULL);
-    return(ctime(&tcurr));
+
+time_t tcurr;
+
+tcurr = time(NULL);
+return(ctime(&tcurr));
 }
 
@@ -161 +161 @@
 /**
  * Remove all characters whose ASCII value is less than or equal to 32
- * (spaces and control characters) from both sides of @p in_out.
- * @param in_out The string to strip spaces/control characters from (modified).
+ * (spaces and control characters) from both sides of @p instr.
+ * @param instr The string to strip spaces/control characters from
+ * returns a newly allocated string without the spaces that needs to be freed
+ * by the caller
  */
-void mr_strip_spaces(char *in_out) {
-    int i = 0;
-    int j = 0;
-    size_t length;
-
-    if (in_out == NULL) {
-        return;
-    }
-    length = strlen(in_out);
-
-    /* Skip initial spaces and special chars */
-    for (i = 0; in_out[i] <= ' ' && i < (int)length ; i++);
-    /* Shift the string to the begining if needed */
-    if (i != 0) {
-        for (j = 0; i < (int)length ; i++, j++) {
-            in_out[j] = in_out[i];
-        }
-        /* Erase the end of the string if needed */
-        in_out[j] = '\0';
-    }
-
-    /* Skip final spaces and special chars */
-    for (i = (int)strlen(in_out) - 1; i >= 0  && in_out[i] <= ' '; i--);
-
-    /* The string now ends after that char */
-    i++;
-    in_out[i] = '\0';
+char *mr_strip_spaces(const char *instr) {
+
+char *p = NULL;
+char *q = NULL;
+char *outstr = NULL;
+
+if (instr == NULL) {
+    return(NULL);
+}
+p = instr;
+
+/* Skip initial spaces and special chars */
+while (*p <= ' ' && *p != '\0') {
+    p++;
+}
+mr_asprintf(outstr, "%s", p);
+q = outstr + strlen(outstr) -1;
+
+/* Skip final spaces and special chars */
+while (*q <= ' ' && q != outstr) {
+    q--;
+}
+
+/* The string now ends after that char */
+q++;
+*q = '\0';
+return(outstr);
 }