Minor space saving improvments
No binary (build failed)
—
$ git checkout -f 9e6c9f731197c9f988f3b97b305bbf1f3ad9a8e5
HEAD is now at 9e6c9f731 Minor space saving improvments
$ git clean -fdx
Removing .menuconfig.log
Removing MCmenu0
Removing MCmenu1
Removing MCmenu2
Removing MCmenu3
Removing MCmenu4
Removing include/config/
Removing scripts/lxdialog/checklist.o
Removing scripts/lxdialog/inputbox.o
Removing scripts/lxdialog/lxdialog
Removing scripts/lxdialog/lxdialog.o
Removing scripts/lxdialog/menubox.o
Removing scripts/lxdialog/msgbox.o
Removing scripts/lxdialog/textbox.o
Removing scripts/lxdialog/util.o
Removing scripts/lxdialog/yesno.o
$ make SHELL=/bin/bash CC=/root/asi_db/compat/cc-wrapper.sh HOSTCC=/root/asi_db/compat/cc-wrapper.sh defconfig
make: *** No rule to make target 'defconfig'. Stop.
$ make SHELL=/bin/bash CC=/root/asi_db/compat/cc-wrapper.sh HOSTCC=/root/asi_db/compat/cc-wrapper.sh allnoconfig
make: *** No rule to make target 'allnoconfig'. Stop.
$ make SHELL=/bin/bash CC=/root/asi_db/compat/cc-wrapper.sh HOSTCC=/root/asi_db/compat/cc-wrapper.sh include/bb_config.h
make: *** No rule to make target 'include/bb_config.h'. Stop.
$ make SHELL=/bin/bash CC=/root/asi_db/compat/cc-wrapper.sh HOSTCC=/root/asi_db/compat/cc-wrapper.sh -j3 V=1
mkdir -p /root/asi_db/builds/busybox/_worktrees/w0/include/config
make -C scripts/lxdialog all
make[1]: Entering directory '/root/asi_db/builds/busybox/_worktrees/w0/scripts/lxdialog'
/root/asi_db/compat/cc-wrapper.sh -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -DLOCALE -DCURSES_LOC="<ncurses.h>" -c -o checklist.o checklist.c
/root/asi_db/compat/cc-wrapper.sh -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -DLOCALE -DCURSES_LOC="<ncurses.h>" -c -o menubox.o menubox.c
/root/asi_db/compat/cc-wrapper.sh -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -DLOCALE -DCURSES_LOC="<ncurses.h>" -c -o textbox.o textbox.c
/root/asi_db/compat/cc-wrapper.sh -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -DLOCALE -DCURSES_LOC="<ncurses.h>" -c -o yesno.o yesno.c
/root/asi_db/compat/cc-wrapper.sh -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -DLOCALE -DCURSES_LOC="<ncurses.h>" -c -o inputbox.o inputbox.c
/root/asi_db/compat/cc-wrapper.sh -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -DLOCALE -DCURSES_LOC="<ncurses.h>" -c -o util.o util.c
/root/asi_db/compat/cc-wrapper.sh -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -DLOCALE -DCURSES_LOC="<ncurses.h>" -c -o lxdialog.o lxdialog.c
/root/asi_db/compat/cc-wrapper.sh -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -DLOCALE -DCURSES_LOC="<ncurses.h>" -c -o msgbox.o msgbox.c
/root/asi_db/compat/cc-wrapper.sh -o lxdialog checklist.o menubox.o textbox.o yesno.o inputbox.o util.o lxdialog.o msgbox.o -lncurses
make[1]: Leaving directory '/root/asi_db/builds/busybox/_worktrees/w0/scripts/lxdialog'
/bin/bash scripts/Menuconfig sysdeps/linux/config.in
Using defaults found in sysdeps/linux/defconfig
Preparing scripts: functions, parsingAwk died with error code 137. Giving up.
.....done.
Your BusyBox configuration changes were NOT saved.
lxtemp.c:1:1: warning: return type defaults to ‘int’ [-Wimplicit-int]
1 | main() {}
| ^~~~
textbox.c: In function ‘dialog_textbox’:
textbox.c:42:10: warning: variable ‘search_term’ set but not used [-Wunused-but-set-variable]
42 | char search_term[MAX_LEN + 1];
| ^~~~~~~~~~~
textbox.c: In function ‘print_line’:
textbox.c:462:12: warning: variable ‘x’ set but not used [-Wunused-but-set-variable]
462 | int y, x;
| ^
textbox.c:462:9: warning: variable ‘y’ set but not used [-Wunused-but-set-variable]
462 | int y, x;
| ^
inputbox.c: In function ‘dialog_inputbox’:
inputbox.c:107:17: warning: pointer targets in passing argument 1 of ‘strcpy’ differ in signedness [-Wpointer-sign]
107 | strcpy (instr, init);
| ^~~~~
| |
| unsigned char *
In file included from /usr/include/features.h:486,
from /usr/include/x86_64-linux-gnu/sys/sysmacros.h:22,
from /root/asi_db/compat/compat_stime.h:9,
from <command-line>:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:77:1: note: expected ‘char * restrict’ but argument is of type ‘unsigned char *’
77 | __NTH (strcpy (char *__restrict __dest, const char *__restrict __src))
| ^~~~~
inputbox.c:109:23: warning: pointer targets in passing argument 1 of ‘strlen’ differ in signedness [-Wpointer-sign]
109 | input_x = strlen (instr);
| ^~~~~
| |
| unsigned char *
In file included from dialog.h:27,
from inputbox.c:22:
/usr/include/string.h:407:35: note: expected ‘const char *’ but argument is of type ‘unsigned char *’
407 | extern size_t strlen (const char *__s)
| ~~~~~~~~~~~~^~~
In file included from dialog.h:29,
from inputbox.c:22:
inputbox.c:117:26: warning: pointer targets in passing argument 2 of ‘waddnstr’ differ in signedness [-Wpointer-sign]
117 | waddstr (dialog, instr);
| ^~~~~
| |
| unsigned char *
/usr/include/curses.h:830:47: note: expected ‘const char *’ but argument is of type ‘unsigned char *’
830 | extern NCURSES_EXPORT(int) waddnstr (WINDOW *,const char *,int); /* implemented */
| ^~~~~~~~~~~~
inputbox.c:147:43: warning: pointer targets in passing argument 1 of ‘strlen’ differ in signedness [-Wpointer-sign]
147 | input_x = strlen (instr) - scroll;
| ^~~~~
| |
| unsigned char *
In file included from dialog.h:27,
from inputbox.c:22:
/usr/include/string.h:407:35: note: expected ‘const char *’ but argument is of type ‘unsigned char *’
407 | extern size_t strlen (const char *__s)
| ~~~~~~~~~~~~^~~
lxdialog.c: In function ‘j_inputbox’:
lxdialog.c:211:25: warning: pointer targets in passing argument 2 of ‘fprintf’ differ in signedness [-Wpointer-sign]
211 | fprintf(stderr, dialog_input_result);
| ^~~~~~~~~~~~~~~~~~~
| |
| unsigned char *
In file included from /usr/include/stdio.h:894,
from /usr/include/curses.h:232,
from dialog.h:29,
from lxdialog.c:22:
/usr/include/x86_64-linux-gnu/bits/stdio2.h:103:60: note: expected ‘const char * restrict’ but argument is of type ‘unsigned char *’
103 | fprintf (FILE *__restrict __stream, const char *__restrict __fmt, ...)
| ~~~~~~~~~~~~~~~~~~~~~~~^~~~~
lxdialog.c:211:25: warning: format not a string literal and no format arguments [-Wformat-security]
211 | fprintf(stderr, dialog_input_result);
| ^~~~~~~~~~~~~~~~~~~
scripts/Menuconfig: line 559: 1320869 Killed awk "$1"
Error opening terminal: unknown.
| @@ -26,9 +26,6 @@ | |
| #include <stdlib.h> | |
| #include "busybox.h" | |
| - | static int total_lines, total_words, total_chars, max_length; |
| - | //static int print_lines, print_words, print_chars, print_length; |
| - | static char print_type = 0; |
| enum print_e { | |
| print_lines = 1, | |
| print_words = 2, | |
| @@ -36,8 +33,14 @@ enum print_e { | |
| print_length = 8 | |
| }; | |
| - | static void print_counts(int lines, int words, int chars, int length, |
| - | const char *name) |
| + | static unsigned int total_lines = 0; |
| + | static unsigned int total_words = 0; |
| + | static unsigned int total_chars = 0; |
| + | static unsigned int max_length = 0; |
| + | static char print_type = 0; |
| + | |
| + | static void print_counts(const unsigned int lines, const unsigned int words, |
| + | const unsigned int chars, const unsigned int length, const char *name) |
| { | |
| if (print_type & print_lines) { | |
| printf("%7d ", lines); | |
| @@ -59,11 +62,14 @@ static void print_counts(int lines, int words, int chars, int length, | |
| static void wc_file(FILE * file, const char *name) | |
| { | |
| - | int lines, words, chars, length; |
| - | int in_word = 0, linepos = 0; |
| - | int c; |
| + | unsigned int lines = 0; |
| + | unsigned int words = 0; |
| + | unsigned int chars = 0; |
| + | unsigned int length = 0; |
| + | unsigned int linepos = 0; |
| + | char in_word = 0; |
| + | char c; |
| - | lines = words = chars = length = 0; |
| while ((c = getc(file)) != EOF) { | |
| chars++; | |
| switch (c) { | |
| @@ -81,7 +87,7 @@ static void wc_file(FILE * file, const char *name) | |
| case ' ': | |
| linepos++; | |
| case '\v': | |
| - | word_separator: |
| + | word_separator: |
| if (in_word) { | |
| in_word = 0; | |
| words++; | |
| @@ -93,30 +99,27 @@ static void wc_file(FILE * file, const char *name) | |
| break; | |
| } | |
| } | |
| - | if (linepos > length) |
| + | if (linepos > length) { |
| length = linepos; | |
| - | if (in_word) |
| + | } |
| + | if (in_word) { |
| words++; | |
| + | } |
| print_counts(lines, words, chars, length, name); | |
| total_lines += lines; | |
| total_words += words; | |
| total_chars += chars; | |
| - | if (length > max_length) |
| + | if (length > max_length) { |
| max_length = length; | |
| - | fclose(file); |
| - | fflush(stdout); |
| + | } |
| } | |
| int wc_main(int argc, char **argv) | |
| { | |
| - | FILE *file; |
| - | unsigned int num_files_counted = 0; |
| - | int opt, status = EXIT_SUCCESS; |
| - | |
| - | total_lines = total_words = total_chars = max_length = 0; |
| + | int opt; |
| while ((opt = getopt(argc, argv, "clLw")) > 0) { | |
| - | switch (opt) { |
| + | switch (opt) { |
| case 'c': | |
| print_type |= print_chars; | |
| break; | |
| @@ -131,7 +134,7 @@ int wc_main(int argc, char **argv) | |
| break; | |
| default: | |
| show_usage(); | |
| - | } |
| + | } |
| } | |
| if (print_type == 0) { | |
| @@ -140,8 +143,8 @@ int wc_main(int argc, char **argv) | |
| if (argv[optind] == NULL || strcmp(argv[optind], "-") == 0) { | |
| wc_file(stdin, ""); | |
| - | return EXIT_SUCCESS; |
| } else { | |
| + | unsigned short num_files_counted = 0; |
| while (optind < argc) { | |
| if (print_type == print_chars) { | |
| struct stat statbuf; | |
| @@ -149,17 +152,18 @@ int wc_main(int argc, char **argv) | |
| print_counts(0, 0, statbuf.st_size, 0, argv[optind]); | |
| total_chars += statbuf.st_size; | |
| } else { | |
| + | FILE *file; |
| file = xfopen(argv[optind], "r"); | |
| wc_file(file, argv[optind]); | |
| + | fclose(file); |
| } | |
| - | num_files_counted++; |
| optind++; | |
| + | num_files_counted++; |
| + | } |
| + | if (num_files_counted > 1) { |
| + | print_counts(total_lines, total_words, total_chars, max_length, "total"); |
| } | |
| } | |
| - | if (num_files_counted > 1) |
| - | print_counts(total_lines, total_words, total_chars, |
| - | max_length, "total"); |
| - | |
| - | return status; |
| + | return(EXIT_SUCCESS); |
| } | |