- don't free user-supplied string (via -e)

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

diff --git a/libbb/fclose_nonstdin.c b/libbb/fclose_nonstdin.c
index 97e303e9cbba862d040287d2d17ba5563c541cfa..6f3f3733203a42b3f748f3265d9b0150a4527786 100644 (file)
--- a/libbb/fclose_nonstdin.c
+++ b/libbb/fclose_nonstdin.c
@@ -4,34 +4,22 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-/* A number of standard utilites can accept multiple command line args
+/* A number of standard utilities can accept multiple command line args
  * of '-' for stdin, according to SUSv3.  So we encapsulate the check
  * here to save a little space.
  */
 
-#include <stdio.h>
-#include <libbb.h>
+#include "libbb.h"
 
-int bb_fclose_nonstdin(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;
 }