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

Go ahead and leave the patch in (i.e., revert

Browse Source 
today's change).  It doesn't cause a problem after all, since
--exclude-from=- is always handled before --files0-from=F.
This commit is contained in:
Jim Meyering
2005-08-27 19:05:24 +00:00
parent 1cf9fe2981
commit e2ea930478
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/du.c
View File

@@ -928,8 +928,6 @@ 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)
@@ -940,14 +938,13 @@ main (int argc, char **argv)
usage (EXIT_FAILURE);
}
istream = (STREQ (files_from, "-") ? stdin : fopen (files_from, "r"));
if (istream == NULL)
if (! (STREQ (files_from, "-") || freopen (files_from, "r", stdin)))
error (EXIT_FAILURE, errno, _("cannot open %s for reading"),
quote (files_from));
readtokens0_init (&tok);
if (! readtokens0 (istream, &tok) || fclose (istream) != 0)
if (! readtokens0 (stdin, &tok) || fclose (stdin) != 0)
error (EXIT_FAILURE, 0, _("cannot read file names from %s"),
quote (files_from));