aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2013-12-27 18:45:01 -0600
committerRob Landley <rob@landley.net>2013-12-27 18:45:01 -0600
commitdc3731783ead154d5a0d8d318566468474b43013 (patch)
tree9d57677eaceacbe64459f6bfb35944c5daa5db34 /lib
parentfc33eb78115adf8a90875f822706bdf3d462524c (diff)
downloadtoybox-dc3731783ead154d5a0d8d318566468474b43013.tar.gz
Pass through all the readfile() arguments from xreadfile().
Diffstat (limited to 'lib')
-rw-r--r--lib/lib.h2
-rw-r--r--lib/xwrap.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/lib.h b/lib/lib.h
index c46aacaa..d052880e 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -102,7 +102,7 @@ size_t xread(int fd, void *buf, size_t len);
void xreadall(int fd, void *buf, size_t len);
void xwrite(int fd, void *buf, size_t len);
off_t xlseek(int fd, off_t offset, int whence);
-char *xreadfile(char *name);
+char *xreadfile(char *name, char *buf, off_t len);
int xioctl(int fd, int request, void *data);
char *xgetcwd(void);
void xstat(char *path, struct stat *st);
diff --git a/lib/xwrap.c b/lib/xwrap.c
index 08a93ddf..ae296cd6 100644
--- a/lib/xwrap.c
+++ b/lib/xwrap.c
@@ -451,10 +451,10 @@ char *xreadlink(char *name)
}
}
-char *xreadfile(char *name)
+char *xreadfile(char *name, char *buf, off_t len)
{
- char *buf = readfile(name, 0, 0);
- if (!buf) perror_exit("xreadfile %s", name);
+ if (!(buf = readfile(name, buf, len))) perror_exit("Bad '%s'", name);
+
return buf;
}