Add in tmpnam() support from David Whedon <dwhedon@gordian.com>,

rework include/stdio.h, and fix up the resultant damage.

10 files changed, 138 insertions, 29 deletions

diff --git a/libc/stdio/Makefile b/libc/stdio/Makefile
index fed74e216..49408c95a 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 getdelim.c getline.c
+CSRC=dputs.c popen.c perror.c remove.c getdelim.c getline.c tmpnam.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 OBJS=$(MOBJ) $(MOBJ2) $(MOBJ3) $(COBJS)
 
diff --git a/libc/stdio/getdelim.c b/libc/stdio/getdelim.c
index 682ed2866..6f9ebb4fb 100644
--- a/libc/stdio/getdelim.c
+++ b/libc/stdio/getdelim.c
@@ -34,18 +34,28 @@
    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)
+ssize_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) {
+	if ((file == NULL || linebuf==NULL || *linebuf == NULL || *linebufsz == 0)
+			&& !(*linebuf == NULL && *linebufsz ==0 )) {
 	    errno=EINVAL;
 	    return -1;
 	}
 
+	if (*linebuf == NULL && *linebufsz == 0){
+		*linebuf = malloc(GROWBY);
+		if (!*linebuf) {
+			errno=ENOMEM;
+			return -1;
+		}
+		*linebufsz += GROWBY;
+	}
+
 	while (1) {
 		ch = fgetc(file);
 		if (ch == EOF)
@@ -65,6 +75,8 @@ size_t getdelim(char **linebuf, size_t *linebufsz, int delimiter, FILE *file)
 
 	if (idx != 0)
 	    (*linebuf)[idx] = 0;
+	else if ( ch == EOF )
+		return -1;
 	return idx;
 }
 
diff --git a/libc/stdio/getline.c b/libc/stdio/getline.c
index c6896fca7..ecc48ffac 100644
--- a/libc/stdio/getline.c
+++ b/libc/stdio/getline.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 
 /* Basically getdelim() with the delimiter hard wired to '\n' */
-size_t getline(char **linebuf, size_t *n, FILE *file)
+ssize_t getline(char **linebuf, size_t *n, FILE *file)
 {
   return (getdelim (linebuf, n, '\n', file));
 }
diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c
index a07c411eb..7a00e570f 100644
--- a/libc/stdio/popen.c
+++ b/libc/stdio/popen.c
@@ -4,16 +4,14 @@
 #include <sys/wait.h>
 
 
-FILE *popen(command, rw)
-char *command;
-char *rw;
+FILE *popen (const char *command, const char *modes)
 {
 	int pipe_fd[2];
 	int pid, reading;
 
 	if (pipe(pipe_fd) < 0)
 		return NULL;
-	reading = (rw[0] == 'r');
+	reading = (modes[0] == 'r');
 
 	pid = vfork();
 	if (pid < 0) {
@@ -34,11 +32,10 @@ char *rw;
 	}
 
 	close(pipe_fd[reading]);
-	return fdopen(pipe_fd[!reading], rw);
+	return fdopen(pipe_fd[!reading], modes);
 }
 
-int pclose(fd)
-FILE *fd;
+int pclose(FILE *fd)
 {
 	int waitstat;
 
diff --git a/libc/stdio/scanf.c b/libc/stdio/scanf.c
index 8ce590684..51d30cdde 100644
--- a/libc/stdio/scanf.c
+++ b/libc/stdio/scanf.c
@@ -3,14 +3,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-
-#ifdef __STDC__
 #include <stdarg.h>
-#define va_strt      va_start
-#else
-#include <varargs.h>
-#define va_strt(p,i) va_start(p)
-#endif
 
 #ifdef L_scanf
 #ifdef __STDC__
@@ -24,7 +17,7 @@ va_dcl
 	va_list ptr;
 	int rv;
 
-	va_strt(ptr, fmt);
+	va_start(ptr, fmt);
 	rv = vfscanf(stdin, fmt, ptr);
 	va_end(ptr);
 	return rv;
@@ -49,7 +42,7 @@ va_dcl
 	va_list ptr;
 	int rv;
 
-	va_strt(ptr, fmt);
+	va_start(ptr, fmt);
 	string->bufpos = (unsigned char *) ((void *) sp);
 	rv = vfscanf(string, fmt, ptr);
 	va_end(ptr);
@@ -70,7 +63,7 @@ va_dcl
 	va_list ptr;
 	int rv;
 
-	va_strt(ptr, fmt);
+	va_start(ptr, fmt);
 	rv = vfscanf(fp, fmt, ptr);
 	va_end(ptr);
 	return rv;
diff --git a/libc/stdio/stdio.c b/libc/stdio/stdio.c
index b34631154..6c8c69380 100644
--- a/libc/stdio/stdio.c
+++ b/libc/stdio/stdio.c
@@ -778,7 +778,7 @@ FILE *fp;
 void setbuffer(fp, buf, size)
 FILE *fp;
 char *buf;
-int size;
+size_t size;
 {
 	fflush(fp);
 
diff --git a/libc/stdio/tmpnam.c b/libc/stdio/tmpnam.c
new file mode 100644
index 000000000..3a3ef67ca
--- /dev/null
+++ b/libc/stdio/tmpnam.c
@@ -0,0 +1,68 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * tmpnam for uClibc
+ *
+ * Copyright (C) 2000 by David Whedon <dwhedon@gordian.com>
+ *
+ * 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 Library 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
+ *
+ * Modified by Erik Andersen <anderse@debian.org> to be reentrant for
+ * the case when S != NULL...
+ */
+
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+
+static char tmpnam_buffer[L_tmpnam];
+
+
+/* Generate a unique filename in /tmp */
+char * tmpnam (char *s)
+{
+    int num __attribute__ ((unused));       /* UNINITIALIZED, so we get whatever crap
+					     happens to be in memory, producing (in theory)
+					     pseudo-random tmpname results... */
+    int n2;
+    char buf[L_tmpnam], *ptr;
+    struct stat statbuf;
+    unsigned char l, i;
+
+    ptr=s ?  s : buf;
+
+    l = snprintf(ptr, L_tmpnam, "%s/tmp.", P_tmpdir);
+
+again:
+    n2 = num;
+    for (i = l ; i < l + 6; i++) {
+	ptr[i] = '0' + n2 % 10;
+	n2 /= 10;
+    }
+
+    if (stat (ptr, &statbuf) == 0){
+	num++;
+	goto again;
+    }
+
+    if (s == NULL)
+	return (char *) memcpy (tmpnam_buffer, ptr, L_tmpnam);
+
+    return ptr;
+}
+
diff --git a/libc/stdio/tmpnam_r.c b/libc/stdio/tmpnam_r.c
new file mode 100644
index 000000000..5533a399f
--- /dev/null
+++ b/libc/stdio/tmpnam_r.c
@@ -0,0 +1,43 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * tmpnam 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 Library 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
+ *
+ * Modified by Erik Andersen <anderse@debian.org> to be reentrant for
+ * the case when S != NULL...
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+
+/* Generate a unique filename in /tmp.
+ * If s is NULL return NULL, making this function thread safe.  */
+
+char * tmpnam_r (char *s)
+{
+	if (s == NULL)
+		return NULL;
+	else
+		return (tmpnam(s));
+}
+
diff --git a/libc/sysdeps/linux/common/Makefile b/libc/sysdeps/linux/common/Makefile
index 7f8ae1505..b658df65f 100644
--- a/libc/sysdeps/linux/common/Makefile
+++ b/libc/sysdeps/linux/common/Makefile
@@ -28,9 +28,8 @@ LIBC=$(TOPDIR)libc.a
 
 CSRC =closedir.o dirfd.o getdents.o getdnnm.o gethstnm.o getpagesize.o \
 	isatty.o kernel_version.o mkfifo.o opendir.o readdir.o rewinddir.o \
-	seekdir.o setegid.o seteuid.o setpgrp.o statfix.o tcgetatr.o tell.o \
-	telldir.o wait.o wait3.o _xmknod.o _fxstat.o _lxstat.o _xstat.o \
-	libc_init.o
+	seekdir.o setegid.o seteuid.o setpgrp.o statfix.o tell.o telldir.o \
+	wait.o wait3.o _xmknod.o _fxstat.o _lxstat.o _xstat.o libc_init.o tcgetatr.o
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 
diff --git a/libc/unistd/getopt.c b/libc/unistd/getopt.c
index 70d20b06b..83a9ad69c 100644
--- a/libc/unistd/getopt.c
+++ b/libc/unistd/getopt.c
@@ -34,10 +34,7 @@ int c;							/* defective option letter */
 	return '?';					/* erroneous-option marker */
 }
 
-int getopt(argc, argv, optstring) /* returns letter, '?', EOF */
-int argc;						/* argument count from main */
-char *argv[];					/* argument vector from main */
-char *optstring;				/* allowed args, e.g. "ab:c" */
+int getopt (int argc, char *const *argv, const char *optstring)
 {
 	static int sp = 1;			/* position within argument */
 	register int osp;			/* saved `sp' for param test */