4c9786310
Denis Vlasenko
2007-02-03
Subject
assorted fixes for bugs found with randomconfig
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
findutils/find.c +4 -1init/init.c +1 -1networking/ether-wake.c +2 -1networking/ping.c +1 -1shell/hush.c +4 -4
findutils/find.c+4 -1
| @@ -316,12 +316,15 @@ static int find_type(const char *type) | |
| } | |
| #endif | |
| + | #if ENABLE_FEATURE_FIND_PERM || ENABLE_FEATURE_FIND_MTIME \ |
| + | || ENABLE_FEATURE_FIND_MMIN |
| static const char* plus_minus_num(const char* str) | |
| { | |
| if (*str == '-' || *str == '+') | |
| str++; | |
| return str; | |
| } | |
| + | #endif |
| static action*** parse_params(char **argv) | |
| { | |
| @@ -486,7 +489,7 @@ static action*** parse_params(char **argv) | |
| ap->subst_count[i] = count_subst(ap->exec_argv[i]); | |
| } | |
| #endif | |
| - | #ifdef ENABLE_FEATURE_FIND_USER |
| + | #if ENABLE_FEATURE_FIND_USER |
| else if (strcmp(arg, "-user") == 0) { | |
| action_user *ap; | |
| if (!*++argv) | |
init/init.c+1 -1
| @@ -122,7 +122,7 @@ static struct init_action *init_action_list = NULL; | |
| static char console[CONSOLE_BUFF_SIZE] = CONSOLE_DEV; | |
| #if !ENABLE_SYSLOGD | |
| - | static char *log_console = VC_5; |
| + | static const char *log_console = VC_5; |
| #endif | |
| #if !ENABLE_DEBUG_INIT | |
| static sig_atomic_t got_cont = 0; | |
networking/ether-wake.c+2 -1
| @@ -107,7 +107,8 @@ static inline int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd); | |
| int ether_wake_main(int argc, char *argv[]) | |
| { | |
| - | char *ifname = "eth0", *pass = NULL; |
| + | const char *ifname = "eth0"; |
| + | char *pass = NULL; |
| unsigned long flags; | |
| unsigned char wol_passwd[6]; | |
| int wol_passwd_sz = 0; | |
networking/ping.c+1 -1
| @@ -190,7 +190,7 @@ int ping_main(int argc, char **argv) | |
| len_and_sockaddr *lsa; | |
| #if ENABLE_PING6 | |
| sa_family_t af = AF_UNSPEC; | |
| - | while (++argv[0][0]) == '-') { |
| + | while (++argv[0][0] == '-') { |
| if (argv[0][1] == '4') { | |
| af = AF_INET; | |
| continue; | |
shell/hush.c+4 -4
| @@ -2795,8 +2795,8 @@ int hush_main(int argc, char **argv) | |
| } | |
| debug_printf("\nrunning script '%s'\n", argv[optind]); | |
| - | global_argv = argv+optind; |
| - | global_argc = argc-optind; |
| + | global_argv = argv + optind; |
| + | global_argc = argc - optind; |
| input = xfopen(argv[optind], "r"); | |
| opt = parse_file_outer(input); | |
| @@ -2809,8 +2809,8 @@ int hush_main(int argc, char **argv) | |
| for (cur = top_vars; cur; cur = tmp) { | |
| tmp = cur->next; | |
| if (!cur->flg_read_only) { | |
| - | free(cur->name); |
| - | free(cur->value); |
| + | free((char*)cur->name); |
| + | free((char*)cur->value); |
| free(cur); | |
| } | |
| } | |