aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-19 16:06:56 -0700
committerJunio C Hamano <junkio@cox.net>2005-09-20 15:07:52 -0700
commite9bacb4f6a6f0aae7270acb257977f9ee0bbd6db (patch)
treed2b824e336e7ca4922677f03d4605062705faf80
parentf318dd229f9df88470de8541916d48c9380e2e35 (diff)
downloadgit-e9bacb4f6a6f0aae7270acb257977f9ee0bbd6db.tar.gz
git-e9bacb4f6a6f0aae7270acb257977f9ee0bbd6db.tar.xz
Use GECOS field a bit better to produce default human readable name.
This updates the default human readable name we generate from GECOS field. We assume the "full-name, followed by additional information separated by commas" format, with an & expanding to the capitalized login name. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--ident.c39
1 files changed, 35 insertions, 4 deletions
diff --git a/ident.c b/ident.c
index a2d241fba..562f5f181 100644
--- a/ident.c
+++ b/ident.c
@@ -15,6 +15,40 @@ static char real_email[1000];
static char real_name[1000];
static char real_date[50];
+static void copy_gecos(struct passwd *w, char *name, int sz)
+{
+ char *src, *dst;
+ int len, nlen;
+
+ nlen = strlen(w->pw_name);
+
+ /* Traditionally GECOS field had office phone numbers etc, separated
+ * with commas. Also & stands for capitalized form of the login name.
+ */
+
+ for (len = 0, dst = name, src = w->pw_gecos; len < sz; src++) {
+ int ch = *src;
+ if (ch != '&') {
+ *dst++ = ch;
+ if (ch == 0 || ch == ',')
+ break;
+ len++;
+ continue;
+ }
+ if (len + nlen < sz) {
+ /* Sorry, Mr. McDonald... */
+ *dst++ = toupper(*w->pw_name);
+ memcpy(dst, w->pw_name + 1, nlen - 1);
+ dst += nlen - 1;
+ }
+ }
+ if (len < sz)
+ name[len] = 0;
+ else
+ die("Your parents must have hated you!");
+
+}
+
int setup_ident(void)
{
int len;
@@ -24,10 +58,7 @@ int setup_ident(void)
die("You don't exist. Go away!");
/* Get the name ("gecos") */
- len = strlen(pw->pw_gecos);
- if (len >= sizeof(real_name))
- die("Your parents must have hated you!");
- memcpy(real_name, pw->pw_gecos, len+1);
+ copy_gecos(pw, real_name, sizeof(real_name));
/* Make up a fake email address (name + '@' + hostname [+ '.' + domainname]) */
len = strlen(pw->pw_name);