1 files changed, 112 insertions, 73 deletions

diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index 772558191306..238c6f2bf709 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -52,91 +52,107 @@ static char sccsid[] = "@(#)id.c	8.2 (Berkeley) 2/16/94";
 #include <errno.h>
 #include <grp.h>
 #include <pwd.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-static void	id_print(struct passwd *, int, int, int);
+static void	id_print(struct passwd *);
 static void	pline(struct passwd *);
 static void	pretty(struct passwd *);
 #ifdef USE_BSM_AUDIT
 static void	auditid(void);
 #endif
-static void	group(struct passwd *, int);
+static void	group(struct passwd *, bool);
 static void	maclabel(void);
+static void	dir(struct passwd *);
+static void	shell(struct passwd *);
 static void	usage(void);
 static struct passwd *who(char *);
 
-static int isgroups, iswhoami;
+static bool isgroups, iswhoami;
 
 int
 main(int argc, char *argv[])
 {
 	struct group *gr;
 	struct passwd *pw;
-	int Gflag, Mflag, Pflag, ch, gflag, id, nflag, pflag, rflag, uflag;
-	int Aflag, cflag;
-	int error;
-	const char *myname;
+#ifdef USE_BSM_AUDIT
+	bool Aflag;
+#endif
+	bool Gflag, Mflag, Pflag;
+	bool cflag, dflag, gflag, nflag, pflag, rflag, sflag, uflag;
+	int ch, combo, error, id;
+	const char *myname, *optstr;
 	char loginclass[MAXLOGNAME];
 
-	Gflag = Mflag = Pflag = gflag = nflag = pflag = rflag = uflag = 0;
-	Aflag = cflag = 0;
+#ifdef USE_BSM_AUDIT
+	Aflag = false;
+#endif
+	Gflag = Mflag = Pflag = false;
+	cflag = dflag = gflag = nflag = pflag = rflag = sflag = uflag = false;
 
-	myname = strrchr(argv[0], '/');
-	myname = (myname != NULL) ? myname + 1 : argv[0];
+	myname = getprogname();
+	optstr = "AGMPacdgnprsu";
 	if (strcmp(myname, "groups") == 0) {
-		isgroups = 1;
-		Gflag = nflag = 1;
+		isgroups = true;
+		optstr = "";
+		Gflag = nflag = true;
 	}
 	else if (strcmp(myname, "whoami") == 0) {
-		iswhoami = 1;
-		uflag = nflag = 1;
+		iswhoami = true;
+		optstr = "";
+		uflag = nflag = true;
 	}
 
-	while ((ch = getopt(argc, argv,
-	    (isgroups || iswhoami) ? "" : "APGMacgnpru")) != -1)
+	while ((ch = getopt(argc, argv, optstr)) != -1) {
 		switch(ch) {
 #ifdef USE_BSM_AUDIT
 		case 'A':
-			Aflag = 1;
+			Aflag = true;
 			break;
 #endif
 		case 'G':
-			Gflag = 1;
+			Gflag = true;
 			break;
 		case 'M':
-			Mflag = 1;
+			Mflag = true;
 			break;
 		case 'P':
-			Pflag = 1;
+			Pflag = true;
 			break;
 		case 'a':
 			break;
 		case 'c':
-			cflag = 1;
+			cflag = true;
+			break;
+		case 'd':
+			dflag = true;
 			break;
 		case 'g':
-			gflag = 1;
+			gflag = true;
 			break;
 		case 'n':
-			nflag = 1;
+			nflag = true;
 			break;
 		case 'p':
-			pflag = 1;
+			pflag = true;
 			break;
 		case 'r':
-			rflag = 1;
+			rflag = true;
+			break;
+		case 's':
+			sflag = true;
 			break;
 		case 'u':
-			uflag = 1;
+			uflag = true;
 			break;
-		case '?':
 		default:
 			usage();
 		}
+	}
 	argc -= optind;
 	argv += optind;
 
@@ -145,16 +161,13 @@ main(int argc, char *argv[])
 	if ((cflag || Aflag || Mflag) && argc > 0)
 		usage();
 
-	switch(Aflag + Gflag + Mflag + Pflag + gflag + pflag + uflag) {
-	case 1:
-		break;
-	case 0:
-		if (!nflag && !rflag)
-			break;
-		/* FALLTHROUGH */
-	default:
+	combo = Aflag + Gflag + Mflag + Pflag + gflag + pflag + uflag;
+	if (combo + dflag + sflag > 1)
+		usage();
+	if (combo > 1)
+		usage();
+	if (combo == 0 && (nflag || rflag))
 		usage();
-	}
 
 	pw = *argv ? who(*argv) : NULL;
 
@@ -194,6 +207,11 @@ main(int argc, char *argv[])
 		exit(0);
 	}
 
+	if (dflag) {
+		dir(pw);
+		exit(0);
+	}
+
 	if (Gflag) {
 		group(pw, nflag);
 		exit(0);
@@ -214,14 +232,12 @@ main(int argc, char *argv[])
 		exit(0);
 	}
 
-	if (pw) {
-		id_print(pw, 1, 0, 0);
-	}
-	else {
-		id = getuid();
-		pw = getpwuid(id);
-		id_print(pw, 0, 1, 1);
+	if (sflag) {
+		shell(pw);
+		exit(0);
 	}
+
+	id_print(pw);
 	exit(0);
 }
 
@@ -235,7 +251,7 @@ pretty(struct passwd *pw)
 	if (pw) {
 		(void)printf("uid\t%s\n", pw->pw_name);
 		(void)printf("groups\t");
-		group(pw, 1);
+		group(pw, true);
 	} else {
 		if ((login = getlogin()) == NULL)
 			err(1, "getlogin");
@@ -261,12 +277,12 @@ pretty(struct passwd *pw)
 				(void)printf("rgid\t%u\n", rid);
 		}
 		(void)printf("groups\t");
-		group(NULL, 1);
+		group(NULL, true);
 	}
 }
 
 static void
-id_print(struct passwd *pw, int use_ggl, int p_euid, int p_egid)
+id_print(struct passwd *pw)
 {
 	struct group *gr;
 	gid_t gid, egid, lastgid;
@@ -275,21 +291,24 @@ id_print(struct passwd *pw, int use_ggl, int p_euid, int p_egid)
 	long ngroups_max;
 	gid_t *groups;
 	const char *fmt;
+	bool print_dbinfo;
 
-	if (pw != NULL) {
+	print_dbinfo = pw != NULL;
+	if (print_dbinfo) {
 		uid = pw->pw_uid;
 		gid = pw->pw_gid;
 	}
 	else {
 		uid = getuid();
 		gid = getgid();
+		pw = getpwuid(uid);
 	}
 
 	ngroups_max = sysconf(_SC_NGROUPS_MAX) + 1;
 	if ((groups = malloc(sizeof(gid_t) * ngroups_max)) == NULL)
 		err(1, "malloc");
 
-	if (use_ggl && pw != NULL) {
+	if (print_dbinfo) {
 		ngroups = ngroups_max;
 		getgrouplist(pw->pw_name, gid, groups, &ngroups);
 	}
@@ -297,19 +316,23 @@ id_print(struct passwd *pw, int use_ggl, int p_euid, int p_egid)
 		ngroups = getgroups(ngroups_max, groups);
 	}
 
+	/*
+	 * We always resolve uids and gids where we can to a name, even if we
+	 * are printing the running process credentials, to be nice.
+	 */
 	if (pw != NULL)
 		printf("uid=%u(%s)", uid, pw->pw_name);
-	else 
-		printf("uid=%u", getuid());
+	else
+		printf("uid=%u", uid);
 	printf(" gid=%u", gid);
 	if ((gr = getgrgid(gid)))
 		(void)printf("(%s)", gr->gr_name);
-	if (p_euid && (euid = geteuid()) != uid) {
+	if (!print_dbinfo && (euid = geteuid()) != uid) {
 		(void)printf(" euid=%u", euid);
 		if ((pw = getpwuid(euid)))
 			(void)printf("(%s)", pw->pw_name);
 	}
-	if (p_egid && (egid = getegid()) != gid) {
+	if (!print_dbinfo && (egid = getegid()) != gid) {
 		(void)printf(" egid=%u", egid);
 		if ((gr = getgrgid(egid)))
 			(void)printf("(%s)", gr->gr_name);
@@ -377,7 +400,7 @@ auditid(void)
 #endif
 
 static void
-group(struct passwd *pw, int nflag)
+group(struct passwd *pw, bool nflag)
 {
 	struct group *gr;
 	int cnt, id, lastid, ngroups;
@@ -463,41 +486,57 @@ who(char *u)
 static void
 pline(struct passwd *pw)
 {
-
-	if (!pw) {
+	if (pw == NULL) {
 		if ((pw = getpwuid(getuid())) == NULL)
 			err(1, "getpwuid");
 	}
-
 	(void)printf("%s:%s:%d:%d:%s:%ld:%ld:%s:%s:%s\n", pw->pw_name,
-			pw->pw_passwd, pw->pw_uid, pw->pw_gid, pw->pw_class,
-			(long)pw->pw_change, (long)pw->pw_expire, pw->pw_gecos,
-			pw->pw_dir, pw->pw_shell);
+	    pw->pw_passwd, pw->pw_uid, pw->pw_gid, pw->pw_class,
+	    (long)pw->pw_change, (long)pw->pw_expire, pw->pw_gecos,
+	    pw->pw_dir, pw->pw_shell);
 }
 
+static void
+dir(struct passwd *pw)
+{
+	if (pw == NULL) {
+		if ((pw = getpwuid(getuid())) == NULL)
+			err(1, "getpwuid");
+	}
+	printf("%s\n", pw->pw_dir);
+}
 
 static void
-usage(void)
+shell(struct passwd *pw)
 {
+	if (pw == NULL) {
+		if ((pw = getpwuid(getuid())) == NULL)
+			err(1, "getpwuid");
+	}
+	printf("%s\n", pw->pw_shell);
+}
 
+static void
+usage(void)
+{
 	if (isgroups)
 		(void)fprintf(stderr, "usage: groups [user]\n");
 	else if (iswhoami)
 		(void)fprintf(stderr, "usage: whoami\n");
 	else
-		(void)fprintf(stderr, "%s\n%s%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
-		    "usage: id [user]",
+		(void)fprintf(stderr,
+		    "usage: id [user]\n"
 #ifdef USE_BSM_AUDIT
-		    "       id -A\n",
-#else
-		    "",
+		    "       id -A\n"
 #endif
-		    "       id -G [-n] [user]",
-		    "       id -M",
-		    "       id -P [user]",
-		    "       id -c",
-		    "       id -g [-nr] [user]",
-		    "       id -p [user]",
-		    "       id -u [-nr] [user]");
+		    "       id -G [-n] [user]\n"
+		    "       id -M\n"
+		    "       id -P [user]\n"
+		    "       id -c\n"
+		    "       id -d [user]\n"
+		    "       id -g [-nr] [user]\n"
+		    "       id -p [user]\n"
+		    "       id -s [user]\n"
+		    "       id -u [-nr] [user]\n");
 	exit(1);
 }