PWN-Hunter/android_external_toybox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass through all the readfile() arguments from xreadfile().

Browse Source
This commit is contained in:
Rob Landley 2013-12-27 18:45:01 -06:00
parent fc33eb7811
commit dc3731783e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lib.h
View File

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

6
lib/xwrap.c
View File

@ -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;
}

2
toys/posix/grep.c
View File

@ -186,7 +186,7 @@ static void parse_regex(void)
// exit to free. Not supporting nofork for this command any time soon.)
al = TT.f ? TT.f : TT.e;
while (al) {
if (TT.f) s = ss = xreadfile(al->arg);
if (TT.f) s = ss = xreadfile(al->arg, 0, 0);
else s = ss = al->arg;
do {