d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strings: avoid unnecessary trip through handle_file for stdin

Browse Source 
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2017-01-25 20:59:06 +00:00
parent d780a32bc5
commit 080b710889
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=312779
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/elftoolchain/strings/strings.c
View File

@ -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);