Changeset 2421 in MondoRescue for branches/2.2.10/mondo/src/lib/mr_str.c

Timestamp:

Sep 24, 2009, 3:50:38 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Remove some compiler warnings on main
• Adds function mr_chomp and mr_strip_char and use them in mr_date and call_program_and_get_last_line_of_output
• Fix call_program_and_get_last_line_of_output to return the right result using a temp file instead of popen
• Fix an issue in mr_getline_int in case of eof (returns now an empty string)
• Sequencing of Init of bkpinfo reviewed

File:

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

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

@@ -104 +104 @@
 }
 
-/* Return a string containing the date */
-char *mr_date(void) {
-    
-    time_t tcurr;
-
-    tcurr = time(NULL);
-    return(ctime(&tcurr));
-}
-
-
 /**
- * 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).
+ * 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_spaces(char *in_out) {
+void mr_strip_char(char *in_out, char *caracs) {
     int i = 0;
     int j = 0;
-    size_t length;
+    int length = 0;
 
+    if (caracs == NULL) {
+        return;
+    }
     if (in_out == NULL) {
         return;
     }
-    length = strlen(in_out);
+    length = (int)strlen(in_out);
 
-    /* Skip initial spaces and special chars */
-    for (i = 0; in_out[i] <= ' ' && i < (int)length ; i++);
+    /* 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 < (int)length ; i++, j++) {
+        for (j = 0; i < length ; i++, j++) {
             in_out[j] = in_out[i];
         }
@@ -142 +135 @@
 
     /* Skip final spaces and special chars */
-    for (i = (int)strlen(in_out) - 1; i >= 0  && in_out[i] <= ' '; i--);
+    for (i = (int)strlen(in_out) - 1; i >= 0  && index(caracs, in_out[i]) != NULL; i--);
 
     /* The string now ends after that char */
@@ -148 +141 @@
     in_out[i] = '\0';
 }
+
+/**
+ * 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).
+ */
+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);
+}
+
+/*
+ * 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);
+}
+
+