Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bogus warning for zero-sized files.

This commit is contained in:
christos 2012-11-19 19:34:03 +00:00
parent 0b640008be
commit c25982c7d1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/cat/cat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cat.c,v 1.50 2012/11/10 18:42:22 wiz Exp $ */ /* $NetBSD: cat.c,v 1.51 2012/11/19 19:34:03 christos Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -44,7 +44,7 @@ __COPYRIGHT(
#if 0 #if 0
static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95";
#else #else
__RCSID("$NetBSD: cat.c,v 1.50 2012/11/10 18:42:22 wiz Exp $"); __RCSID("$NetBSD: cat.c,v 1.51 2012/11/19 19:34:03 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -305,8 +305,9 @@ raw_cat(int rfd)
if (bsize != 0) if (bsize != 0)
buf = malloc(bsize); buf = malloc(bsize);
if (buf == NULL) { if (buf == NULL) {
bsize = sizeof(fb_buf); if (bsize != 0)
warnx("malloc, using %zu buffer", bsize); warnx("malloc, using %zu buffer", bsize);
bsize = sizeof(fb_buf);
buf = fb_buf; buf = fb_buf;
} }
} }