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

nc, hush: cosmetic cleanups, no code changes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-06-01 11:26:30 +02:00
parent 4b7db4f2ca
commit 28a105d867
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
networking/nc.c
View File

@ -129,7 +129,7 @@ int nc_main(int argc, char **argv)
if (wsecs) { if (wsecs) {
alarm(0); alarm(0);
/* Non-ignored siganls revert to SIG_DFL on exec anyway */ /* Non-ignored signals revert to SIG_DFL on exec anyway */
/*signal(SIGALRM, SIG_DFL);*/ /*signal(SIGALRM, SIG_DFL);*/
} }

24
shell/hush.c
View File

@ -563,9 +563,9 @@ struct built_in_command {
int (*function)(char **argv); int (*function)(char **argv);
#if ENABLE_HUSH_HELP #if ENABLE_HUSH_HELP
const char *descr; const char *descr;
#define BLTIN(cmd, func, help) { cmd, func, help } # define BLTIN(cmd, func, help) { cmd, func, help }
#else #else
#define BLTIN(cmd, func, help) { cmd, func } # define BLTIN(cmd, func, help) { cmd, func }
#endif #endif
}; };
@ -612,7 +612,7 @@ static const struct built_in_command bltins[] = {
BLTIN("test" , builtin_test , "Test condition"), BLTIN("test" , builtin_test , "Test condition"),
BLTIN("trap" , builtin_trap , "Trap signals"), BLTIN("trap" , builtin_trap , "Trap signals"),
BLTIN("type" , builtin_type , "Write a description of command type"), BLTIN("type" , builtin_type , "Write a description of command type"),
// BLTIN("ulimit" , builtin_return , "Control resource limits"), // BLTIN("ulimit" , builtin_ulimit , "Control resource limits"),
BLTIN("umask" , builtin_umask , "Set file creation mask"), BLTIN("umask" , builtin_umask , "Set file creation mask"),
BLTIN("unset" , builtin_unset , "Unset environment variable"), BLTIN("unset" , builtin_unset , "Unset environment variable"),
BLTIN("wait" , builtin_wait , "Wait for process"), BLTIN("wait" , builtin_wait , "Wait for process"),
@ -693,7 +693,7 @@ static void debug_print_strings(const char *prefix, char **vv)
fprintf(stderr, " '%s'\n", *vv++); fprintf(stderr, " '%s'\n", *vv++);
} }
#else #else
#define debug_print_strings(prefix, vv) ((void)0) # define debug_print_strings(prefix, vv) ((void)0)
#endif #endif
@ -819,7 +819,7 @@ static void syntax_error_unexpected_ch(unsigned lineno, int ch)
#if ENABLE_HUSH_INTERACTIVE #if ENABLE_HUSH_INTERACTIVE
static void cmdedit_update_prompt(void); static void cmdedit_update_prompt(void);
#else #else
# define cmdedit_update_prompt() # define cmdedit_update_prompt() ((void)0)
#endif #endif
@ -1003,13 +1003,13 @@ static void restore_G_args(save_arg_t *sv, char **argv)
* If job control is off, backgrounded commands ("cmd &") * If job control is off, backgrounded commands ("cmd &")
* have SIGINT, SIGQUIT set to SIG_IGN. * have SIGINT, SIGQUIT set to SIG_IGN.
* *
* Commands run in command substitution ("`cmd`") * Commands which are run in command substitution ("`cmd`")
* have SIGTTIN, SIGTTOU, SIGTSTP set to SIG_IGN. * have SIGTTIN, SIGTTOU, SIGTSTP set to SIG_IGN.
* *
* Ordinary commands have signals set to SIG_IGN/DFL as inherited * Ordinary commands have signals set to SIG_IGN/DFL as inherited
* by the shell from its parent. * by the shell from its parent.
* *
* Siganls which differ from SIG_DFL action * Signals which differ from SIG_DFL action
* (note: child (i.e., [v]forked) shell is not an interactive shell): * (note: child (i.e., [v]forked) shell is not an interactive shell):
* *
* SIGQUIT: ignore * SIGQUIT: ignore
@ -1714,7 +1714,7 @@ static void nommu_addchr(o_string *o, int ch)
o_addchr(o, ch); o_addchr(o, ch);
} }
#else #else
#define nommu_addchr(o, str) ((void)0) # define nommu_addchr(o, str) ((void)0)
#endif #endif
static void o_addstr_with_NUL(o_string *o, const char *str) static void o_addstr_with_NUL(o_string *o, const char *str)
@ -1834,7 +1834,7 @@ static void debug_print_list(const char *prefix, o_string *o, int n)
} }
} }
#else #else
#define debug_print_list(prefix, o, n) ((void)0) # define debug_print_list(prefix, o, n) ((void)0)
#endif #endif
/* n = o_save_ptr_helper(str, n) "starts new string" by storing an index value /* n = o_save_ptr_helper(str, n) "starts new string" by storing an index value
@ -6294,7 +6294,7 @@ int hush_main(int argc, char **argv)
/* bash: after sourcing /etc/profile, /* bash: after sourcing /etc/profile,
* tries to source (in the given order): * tries to source (in the given order):
* ~/.bash_profile, ~/.bash_login, ~/.profile, * ~/.bash_profile, ~/.bash_login, ~/.profile,
* stopping of first found. --noprofile turns this off. * stopping on first found. --noprofile turns this off.
* bash also sources ~/.bash_logout on exit. * bash also sources ~/.bash_logout on exit.
* If called as sh, skips .bash_XXX files. * If called as sh, skips .bash_XXX files.
*/ */
@ -6325,8 +6325,8 @@ int hush_main(int argc, char **argv)
* NB: don't forget to (re)run block_signals(0/1) as needed. * NB: don't forget to (re)run block_signals(0/1) as needed.
*/ */
/* A shell is interactive if the '-i' flag was given, or if all of /* A shell is interactive if the '-i' flag was given,
* the following conditions are met: * or if all of the following conditions are met:
* no -c command * no -c command
* no arguments remaining or the -s flag given * no arguments remaining or the -s flag given
* standard input is a terminal * standard input is a terminal