emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- patch from Denis Vlasenko to add and use bb_xopen3()

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer
2006-04-13 12:45:04 +00:00
parent 4f3d2deaa4
commit c2cb0f32b4
12 changed files with 38 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libbb/Makefile.in
View File

@@ -68,7 +68,7 @@ $(LIBBB_MOBJ0):$(LIBBB_MSRC0)
LIBBB_MSRC1:=$(srcdir)/xfuncs.c
LIBBB_MOBJ1:=xmalloc.o xrealloc.o xcalloc.o xstrdup.o xstrndup.o \
xfopen.o xopen.o xread.o xread_all.o xread_char.o \
xfopen.o xopen.o xopen3.o xread.o xread_all.o xread_char.o \
xferror.o xferror_stdout.o xfflush_stdout.o strlen.o
LIBBB_MOBJ1:=$(patsubst %,$(LIBBB_DIR)/%, $(LIBBB_MOBJ1))
$(LIBBB_MOBJ1):$(LIBBB_MSRC1)

13
libbb/xfuncs.c
View File

@@ -99,11 +99,18 @@ FILE *bb_xfopen(const char *path, const char *mode)
#ifdef L_xopen
int bb_xopen(const char *pathname, int flags)
{
return bb_xopen3(pathname, flags, 0777);
}
#endif
#ifdef L_xopen3
int bb_xopen3(const char *pathname, int flags, int mode)
{
int ret;
ret = open(pathname, flags, 0777);
if (ret == -1) {
ret = open(pathname, flags, mode);
if (ret < 0) {
bb_perror_msg_and_die("%s", pathname);
}
return ret;
@@ -116,7 +123,7 @@ ssize_t bb_xread(int fd, void *buf, size_t count)
ssize_t size;
size = read(fd, buf, count);
if (size == -1) {
if (size < 0) {
bb_perror_msg_and_die(bb_msg_read_error);
}
return(size);