3f2477e8a
Denys Vlasenko
2010-12-01
Subject
touch: fix help text to not show options disabled in .config
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/Config.src +0 -7coreutils/Kbuild.src +0 -1coreutils/touch.c +29 -0include/applets.src.h +0 -1include/usage.src.h +0 -16
coreutils/Config.src+0 -7
| @@ -661,13 +661,6 @@ config FEATURE_TEE_USE_BLOCK_IO | |
| help | |
| 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 | |
| bool "true" | |
| default y | |
coreutils/Kbuild.src+0 -1
| @@ -74,7 +74,6 @@ lib-$(CONFIG_SYNC) += sync.o | |
| lib-$(CONFIG_TAC) += tac.o | |
| lib-$(CONFIG_TAIL) += tail.o | |
| lib-$(CONFIG_TEE) += tee.o | |
| - | lib-$(CONFIG_TOUCH) += touch.o |
| lib-$(CONFIG_TRUE) += true.o | |
| lib-$(CONFIG_TTY) += tty.o | |
| lib-$(CONFIG_UNAME) += uname.o | |
coreutils/touch.c+29 -0
| @@ -19,6 +19,35 @@ | |
| #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! */ | |
| /* coreutils implements: | |
include/applets.src.h+0 -1
| @@ -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_TIMEOUT(APPLET(timeout, _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_TRACEROUTE(APPLET(traceroute, _BB_DIR_USR_BIN, _BB_SUID_MAYBE)) | |
| IF_TRACEROUTE6(APPLET(traceroute6, _BB_DIR_USR_BIN, _BB_SUID_MAYBE)) | |
include/usage.src.h+0 -16
| @@ -4005,22 +4005,6 @@ INSERT | |
| "and display a screenful of them." \ | |
| //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 \ | |
| "[-cds] STRING1 [STRING2]" | |
| #define tr_full_usage "\n\n" \ | |