Browse Source

ident: make xgetpwuid_self() a static local helper

This function is defined in wrapper.c, but nobody besides
ident.c uses it. And nobody is likely to in the future,
either, as anything that cares about the user's name should
be going through the ident code.

Moving it here is a cleanup of the global namespace, but it
will also enable further cleanups inside ident.c.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 9 years ago committed by Junio C Hamano
parent
commit
e850194c83
  1. 3
      git-compat-util.h
  2. 12
      ident.c
  3. 12
      wrapper.c

3
git-compat-util.h

@ -923,9 +923,6 @@ int access_or_die(const char *path, int mode, unsigned flag); @@ -923,9 +923,6 @@ int access_or_die(const char *path, int mode, unsigned flag);
/* Warn on an inaccessible file that ought to be accessible */
void warn_on_inaccessible(const char *path);

/* Get the passwd entry for the UID of the current process. */
struct passwd *xgetpwuid_self(void);

#ifdef GMTIME_UNRELIABLE_ERRORS
struct tm *git_gmtime(const time_t *);
struct tm *git_gmtime_r(const time_t *, struct tm *);

12
ident.c

@ -23,6 +23,18 @@ static int author_ident_explicitly_given; @@ -23,6 +23,18 @@ static int author_ident_explicitly_given;
#define get_gecos(struct_passwd) ((struct_passwd)->pw_gecos)
#endif

static struct passwd *xgetpwuid_self(void)
{
struct passwd *pw;

errno = 0;
pw = getpwuid(getuid());
if (!pw)
die(_("unable to look up current user in the passwd file: %s"),
errno ? strerror(errno) : _("no such user"));
return pw;
}

static void copy_gecos(const struct passwd *w, struct strbuf *name)
{
char *src;

12
wrapper.c

@ -601,18 +601,6 @@ int access_or_die(const char *path, int mode, unsigned flag) @@ -601,18 +601,6 @@ int access_or_die(const char *path, int mode, unsigned flag)
return ret;
}

struct passwd *xgetpwuid_self(void)
{
struct passwd *pw;

errno = 0;
pw = getpwuid(getuid());
if (!pw)
die(_("unable to look up current user in the passwd file: %s"),
errno ? strerror(errno) : _("no such user"));
return pw;
}

char *xgetcwd(void)
{
struct strbuf sb = STRBUF_INIT;

Loading…
Cancel
Save