Patch from vodz:

[oweals/busybox.git] / libbb / my_getpwnam.c

diff --git a/libbb/my_getpwnam.c b/libbb/my_getpwnam.c
index ae73ae7f1628a74aad08c93995fb83be38183922..57c2a01ecad39972dcf39e985f580f64f46e2549 100644 (file)
--- a/libbb/my_getpwnam.c
+++ b/libbb/my_getpwnam.c
@@ -2,9 +2,7 @@
 /*
  * Utility routines.
  *
- * Copyright (C) tons of folks.  Tracking down who wrote what
- * isn't something I'm going to worry about...  If you wrote something
- * here, please feel free to acknowledge your work.
+ * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,18 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell 
- * Permission has been granted to redistribute this code under the GPL.
- *
  */
 
 #include <stdio.h>
 #include <string.h>
-#include "../pwd_grp/pwd.h"
-#include "../pwd_grp/grp.h"
 #include "libbb.h"
-
+#include "pwd_.h"
+#include "grp_.h"
 
 
 /* returns a uid given a username */
@@ -40,7 +33,7 @@ long my_getpwnam(const char *name)
 
        myuser  = getpwnam(name);
        if (myuser==NULL)
-               error_msg_and_die("unknown user name: %s", name);
+               bb_error_msg_and_die("unknown user name: %s", name);
 
        return myuser->pw_uid;
 }