emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

touch: fix help text to not show options disabled in .config

Browse Source 
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko 2010-12-01 13:06:03 +01:00
parent 631fd5ccd7
commit 3f2477e8a8
5 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
coreutils/Config.src
View File

@ -661,13 +661,6 @@ config FEATURE_TEE_USE_BLOCK_IO
help help
Enable this option for a faster tee, at expense of size. Enable this option for a faster tee, at expense of size.
config TOUCH
bool "touch"
default y
help
touch is used to create or change the access and/or
modification timestamp of specified files.
config TRUE config TRUE
bool "true" bool "true"
default y default y

1
coreutils/Kbuild.src
View File

@ -74,7 +74,6 @@ lib-$(CONFIG_SYNC) += sync.o
lib-$(CONFIG_TAC) += tac.o lib-$(CONFIG_TAC) += tac.o
lib-$(CONFIG_TAIL) += tail.o lib-$(CONFIG_TAIL) += tail.o
lib-$(CONFIG_TEE) += tee.o lib-$(CONFIG_TEE) += tee.o
lib-$(CONFIG_TOUCH) += touch.o
lib-$(CONFIG_TRUE) += true.o lib-$(CONFIG_TRUE) += true.o
lib-$(CONFIG_TTY) += tty.o lib-$(CONFIG_TTY) += tty.o
lib-$(CONFIG_UNAME) += uname.o lib-$(CONFIG_UNAME) += uname.o

29
coreutils/touch.c
View File

@ -19,6 +19,35 @@
#include "libbb.h" #include "libbb.h"
//config:config TOUCH
//config: bool "touch"
//config: default y
//config: help
//config: touch is used to create or change the access and/or
//config: modification timestamp of specified files.
//applet:IF_TOUCH(APPLET_NOFORK(touch, touch, _BB_DIR_BIN, _BB_SUID_DROP, touch))
//kbuild:lib-$(CONFIG_TOUCH) += touch.o
//usage:#define touch_trivial_usage
//usage: "[-c]" IF_DESKTOP(" [-d DATE] [-r FILE]") " FILE [FILE]..."
//usage:#define touch_full_usage "\n\n"
//usage: "Update the last-modified date on the given FILE[s]\n"
//usage: "\nOptions:"
//usage: "\n -c Don't create files"
//usage: IF_DESKTOP(
//usage: "\n -d DT Date/time to use"
//usage: "\n -r FILE Use FILE's date/time"
//usage: )
//usage:
//usage:#define touch_example_usage
//usage: "$ ls -l /tmp/foo\n"
//usage: "/bin/ls: /tmp/foo: No such file or directory\n"
//usage: "$ touch /tmp/foo\n"
//usage: "$ ls -l /tmp/foo\n"
//usage: "-rw-rw-r-- 1 andersen andersen 0 Apr 15 01:11 /tmp/foo\n"
/* This is a NOFORK applet. Be very careful! */ /* This is a NOFORK applet. Be very careful! */
/* coreutils implements: /* coreutils implements:

1
include/applets.src.h
View File

@ -356,7 +356,6 @@ IF_TFTPD(APPLET(tftpd, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_TIME(APPLET(time, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_TIME(APPLET(time, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_TIMEOUT(APPLET(timeout, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_TIMEOUT(APPLET(timeout, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_TOP(APPLET(top, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_TOP(APPLET(top, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_TOUCH(APPLET_NOFORK(touch, touch, _BB_DIR_BIN, _BB_SUID_DROP, touch))
IF_TR(APPLET(tr, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_TR(APPLET(tr, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_TRACEROUTE(APPLET(traceroute, _BB_DIR_USR_BIN, _BB_SUID_MAYBE)) IF_TRACEROUTE(APPLET(traceroute, _BB_DIR_USR_BIN, _BB_SUID_MAYBE))
IF_TRACEROUTE6(APPLET(traceroute6, _BB_DIR_USR_BIN, _BB_SUID_MAYBE)) IF_TRACEROUTE6(APPLET(traceroute6, _BB_DIR_USR_BIN, _BB_SUID_MAYBE))

16
include/usage.src.h
View File

@ -4005,22 +4005,6 @@ INSERT
"and display a screenful of them." \ "and display a screenful of them." \
//TODO: add options and keyboard commands //TODO: add options and keyboard commands
#define touch_trivial_usage \
"[-c] [-d DATE] [-r FILE] FILE [FILE]..."
#define touch_full_usage "\n\n" \
"Update the last-modified date on the given FILE[s]\n" \
"\nOptions:" \
"\n -c Don't create files" \
"\n -d DT Date/time to use" \
"\n -r FILE Use FILE's date/time" \
#define touch_example_usage \
"$ ls -l /tmp/foo\n" \
"/bin/ls: /tmp/foo: No such file or directory\n" \
"$ touch /tmp/foo\n" \
"$ ls -l /tmp/foo\n" \
"-rw-rw-r-- 1 andersen andersen 0 Apr 15 01:11 /tmp/foo\n"
#define tr_trivial_usage \ #define tr_trivial_usage \
"[-cds] STRING1 [STRING2]" "[-cds] STRING1 [STRING2]"
#define tr_full_usage "\n\n" \ #define tr_full_usage "\n\n" \