Changeset 3193 in MondoRescue for branches/3.1/mondo/src/lib/mr_str.c

Timestamp:

Sep 29, 2013, 9:31:34 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Finish with backports from 3.1 for now. Still some work to do, but we will now make that version compile and work again and serve as a base

so the gettext patch can be added

File:

• branches/3.1/mondo/src/lib/mr_str.c (modified) (9 diffs)

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

@@ -12 +12 @@
 
 #include "mr_mem.h"
+
+// to get bool type
+#define _MY_STUFF_H_
+#include "my-stuff.h"
  
 /**
@@ -66 +70 @@
  * @note this function allocates memory that needs to be freed by caller
  **/
-char *mr_stresc(char *instr, char *toesc, const char escchr) {
+char *mr_stresc(char *instr, char *toesc, const char escchr, const char specialchr) {
     char *inptr = NULL;
     char *retstr = NULL;
@@ -72 +76 @@
     char *escptr = NULL;
     int cnt = 0;
+    bool found = FALSE;
 
     inptr = instr;
-
     // Count how many characters need escaping.
     while (*inptr != '\0') {
@@ -82 +86 @@
                 // Found it, skip the rest.
                 cnt++;
+                // if specialchar (' or ") then replace it with '\'' or "\"" so adds 2 chars
+                if (*inptr == specialchr) {
+                    cnt += 2;
+                }
                 break;
             }
@@ -88 +96 @@
         inptr++;
     }
+
     inptr = instr;
-
     retstr = (char *) mr_malloc(strlen(inptr) + cnt + 1);
     retptr = retstr;
@@ -99 +107 @@
             if (*inptr == *escptr) {
                 // Found it, skip the rest.
-                *retptr = escchr;
-                retptr++;
+                // 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;
             }
@@ -108 +125 @@
         retptr++;
         inptr++;
+        if (found) {
+            // finish to put the remaining specialchr
+            *retptr = specialchr;
+            retptr++;
+            found = FALSE;
+        }
     }
     *retptr = '\0';
@@ -114 +137 @@
 }
 
-/**
- * Remove all characters in caracs from begining and end of string @p in_out
- * @param in_out The string to strip char characters from (modified).
+/* Return a string containing the date */
+char *mr_date(void) {
+    
+    time_t tcurr;
+
+    tcurr = time(NULL);
+    return(ctime(&tcurr));
+}
+
+/* Return an allocated string containing the date
+char *mr_date(void) {
+    
+    time_t tcurr;
+    char *tmp = NULL;
+
+    tcurr = time(NULL);
+    mr_asprintf(tmp, "%s", ctime(&tcurr));
+    mr_chomp(tmp);
+    return(tmp);
+}
  */
-void mr_strip_char(char *in_out, char *caracs) {
-    int i = 0;
-    int j = 0;
-    int length = 0;
-
-    if (caracs == NULL) {
-        return;
-    }
-    if (in_out == NULL) {
-        return;
-    }
-    length = (int)strlen(in_out);
-
-    /* Skip initial caracs */
-    for (i = 0; index(caracs, in_out[i]) != NULL && i < length ; i++);
-
-    /* Shift the string to the begining if needed */
-    if (i != 0) {
-        for (j = 0; i < length ; i++, j++) {
-            in_out[j] = in_out[i];
-        }
-        /* Erase the end of the string if needed */
-        j++;
-        in_out[j] = '\0';
-    }
-
-    /* Skip final spaces and special chars */
-    for (i = (int)strlen(in_out) - 1; i >= 0  && index(caracs, in_out[i]) != NULL; i--);
-
-    /* The string now ends after that char */
-    i++;
-    in_out[i] = '\0';
-}
 
 /**
@@ -158 +165 @@
  */
 void mr_strip_spaces(char *in_out) {
-
-    int i;
-    char *tmp = NULL;
-
-    mr_asprintf(tmp, "");
-
-    /* Build the string of char to avoid: ctrl char up to space*/
-    for (i = 0; i <= ' '; i++) {
-        mr_strcat(tmp, "%c", i);
-    }
-    
-    mr_strip_char(in_out, tmp);
-    mr_free(tmp);
-}
+    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 */
+        j++;
+        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';
+}
+
 
 /*
  * Remove '\n' char from both sides of @p in_out.
  * @param in_out The string to strip characters from (modified).
- */
+
 void mr_chomp(char *in_out) {
 
     mr_strip_char(in_out, "\n");
 }
-
-/* Return an allocated string containing the date */
-char *mr_date(void) {
-    
-    time_t tcurr;
-    char *tmp = NULL;
-
-    tcurr = time(NULL);
-    mr_asprintf(tmp, "%s", ctime(&tcurr));
-    mr_chomp(tmp);
-    return(tmp);
-}
-
-
+*/
+
+/**
+ * Remove all characters in caracs from begining and end of string @p in_out
+ * @param in_out The string to strip char characters from (modified).
+
+void mr_strip_char(char *in_out, char *caracs) {
+    int i = 0;
+    int j = 0;
+    size_t length = 0;
+
+    if (caracs == NULL) {
+        return;
+    }
+    if (in_out == NULL) {
+        return;
+    }
+    length = strlen(in_out);
+
+    /* Skip initial caracs */
+    for (i = 0; index(caracs, in_out[i]) != NULL && 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 */
+        j++;
+        in_out[j] = '\0';
+    }
+
+    /* Skip final caracs */
+    for (i = (int)strlen(in_out) - 1; i >= 0  && index(caracs, in_out[i]) != NULL; i--);
+
+    /* The string now ends after that char */
+    i++;
+    in_out[i] = '\0';
+}
+*/
+