aboutsummaryrefslogtreecommitdiff
path: root/contrib/elftoolchain
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2017-01-25 20:59:06 +0000
committerEd Maste <emaste@FreeBSD.org>2017-01-25 20:59:06 +0000
commit080b7108890196477ab7e1eb7aca0f8eccb4a408 (patch)
tree650d62949ac7a1f00cb7edf24509bb8c8623ed4c /contrib/elftoolchain
parentd780a32bc50de8dc50af2a1fead54fca610a0dd6 (diff)
downloadsrc-080b7108890196477ab7e1eb7aca0f8eccb4a408.tar.gz
src-080b7108890196477ab7e1eb7aca0f8eccb4a408.zip
strings: avoid unnecessary trip through handle_file for stdin
Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=312779
Diffstat (limited to 'contrib/elftoolchain')
-rw-r--r--contrib/elftoolchain/strings/strings.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/contrib/elftoolchain/strings/strings.c b/contrib/elftoolchain/strings/strings.c
index a936b6be1bbb..30917d8292b5 100644
--- a/contrib/elftoolchain/strings/strings.c
+++ b/contrib/elftoolchain/strings/strings.c
@@ -189,7 +189,7 @@ main(int argc, char **argv)
if (!min_len)
min_len = 4;
if (!*argv)
- rc = handle_file("{standard input}");
+ rc = find_strings("{standard input}", 0, 0);
else while (*argv) {
if (handle_file(*argv) != 0)
rc = 1;
@@ -205,13 +205,9 @@ handle_file(const char *name)
if (name == NULL)
return (1);
- if (strcmp("{standard input}", name) != 0) {
- if (freopen(name, "rb", stdin) == NULL) {
- warnx("'%s': %s", name, strerror(errno));
- return (1);
- }
- } else {
- return (find_strings(name, (off_t)0, (off_t)0));
+ if (freopen(name, "rb", stdin) == NULL) {
+ warnx("'%s': %s", name, strerror(errno));
+ return (1);
}
fd = fileno(stdin);