rewritten from the manual page; add Berkeley specific header

SCCS-vsn: old/whoami/whoami.c 5.2

diff --git a/usr/src/old/whoami/whoami.c b/usr/src/old/whoami/whoami.c
index acc77f4..68f2558 100644 (file)
--- a/usr/src/old/whoami/whoami.c
+++ b/usr/src/old/whoami/whoami.c
@@ -1,34 +1,38 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1988 Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)whoami.c   5.1 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)whoami.c   5.2 (Berkeley) %G%";
+#endif /* not lint */

 
 

+#include <sys/types.h>

 #include <pwd.h>
 #include <pwd.h>

-/*
- * whoami
- */
-struct passwd *getpwuid();

 
 main()
 {
 
 main()
 {

-       register struct passwd *pp;
+       struct passwd *p, *getpwuid();
+       uid_t uid;

 
 

-       pp = getpwuid(geteuid());
-       if (pp == 0) {
-               printf("Intruder alert.\n");
+       uid = geteuid();
+       if (!(p = getpwuid(uid))) {
+               printf("whoami: no login associated with uid %u.\n", uid);

                exit(1);
        }
                exit(1);
        }

-       printf("%s\n", pp->pw_name);
+       printf("%s\n", p->pw_name);

        exit(0);
 }
        exit(0);
 }