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

Fix from Tito to read from stdin only when it's not a tty.

Browse Source
This commit is contained in:
Rob Landley 2006-06-07 21:22:42 +00:00
parent 5929edc1fa
commit 6d8ce170b0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/usage.h
View File

@ -994,7 +994,7 @@ USE_FEATURE_DATE_ISOFMT( \
#define hdparm_trivial_usage \
"[options] [device] .."
#define hdparm_full_usage \
USE_FEATURE_HDPARM_GET_IDENTITY("\tIf no device name is specified read from stdin.\n") \
USE_FEATURE_HDPARM_GET_IDENTITY("\tIf no device name is specified try to read from stdin.\n") \
"\nOptions:\n" \
"\t-a get/set fs readahead\n" \
"\t-A set drive read-lookahead flag (0/1)\n" \

6
miscutils/hdparm.c
View File

@ -2185,11 +2185,11 @@ int hdparm_main(int argc, char **argv)
argc -= optind;
argv += optind;
#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
if (argc < 1) {
identify_from_stdin(); /* EXIT */
if (ENABLE_FEATURE_HDPARM_GET_IDENTITY && !isatty(STDIN_FILENO))
identify_from_stdin(); /* EXIT */
else bb_show_usage();
}
#endif
while (argc--) {
process_dev(*argv);