diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 2009-07-12 18:45:22 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 2009-07-12 18:45:22 +0000 |
commit | 35b45cf211de27e6932252ed9c60e7a1f6887998 (patch) | |
tree | cfb0de6f429d27ebed30971eea3efd070571053e /lib/libc/stdio/fread.c | |
parent | 3b609b2042d45ba683a407506561ad0b511e6f93 (diff) |
fwrite() should also return 0 if either size or nmemb are 0.
Adapted from FreeBSD. OK deraadt@
Diffstat (limited to 'lib/libc/stdio/fread.c')
-rw-r--r-- | lib/libc/stdio/fread.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c index 62906216d8b..c7389e76ed6 100644 --- a/lib/libc/stdio/fread.c +++ b/lib/libc/stdio/fread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fread.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */ +/* $OpenBSD: fread.c,v 1.7 2009/07/12 18:45:21 millert Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -44,9 +44,7 @@ fread(void *buf, size_t size, size_t count, FILE *fp) size_t total; /* - * The ANSI standard requires a return value of 0 for a count - * or a size of 0. Peculiarily, it imposes no such requirements - * on fwrite; it only requires fread to be broken. + * ANSI and SUSv2 require a return value of 0 if size or count are 0. */ if ((resid = count * size) == 0) return (0); |