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

removed warning "comparison between signed and unsigned". Added ATTRIBUTE_UNUSED. My whitespace

Browse Source
This commit is contained in:
"Vladimir N. Oleynik"
2006-01-30 13:51:50 +00:00
parent 676b15e067
commit 59c4e5cf92
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
findutils/xargs.c
View File

@@ -71,13 +71,13 @@
static int xargs_exec(char *const *args) static int xargs_exec(char *const *args)
{ {
pid_t p; pid_t p;
volatile int exec_errno = 0; /* shared vfork stack */ volatile int exec_errno = 0; /* shared vfork stack */
if ((p = vfork()) >= 0) { if ((p = vfork()) >= 0) {
if (p == 0) { if (p == 0) {
/* vfork -- child */ /* vfork -- child */
execvp(args[0], args); execvp(args[0], args);
exec_errno = errno; /* set error to shared stack */ exec_errno = errno; /* set error to shared stack */
_exit(1); _exit(1);
} else { } else {
/* vfork -- parent */ /* vfork -- parent */
@@ -137,18 +137,18 @@ static xlist_t *process_stdin(xlist_t * list_arg,
#define BACKSLASH 2 #define BACKSLASH 2
#define SPACE 4 #define SPACE 4
char *s = NULL; /* start word */ char *s = NULL; /* start word */
char *p = NULL; /* pointer to end word */ char *p = NULL; /* pointer to end word */
char q = 0; /* quote char */ char q = 0; /* quote char */
char state = NORM; char state = NORM;
char eof_str_detected = 0; char eof_str_detected = 0;
size_t line_l = 0; /* size loaded args line */ size_t line_l = 0; /* size loaded args line */
int c; /* current char */ int c; /* current char */
xlist_t *cur; xlist_t *cur;
xlist_t *prev; xlist_t *prev;
for (prev = cur = list_arg; cur; cur = cur->link) { for (prev = cur = list_arg; cur; cur = cur->link) {
line_l += cur->lenght; /* previous allocated */ line_l += cur->lenght; /* previous allocated */
if (prev != cur) if (prev != cur)
prev = prev->link; prev = prev->link;
} }
@@ -192,13 +192,13 @@ unexpected_eof:
state = QUOTE; state = QUOTE;
} else { } else {
set: set:
if ((p - buf) >= mc) if ((size_t)(p - buf) >= mc)
bb_error_msg_and_die("argument line too long"); bb_error_msg_and_die("argument line too long");
*p++ = c; *p++ = c;
} }
} }
} }
if (state == SPACE) { /* word's delimiter or EOF detected */ if (state == SPACE) { /* word's delimiter or EOF detected */
if (q) { if (q) {
bb_error_msg_and_die("unmatched %s quote", bb_error_msg_and_die("unmatched %s quote",
q == '\'' ? "single" : "double"); q == '\'' ? "single" : "double");
@@ -238,16 +238,16 @@ 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; int 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) { for (prev = cur = list_arg; cur; cur = cur->link) {
line_l += cur->lenght; /* previous allocated */ line_l += cur->lenght; /* previous allocated */
if (prev != cur) if (prev != cur)
prev = prev->link; prev = prev->link;
} }
@@ -269,7 +269,7 @@ static xlist_t *process_stdin(xlist_t * list_arg,
if ((p - buf) >= mc) if ((p - buf) >= mc)
bb_error_msg_and_die("argument line too long"); bb_error_msg_and_die("argument line too long");
*p++ = c == EOF ? 0 : c; *p++ = c == EOF ? 0 : c;
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;
@@ -340,18 +340,18 @@ static int xargs_ask_confirmation(void)
#endif #endif
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM #ifdef CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM
static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str, static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str ATTRIBUTE_UNUSED,
size_t mc, char *buf) size_t mc, char *buf)
{ {
int c; /* current char */ int c; /* current char */
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) { for (prev = cur = list_arg; cur; cur = cur->link) {
line_l += cur->lenght; /* previous allocated */ line_l += cur->lenght; /* previous allocated */
if (prev != cur) if (prev != cur)
prev = prev->link; prev = prev->link;
} }
@@ -366,10 +366,10 @@ static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str,
} }
if (s == NULL) if (s == NULL)
s = p = buf; s = p = buf;
if ((p - buf) >= mc) if ((size_t)(p - buf) >= mc)
bb_error_msg_and_die("argument line too long"); bb_error_msg_and_die("argument line too long");
*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 lenght = (p - buf);
@@ -395,9 +395,9 @@ static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str,
} }
# define READ_ARGS(l, e, nmc, mc) (*read_args)(l, e, nmc, mc) # define READ_ARGS(l, e, nmc, mc) (*read_args)(l, e, nmc, mc)
# define OPT_INC_0 1 /* future use */ # define OPT_INC_0 1 /* future use */
#else #else
# define OPT_INC_0 0 /* future use */ # define OPT_INC_0 0 /* future use */
# define READ_ARGS(l, e, nmc, mc) process_stdin(l, e, nmc, mc) # define READ_ARGS(l, e, nmc, mc) process_stdin(l, e, nmc, mc)
#endif /* CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM */ #endif /* CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM */
@@ -410,7 +410,7 @@ static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str,
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION #ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
#define OPT_INTERACTIVE (1<<5) #define OPT_INTERACTIVE (1<<5)
#else #else
#define OPT_INTERACTIVE (0) /* require for algorithm &| */ #define OPT_INTERACTIVE (0) /* require for algorithm &| */
#endif #endif
#define OPT_TERMINATE (1<<(5+OPT_INC_P)) #define OPT_TERMINATE (1<<(5+OPT_INC_P))
#define OPT_ZEROTERM (1<<(5+OPT_INC_P+OPT_INC_X)) #define OPT_ZEROTERM (1<<(5+OPT_INC_P+OPT_INC_X))
@@ -464,7 +464,7 @@ int xargs_main(int argc, char **argv)
orig_arg_max = ARG_MAX; orig_arg_max = ARG_MAX;
if (orig_arg_max == -1) if (orig_arg_max == -1)
orig_arg_max = LONG_MAX; orig_arg_max = LONG_MAX;
orig_arg_max -= 2048; /* POSIX.2 requires subtracting 2048. */ orig_arg_max -= 2048; /* POSIX.2 requires subtracting 2048. */
if ((opt & OPT_UPTO_SIZE)) { if ((opt & OPT_UPTO_SIZE)) {
n_max_chars = bb_xgetularg10_bnd(max_chars, 1, orig_arg_max); n_max_chars = bb_xgetularg10_bnd(max_chars, 1, orig_arg_max);
for (i = 0; i < a; i++) { for (i = 0; i < a; i++) {