httpd: fix handling of range requests

[oweals/busybox.git] / libbb / fclose_nonstdin.c

diff --git a/libbb/fclose_nonstdin.c b/libbb/fclose_nonstdin.c
index 88e8474f2bd95443cb6a66fb1e00d1ab56f30ed8..1b14413474ecab9a9aa6e8c389335fc5c77b58aa 100644 (file)
--- a/libbb/fclose_nonstdin.c
+++ b/libbb/fclose_nonstdin.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* A number of standard utilities can accept multiple command line args
@@ -14,10 +14,13 @@
 
 #include "libbb.h"
 
-int fclose_if_not_stdin(FILE *f)
+int FAST_FUNC fclose_if_not_stdin(FILE *f)
 {
-       if (f != stdin) {
-               return fclose(f);
-       }
-       return 0;
+       /* Some more paranoid applets want ferror() check too */
+       int r = ferror(f); /* NB: does NOT set errno! */
+       if (r)
+               errno = EIO; /* so we'll help it */
+       if (f != stdin)
+               return (r | fclose(f)); /* fclose does set errno on error */
+       return r;
 }