From 820bd9717106bb769c90e69111e287eda4cd18a9 Mon Sep 17 00:00:00 2001 From: emaste Date: Wed, 3 May 2017 02:04:38 +0000 Subject: MFC r312779: strings: avoid unnecessary trip through handle_file for stdin Sponsored by: The FreeBSD Foundation --- contrib/elftoolchain/strings/strings.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'contrib/elftoolchain/strings/strings.c') diff --git a/contrib/elftoolchain/strings/strings.c b/contrib/elftoolchain/strings/strings.c index fbc8001..0395429 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); -- cgit v1.1