aboutsummaryrefslogtreecommitdiff
path: root/libbb/xfuncs.c
diff options
context:
space:
mode:
Diffstat (limited to 'libbb/xfuncs.c')
-rw-r--r--libbb/xfuncs.c32
1 files changed, 24 insertions, 8 deletions
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index dde91a2ba..870d736b3 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -106,31 +106,46 @@ FILE *xfopen(const char *path, const char *mode)
106{ 106{
107 FILE *fp = fopen(path, mode); 107 FILE *fp = fopen(path, mode);
108 if (fp == NULL) 108 if (fp == NULL)
109 bb_perror_msg_and_die("%s", path); 109 bb_perror_msg_and_die("cannot open '%s'", path);
110 return fp; 110 return fp;
111} 111}
112 112
113// Die if we can't open an existing file and return an fd. 113// Die if we can't open a file and return a fd.
114int xopen(const char *pathname, int flags) 114int xopen3(const char *pathname, int flags, int mode)
115{ 115{
116 //if (ENABLE_DEBUG && (flags & O_CREAT)) 116 int ret;
117 // bb_error_msg_and_die("xopen() with O_CREAT"); 117
118 ret = open(pathname, flags, mode);
119 if (ret < 0) {
120 bb_perror_msg_and_die("cannot open '%s'", pathname);
121 }
122 return ret;
123}
118 124
125// Die if we can't open an existing file and return a fd.
126int xopen(const char *pathname, int flags)
127{
119 return xopen3(pathname, flags, 0666); 128 return xopen3(pathname, flags, 0666);
120} 129}
121 130
122// Die if we can't open a new file and return an fd. 131// Warn if we can't open a file and return a fd.
123int xopen3(const char *pathname, int flags, int mode) 132int open3_or_warn(const char *pathname, int flags, int mode)
124{ 133{
125 int ret; 134 int ret;
126 135
127 ret = open(pathname, flags, mode); 136 ret = open(pathname, flags, mode);
128 if (ret < 0) { 137 if (ret < 0) {
129 bb_perror_msg_and_die("%s", pathname); 138 bb_perror_msg("cannot open '%s'", pathname);
130 } 139 }
131 return ret; 140 return ret;
132} 141}
133 142
143// Warn if we can't open a file and return a fd.
144int open_or_warn(const char *pathname, int flags)
145{
146 return open3_or_warn(pathname, flags, 0666);
147}
148
134void xunlink(const char *pathname) 149void xunlink(const char *pathname)
135{ 150{
136 if (unlink(pathname)) 151 if (unlink(pathname))
@@ -184,6 +199,7 @@ off_t xlseek(int fd, off_t offset, int whence)
184void die_if_ferror(FILE *fp, const char *fn) 199void die_if_ferror(FILE *fp, const char *fn)
185{ 200{
186 if (ferror(fp)) { 201 if (ferror(fp)) {
202 /* doesn't set useful errno */
187 bb_error_msg_and_die("%s: I/O error", fn); 203 bb_error_msg_and_die("%s: I/O error", fn);
188 } 204 }
189} 205}