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

Move xgetpwuid() and xgetgrgid() into xwrap.c

Browse Source
This commit is contained in:
Rob Landley 2013-11-28 20:18:04 -06:00
parent 9fff257357
commit 9e44a5841f
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lib.h
View File

@ -111,6 +111,8 @@ char *xrealpath(char *path);
void xchdir(char *path);
void xmkpath(char *path, int mode);
void xsetuid(uid_t uid);
struct passwd *xgetpwuid(uid_t uid);
struct group *xgetgrgid(gid_t gid);
char *xreadlink(char *name);
long xparsetime(char *arg, long units, long *fraction);
void xpidfile(char *name);

14
lib/xwrap.c
View File

@ -399,6 +399,20 @@ void xsetuid(uid_t uid)
if (setuid(uid)) perror_exit("xsetuid");
}
struct passwd *xgetpwuid(uid_t uid)
{
struct passwd *pwd = getpwuid(uid);
if (!pwd) error_exit(NULL);
return pwd;
}
struct group *xgetgrgid(gid_t gid)
{
struct group *group = getgrgid(gid);
if (!group) error_exit(NULL);
return group;
}
// This can return null (meaning file not found). It just won't return null
// for memory allocation reasons.
char *xreadlink(char *name)

14
toys/posix/id.c
View File

@ -52,20 +52,6 @@ static void showid(char *header, unsigned u, char *s)
printf("%s%u(%s)", header, u, s);
}
struct passwd *xgetpwuid(uid_t uid)
{
struct passwd *pwd = getpwuid(uid);
if (!pwd) error_exit(NULL);
return pwd;
}
struct group *xgetgrgid(gid_t gid)
{
struct group *group = getgrgid(gid);
if (!group) error_exit(NULL);
return group;
}
void do_id(char *username)
{
int flags, i, ngroups, cmd_groups = toys.which->name[0] == 'g';