386BSD 0.1 development

[unix-history] / usr / src / usr.bin / mail / getname.c

diff --git a/usr/src/usr.bin/mail/getname.c b/usr/src/usr.bin/mail/getname.c
index 2c1a9b8..c25ad12 100644 (file)
--- a/usr/src/usr.bin/mail/getname.c
+++ b/usr/src/usr.bin/mail/getname.c
@@ -1,6 +1,41 @@
+/*
+ * Copyright (c) 1980 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
 #ifndef lint

-static char sccsid[] = "@(#)getname.c  2.3 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)getname.c  5.8 (Berkeley) 6/1/90";
+#endif /* not lint */
+
+#include <sys/types.h>

 #include <pwd.h>
 
 /*
 #include <pwd.h>
 
 /*


@@ -14,37 +49,27 @@ static char sccsid[] = "@(#)getname.c       2.3 (Berkeley) %G%";
 /*
  * Search the passwd file for a uid.  Return name through ref parameter
  * if found, indicating success with 0 return.  Return -1 on error.
 /*
  * Search the passwd file for a uid.  Return name through ref parameter
  * if found, indicating success with 0 return.  Return -1 on error.

- * If -1 is passed as the user id, close the passwd file.

  */
  */

-
-getname(uid, namebuf)
-       char namebuf[];
+char *
+getname(uid)

 {
        struct passwd *pw;
 
 {
        struct passwd *pw;
 

-       if (uid == -1) {
-               return(0);
-       }

        if ((pw = getpwuid(uid)) == NULL)
        if ((pw = getpwuid(uid)) == NULL)

-               return(-1);
-       strcpy(namebuf, pw->pw_name);
-       return 0;
+               return NOSTR;
+       return pw->pw_name;

 }
 
 /*
  * Convert the passed name to a user id and return it.  Return -1
 }
 
 /*
  * Convert the passed name to a user id and return it.  Return -1

- * on error.  Iff the name passed is -1 (yech) close the pwfile.
+ * on error.

  */
  */

-

 getuserid(name)
        char name[];
 {
        struct passwd *pw;
 
 getuserid(name)
        char name[];
 {
        struct passwd *pw;
 

-       if (name == (char *) -1) {
-               return(0);
-       }

        if ((pw = getpwnam(name)) == NULL)
        if ((pw = getpwnam(name)) == NULL)

-               return 0;
+               return -1;

        return pw->pw_uid;
 }
        return pw->pw_uid;
 }