Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/wfopen.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/wfopen.c (modified) (1 diff)

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

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@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.
  */
 
 #include "libbb.h"
 
-FILE *fopen_or_warn(const char *path, const char *mode)
+FILE* FAST_FUNC fopen_or_warn(const char *path, const char *mode)
 {
     FILE *fp = fopen(path, mode);
     if (!fp) {
-        bb_perror_msg("%s", path);
-        errno = 0;
+        bb_simple_perror_msg(path);
+        //errno = 0; /* why? */
     }
     return fp;
 }
+
+FILE* FAST_FUNC fopen_for_read(const char *path)
+{
+    return fopen(path, "r");
+}
+
+FILE* FAST_FUNC xfopen_for_read(const char *path)
+{
+    return xfopen(path, "r");
+}
+
+FILE* FAST_FUNC fopen_for_write(const char *path)
+{
+    return fopen(path, "w");
+}
+
+FILE* FAST_FUNC xfopen_for_write(const char *path)
+{
+    return xfopen(path, "w");
+}
+
+static FILE* xfdopen_helper(unsigned fd_and_rw_bit)
+{
+    FILE* fp = fdopen(fd_and_rw_bit >> 1, fd_and_rw_bit & 1 ? "w" : "r");
+    if (!fp)
+        bb_error_msg_and_die(bb_msg_memory_exhausted);
+    return fp;
+}
+FILE* FAST_FUNC xfdopen_for_read(int fd)
+{
+    return xfdopen_helper(fd << 1);
+}
+FILE* FAST_FUNC xfdopen_for_write(int fd)
+{
+    return xfdopen_helper((fd << 1) + 1);
+}