diff options
author | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-06-07 21:22:42 +0000 |
---|---|---|
committer | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-06-07 21:22:42 +0000 |
commit | 1ccac5fce7dfe23c4d2c2fc1faaf889a21e7782a (patch) | |
tree | 9eb1bcdc6c73b7512c3611911275f28d06ec94c5 /miscutils/hdparm.c | |
parent | ed8ac8dd824e5ec31d60c0325041cfada5fd1384 (diff) | |
download | busybox-w32-1ccac5fce7dfe23c4d2c2fc1faaf889a21e7782a.tar.gz busybox-w32-1ccac5fce7dfe23c4d2c2fc1faaf889a21e7782a.tar.bz2 busybox-w32-1ccac5fce7dfe23c4d2c2fc1faaf889a21e7782a.zip |
Fix from Tito to read from stdin only when it's not a tty.
git-svn-id: svn://busybox.net/trunk/busybox@15328 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'miscutils/hdparm.c')
-rw-r--r-- | miscutils/hdparm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 5703eceb5..512995a4b 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
@@ -2185,11 +2185,11 @@ int hdparm_main(int argc, char **argv) | |||
2185 | argc -= optind; | 2185 | argc -= optind; |
2186 | argv += optind; | 2186 | argv += optind; |
2187 | 2187 | ||
2188 | #if ENABLE_FEATURE_HDPARM_GET_IDENTITY | ||
2189 | if (argc < 1) { | 2188 | if (argc < 1) { |
2190 | identify_from_stdin(); /* EXIT */ | 2189 | if (ENABLE_FEATURE_HDPARM_GET_IDENTITY && !isatty(STDIN_FILENO)) |
2190 | identify_from_stdin(); /* EXIT */ | ||
2191 | else bb_show_usage(); | ||
2191 | } | 2192 | } |
2192 | #endif | ||
2193 | 2193 | ||
2194 | while (argc--) { | 2194 | while (argc--) { |
2195 | process_dev(*argv); | 2195 | process_dev(*argv); |