unicode: check $LC_ALL to detect Unicode mode, not only $LANG

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

diff --git a/libbb/wfopen.c b/libbb/wfopen.c
index ac365c2a0093869fff0f4695ea07a8601fef13be..76dc8b82a0312b31d16e38e5727e527aad0a30c7 100644 (file)
--- a/libbb/wfopen.c
+++ b/libbb/wfopen.c
@@ -4,7 +4,7 @@
  *
  * 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"
@@ -14,7 +14,43 @@ FILE* FAST_FUNC fopen_or_warn(const char *path, const char *mode)
        FILE *fp = fopen(path, mode);
        if (!fp) {
                bb_simple_perror_msg(path);
-               errno = 0;
+               //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);
+}