BSD 4_4 release

[unix-history] / usr / src / old / whoami / whoami.c

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

- * 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, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #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.5 (Berkeley) 3/2/91";
+#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;
+       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);
 }