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

Fix exit status. `cat no-such-file >/dev/null' exited with status 0.

Browse Source 
This has been broken since cat's own err() function was sloppily
replaced by the library functions warn() and err().
This commit is contained in:
Bruce Evans 1995-10-03 12:46:37 +00:00
parent 9d7f79dc98
commit 001aff9ffc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=11145
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/cat/cat.c
View File

@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: cat.c,v 1.2 1994/09/24 02:53:26 davidg Exp $
*/
#ifndef lint
@ -128,6 +128,7 @@ cook_args(argv)
fp = stdin;
else if ((fp = fopen(*argv, "r")) == NULL) {
warn("%s", *argv);
rval = 1;
++argv;
continue;
}
@ -196,6 +197,7 @@ cook_buf(fp)
}
if (ferror(fp)) {
warn("%s", filename);
rval = 1;
clearerr(fp);
}
if (ferror(stdout))
@ -216,6 +218,7 @@ raw_args(argv)
fd = fileno(stdin);
else if ((fd = open(*argv, O_RDONLY, 0)) < 0) {
warn("%s", *argv);
rval = 1;
++argv;
continue;
}
@ -248,6 +251,8 @@ raw_cat(rfd)
for (off = 0; nr; nr -= nw, off += nw)
if ((nw = write(wfd, buf + off, nr)) < 0)
err(1, "stdout");
if (nr < 0)
if (nr < 0) {
warn("%s", filename);
rval = 1;
}
}