aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2009-11-01 04:01:30 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2009-11-01 04:01:30 +0100
commitfe4e23f9ded69194d525775b1ef7648461a7f76d (patch)
tree524f5724e56b8fea8e0237cd300a7db4e75f302f /libbb
parent95a036e125c28dc93d91ae77923c02a1684fc5ef (diff)
downloadbusybox-fe4e23f9ded69194d525775b1ef7648461a7f76d.tar.gz
Add more compat code for non GNU environments
Signed-off-by: Dan Fandrich <dan@coneharvesters.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/platform.c67
1 files changed, 59 insertions, 8 deletions
diff --git a/libbb/platform.c b/libbb/platform.c
index 470185a68..fdd388259 100644
--- a/libbb/platform.c
+++ b/libbb/platform.c
@@ -6,13 +6,13 @@
*
* Licensed under the GPL version 2, see the file LICENSE in this tarball.
*/
-
#include "libbb.h"
#ifndef HAVE_STRCHRNUL
-char * FAST_FUNC strchrnul(const char *s, int c)
+char* FAST_FUNC strchrnul(const char *s, int c)
{
- while (*s && *s != c) ++s;
+ while (*s != '\0' && *s != c)
+ s++;
return (char*)s;
}
#endif
@@ -22,15 +22,19 @@ int FAST_FUNC vasprintf(char **string_ptr, const char *format, va_list p)
{
int r;
va_list p2;
+ char buf[128];
va_copy(p2, p);
- r = vsnprintf(NULL, 0, format, p);
+ r = vsnprintf(buf, 128, format, p);
va_end(p);
+
+ if (r < 128) {
+ va_end(p2);
+ return xstrdup(buf);
+ }
+
*string_ptr = xmalloc(r+1);
- if (!*string_ptr)
- r = -1;
- else
- r = vsnprintf(*string_ptr, r+1, format, p2);
+ r = vsnprintf(*string_ptr, r+1, format, p2);
va_end(p2);
return r;
@@ -38,6 +42,7 @@ int FAST_FUNC vasprintf(char **string_ptr, const char *format, va_list p)
#endif
#ifndef HAVE_FDPRINTF
+/* dprintf is now actually part of POSIX.1, but was only added in 2008 */
int fdprintf(int fd, const char *format, ...)
{
va_list p;
@@ -55,3 +60,49 @@ int fdprintf(int fd, const char *format, ...)
}
#endif
+#ifndef HAVE_MEMRCHR
+/* Copyright (C) 2005 Free Software Foundation, Inc.
+ * memrchr() is a GNU function that might not be available everywhere.
+ * It's basically the inverse of memchr() - search backwards in a
+ * memory block for a particular character.
+ */
+void* FAST_FUNC memrchr(const void *s, int c, size_t n)
+{
+ const char *start = s, *end = s;
+
+ end += n - 1;
+
+ while (end >= start) {
+ if (*end == (char)c)
+ return (void *) end;
+ end--;
+ }
+
+ return NULL;
+}
+#endif
+
+#ifndef HAVE_MKDTEMP
+/* This is now actually part of POSIX.1, but was only added in 2008 */
+char* FAST_FUNC mkdtemp(char *template)
+{
+ if (mktemp(template) == NULL || mkdir(template, 0700) != 0)
+ return NULL;
+ return template;
+}
+#endif
+
+#ifndef HAVE_STRCASESTR
+/* Copyright (c) 1999, 2000 The ht://Dig Group */
+char* FAST_FUNC strcasestr(const char *s, const char *pattern)
+{
+ int length = strlen(pattern);
+
+ while (*s) {
+ if (strncasecmp(s, pattern, length) == 0)
+ return (char *)s;
+ s++;
+ }
+ return 0;
+}
+#endif