Changeset 36907

Timestamp:

Jun 18, 2014, 9:43:39 PM (12 years ago)

Author:

eugene

Message:

add simple getword, skipword functions

Location:

branches/eam_branches/ipp-20140610/Ohana/src/libohana

Files:

• include/ohana.h (modified) (1 diff)
• src/string.c (modified) (1 diff)

branches/eam_branches/ipp-20140610/Ohana/src/libohana/include/ohana.h

@@ -267 +267 @@
 char   *strsubs                PROTO((char *string, char *match, char *with));
 
+char   *getword                PROTO((char *string));
+char   *skipword               PROTO((char *string));
+
 /* in findexec.c */
 char   *pathname               PROTO((char *name));

branches/eam_branches/ipp-20140610/Ohana/src/libohana/src/string.c

@@ -402 +402 @@
   return (q);
 }
+
+// return a newly allocated string containing the first complete set of non-whitespace
+char *getword (char *string) {
+
+  int i, j;
+  char *word;
+
+  if (!string) return (NULL);
+
+  // find the end of the whitespace (is there any non-whitespace?)
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
+  if (!string[i]) return (NULL);
+
+  for (j = i; string[j] && !OHANA_WHITESPACE(string[j]); j++);
+  word = strncreate (&string[i], j - i);
+  return (word);
+}
+
+// returns a pointer to the next word, or NULL if there is not a next word
+char *skipword (char *string) {
+
+  int i;
+
+  if (!string) return (NULL);
+
+  // find the end of the whitespace (is there any non-whitespace?)
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
+  if (!string[i]) return (NULL);
+
+  // find the end of the non-whitespace (this word)
+  while (string[i] && !OHANA_WHITESPACE(string[i])) i++;
+
+  // find the end of the following whitespace
+  while (string[i] &&  OHANA_WHITESPACE(string[i])) i++;
+  if (!string[i]) return (NULL);
+
+  return (&string[i]);
+}
+