svn commit: trunk/busybox: editors include libbb

[landley at busybox.net]

Author: landley
Date: 2006-03-09 14:21:20 -0800 (Thu, 09 Mar 2006)
New Revision: 14498

Log:
Portability patch from rfelker.  The bb_asprintf.c thing needs an eventual
follow up in platform.h to set the #ifdef, but the workaround works for
everybody, so...


Modified:
   trunk/busybox/editors/sed.c
   trunk/busybox/include/inet_common.h
   trunk/busybox/include/libbb.h
   trunk/busybox/libbb/bb_asprintf.c


Changeset:
Modified: trunk/busybox/editors/sed.c
===================================================================
--- trunk/busybox/editors/sed.c	2006-03-09 22:08:41 UTC (rev 14497)
+++ trunk/busybox/editors/sed.c	2006-03-09 22:21:20 UTC (rev 14498)
@@ -434,7 +434,7 @@
 		while(isspace(*cmdstr)) cmdstr++;
 		length = strcspn(cmdstr, semicolon_whitespace);
 		if (length) {
-			sed_cmd->string = strndup(cmdstr, length);
+			sed_cmd->string = bb_xstrndup(cmdstr, length);
 			cmdstr += length;
 		}
 	}

Modified: trunk/busybox/include/inet_common.h
===================================================================
--- trunk/busybox/include/inet_common.h	2006-03-09 22:08:41 UTC (rev 14497)
+++ trunk/busybox/include/inet_common.h	2006-03-09 22:21:20 UTC (rev 14498)
@@ -11,7 +11,7 @@
 #include <features.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>
+#include <netinet/in.h>
 
 
 extern const char bb_INET_default[];    /* = "default" */

Modified: trunk/busybox/include/libbb.h
===================================================================
--- trunk/busybox/include/libbb.h	2006-03-09 22:08:41 UTC (rev 14497)
+++ trunk/busybox/include/libbb.h	2006-03-09 22:21:20 UTC (rev 14498)
@@ -20,6 +20,7 @@
 #include <stdint.h>
 
 #include <netdb.h>
+#include <netinet/in.h>
 
 #include <features.h>
 

Modified: trunk/busybox/libbb/bb_asprintf.c
===================================================================
--- trunk/busybox/libbb/bb_asprintf.c	2006-03-09 22:08:41 UTC (rev 14497)
+++ trunk/busybox/libbb/bb_asprintf.c	2006-03-09 22:21:20 UTC (rev 14498)
@@ -13,9 +13,19 @@
 	int r;
 	char *string_ptr;
 
+#ifdef HAVE_GNU_EXTENSIONS
 	va_start(p, format);
 	r = vasprintf(&string_ptr, format, p);
 	va_end(p);
+#else
+	va_start(p, format);
+	r = vsnprintf(NULL, 0, format, p);
+	va_end(p);
+	string_ptr = xmalloc(r+1);
+	va_start(p, format);
+	r = vsnprintf(string_ptr, r+1, format, p);
+	va_end(p);
+#endif
 
 	if (r < 0) {
 		bb_perror_msg_and_die("bb_xasprintf");