Tito writes,
"This patch fixes all the bugs in id previously spotted by vodz and me. The binary size increased a bit, but now it should work as expected."
This commit is contained in:
@@ -22,49 +22,28 @@
|
||||
/* Hacked by Tito Ragusa (c) 2004 <farmatito@tiscali.it> to make it more
|
||||
* flexible :
|
||||
*
|
||||
* if bufsize is > 0 char *user can not be set to NULL
|
||||
* on success username is written on static allocated buffer
|
||||
* on failure uid as string is written to buffer and NULL is returned
|
||||
* if bufsize is = 0 char *user can be set to NULL
|
||||
* on success username is returned
|
||||
* on failure NULL is returned
|
||||
* if bufsize is > 0 char *user can not be set to NULL.
|
||||
* On success username is written on static allocated buffer name
|
||||
* (and a pointer to it is returned).
|
||||
* On failure uid as string is written to static allocated buffer name
|
||||
* and NULL is returned.
|
||||
* if bufsize is = 0 char *user can be set to NULL.
|
||||
* On success username is returned.
|
||||
* On failure NULL is returned.
|
||||
* if bufsize is < 0 char *user can be set to NULL
|
||||
* on success username is returned
|
||||
* on failure an error message is printed and the program exits
|
||||
* On success username is returned.
|
||||
* On failure an error message is printed and the program exits.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
#include "libbb.h"
|
||||
#include "pwd_.h"
|
||||
#include "grp_.h"
|
||||
|
||||
|
||||
|
||||
/* gets a username given a uid */
|
||||
char * my_getpwuid(char *name, long uid, int bufsize)
|
||||
{
|
||||
struct passwd *myuser;
|
||||
struct passwd *myuser = getpwuid(uid);
|
||||
|
||||
myuser = getpwuid(uid);
|
||||
if (myuser==NULL) {
|
||||
if(bufsize > 0) {
|
||||
assert(name != NULL);
|
||||
snprintf(name, bufsize, "%ld", (long)uid);
|
||||
}
|
||||
if (bufsize < 0 ) {
|
||||
bb_error_msg_and_die("unknown uid %ld", (long)uid);
|
||||
}
|
||||
return NULL;
|
||||
} else {
|
||||
if(bufsize > 0 )
|
||||
{
|
||||
assert(name != NULL);
|
||||
return safe_strncpy(name, myuser->pw_name, bufsize);
|
||||
}
|
||||
return myuser->pw_name;
|
||||
}
|
||||
return my_getug(name, (myuser) ? myuser->pw_name : (char *)myuser , uid, bufsize, 'u');
|
||||
}
|
||||
|
||||
/* END CODE */
|
||||
|
Reference in New Issue
Block a user