CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-20 10:51:48 +02:00
Code Issues Projects Releases Wiki Activity

Revert the du.c part of the change from 2005-07-02:

Browse Source 
That change (to reopen stdin on F for --files0-from=F) made it so
--exclude-from=- and --files0-from=F would not work together.
This commit is contained in:
Jim Meyering
2005-08-27 18:12:54 +00:00
parent 21e8dcda49
commit 509e46c548
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/du.c
View File

@@ -928,6 +928,8 @@ main (int argc, char **argv)
if (files_from)
{
FILE *istream;
/* When using --files0-from=F, you may not specify any files
on the command-line. */
if (optind < argc)
@@ -938,13 +940,14 @@ main (int argc, char **argv)
usage (EXIT_FAILURE);
}
if (! (STREQ (files_from, "-") || freopen (files_from, "r", stdin)))
istream = (STREQ (files_from, "-") ? stdin : fopen (files_from, "r"));
if (istream == NULL)
error (EXIT_FAILURE, errno, _("cannot open %s for reading"),
quote (files_from));
readtokens0_init (&tok);
if (! readtokens0 (stdin, &tok) || fclose (stdin) != 0)
if (! readtokens0 (istream, &tok) || fclose (istream) != 0)
error (EXIT_FAILURE, 0, _("cannot read file names from %s"),
quote (files_from));