Changeset 1168 in MondoRescue for branches/stable/monitas/from-mondo.c

Timestamp:

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

Author:

Bruno Cornec

Message:

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

File:

• branches/stable/monitas/from-mondo.c (modified) (5 diffs)

branches/stable/monitas/from-mondo.c

@@ -6 +6 @@
 
 #include "structs.h"
+#include "mr_str.h"
 
 
@@ -13 +14 @@
 bool does_file_exist (char *);
 int make_hole_for_file (char *);
-void strip_spaces(char*);
 
 
@@ -53 +53 @@
       pclose (fin);
     }
-  strip_spaces (result);
+  mr_strip_spaces (result);
   return (result);
 }
@@ -124 +124 @@
       incoming[i]='\0';
 */
-      strip_spaces (incoming);
+      mr_strip_spaces (incoming);
       log_it (debug, incoming);
     }
@@ -204 +204 @@
 }
 
-
-
-
-
-
-
-
-
-/*************************************************************************
- * strip_spaces() -- Hugo Rabson                                         *
- *                   rewitten Stefan Huebner                             *
- *                                                                       *
- * Purpose:   remove leading whitespaces and control characters, replace *
- *            TABs by SPACES, remove previous char when followed with BS,*
- *            skip control chars, terminate string with '\0' when CR or  *
- *            NL is detected                                             *
- *            afterwards remove trailing whitespace                      *
- * Called by:                                                            *
- * Returns:                                                              *
- *************************************************************************/
-void
-strip_spaces (char *in_out)
-{
-    char *r, *w;
-    r = w = in_out;             // initialize read and write pointer
-
-    while ( *r && *r <= ' ' )
-        ++r;                    // skip leading whitespace and control chars
-
-    for ( ; *r ; ++r )          // until end of existing string do:
-      {
-        if (*r == '\t')                 // TAB
-          { *w++ = ' ';                     // write SPACE instead
-            continue; }
-        if (*r == (char) 8)             // BACKSPACE
-          { if (w > in_out) --w;            // remove previous character (if any ;-)
-            continue; }
-        if (*r == '\n' || *r == '\r')   // CR and LF
-            break;                          // terminate copying
-        if (*r < ' ')                   // Control chars
-            continue;                       // are ignored (skipped)
-        *w++ = *r;                      // all other chars are copied
-      }
-    // all characters are copied
-    *w = '\0';                  // terminate the copied string
-    for (--w; w>in_out && *w == ' '; --w)
-        *w = '\0';              // remove trailing whitespaces
-    return;
-    /** buffers ******************************************************/
-//  char tmp[MAX_STR_LEN+1];
-
-    /** pointers *****************************************************/
-//  char *p;
-
-    /** int *********************************************************/
-//  int i;
-
-    /** end vars ****************************************************/
-/*  for (i = 0; in_out[i] <= ' ' && i < strlen (in_out); i++);
-  strcpy (tmp, in_out + i);
-  for (i = strlen (tmp); i>0 && tmp[i - 1] <= 32; i--);
-  tmp[i] = '\0';
-  for (i = 0; i < 80; i++)
-    {
-      in_out[i] = ' ';
-    }
-  in_out[i] = '\0';
-  i = 0;
-  p = tmp;
-  while (*p != '\0')
-    {
-      in_out[i] = *(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] == '\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';
-*/
-/*  for(i=strlen(in_out); i>0 && in_out[i-1]<=32; i--) {in_out[i-1]='\0';} */
-}
-
-
-
-
-
-
-
-
-
-
-