emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xargs: shrink code, ~80 bytes

Browse Source 
applets.h: +#undef APPLET_NOEXEC
This commit is contained in:
Denis Vlasenko
2007-04-09 21:30:53 +00:00
parent 53d445aa75
commit 1b4b2cb20e
2 changed files with 80 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
findutils/xargs.c
View File

@@ -30,17 +30,17 @@
#ifdef TEST #ifdef TEST
# ifndef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION # ifndef ENABLE_FEATURE_XARGS_SUPPORT_CONFIRMATION
# define CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION # define ENABLE_FEATURE_XARGS_SUPPORT_CONFIRMATION 1
# endif # endif
# ifndef CONFIG_FEATURE_XARGS_SUPPORT_QUOTES # ifndef ENABLE_FEATURE_XARGS_SUPPORT_QUOTES
# define CONFIG_FEATURE_XARGS_SUPPORT_QUOTES # define ENABLE_FEATURE_XARGS_SUPPORT_QUOTES 1
# endif # endif
# ifndef CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT # ifndef ENABLE_FEATURE_XARGS_SUPPORT_TERMOPT
# define CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT # define ENABLE_FEATURE_XARGS_SUPPORT_TERMOPT 1
# endif # endif
# ifndef CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM # ifndef ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM
# define CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM # define ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM 1
# endif # endif
#endif #endif
@@ -94,20 +94,20 @@ static int xargs_exec(char *const *args)
} }
typedef struct xlist_s { typedef struct xlist_t {
char *data; char *data;
size_t lenght; size_t length;
struct xlist_s *link; struct xlist_t *link;
} xlist_t; } xlist_t;
static int eof_stdin_detected; static smallint eof_stdin_detected;
#define ISBLANK(c) ((c) == ' ' || (c) == '\t') #define ISBLANK(c) ((c) == ' ' || (c) == '\t')
#define ISSPACE(c) (ISBLANK(c) || (c) == '\n' || (c) == '\r' \ #define ISSPACE(c) (ISBLANK(c) || (c) == '\n' || (c) == '\r' \
|| (c) == '\f' || (c) == '\v') || (c) == '\f' || (c) == '\v')
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_QUOTES #if ENABLE_FEATURE_XARGS_SUPPORT_QUOTES
static xlist_t *process_stdin(xlist_t * list_arg, static xlist_t *process_stdin(xlist_t *list_arg,
const char *eof_str, size_t mc, char *buf) const char *eof_str, size_t mc, char *buf)
{ {
#define NORM 0 #define NORM 0
@@ -125,16 +125,18 @@ static xlist_t *process_stdin(xlist_t * list_arg,
xlist_t *cur; xlist_t *cur;
xlist_t *prev; xlist_t *prev;
for (prev = cur = list_arg; cur; cur = cur->link) { cur = list_arg;
line_l += cur->lenght; /* previous allocated */ while (1) {
if (prev != cur) prev = cur;
prev = prev->link; if (!cur) break;
line_l += cur->length;
cur = cur->link;
} }
while (!eof_stdin_detected) { while (!eof_stdin_detected) {
c = getchar(); c = getchar();
if (c == EOF) { if (c == EOF) {
eof_stdin_detected++; eof_stdin_detected = 1;
if (s) if (s)
goto unexpected_eof; goto unexpected_eof;
break; break;
@@ -183,22 +185,22 @@ set:
} }
/* word loaded */ /* word loaded */
if (eof_str) { if (eof_str) {
eof_str_detected = strcmp(s, eof_str) == 0; eof_str_detected = (strcmp(s, eof_str) == 0);
} }
if (!eof_str_detected) { if (!eof_str_detected) {
size_t lenght = (p - buf); size_t length = (p - buf);
cur = xmalloc(sizeof(xlist_t) + lenght); cur = xzalloc(sizeof(xlist_t) + length);
cur->data = memcpy(cur + 1, s, lenght); cur->data = memcpy(cur + 1, s, length);
cur->lenght = lenght; cur->length = length;
cur->link = NULL; /*cur->link = NULL;*/
if (prev == NULL) { if (prev == NULL) {
list_arg = cur; list_arg = cur;
} else { } else {
prev->link = cur; prev->link = cur;
} }
prev = cur; prev = cur;
line_l += lenght; line_l += length;
if (line_l > mc) { if (line_l > mc) {
/* stop memory usage :-) */ /* stop memory usage :-) */
break; break;
@@ -212,28 +214,30 @@ set:
} }
#else #else
/* The variant does not support single quotes, double quotes or backslash */ /* The variant does not support single quotes, double quotes or backslash */
static xlist_t *process_stdin(xlist_t * list_arg, static xlist_t *process_stdin(xlist_t *list_arg,
const char *eof_str, size_t mc, char *buf) const char *eof_str, size_t mc, char *buf)
{ {
int c; /* current char */ int c; /* current char */
int eof_str_detected = 0; char eof_str_detected = 0;
char *s = NULL; /* start word */ char *s = NULL; /* start word */
char *p = NULL; /* pointer to end word */ char *p = NULL; /* pointer to end word */
size_t line_l = 0; /* size loaded args line */ size_t line_l = 0; /* size loaded args line */
xlist_t *cur; xlist_t *cur;
xlist_t *prev; xlist_t *prev;
for (prev = cur = list_arg; cur; cur = cur->link) { cur = list_arg;
line_l += cur->lenght; /* previous allocated */ while (1) {
if (prev != cur) prev = cur;
prev = prev->link; if (!cur) break;
line_l += cur->length;
cur = cur->link;
} }
while (!eof_stdin_detected) { while (!eof_stdin_detected) {
c = getchar(); c = getchar();
if (c == EOF) { if (c == EOF) {
eof_stdin_detected++; eof_stdin_detected = 1;
} }
if (eof_str_detected) if (eof_str_detected)
continue; continue;
@@ -250,22 +254,22 @@ static xlist_t *process_stdin(xlist_t * list_arg,
if (c == EOF) { /* word's delimiter or EOF detected */ if (c == EOF) { /* word's delimiter or EOF detected */
/* word loaded */ /* word loaded */
if (eof_str) { if (eof_str) {
eof_str_detected = strcmp(s, eof_str) == 0; eof_str_detected = (strcmp(s, eof_str) == 0);
} }
if (!eof_str_detected) { if (!eof_str_detected) {
size_t lenght = (p - buf); size_t length = (p - buf);
cur = xmalloc(sizeof(xlist_t) + lenght); cur = xzalloc(sizeof(xlist_t) + length);
cur->data = memcpy(cur + 1, s, lenght); cur->data = memcpy(cur + 1, s, length);
cur->lenght = lenght; cur->length = length;
cur->link = NULL; /*cur->link = NULL;*/
if (prev == NULL) { if (prev == NULL) {
list_arg = cur; list_arg = cur;
} else { } else {
prev->link = cur; prev->link = cur;
} }
prev = cur; prev = cur;
line_l += lenght; line_l += length;
if (line_l > mc) { if (line_l > mc) {
/* stop memory usage :-) */ /* stop memory usage :-) */
break; break;
@@ -276,39 +280,34 @@ static xlist_t *process_stdin(xlist_t * list_arg,
} }
return list_arg; return list_arg;
} }
#endif /* CONFIG_FEATURE_XARGS_SUPPORT_QUOTES */ #endif /* FEATURE_XARGS_SUPPORT_QUOTES */
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION #if ENABLE_FEATURE_XARGS_SUPPORT_CONFIRMATION
/* Prompt the user for a response, and /* Prompt the user for a response, and
if the user responds affirmatively, return true; if the user responds affirmatively, return true;
otherwise, return false. Used "/dev/tty", not stdin. */ otherwise, return false. Uses "/dev/tty", not stdin. */
static int xargs_ask_confirmation(void) static int xargs_ask_confirmation(void)
{ {
static FILE *tty_stream; FILE *tty_stream;
int c, savec; int c, savec;
if (!tty_stream) { tty_stream = xfopen(CURRENT_TTY, "r");
tty_stream = xfopen(CURRENT_TTY, "r");
/* pranoidal security by vodz */
fcntl(fileno(tty_stream), F_SETFD, FD_CLOEXEC);
}
fputs(" ?...", stderr); fputs(" ?...", stderr);
fflush(stderr); fflush(stderr);
c = savec = getc(tty_stream); c = savec = getc(tty_stream);
while (c != EOF && c != '\n') while (c != EOF && c != '\n')
c = getc(tty_stream); c = getc(tty_stream);
if (savec == 'y' || savec == 'Y') fclose(tty_stream);
return 1; return (savec == 'y' || savec == 'Y');
return 0;
} }
#else #else
# define xargs_ask_confirmation() 1 # define xargs_ask_confirmation() 1
#endif /* CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION */ #endif /* FEATURE_XARGS_SUPPORT_CONFIRMATION */
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM #if ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM
static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str ATTRIBUTE_UNUSED, static xlist_t *process0_stdin(xlist_t *list_arg,
size_t mc, char *buf) const char *eof_str ATTRIBUTE_UNUSED, size_t mc, char *buf)
{ {
int c; /* current char */ int c; /* current char */
char *s = NULL; /* start word */ char *s = NULL; /* start word */
@@ -317,16 +316,18 @@ static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str ATTRIBUTE
xlist_t *cur; xlist_t *cur;
xlist_t *prev; xlist_t *prev;
for (prev = cur = list_arg; cur; cur = cur->link) { cur = list_arg;
line_l += cur->lenght; /* previous allocated */ while (1) {
if (prev != cur) prev = cur;
prev = prev->link; if (!cur) break;
line_l += cur->length;
cur = cur->link;
} }
while (!eof_stdin_detected) { while (!eof_stdin_detected) {
c = getchar(); c = getchar();
if (c == EOF) { if (c == EOF) {
eof_stdin_detected++; eof_stdin_detected = 1;
if (s == NULL) if (s == NULL)
break; break;
c = 0; c = 0;
@@ -338,19 +339,19 @@ static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str ATTRIBUTE
*p++ = c; *p++ = c;
if (c == 0) { /* word's delimiter or EOF detected */ if (c == 0) { /* word's delimiter or EOF detected */
/* word loaded */ /* word loaded */
size_t lenght = (p - buf); size_t length = (p - buf);
cur = xmalloc(sizeof(xlist_t) + lenght); cur = xzalloc(sizeof(xlist_t) + length);
cur->data = memcpy(cur + 1, s, lenght); cur->data = memcpy(cur + 1, s, length);
cur->lenght = lenght; cur->length = length;
cur->link = NULL; /*cur->link = NULL;*/
if (prev == NULL) { if (prev == NULL) {
list_arg = cur; list_arg = cur;
} else { } else {
prev->link = cur; prev->link = cur;
} }
prev = cur; prev = cur;
line_l += lenght; line_l += length;
if (line_l > mc) { if (line_l > mc) {
/* stop memory usage :-) */ /* stop memory usage :-) */
break; break;
@@ -360,7 +361,7 @@ static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str ATTRIBUTE
} }
return list_arg; return list_arg;
} }
#endif /* CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM */ #endif /* FEATURE_XARGS_SUPPORT_ZERO_TERM */
/* Correct regardless of combination of CONFIG_xxx */ /* Correct regardless of combination of CONFIG_xxx */
enum { enum {
@@ -413,8 +414,8 @@ int xargs_main(int argc, char **argv)
if (opt & OPT_ZEROTERM) if (opt & OPT_ZEROTERM)
USE_FEATURE_XARGS_SUPPORT_ZERO_TERM(read_args = process0_stdin); USE_FEATURE_XARGS_SUPPORT_ZERO_TERM(read_args = process0_stdin);
argc -= optind;
argv += optind; argv += optind;
argc -= optind;
if (!argc) { if (!argc) {
/* default behavior is to echo all the filenames */ /* default behavior is to echo all the filenames */
*argv = (char*)"echo"; *argv = (char*)"echo";
@@ -458,9 +459,9 @@ int xargs_main(int argc, char **argv)
opt |= OPT_NO_EMPTY; opt |= OPT_NO_EMPTY;
n = 0; n = 0;
n_chars = 0; n_chars = 0;
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT #if ENABLE_FEATURE_XARGS_SUPPORT_TERMOPT
for (cur = list; cur;) { for (cur = list; cur;) {
n_chars += cur->lenght; n_chars += cur->length;
n++; n++;
cur = cur->link; cur = cur->link;
if (n_chars > n_max_chars || (n == n_max_arg && cur)) { if (n_chars > n_max_chars || (n == n_max_arg && cur)) {
@@ -471,13 +472,13 @@ int xargs_main(int argc, char **argv)
} }
#else #else
for (cur = list; cur; cur = cur->link) { for (cur = list; cur; cur = cur->link) {
n_chars += cur->lenght; n_chars += cur->length;
n++; n++;
if (n_chars > n_max_chars || n == n_max_arg) { if (n_chars > n_max_chars || n == n_max_arg) {
break; break;
} }
} }
#endif /* CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT */ #endif /* FEATURE_XARGS_SUPPORT_TERMOPT */
/* allocate pointers for execvp: /* allocate pointers for execvp:
argc*arg, n*arg from stdin, NULL */ argc*arg, n*arg from stdin, NULL */
@@ -517,7 +518,8 @@ int xargs_main(int argc, char **argv)
break; break;
} }
} }
if (ENABLE_FEATURE_CLEAN_UP) free(max_chars); if (ENABLE_FEATURE_CLEAN_UP)
free(max_chars);
return child_error; return child_error;
} }

5
include/applets.h
View File

@@ -14,8 +14,8 @@
/* /*
name - applet name as it is typed on command line name - applet name as it is typed on command line
name2 - applet name, converted to C (ether-wake: name2 = ether_wake) name2 - applet name, converted to C (ether-wake: name2 = ether_wake)
main - <applet>_main part (e.g. for bzcat: main = bunzip2) main - corresponding <applet>_main to call (bzcat: main = bunzip2)
l - location ([/usr]/[s]bin) l - location to install link to: [/usr]/[s]bin
s - suid type: s - suid type:
_BB_SUID_ALWAYS: will complain if busybox isn't suid _BB_SUID_ALWAYS: will complain if busybox isn't suid
and is run by non-root (applet_main() will not be called at all) and is run by non-root (applet_main() will not be called at all)
@@ -363,3 +363,4 @@ USE_ZCIP(APPLET(zcip, _BB_DIR_SBIN, _BB_SUID_NEVER))
#undef APPLET_NOUSAGE #undef APPLET_NOUSAGE
#undef APPLET_ODDNAME #undef APPLET_ODDNAME
#undef APPLET_NOEXEC #undef APPLET_NOEXEC
#undef APPLET_NOFORK