The previous patch broke -nG, so move the -G code back to showone() which handles -n.
Add the missing tests for the various uses of -n. Also refactor the code to avoid the need to test optflags directly. --- tests/id.test | 3 +++ toys/posix/id.c | 65 +++++++++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 29 deletions(-)
From c93d8c5fbf2289307954028920607ad95b833cfc Mon Sep 17 00:00:00 2001 From: Elliott Hughes <[email protected]> Date: Mon, 4 Nov 2019 20:57:59 -0800 Subject: [PATCH] id.c: fix -nG. The previous patch broke -nG, so move the -G code back to showone() which handles -n. Add the missing tests for the various uses of -n. Also refactor the code to avoid the need to test optflags directly. --- tests/id.test | 3 +++ toys/posix/id.c | 65 +++++++++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/tests/id.test b/tests/id.test index f62938f0..05c5378c 100755 --- a/tests/id.test +++ b/tests/id.test @@ -7,7 +7,10 @@ testing "id 0" "id 0" "uid=0(root) gid=0(root) groups=0(root)\n" "" "" testing "id root" "id root" "uid=0(root) gid=0(root) groups=0(root)\n" "" "" testing "id -G root" "id -G root" "0\n" "" "" +testing "id -nG root" "id -nG root" "root\n" "" "" testing "id -g root" "id -g root" "0\n" "" "" +testing "id -ng root" "id -ng root" "root\n" "" "" testing "id -u root" "id -u root" "0\n" "" "" +testing "id -nu root" "id -nu root" "root\n" "" "" testing "id no-such-user" "id no-such-user 2>/dev/null ; echo \$?" "1\n" "" "" testing "id 9999999" "id 9999999 2>/dev/null ; echo \$?" "1\n" "" "" diff --git a/toys/posix/id.c b/toys/posix/id.c index b1f303bf..ac29990b 100644 --- a/toys/posix/id.c +++ b/toys/posix/id.c @@ -67,16 +67,19 @@ GLOBALS( int is_groups; ) -static void showone(char *s, unsigned u) +static void showone(char *prefix, char *s, unsigned u, int done) { - if (FLAG(n)) printf("%s\n", s); - else printf("%u\n", u); - xexit(); + if (FLAG(n)) printf("%s%s", prefix, s); + else printf("%s%u", prefix, u); + if (done) { + xputc('\n'); + xexit(); + } } -static void showid(char *header, unsigned u, char *s) +static void showid(char *prefix, unsigned u, char *s) { - printf("%s%u(%s)", header, u, s); + printf("%s%u(%s)", prefix, u, s); } static void do_id(char *username) @@ -85,6 +88,8 @@ static void do_id(char *username) struct group *grp; uid_t uid = getuid(), euid = geteuid(); gid_t gid = getgid(), egid = getegid(); + gid_t *groups = (gid_t *)toybuf; + int i = sizeof(toybuf)/sizeof(gid_t), ngroups; // check if a username is given if (username) { @@ -100,12 +105,28 @@ static void do_id(char *username) } pw = xgetpwuid(FLAG(r) ? uid : euid); - if (FLAG(u)) showone(pw->pw_name, pw->pw_uid); + if (FLAG(u)) showone("", pw->pw_name, pw->pw_uid, 1); grp = xgetgrgid(FLAG(r) ? gid : egid); - if (FLAG(g)) showone(grp->gr_name, grp->gr_gid); + if (FLAG(g)) showone("", grp->gr_name, grp->gr_gid, 1); + + ngroups = username ? getgrouplist(username, gid, groups, &i) + : getgroups(i, groups); + if (ngroups<0) perror_exit("getgroups"); + + if (FLAG(G)) { + showone("", grp->gr_name, grp->gr_gid, 0); + for (i = 0; i<ngroups; i++) { + if (groups[i] != egid) { + if ((grp=getgrgid(groups[i]))) showone(" ",grp->gr_name,grp->gr_gid,0); + else printf(" %u", groups[i]); + } + } + xputc('\n'); + return; + } - if (!(toys.optflags&(FLAG_G|FLAG_g|FLAG_Z))) { + if (!FLAG(Z)) { showid("uid=", pw->pw_uid, pw->pw_name); showid(" gid=", grp->gr_gid, grp->gr_name); @@ -119,31 +140,17 @@ static void do_id(char *username) showid(" egid=", grp->gr_gid, grp->gr_name); } } - } - if (!(toys.optflags&(FLAG_g|FLAG_Z))) { - gid_t *groups = (gid_t *)toybuf; - int i = sizeof(toybuf)/sizeof(gid_t), ngroups; - - ngroups = username ? getgrouplist(username, gid, groups, &i) - : getgroups(i, groups); - if (ngroups<0) perror_exit("getgroups"); - if (FLAG(G)) { - printf("%u", grp->gr_gid); - for (i = 0; i<ngroups; i++) - if (groups[i] != egid) printf(" %u", groups[i]); - } else { - showid(" groups=", gid, grp->gr_name); - for (i = 0; i<ngroups; i++) { - if (groups[i] != egid) { - if ((grp=getgrgid(groups[i]))) showid(",", grp->gr_gid, grp->gr_name); - else printf(",%u", groups[i]); - } + showid(" groups=", gid, grp->gr_name); + for (i = 0; i<ngroups; i++) { + if (groups[i] != egid) { + if ((grp=getgrgid(groups[i]))) showid(",", grp->gr_gid, grp->gr_name); + else printf(",%u", groups[i]); } } } - if (!CFG_TOYBOX_LSM_NONE && !FLAG(G)) { + if (!CFG_TOYBOX_LSM_NONE) { if (lsm_enabled()) { char *context = lsm_context(); -- 2.24.0.rc1.363.gb1bccd3e3d-goog
_______________________________________________ Toybox mailing list [email protected] http://lists.landley.net/listinfo.cgi/toybox-landley.net
