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

The "cat - -" feature was broken by the last commit.

Browse Source 
Restore the code that avoided closing and reopening
stdin.  This is also required by POSIX.  As a bonus,
enable multiple stdin reads with the -benstv flags,
by resetting the EOF condition on stdin.
This commit is contained in:
Ruslan Ermilov 2001-09-26 11:32:23 +00:00
parent 3418ebebfe
commit 1b00c916a1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=83961
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/cat/cat.c
View File

@ -135,13 +135,14 @@ scanfiles(argv, cooked)
{
int i = 0;
char *path;
FILE *fp;
while ((path = argv[i]) != NULL || i == 0) {
int fd;
if (path == NULL || strcmp(path, "-") == 0) {
filename = "stdin";
fd = 0;
fd = STDIN_FILENO;
} else {
filename = path;
fd = open(path, O_RDONLY);
@ -154,12 +155,17 @@ scanfiles(argv, cooked)
warn("%s", path);
rval = 1;
} else if (cooked) {
FILE *fp = fdopen(fd, "r");
cook_cat(fp);
fclose(fp);
if (fd == STDIN_FILENO)
cook_cat(stdin);
else {
fp = fdopen(fd, "r");
cook_cat(fp);
fclose(fp);
}
} else {
raw_cat(fd);
close(fd);
if (fd != STDIN_FILENO)
close(fd);
}
if (path == NULL)
break;
@ -173,6 +179,10 @@ cook_cat(fp)
{
register int ch, gobble, line, prev;
/* Reset EOF condition on stdin. */
if (fp == stdin && feof(stdin))
clearerr(stdin);
line = gobble = 0;
for (prev = '\n'; (ch = getc(fp)) != EOF; prev = ch) {
if (prev == '\n') {