Changeset 10073 for trunk/Ohana/src/opihi/lib.shell/string.c

Timestamp:

Nov 17, 2006, 5:04:25 PM (20 years ago)

Author:

eugene

Message:

added additional chars to whitespace checks

File:

• trunk/Ohana/src/opihi/lib.shell/string.c (modified) (15 diffs)

trunk/Ohana/src/opihi/lib.shell/string.c

@@ -3 +3 @@
 /**********************************************************************/
 /* returns a pointer to an isolated string containing the first word,
-   removing leading whitespace.  A "word" is a contiguous set of 
+   removing leading WHITESPACE.  A "word" is a contiguous set of 
    characters from the set: alphanumerics, and any of: / . _ -
-   Any other single, non-whitespace characters are considered to be 
+   Any other single, non-WHITESPACE characters are considered to be 
    complete words in themselves.  Any characters surrounded by quotes 
    make a single word 
@@ -17 +17 @@
   if (string == (char *) NULL) return ((char *) NULL);
 
-  for (i = 0; whitespace (string[i]); i++);
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
   if (string[i] == 0) return ((char *)NULL);
   if (string[i] == ';') {
@@ -63 +63 @@
 
 
-  for (j = i; (string[j] != 0) && (string[j] != ';') && !whitespace(string[j]); j++);
+  for (j = i; (string[j] != 0) && (string[j] != ';') && !OHANA_WHITESPACE(string[j]); j++);
   word = strncreate (&string[i], j - i);
   return (word);
@@ -70 +70 @@
 
 /* returns a pointer to an isolated string containing the first command,
-   removing leading whitespace.  A command ends with the first non whitespace */
+   removing leading WHITESPACE.  A command ends with the first non WHITESPACE */
 char *thiscomm (char *string) {
 
@@ -78 +78 @@
   if (string == (char *) NULL) return ((char *) NULL);
 
-  for (i = 0; whitespace (string[i]); i++);
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
   if (string[i] == 0) return ((char *)NULL);
 
-  for (j = i; ((string[j] != 0) && !whitespace (string[j])); j++);
+  for (j = i; ((string[j] != 0) && !OHANA_WHITESPACE (string[j])); j++);
   if (i == j) return ((char *) NULL);
 
@@ -122 +122 @@
   if (string == (char *) NULL) return ((char *) NULL);
 
-  for (i = 0; whitespace (string[i]); i++);
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
   if (string[i] == 0) return ((char *)NULL);
 
@@ -134 +134 @@
     }
     i++;
-    for (; (string[i] != 0) && whitespace (string[i]); i++);
+    for (; (string[i] != 0) && OHANA_WHITESPACE (string[i]); i++);
     if (string[i] == 0) return ((char *) NULL);
     return (&string[i]);
@@ -155 +155 @@
       return ((char *)NULL);
     }
-    for (; (string[i] != 0) && whitespace (string[i]); i++);
+    for (; (string[i] != 0) && OHANA_WHITESPACE (string[i]); i++);
     if (string[i] == 0) return ((char *) NULL);
     return (&string[i]);
@@ -161 +161 @@
 
   if (string[i] == ';') i++;
-  for (; (string[i] != 0) && (string[i] != ';') && !whitespace(string[i]); i++);
-  for (; (string[i] != 0) && whitespace (string[i]); i++);
+  for (; (string[i] != 0) && (string[i] != ';') && !OHANA_WHITESPACE(string[i]); i++);
+  for (; (string[i] != 0) && OHANA_WHITESPACE (string[i]); i++);
   if (string[i] == 0) return ((char *) NULL);
 
@@ -169 +169 @@
 
 /* returns a pointer to the next command, or (char *) NULL 
-   if there is not a next command.  A command is bounded by whitespace */
+   if there is not a next command.  A command is bounded by WHITESPACE */
 char *nextcomm (char *string) {
 
@@ -176 +176 @@
   if (string == (char *) NULL) return ((char *) NULL);
   
-  for (i = 0; (string[i] != 0) && !whitespace (string[i]); i++);
+  for (i = 0; (string[i] != 0) && !OHANA_WHITESPACE (string[i]); i++);
   if (string[i] == 0) return ((char *) NULL);
   
-  for (; whitespace (string[i]); i++);
+  for (; OHANA_WHITESPACE (string[i]); i++);
   if (string[i] == 0) return ((char *) NULL);
 
@@ -193 +193 @@
   if (c == (char *) NULL) return ((char *) NULL);
 
-  for (; !whitespace(*c) && (c >= string); c--);
+  for (; !OHANA_WHITESPACE(*c) && (c >= string); c--);
   if (c < string) return ((char *)NULL);
 
-  for (; whitespace(*c) && (c >= string); c--);
+  for (; OHANA_WHITESPACE(*c) && (c >= string); c--);
   if (c < string)
     return ((char *)NULL);
-  for (; !whitespace(*c) && (c >= string); c--);
+  for (; !OHANA_WHITESPACE(*c) && (c >= string); c--);
   c++;
   return (c);
@@ -207 +207 @@
 
 /* take a pointer to the beginning of a variable (ie $fred) and return
-   a pointer to the next thing (non whitespace) which is not part of the
+   a pointer to the next thing (non WHITESPACE) which is not part of the
    variable extract only the variable name */
 
@@ -224 +224 @@
   if (i == start) return ((char *) NULL);
 
-  for (j = i; whitespace (string[j]); j++);
+  for (j = i; OHANA_WHITESPACE (string[j]); j++);
   if (string[j] == 0) return ((char *)NULL);
 
@@ -240 +240 @@
   if (c == (char *) NULL) return ((char *) NULL);
 
-  for (; (c >= string) && whitespace(*c); c--);
+  for (; (c >= string) && OHANA_WHITESPACE(*c); c--);
   if (c < string) return ((char *)NULL);