summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorEric Andersen2001-08-02 10:55:32 +0000
committerEric Andersen2001-08-02 10:55:32 +0000
commitbe0c36009a342de3599d498d6f150030b6a75b98 (patch)
tree5af27e4751ecae51387a99872b66a8cd6e621caa /libbb
parent23b1e5c7df2e619654d0a53785fcdef5072b40ed (diff)
downloadbusybox-be0c36009a342de3599d498d6f150030b6a75b98.zip
busybox-be0c36009a342de3599d498d6f150030b6a75b98.tar.gz
More libc5 fixups
-Erik
Diffstat (limited to 'libbb')
-rw-r--r--libbb/libbb.h2
-rw-r--r--libbb/libc5.c (renamed from libbb/daemon.c)84
2 files changed, 77 insertions, 9 deletions
diff --git a/libbb/libbb.h b/libbb/libbb.h
index 70ac36a..04ed2ae 100644
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -46,6 +46,8 @@
typedef unsigned int socklen_t;
/* libc5 doesn't implement BSD 4.4 daemon() */
extern int daemon (int nochdir, int noclose);
+/* libc5 doesn't implement strtok_r */
+char *strtok_r(char *s, const char *delim, char **ptrptr);
#endif
/* Some useful definitions */
diff --git a/libbb/daemon.c b/libbb/libc5.c
index 6d4169e..20295fd 100644
--- a/libbb/daemon.c
+++ b/libbb/libc5.c
@@ -1,4 +1,77 @@
/* vi: set sw=4 ts=4: */
+
+
+#include <features.h>
+#include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <paths.h>
+#include <unistd.h>
+
+
+#if __GNU_LIBRARY__ < 5
+
+
+/* Copyright (C) 1991 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library 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.
+
+The GNU C Library 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 the GNU C Library; see the file COPYING.LIB. If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA. */
+
+/*
+ * Modified by Manuel Novoa III Mar 1, 2001
+ *
+ * Converted original strtok.c code of strtok to __strtok_r.
+ * Cleaned up logic and reduced code size.
+ */
+
+
+char *strtok_r(char *s, const char *delim, char **save_ptr)
+{
+ char *token;
+
+ token = 0; /* Initialize to no token. */
+
+ if (s == 0) { /* If not first time called... */
+ s = *save_ptr; /* restart from where we left off. */
+ }
+
+ if (s != 0) { /* If not finished... */
+ *save_ptr = 0;
+
+ s += strspn(s, delim); /* Skip past any leading delimiters. */
+ if (*s != '\0') { /* We have a token. */
+ token = s;
+ *save_ptr = strpbrk(token, delim); /* Find token's end. */
+ if (*save_ptr != 0) {
+ /* Terminate the token and make SAVE_PTR point past it. */
+ *(*save_ptr)++ = '\0';
+ }
+ }
+ }
+
+ return token;
+}
+
+/* Basically getdelim() with the delimiter hard wired to '\n' */
+ssize_t getline(char **linebuf, size_t *n, FILE *file)
+{
+ return (getdelim (linebuf, n, '\n', file));
+}
+
+
/*
* daemon implementation for uClibc
*
@@ -26,14 +99,6 @@
* Original copyright notice is retained at the end of this file.
*/
-#include <features.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <unistd.h>
-
-
-#if __GNU_LIBRARY__ < 5
-
int daemon( int nochdir, int noclose )
{
int fd;
@@ -62,7 +127,6 @@ int daemon( int nochdir, int noclose )
}
return(0);
}
-#endif
/*-
@@ -99,3 +163,5 @@ int daemon( int nochdir, int noclose )
*/
+#endif
+