485d7cbdf
"Vladimir N. Oleynik"
2005-10-17
Subject
data --> text
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/hush.c+7 -7
| @@ -133,7 +133,7 @@ typedef enum { | |
| /* The descrip member of this structure is only used to make debugging | |
| * output pretty */ | |
| - | static struct {int mode; int default_fd; char *descrip;} redir_table[] = { |
| + | static const struct {int mode; int default_fd; const char *descrip;} redir_table[] = { |
| { 0, 0, "()" }, | |
| { O_RDONLY, 0, "<" }, | |
| { O_CREAT|O_TRUNC|O_WRONLY, 1, ">" }, | |
| @@ -297,8 +297,8 @@ struct in_str { | |
| #define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n" | |
| struct built_in_command { | |
| - | char *cmd; /* name */ |
| - | char *descr; /* description */ |
| + | const char *cmd; /* name */ |
| + | const char *descr; /* description */ |
| int (*function) (struct child_prog *); /* function ptr */ | |
| }; | |
| @@ -414,7 +414,7 @@ static int set_local_var(const char *s, int flg_export); | |
| * in the parent shell process. If forked, of course they can not. | |
| * For example, 'unset foo | whatever' will parse and run, but foo will | |
| * still be set at the end. */ | |
| - | static struct built_in_command bltins[] = { |
| + | static const struct built_in_command bltins[] = { |
| {"bg", "Resume a job in the background", builtin_fg_bg}, | |
| {"break", "Exit for, while or until loop", builtin_not_written}, | |
| {"cd", "Change working directory", builtin_cd}, | |
| @@ -618,7 +618,7 @@ static int builtin_fg_bg(struct child_prog *child) | |
| /* built-in 'help' handler */ | |
| static int builtin_help(struct child_prog *dummy) | |
| { | |
| - | struct built_in_command *x; |
| + | const struct built_in_command *x; |
| printf("\nBuilt-in commands:\n"); | |
| printf("-------------------\n"); | |
| @@ -1076,7 +1076,7 @@ static void pseudo_exec(struct child_prog *child) | |
| { | |
| int i, rcode; | |
| char *p; | |
| - | struct built_in_command *x; |
| + | const struct built_in_command *x; |
| if (child->argv) { | |
| for (i=0; is_assignment(child->argv[i]); i++) { | |
| debug_printf("pid %d environment modification: %s\n",getpid(),child->argv[i]); | |
| @@ -1338,7 +1338,7 @@ static int run_pipe_real(struct pipe *pi) | |
| int nextin, nextout; | |
| int pipefds[2]; /* pipefds[0] is for reading */ | |
| struct child_prog *child; | |
| - | struct built_in_command *x; |
| + | const struct built_in_command *x; |
| char *p; | |
| nextin = 0; | |
shell/msh.c+7 -7
| @@ -514,7 +514,7 @@ static int eofc(void); | |
| static int readc(void); | |
| static void unget(int c); | |
| static void ioecho(int c); | |
| - | static void prs(char *s); |
| + | static void prs(const char *s); |
| static void prn(unsigned u); | |
| static void closef(int i); | |
| static void closeall(void); | |
| @@ -622,7 +622,7 @@ struct here { | |
| struct here *h_next; | |
| }; | |
| - | static char *signame[] = { |
| + | static const char * const signame[] = { |
| "Signal 0", | |
| "Hangup", | |
| (char *) NULL, /* interrupt */ | |
| @@ -644,10 +644,10 @@ static char *signame[] = { | |
| #define NSIGNAL (sizeof(signame)/sizeof(signame[0])) | |
| struct res { | |
| - | char *r_name; |
| + | const char *r_name; |
| int r_val; | |
| }; | |
| - | static struct res restab[] = { |
| + | static const struct res restab[] = { |
| {"for", FOR}, | |
| {"case", CASE}, | |
| {"esac", ESAC}, | |
| @@ -709,7 +709,7 @@ static char **dolv; | |
| static int dolc; | |
| static int exstat; | |
| static char gflg; | |
| - | static int interactive = 0; /* Is this an interactive shell */ |
| + | static int interactive; /* Is this an interactive shell */ |
| static int execflg; | |
| static int multiline; /* \n changed to ; */ | |
| static struct op *outtree; /* result from parser */ | |
| @@ -2245,7 +2245,7 @@ char **wp; | |
| static int rlookup(n) | |
| REGISTER char *n; | |
| { | |
| - | REGISTER struct res *rp; |
| + | REGISTER const struct res *rp; |
| DBGPRINTF7(("RLOOKUP: enter, n is %s\n", n)); | |
| @@ -5166,7 +5166,7 @@ REGISTER struct ioarg *ap; | |
| } | |
| static void prs(s) | |
| - | REGISTER char *s; |
| + | REGISTER const char *s; |
| { | |
| if (*s) | |
| write(2, s, strlen(s)); | |