added sepsplit() in wordsplit.c

diff --git a/lib/lib.h b/lib/lib.h
index 2a106e7ff50d234d65ea46c7b76114d53c64f9cc..de5b4b8cac65b2935543a57add7e70aa4b1ed909 100644 (file)
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -128,6 +128,7 @@ int fls(u32);
 
 /* wordsplit.c */
 
 
 /* wordsplit.c */
 

+int sepsplit(byte *str, byte sep, byte **rec, uns max);

 int wordsplit(byte *, byte **, uns);
 
 /* pat(i)match.c: Matching of shell patterns */
 int wordsplit(byte *, byte **, uns);
 
 /* pat(i)match.c: Matching of shell patterns */

diff --git a/lib/wordsplit.c b/lib/wordsplit.c
index 6e2e792edd71b9ed62989c6cb7c7aefe4613f661..1a488f2e68d305e88424626eba549c753788ab61 100644 (file)
--- a/lib/wordsplit.c
+++ b/lib/wordsplit.c
@@ -2,6 +2,7 @@
  *     Sherlock Library -- Word Splitting
  *
  *     (c) 1997 Martin Mares <mj@ucw.cz>
  *     Sherlock Library -- Word Splitting
  *
  *     (c) 1997 Martin Mares <mj@ucw.cz>

+ *     (c) 2004 Robert Spalek <robert@ucw.cz>

  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.


@@ -10,6 +11,24 @@
 #include "lib/lib.h"
 #include "lib/chartype.h"
 
 #include "lib/lib.h"
 #include "lib/chartype.h"
 

+#include <string.h>
+
+int
+sepsplit(byte *str, byte sep, byte **rec, uns max)
+{
+  uns cnt = 0;
+  while (1)
+  {
+    rec[cnt++] = str;
+    str = strchr(str, sep);
+    if (!str)
+      return cnt;
+    if (cnt >= max)
+      return -1;
+    *str++ = 0;
+  }
+}
+

 int
 wordsplit(byte *src, byte **dst, uns max)
 {
 int
 wordsplit(byte *src, byte **dst, uns max)
 {