From 80a438dd35782db8d3e0bca81ca78dea128f9c37 Mon Sep 17 00:00:00 2001 From: Isaac Dunham Date: Sun, 25 May 2014 11:46:58 -0500 Subject: logname and whoami are the same as id -un, so merge them. Since the starting letters are greater than those for 'id' or 'groups', we cn just check if the first letter is greater than 'i'. --- toys/posix/id.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'toys/posix/id.c') diff --git a/toys/posix/id.c b/toys/posix/id.c index 8b68d4de..a03a0975 100644 --- a/toys/posix/id.c +++ b/toys/posix/id.c @@ -8,6 +8,8 @@ USE_ID(NEWTOY(id, ">1nGgru[!Ggu]", TOYFLAG_BIN)) USE_ID_GROUPS(OLDTOY(groups, id, NULL, TOYFLAG_USR|TOYFLAG_BIN)) +USE_ID_LOGNAME(OLDTOY(logname, id, ">0", TOYFLAG_BIN)) +USE_ID_LOGNAME(OLDTOY(whoami, id, ">0", TOYFLAG_BIN)) config ID bool "id" @@ -32,6 +34,15 @@ config ID_GROUPS Print the groups a user is in. +config ID_LOGNAME + bool "logname" + default y + depends on ID + help + usage: logname + + Print the current user name. + */ #define FOR_id @@ -116,6 +127,7 @@ void do_id(char *username) void id_main(void) { + if (toys.which->name[0] > 'i') toys.optflags = (FLAG_u | FLAG_n); if (toys.optc) while(*toys.optargs) do_id(*toys.optargs++); else do_id(NULL); } -- cgit v1.2.3