Add some more stuff -- {get|set}mntent, getline, getdelim, etc.

3 files changed, 103 insertions, 1 deletions

diff --git a/libc/stdio/Makefile b/libc/stdio/Makefile
index 2061a745d..5b0b16132 100644
--- a/libc/stdio/Makefile
+++ b/libc/stdio/Makefile
@@ -36,7 +36,7 @@ MOBJ2=printf.o sprintf.o fprintf.o vprintf.o vsprintf.o vfprintf.o snprintf.o vs
 MSRC3=scanf.c
 MOBJ3=scanf.o sscanf.o fscanf.o vscanf.o vsscanf.o vfscanf.o
 
-CSRC=dputs.c popen.c perror.c remove.c
+CSRC=dputs.c popen.c perror.c remove.c getdelim.c getline.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 OBJS=$(MOBJ) $(MOBJ2) $(MOBJ3) $(COBJS)
 
diff --git a/libc/stdio/getdelim.c b/libc/stdio/getdelim.c
new file mode 100644
index 000000000..99d48bb32
--- /dev/null
+++ b/libc/stdio/getdelim.c
@@ -0,0 +1,70 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * getdelim for uclibc
+ *
+ * Copyright (C) 2000 by Lineo, inc.  Written by Erik Andersen
+ * <andersen@lineo.com>, <andersee@debian.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <errno.h>
+
+
+/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
+   (and null-terminate it). *LINEPTR is a pointer returned from malloc (or
+   NULL), pointing to *N characters of space.  It is realloc'd as
+   necessary.  Returns the number of characters read (not including the
+   null delimiter), or -1 on error or EOF.  */
+size_t getdelim(char **linebuf, size_t *linebufsz, int delimiter, FILE *file)
+{
+	static const int GROWBY = 80; /* how large we will grow strings by */
+
+	int ch;
+	int idx = 0;
+
+	if (file == NULL || linebuf==NULL || *linebuf == NULL || linebufsz == NULL) {
+	    errno=EINVAL;
+	    return -1;
+	}
+
+	while (1) {
+		ch = fgetc(file);
+		if (ch == EOF)
+			break;
+		/* grow the line buffer as necessary */
+		while (idx > *linebufsz-2) {
+			*linebuf = realloc(*linebuf, *linebufsz += GROWBY);
+			if (!*linebuf) {
+				errno=ENOMEM;
+				return -1;
+			}
+		}
+		*linebuf[idx++] = (char)ch;
+		if ((char)ch == delimiter)
+			break;
+	}
+
+	if (idx != 0)
+	    *linebuf[idx] = 0;
+	return idx;
+}
+
diff --git a/libc/stdio/getline.c b/libc/stdio/getline.c
new file mode 100644
index 000000000..38440e1bf
--- /dev/null
+++ b/libc/stdio/getline.c
@@ -0,0 +1,32 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * getline for uclibc
+ *
+ * Copyright (C) 2000 by Lineo, inc.  Written by Erik Andersen
+ * <andersen@lineo.com>, <andersee@debian.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <stddef.h>
+#include <stdio.h>
+
+/* Basically getdelim() with the delimiter hard wired to '\n' */
+size_t getline(char **linebuf, size_t *n, FILE *file)
+{
+  return (getdelim (linebuf, n, '\n', file));
+}
+