aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-03-06 23:09:42 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2011-03-06 23:09:42 +0100
commit726ebbaa9f1cae426b5f2a4bddbe0a88c81d754e (patch)
treedceefc7a1fca805a1c9f4014a4843cb741b7f504
parent102b8bde3b86e5d2eb9e8a60d220e55e00beccf1 (diff)
downloadbusybox-w32-726ebbaa9f1cae426b5f2a4bddbe0a88c81d754e.tar.gz
busybox-w32-726ebbaa9f1cae426b5f2a4bddbe0a88c81d754e.tar.bz2
busybox-w32-726ebbaa9f1cae426b5f2a4bddbe0a88c81d754e.zip
fix bit rot in scripts/Makefile.IMA
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--loginutils/getty.c4
-rw-r--r--scripts/Makefile.IMA8
2 files changed, 9 insertions, 3 deletions
diff --git a/loginutils/getty.c b/loginutils/getty.c
index 3f20c8e81..dfa15b3da 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -87,7 +87,7 @@ struct globals {
87 const char *login; /* login program */ 87 const char *login; /* login program */
88 const char *fakehost; 88 const char *fakehost;
89 const char *tty; /* name of tty */ 89 const char *tty; /* name of tty */
90 const char *initstring; /* modem init string */ 90 char *initstring; /* modem init string */
91 const char *issue; /* alternative issue file */ 91 const char *issue; /* alternative issue file */
92 int numspeed; /* number of baud rates to try */ 92 int numspeed; /* number of baud rates to try */
93 int speeds[MAX_SPEED]; /* baud rates to be tried */ 93 int speeds[MAX_SPEED]; /* baud rates to be tried */
@@ -176,7 +176,7 @@ static void parse_args(char **argv)
176 if (flags & F_INITSTRING) { 176 if (flags & F_INITSTRING) {
177 G.initstring = xstrdup(G.initstring); 177 G.initstring = xstrdup(G.initstring);
178 /* decode \ddd octal codes into chars */ 178 /* decode \ddd octal codes into chars */
179 strcpy_and_process_escape_sequences((char*)G.initstring, G.initstring); 179 strcpy_and_process_escape_sequences(G.initstring, G.initstring);
180 } 180 }
181 argv += optind; 181 argv += optind;
182 debug("after getopt\n"); 182 debug("after getopt\n");
diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA
index a62618ae0..fcb8e5049 100644
--- a/scripts/Makefile.IMA
+++ b/scripts/Makefile.IMA
@@ -9,7 +9,10 @@ objtree := $(CURDIR)
9src := $(srctree) 9src := $(srctree)
10obj := $(objtree) 10obj := $(objtree)
11 11
12# Look for make include files relative to root of kernel src 12# Make generated files
13DUMMY := $(shell $(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree) >&2)
14
15# Look for make include files relative to root of src
13MAKEFLAGS += --include-dir=$(srctree) 16MAKEFLAGS += --include-dir=$(srctree)
14 17
15default: busybox 18default: busybox
@@ -121,6 +124,9 @@ lib-y:=
121include miscutils/Kbuild 124include miscutils/Kbuild
122lib-all-y += $(patsubst %,miscutils/%,$(sort $(lib-y))) 125lib-all-y += $(patsubst %,miscutils/%,$(sort $(lib-y)))
123lib-y:= 126lib-y:=
127include mailutils/Kbuild
128lib-all-y += $(patsubst %,mailutils/%,$(sort $(lib-y)))
129lib-y:=
124include coreutils/libcoreutils/Kbuild 130include coreutils/libcoreutils/Kbuild
125lib-all-y += $(patsubst %,coreutils/libcoreutils/%,$(sort $(lib-y))) 131lib-all-y += $(patsubst %,coreutils/libcoreutils/%,$(sort $(lib-y)))
126lib-y:= 132lib-y:=