# HG changeset patch
# User lost
# Date 1266038480 0
# Node ID 2eb058346cade2709a8432a18a0330a675561cc6
# Parent  619fd6ad4ab908b41bfae9484449bd936ca281fe
Added string module and expanded stringlist module

diff -r 619fd6ad4ab9 -r 2eb058346cad lwlib/Makefile.am
--- a/lwlib/Makefile.am	Sat Feb 13 05:20:55 2010 +0000
+++ b/lwlib/Makefile.am	Sat Feb 13 05:21:20 2010 +0000
@@ -1,3 +1,3 @@
 noinst_LIBRARIES = liblw.a
-liblw_a_SOURCES = lw_alloc.c lw_stringlist.c
-EXTRA_DIST = lw_alloc.h lw_stringlist.h
+liblw_a_SOURCES = lw_alloc.c lw_stringlist.c lw_string.c
+EXTRA_DIST = lw_alloc.h lw_stringlist.h lw_string.h
diff -r 619fd6ad4ab9 -r 2eb058346cad lwlib/lw_string.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lwlib/lw_string.c	Sat Feb 13 05:21:20 2010 +0000
@@ -0,0 +1,70 @@
+/*
+lw_string.c
+
+Copyright © 2010 William Astle
+
+This file is part of LWTOOLS.
+
+LWTOOLS is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation, either version 3 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <config.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+#define ___lw_string_c_seen___
+#include "lw_alloc.h"
+#include "lw_string.h"
+
+char *lw_strdup(const char *s)
+{
+	char *r;
+	
+	if (!s)
+		s = "(null)";
+
+	r = lw_alloc(strlen(s) + 1);
+	strcpy(r, s);
+	return r;
+}
+
+char *lw_token(const char *s, int sep, const char **ap)
+{
+	const char *p;
+	char *r;
+
+	if (!s)
+		return NULL;
+	
+	p = strchr(s, sep);
+	if (!p)
+	{
+		if (ap)
+			*ap = NULL;
+		return lw_strdup(s);
+	}
+	
+	r = lw_alloc(p - s + 1);
+	strncpy(r, (char *)s, p - s);
+	r[p - s] = '\0';
+	
+	if (ap)
+	{
+		while (*p && *p == sep)
+			p++;
+		*ap = p;
+	}
+	return r;
+}
diff -r 619fd6ad4ab9 -r 2eb058346cad lwlib/lw_string.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lwlib/lw_string.h	Sat Feb 13 05:21:20 2010 +0000
@@ -0,0 +1,35 @@
+/*
+lw_string.h
+
+Copyright © 2010 William Astle
+
+This file is part of LWTOOLS.
+
+LWTOOLS is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation, either version 3 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef ___lw_string_h_seen___
+#define ___lw_string_h_seen___
+
+
+#ifdef ___lw_string_c_seen___
+
+#else /* def ___lw_string_c_seen___ */
+
+extern char *lw_strdup(const char *s);
+extern char *lw_token(const char *s, int sep, const char **ap);
+
+#endif /* def ___lw_string_c_seen___ */
+
+#endif /* ___lw_string_h_seen___ */
\ No newline at end of file
diff -r 619fd6ad4ab9 -r 2eb058346cad lwlib/lw_stringlist.c
--- a/lwlib/lw_stringlist.c	Sat Feb 13 05:20:55 2010 +0000
+++ b/lwlib/lw_stringlist.c	Sat Feb 13 05:21:20 2010 +0000
@@ -21,9 +21,11 @@
 
 #include <config.h>
 
+#include <stdlib.h>
+
 #define ___lw_stringlist_c_seen___
 #include "lw_stringlist.h"
-
+#include "lw_string.h"
 #include "lw_alloc.h"
 
 lw_stringlist_t lw_stringlist_create(void)
@@ -43,3 +45,33 @@
 		lw_free(S);
 	}
 }
+
+void lw_stringlist_addstring(lw_stringlist_t S, char *str)
+{
+	S -> strings = lw_realloc(S -> strings, sizeof(char *) * (S -> nstrings + 1));
+	S -> strings[S -> nstrings] = lw_strdup(str);
+	S -> nstrings++;
+}
+
+void lw_stringlist_reset(lw_stringlist_t S)
+{
+	S -> cstring = 0;
+}
+
+char *lw_stringlist_current(lw_stringlist_t S)
+{
+	if (S -> cstring >= S -> nstrings)
+		return NULL;
+	return S -> strings[S -> cstring];
+}
+
+char *lw_stringlist_next(lw_stringlist_t S)
+{
+	S -> cstring++;
+	return lw_stringlist_current(S);
+}
+
+int lw_stringlist_nstrings(lw_stringlist_t S)
+{
+	return S -> nstrings;
+}
diff -r 619fd6ad4ab9 -r 2eb058346cad lwlib/lw_stringlist.h
--- a/lwlib/lw_stringlist.h	Sat Feb 13 05:20:55 2010 +0000
+++ b/lwlib/lw_stringlist.h	Sat Feb 13 05:21:20 2010 +0000
@@ -29,14 +29,21 @@
 {
 	char **strings;
 	int nstrings;
+	int cstring;
 };
 typedef struct lw_stringlist_priv * lw_stringlist_t;
 
 #else /* def ___lw_stringlist_c_seen___ */
 
 typedef void * lw_stringlist_t;
-
+extern lw_stringlist_t lw_stringlist_create(void);
+extern void lw_stringlist_destroy(lw_stringlist_t S);
+extern void lw_stringlist_addstring(lw_stringlist_t S, char *str);
+extern void lw_stringlist_reset(lw_stringlist_t S);
+extern char *lw_stringlist_current(lw_stringlist_t S);
+extern char *lw_stringlist_next(lw_stringlist_t S);
+extern int lw_stringlist_nstrings(lw_stringlist_t S);
 
 #endif /* def ___lw_stringlist_c_seen___ */
 
-#endif /* ___lw_stringlist_h_seen___ */
\ No newline at end of file
+#endif /* ___lw_stringlist_h_seen___ */