nasmlib.c: Introduce nasm_get_word helper

For easier space separated words extraction
from a text stream.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>

diff --git a/nasmlib.c b/nasmlib.c
index 2351101f190db954092e30a547ca0e1e0cbb21ce..812f6400500ab434f720cd48acca26901fd33e6d 100644 (file)
--- a/nasmlib.c
+++ b/nasmlib.c
@@ -704,6 +704,27 @@ char *nasm_trim_spaces(char *p)
     return p;
 }
 
+/*
+ * return the word extracted from a stream
+ * or NULL if nothing left
+ */
+char *nasm_get_word(char *p, char **tail)
+{
+    char *word = nasm_skip_spaces(p);
+    char *next = nasm_skip_word(word);
+
+    if (word && *word) {
+        if (*next)
+            *next++ = '\0';
+    } else
+        word = next = NULL;
+
+    /* NOTE: the tail may start with spaces */
+    *tail = next;
+
+    return word;
+}
+
 /*
  * extract option and value from a string formatted as "opt = val"
  * and return pointer to the next string or NULL on empty string

diff --git a/nasmlib.h b/nasmlib.h
index f103e62905bda44251ad8329cd56ee1e25abac54..5efb0b4c2608811e09eff518116633fb99d99259 100644 (file)
--- a/nasmlib.h
+++ b/nasmlib.h
@@ -394,6 +394,7 @@ char *nasm_skip_word(const char *p);
 char *nasm_zap_spaces_fwd(char *p);
 char *nasm_zap_spaces_rev(char *p);
 char *nasm_trim_spaces(char *p);
+char *nasm_get_word(char *p, char **tail);
 char *nasm_opt_val(char *p, char **opt, char **val);
 
 const char *prefix_name(int);