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

Timestamp:

Jan 28, 2006, 6:42:59 PM (18 years ago)

Author:

bcornec

Message:

monitas latest version

File:

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

branches/stable/monitas/from-mondo.c

@@ -8 +8 @@
 
 
-extern void log_it_SUB(char*, t_loglevel, char*);
+//extern void log_it_SUB(char*, t_loglevel, char*);
 char *call_program_and_get_last_line_of_output(char*);
 int call_program_and_log_output (char *);
@@ -17 +17 @@
 
 
-extern char g_logfile[MAX_STR_LEN+1];
 
 
@@ -215 +214 @@
 /*************************************************************************
  * strip_spaces() -- Hugo Rabson                                         *
- *                                                                       *
- * Purpose:                                                              *
+ *                   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:                                                              *
@@ -223 +227 @@
 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];
+//  char tmp[MAX_STR_LEN+1];
 
     /** pointers *****************************************************/
-  char *p;
+//  char *p;
 
     /** int *********************************************************/
-  int i;
+//  int i;
 
     /** end vars ****************************************************/
-  for (i = 0; in_out[i] <= ' ' && i < strlen (in_out); i++);
+/*  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--);
@@ -277 +306 @@
     }
   in_out[i] = '\0';
+*/
 /*  for(i=strlen(in_out); i>0 && in_out[i-1]<=32; i--) {in_out[i-1]='\0';} */
 }