Changeset 1168 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

Feb 15, 2007, 12:27:39 AM (18 years ago)

Author:

Bruno Cornec

Message:

strip_spaces => mr_strip_spaces in mr_str.c and corrected at the same time :-)

Location:

branches/stable/mondo/src/common

Files:

• libmondo-archive.c (modified) (1 diff)
• libmondo-devices.c (modified) (9 diffs)
• libmondo-fork.c (modified) (3 diffs)
• libmondo-raid.c (modified) (1 diff)
• libmondo-string-EXT.h (modified) (1 diff)
• libmondo-string.c (modified) (3 diffs)
• libmondo-string.h (modified) (1 diff)
• newt-specific.c (modified) (3 diffs)

branches/stable/mondo/src/common/libmondo-archive.c

@@ -1245 +1245 @@
 if=/dev/urandom bs=16 count=1 2> /dev/null | \
 hexdump | tr -s ' ' '0' | head -n1"));
-    strip_spaces(g_serial_string);
+    mr_strip_spaces(g_serial_string);
     strcat(g_serial_string, "...word.");
     mr_msg(2, "g_serial_string = '%s'", g_serial_string);

branches/stable/mondo/src/common/libmondo-devices.c

@@ -19 +19 @@
 #include "mr_mem.h"
 #include "mr_msg.h"
+#include "mr_str.h"
 
 #include <sys/ioctl.h>
@@ -1108 +1109 @@
 
     FILE *pin = NULL;
-    bool retval;
+    bool retval = FALSE;
     size_t n = 0;
     assert_string_is_neither_NULL_nor_zerolength(format);
@@ -1127 +1128 @@
     if (!pin) {
         log_OS_error("Unable to read good formats");
-        retval = FALSE;
     } else {
         mr_getline(&good_formats, &n , pin);
@@ -1133 +1133 @@
             log_OS_error("Cannot pclose good formats");
         }
-        strip_spaces(good_formats);
+        mr_strip_spaces(good_formats);
         // " ntfs 7 " -- um, cheating much? :)
         mr_asprintf(&tmp, " %s swap lvm raid ntfs 7 ",good_formats);
@@ -1141 +1141 @@
         if (strstr(good_formats, format_sz)) {
             retval = TRUE;
-        } else {
-            retval = FALSE;
         }
         mr_free(good_formats);
@@ -1704 +1702 @@
             // check whether already mounted - we better remove
             // surrounding spaces and trailing '/' for this
-            /* BERLIOS: Useless
-            strip_spaces(bkpinfo->nfs_mount);
-            */
+            mr_strip_spaces(bkpinfo->nfs_mount);
             if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
                 bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
@@ -1768 +1764 @@
         mr_free(tmp);
         // check whether writable - we better remove surrounding spaces for this
-        strip_spaces(bkpinfo->nfs_remote_dir);
+        mr_strip_spaces(bkpinfo->nfs_remote_dir);
         mr_asprintf(&command, "echo hi > '%s/%s/.dummy.txt'", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir);
@@ -1786 +1782 @@
             mr_free(tmp);
             // check whether writable - we better remove surrounding space s for this
-            strip_spaces(bkpinfo->nfs_remote_dir);
+            mr_strip_spaces(bkpinfo->nfs_remote_dir);
 
             mr_free(command);
@@ -2293 +2289 @@
     for (mr_getline(&current_drive, &n, pdrives); !feof(pdrives);
          mr_getline(&current_drive, &n, pdrives)) {
-        strip_spaces(current_drive);
+        mr_strip_spaces(current_drive);
         log_it("looking at drive %s's MBR", current_drive);
         if (does_string_exist_in_boot_block(current_drive, "GRUB")) {

branches/stable/mondo/src/common/libmondo-fork.c

@@ -5 +5 @@
 #include "mr_mem.h"
 #include "mr_msg.h"
+#include "mr_str.h"
+
 #include "mondostructures.h"
 #include "libmondo-fork.h"
@@ -55 +57 @@
         log_OS_error("Unable to popen call");
     }
-    strip_spaces(result);
+    mr_strip_spaces(result);
     mr_free(tmp);
     return (result);
@@ -246 +248 @@
             }
             /* end of patch */
-            strip_spaces(incoming);
+            mr_strip_spaces(incoming);
             if ((res == 0 && log_if_success)
                 || (res != 0 && log_if_failure)) {

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

@@ -442 +442 @@
     for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
          fgets(incoming, MAX_STR_LEN - 1, fin)) {
-        strip_spaces(incoming);
+        mr_strip_spaces(incoming);
         p = strchr(incoming, ' ');
         if (strlen(incoming) < 3 || incoming[0] == '#' || !p) {

branches/stable/mondo/src/common/libmondo-string-EXT.h

@@ -27 +27 @@
 extern int strcmp_inc_numbers(char *stringA, char *stringB);
 extern char *strip_afio_output_line(char *input);
-extern void strip_spaces(char *in_out);
 extern char *trim_empty_quotes(char *incoming);
 extern char *truncate_to_drive_name(char *partition);

branches/stable/mondo/src/common/libmondo-string.c

@@ -9 +9 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
+
 #include "mondostructures.h"
 #include "libmondo-string.h"
@@ -98 +100 @@
     for (p = in_out; *p == ' '; p++);
     strcpy(scratch, p);
-    strip_spaces (scratch);
+    mr_strip_spaces (scratch);
     len = (int) strlen(scratch);
     mid = width / 2;
@@ -737 +739 @@
 
 
-
-/**
- * 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 strip_spaces(char *in_out)
-{
-    /*@ buffers ***************************************************** */
-    char *tmp = NULL;
-
-    /*@ pointers **************************************************** */
-    char *p;
-
-    /*@ int ******************************************************** */
-    int i;
-    int j;
-    int original_incoming_length;
-
-    /*@ end vars *************************************************** */
-
-    assert(in_out != NULL);
-    original_incoming_length = (int)strlen(in_out);
-
-    for (i = 0; (in_out[i] <= ' ' || in_out[i] == '\t' || in_out[i] == '\r') 
-                    && i < original_incoming_length ; i++);
-    for (j = 0; in_out[i] > ' ' && in_out[i] != '\t' && in_out[i] != '\r' 
-                    && i < original_incoming_length ; i++, j++) {
-        in_out[j] = in_out[i];
-    }
-    in_out[j] = '\0';
-
-    /* BERLIOS: Old code 
-    malloc_string(tmp);
-    strcpy(tmp, in_out + i);
-    for (i = (int) strlen(tmp); i > 0 && tmp[i - 1] <= 32; i--);
-    tmp[i] = '\0';
-    for (i = 0; i < original_incoming_length && MAX_STR_LEN; i++) {
-        in_out[i] = ' ';
-    }
-    in_out[i] = '\0';
-    i = 0;
-    p = tmp;
-    while (*p != '\0') {
-        in_out[i] = *p;
-        p++;
-        in_out[i + 1] = '\0';
-        if (in_out[i] < 32 && i > 0) {
-            if (in_out[i] == 8) {
-                i--;
-            } else if (in_out[i] == 9) {
-                in_out[i++] = ' ';
-            } else if (in_out[i] == '\r')   // added 1st October 2003 -- FIXME
-            {
-                strcpy(tmp, in_out + i);
-                strcpy(in_out, tmp);
-                i = -1;
-                continue;
-            } else if (in_out[i] == '\t') {
-                for (i++; i % 5; i++);
-            } else if (in_out[i] >= 10 && in_out[i] <= 13) {
-                break;
-            } else {
-                i--;
-            }
-        } else {
-            i++;
-        }
-    }
-    in_out[i] = '\0';
-    mr_free(tmp);
-    */
-}
-
-
 /**
  * If there are double quotes "" around @p incoming then remove them.

branches/stable/mondo/src/common/libmondo-string.h

@@ -22 +22 @@
 int strcmp_inc_numbers(char *stringA, char *stringB);
 char *strip_afio_output_line(char *input);
-void strip_spaces(char *in_out);
 char *trim_empty_quotes(char *incoming);
 char *truncate_to_drive_name(char *partition);

branches/stable/mondo/src/common/newt-specific.c

@@ -21 +21 @@
 #include "mr_mem.h"
 #include "mr_msg.h"
+#include "mr_str.h"
+
 #include "mondostructures.h"
 #include "newt-specific.h"
@@ -466 +468 @@
                     (void) fgets(err_log_lines[i], MAX_NEWT_COMMENT_LEN,
                                  fin);
-                    strip_spaces(err_log_lines[i]);
+                    mr_strip_spaces(err_log_lines[i]);
                     if (!strncmp(err_log_lines[i], "root:", 5)) {
                         strcpy(tmp, err_log_lines[i] + 6);
@@ -1259 +1261 @@
                 printf(")\n--> ");
                 (void) fgets(outstr, MAX_NEWT_COMMENT_LEN, stdin);
-                strip_spaces(outstr);
+                mr_strip_spaces(outstr);
                 for (i = 0; possible_responses[i]; i++) {
                     if (!strcmp(possible_responses[i], outstr)) {