037219738
Rob Landley
2006-09-22
Subject
"I'll think about it" != "apply it now". It means I need to think about it.
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 →
console-tools/Config.in +0 -17console-tools/Makefile.in +0 -1console-tools/resize.c +0 -38include/applets.h +1 -1include/usage.h +0 -5
console-tools/Config.in+0 -17
| @@ -58,23 +58,6 @@ config CONFIG_RESET | |
| This program is used to reset the terminal screen, if it | |
| gets messed up. | |
| - | config CONFIG_APP_RESIZE |
| - | bool "resize" |
| - | default n |
| - | help |
| - | This program is used to (re)set the width and height of your current |
| - | terminal. |
| - | |
| - | config CONFIG_FEATURE_RESIZE_PRINT |
| - | bool "print environment variables" |
| - | default n |
| - | depends on CONFIG_APP_RESIZE |
| - | help |
| - | Prints the newly set size (number of columns and rows) of |
| - | the terminal. |
| - | E.g.: |
| - | COLUMNS=80;LINES=44;export COLUMNS LINES; |
| - | |
| config CONFIG_SETCONSOLE | |
| bool "setconsole" | |
| default n | |
console-tools/Makefile.in+0 -1
| @@ -20,7 +20,6 @@ CONSOLETOOLS-$(CONFIG_LOADFONT) += loadfont.o | |
| CONSOLETOOLS-$(CONFIG_LOADKMAP) += loadkmap.o | |
| CONSOLETOOLS-$(CONFIG_OPENVT) += openvt.o | |
| CONSOLETOOLS-$(CONFIG_RESET) += reset.o | |
| - | CONSOLETOOLS-$(CONFIG_APP_RESIZE) += resize.o |
| CONSOLETOOLS-$(CONFIG_SETKEYCODES) += setkeycodes.o | |
| CONSOLETOOLS-$(CONFIG_SETLOGCONS) += setlogcons.o | |
console-tools/resize.c+0 -38
| @@ -1,38 +0,0 @@ | |
| - | /* vi: set sw=4 ts=4: */ |
| - | /* |
| - | * resize - set terminal width and height. |
| - | * |
| - | * Copyright 2006 Bernhard Fischer |
| - | * |
| - | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
| - | */ |
| - | /* no options, no getopt */ |
| - | #include "busybox.h" |
| - | |
| - | int resize_main(int argc, char **argv) |
| - | { |
| - | struct termios old, new; |
| - | struct winsize w = {0,0,0,0}; |
| - | int ret; |
| - | |
| - | tcgetattr(STDOUT_FILENO, &old); /* fiddle echo */ |
| - | new = old; |
| - | new.c_cflag |= (CLOCAL | CREAD); |
| - | new.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); |
| - | tcsetattr(STDOUT_FILENO, TCSANOW, &new); |
| - | /* save_cursor_pos 7 |
| - | * scroll_whole_screen [r |
| - | * put_cursor_waaaay_off [$x;$yH |
| - | * get_cursor_pos [6n |
| - | * restore_cursor_pos 8 |
| - | */ |
| - | printf("\0337\033[r\033[999;999H\033[6n"); |
| - | scanf("\033[%hu;%huR", &w.ws_row, &w.ws_col); |
| - | ret = ioctl(STDOUT_FILENO, TIOCSWINSZ, &w); |
| - | printf("\0338"); |
| - | tcsetattr(STDOUT_FILENO, TCSANOW, &old); |
| - | if (ENABLE_FEATURE_RESIZE_PRINT) |
| - | printf("COLUMNS=%d;LINES=%d;export COLUMNS LINES;", |
| - | w.ws_col, w.ws_row); |
| - | return ret; |
| - | } |
include/applets.h+1 -1
| @@ -58,6 +58,7 @@ USE_ASH(APPLET_NOUSAGE(ash, ash, _BB_DIR_BIN, _BB_SUID_NEVER)) | |
| USE_AWK(APPLET(awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | |
| USE_BASENAME(APPLET(basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | |
| USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER)) | |
| + | //USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER)) |
| USE_BUNZIP2(APPLET(bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | |
| /* Always enabled. */ | |
| APPLET_NOUSAGE(busybox, busybox, _BB_DIR_BIN, _BB_SUID_MAYBE) | |
| @@ -226,7 +227,6 @@ USE_REALPATH(APPLET(realpath, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | |
| USE_HALT(APPLET_ODDNAME(reboot, halt, _BB_DIR_SBIN, _BB_SUID_NEVER, reboot)) | |
| USE_RENICE(APPLET(renice, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | |
| USE_RESET(APPLET(reset, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | |
| - | USE_APP_RESIZE(APPLET(resize, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
| USE_RM(APPLET(rm, _BB_DIR_BIN, _BB_SUID_NEVER)) | |
| USE_RMDIR(APPLET(rmdir, _BB_DIR_BIN, _BB_SUID_NEVER)) | |
| USE_RMMOD(APPLET(rmmod, _BB_DIR_SBIN, _BB_SUID_NEVER)) | |
include/usage.h+0 -5
| @@ -2455,11 +2455,6 @@ USE_FEATURE_MDEV_CONFIG( \ | |
| #define reset_full_usage \ | |
| "Resets the screen." | |
| - | #define resize_trivial_usage \ |
| - | "" |
| - | #define resize_full_usage \ |
| - | "Resizes the screen." |
| - | |
| #define rm_trivial_usage \ | |
| "[OPTION]... FILE..." | |
| #define rm_full_usage \ | |