projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assume vprintf.
[gnulib.git]
/
lib
/
idcache.c
diff --git
a/lib/idcache.c
b/lib/idcache.c
index
b8104f1
..
8b85f07
100644
(file)
--- a/
lib/idcache.c
+++ b/
lib/idcache.c
@@
-1,5
+1,6
@@
/* idcache.c -- map user and group IDs, cached for speed
/* idcache.c -- map user and group IDs, cached for speed
- Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998, 2003 Free Software
+ Foundation, Inc.
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
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
@@
-20,20
+21,17
@@
#endif
#include <stdio.h>
#endif
#include <stdio.h>
+#include <string.h>
#include <sys/types.h>
#include <pwd.h>
#include <grp.h>
#include <sys/types.h>
#include <pwd.h>
#include <grp.h>
-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include "xalloc.h"
+
#ifndef _POSIX_VERSION
struct passwd *getpwuid ();
struct passwd *getpwnam ();
#ifndef _POSIX_VERSION
struct passwd *getpwuid ();
struct passwd *getpwnam ();
@@
-41,9
+39,6
@@
struct group *getgrgid ();
struct group *getgrnam ();
#endif
struct group *getgrnam ();
#endif
-char *xmalloc ();
-char *xstrdup ();
-
#ifdef __DJGPP__
static char digits[] = "0123456789";
#endif
#ifdef __DJGPP__
static char digits[] = "0123456789";
#endif
@@
-77,7
+72,7
@@
getuser (uid_t uid)
return tail->name;
pwent = getpwuid (uid);
return tail->name;
pwent = getpwuid (uid);
- tail =
(struct userid *)
xmalloc (sizeof (struct userid));
+ tail = xmalloc (sizeof (struct userid));
tail->id.u = uid;
tail->name = pwent ? xstrdup (pwent->pw_name) : NULL;
tail->id.u = uid;
tail->name = pwent ? xstrdup (pwent->pw_name) : NULL;
@@
-119,7
+114,7
@@
getuidbyname (const char *user)
}
#endif
}
#endif
- tail =
(struct userid *)
xmalloc (sizeof (struct userid));
+ tail = xmalloc (sizeof (struct userid));
tail->name = xstrdup (user);
/* Add to the head of the list, so most recently used is first. */
tail->name = xstrdup (user);
/* Add to the head of the list, so most recently used is first. */
@@
-153,7
+148,7
@@
getgroup (gid_t gid)
return tail->name;
grent = getgrgid (gid);
return tail->name;
grent = getgrgid (gid);
- tail =
(struct userid *)
xmalloc (sizeof (struct userid));
+ tail = xmalloc (sizeof (struct userid));
tail->id.g = gid;
tail->name = grent ? xstrdup (grent->gr_name) : NULL;
tail->id.g = gid;
tail->name = grent ? xstrdup (grent->gr_name) : NULL;
@@
-195,7
+190,7
@@
getgidbyname (const char *group)
}
#endif
}
#endif
- tail =
(struct userid *)
xmalloc (sizeof (struct userid));
+ tail = xmalloc (sizeof (struct userid));
tail->name = xstrdup (group);
/* Add to the head of the list, so most recently used is first. */
tail->name = xstrdup (group);
/* Add to the head of the list, so most recently used is first. */