Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/fclose_nonstdin.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/fclose_nonstdin.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/libbb/fclose_nonstdin.c

@@ -5 +5 @@
  * 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.
  */
 
@@ -15 +15 @@
 #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;
 }