Author: emaste
Date: Wed Jan 25 20:59:06 2017
New Revision: 312779
URL: https://svnweb.freebsd.org/changeset/base/312779
Log:
strings: avoid unnecessary trip through handle_file for stdin
Sponsored by: The FreeBSD Foundation
Modified:
head/contrib/elftoolchain/strings/strings.c
Modified: head/contrib/elftoolchain/strings/strings.c
==============================================================================
--- head/contrib/elftoolchain/strings/strings.c Wed Jan 25 20:44:57 2017
(r312778)
+++ head/contrib/elftoolchain/strings/strings.c Wed Jan 25 20:59:06 2017
(r312779)
@@ -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);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
