Hi,
I've fixed also the issue of whoami cutting down usernames.
This time I cannot send a diff because i don't know if my previous patches will be applied
or not, so I send in the whole file.
The changes I've made don't affect size but ensure that usernames of whatever lenght
are correctly displayed.
root@localhost:/dev/pts/3:/root/Desktop/busybox/coreutils# size whoami_orig.o
text data bss dec hex filename
102 0 0 102 66 whoami_orig.o
root@localhost:/dev/pts/3:/root/Desktop/busybox/coreutils# size whoami.o
text data bss dec hex filename
93 0 0 93 5d whoami.o
This should be applied even if the other patches aren't as this matches the behaviour of the GNU whoami.
Thanks in advance,
Ciao,
Tito
47 lines
1.3 KiB
C
47 lines
1.3 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini whoami implementation for busybox
|
|
*
|
|
* 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
|
|
*
|
|
*/
|
|
|
|
/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include "busybox.h"
|
|
#include "pwd_.h"
|
|
#include "grp_.h"
|
|
|
|
extern int whoami_main(int argc, char **argv)
|
|
{
|
|
struct passwd *p;
|
|
uid_t uid;
|
|
|
|
if (argc > 1)
|
|
bb_show_usage();
|
|
|
|
uid = geteuid();
|
|
if((p = getpwuid(uid))!=NULL) {
|
|
puts(p->pw_name);
|
|
bb_fflush_stdout_and_exit(EXIT_SUCCESS);
|
|
}
|
|
bb_error_msg_and_die("cannot find username for UID %u", (unsigned) uid);
|
|
}
|