ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- 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

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);