Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/whoami.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/whoami.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/coreutils/whoami.c

@@ -5 +5 @@
  * Copyright (C) 2000  Edward Betts <edward@debian.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * 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
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int whoami_main(int argc, char **argv);
 int whoami_main(int argc, char **argv)
 {
@@ -33 +20 @@
         bb_show_usage();
 
-    puts(bb_getpwuid(NULL, geteuid(), -1));
-    /* exits on error */
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    /* Will complain and die if username not found */
+    puts(bb_getpwuid(NULL, -1, geteuid()));
+
+    return fflush(stdout);
 }