summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--scripts/lxdialog/Makefile34
-rwxr-xr-xscripts/lxdialog/lxdialogbin37159 -> 0 bytes
-rw-r--r--scripts/lxdialog/util.c2
3 files changed, 21 insertions, 15 deletions
diff --git a/scripts/lxdialog/Makefile b/scripts/lxdialog/Makefile
index 75b7bac..b34bbc3 100644
--- a/scripts/lxdialog/Makefile
+++ b/scripts/lxdialog/Makefile
@@ -1,44 +1,50 @@
1HOST_CFLAGS := -DLOCALE 1HOST_EXTRACFLAGS := -DLOCALE
2HOST_LDFLAGS := -lncurses 2HOST_LOADLIBES := -lncurses
3HOSTCC = gcc
3 4
4ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h)) 5ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
5 HOST_CFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" 6 HOST_EXTRACFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
6else 7else
7ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h)) 8ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h))
8 HOST_CFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>" 9 HOST_EXTRACFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
9else 10else
10ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h)) 11ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
11 HOST_CFLAGS += -DCURSES_LOC="<ncurses.h>" 12 HOST_EXTRACFLAGS += -DCURSES_LOC="<ncurses.h>"
12else 13else
13 HOST_CFLAGS += -DCURSES_LOC="<curses.h>" 14 HOST_EXTRACFLAGS += -DCURSES_LOC="<curses.h>"
14endif 15endif
15endif 16endif
16endif 17endif
17 18
18host-progs := lxdialog 19 host-progs:= lxdialog
20 always := $(host-progs)
19 21
20lxdialog-objs := checklist.o menubox.o textbox.o yesno.o inputbox.o \ 22lxdialog-objs := checklist.o menubox.o textbox.o yesno.o inputbox.o \
21 util.o lxdialog.o msgbox.o 23 util.o lxdialog.o msgbox.o
22 24
23EXTRA_TARGETS := lxdialog 25first_rule: ncurses lxdialog
24
25first_rule: ncurses
26
27include $(TOPDIR)/Rules.make
28 26
29.PHONY: ncurses 27.PHONY: ncurses
30
31ncurses: 28ncurses:
32 @echo "main() {}" > lxtemp.c 29 @echo "main() {}" > lxtemp.c
33 @if $(HOSTCC) $(HOST_CFLAGS) lxtemp.c $(HOST_LDFLAGS); then \ 30 @if $(HOSTCC) lxtemp.c $(HOST_LOADLIBES); then \
34 rm -f lxtemp.c a.out; \ 31 rm -f lxtemp.c a.out; \
35 else \ 32 else \
36 rm -f lxtemp.c; \ 33 rm -f lxtemp.c; \
37 echo -e "\007" ;\ 34 echo -e "\007" ;\
38 echo ">> Unable to find the Ncurses libraries." ;\ 35 echo ">> Unable to find the Ncurses libraries." ;\
39 echo ">>" ;\ 36 echo ">>" ;\
40 echo ">> You must have Ncurses installed in order" ;\ 37 echo ">> You must have Ncurses installed in order" ;\
41 echo ">> to use 'make menuconfig'" ;\ 38 echo ">> to use 'make menuconfig'" ;\
42 echo ;\ 39 echo ;\
43 exit 1 ;\ 40 exit 1 ;\
44 fi 41 fi
42
43clean:
44 rm -f $(lxdialog-objs) lxdialog
45
46%.o: %.c
47 $(HOSTCC) $(HOST_EXTRACFLAGS) -fPIC -c $^ -o $@
48
49lxdialog: $(lxdialog-objs)
50 $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) $^ -o $@
diff --git a/scripts/lxdialog/lxdialog b/scripts/lxdialog/lxdialog
deleted file mode 100755
index f0dca91..0000000
--- a/scripts/lxdialog/lxdialog
+++ b/dev/null
Binary files differ
diff --git a/scripts/lxdialog/util.c b/scripts/lxdialog/util.c
index b3a7af9..e7bce9b 100644
--- a/scripts/lxdialog/util.c
+++ b/scripts/lxdialog/util.c
@@ -343,17 +343,17 @@ int
343first_alpha(const char *string, const char *exempt) 343first_alpha(const char *string, const char *exempt)
344{ 344{
345 int i, in_paren=0, c; 345 int i, in_paren=0, c;
346 346
347 for (i = 0; i < strlen(string); i++) { 347 for (i = 0; i < strlen(string); i++) {
348 c = tolower(string[i]); 348 c = tolower(string[i]);
349 349
350 if (strchr("<[(", c)) ++in_paren; 350 if (strchr("<[(", c)) ++in_paren;
351 if (strchr(">])", c)) --in_paren; 351 if (strchr(">])", c) && in_paren > 0) --in_paren;
352 352
353 if ((! in_paren) && isalpha(c) && 353 if ((! in_paren) && isalpha(c) &&
354 strchr(exempt, c) == 0) 354 strchr(exempt, c) == 0)
355 return i; 355 return i;
356 } 356 }
357 357
358 return 0; 358 return 0;
359} 359}