Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-12 14:30:54 +00:00
Code Issues Projects Releases Wiki Activity

Portability patch from rfelker. The bb_asprintf.c thing needs an eventual

Browse Source 
follow up in platform.h to set the #ifdef, but the workaround works for
everybody, so...
This commit is contained in:
Rob Landley 2006-03-09 22:21:20 +00:00
parent 3a324754f8
commit 1f305dc0fd
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editors/sed.c
View File

@ -434,7 +434,7 @@ static char *parse_cmd_args(sed_cmd_t *sed_cmd, char *cmdstr)
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;
}
}

2
include/inet_common.h
View File

@ -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" */

1
include/libbb.h
View File

@ -20,6 +20,7 @@
#include <stdint.h>
#include <netdb.h>
#include <netinet/in.h>
#include <features.h>

10
libbb/bb_asprintf.c
View File

@ -13,9 +13,19 @@ char *bb_xasprintf(const char *format, ...)
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");