ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change interface to bb_xasprintf() - more perfect for me.

Browse source 
ln.c: error_msg(str)->error_msg(%s, str) - remove standart "feature" for hackers
reduce 100 bytes don't care in sum
This commit is contained in:
"Vladimir N. Oleynik" 2005-09-29 16:18:57 +00:00
parent 6a60c821a8
commit 39a841cecf
16 changed files with 33 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libbb/bb_asprintf.c
View file

@ -1,5 +1,5 @@
/*
Copyright (C) 2002 Vladimir Oleynik <dzo@simtreas.ru>
Copyright (C) 2002,2005 Vladimir Oleynik <dzo@simtreas.ru>
*/
#include <stdlib.h>
@ -7,16 +7,18 @@
#include <stdarg.h>
#include "libbb.h"
void bb_xasprintf(char **string_ptr, const char *format, ...)
char *bb_xasprintf(const char *format, ...)
{
va_list p;
int r;
char *string_ptr;
va_start(p, format);
r = vasprintf(string_ptr, format, p);
r = vasprintf(&string_ptr, format, p);
va_end(p);
if (r < 0) {
bb_perror_msg_and_die("bb_xasprintf");
}
return string_ptr;
}

5
libbb/concat_path_file.c
View file

@ -30,7 +30,6 @@
extern char *concat_path_file(const char *path, const char *filename)
{
char *outbuf;
char *lc;
if (!path)
@ -38,7 +37,5 @@ extern char *concat_path_file(const char *path, const char *filename)
lc = last_char_is(path, '/');
while (*filename == '/')
filename++;
bb_xasprintf(&outbuf, "%s%s%s", path, (lc==NULL ? "/" : ""), filename);
return outbuf;
return bb_xasprintf("%s%s%s", path, (lc==NULL ? "/" : ""), filename);
}

7
libbb/run_shell.c
View file

@ -84,11 +84,8 @@ void run_shell ( const char *shell, int loginshell, const char *command, const c
args [0] = bb_get_last_path_component ( bb_xstrdup ( shell ));
if ( loginshell ) {
char *args0;
bb_xasprintf ( &args0, "-%s", args [0] );
args [0] = args0;
}
if ( loginshell )
args [0] = bb_xasprintf ("-%s", args [0]);
if ( command ) {
args [argno++] = "-c";