X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fwfopen.c;h=deec79a280683d468f0ded2e3f4fee9eb7a38d81;hb=d7171c114028815df4e92f9c26875f1d60c6af2a;hp=4c84b3ba978a3edf7a93120adf0e1a0d8f395ea8;hpb=5415c856eaccd1bc5d064022770a288f43b2e94f;p=oweals%2Fbusybox.git diff --git a/libbb/wfopen.c b/libbb/wfopen.c index 4c84b3ba9..deec79a28 100644 --- a/libbb/wfopen.c +++ b/libbb/wfopen.c @@ -14,7 +14,7 @@ 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; } @@ -38,3 +38,19 @@ 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); +}