X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=ident.c;h=562f5f18160166506e99aa4f6b5b417cbdc847d8;hb=8b73edf498adf2895af7ff9c750283cf9325a632;hp=0fe81f6900dcb6951539c050f1398b1d4b208ea6;hpb=8c1f5f0f1f9c36ef5465512753efeff36758ba7d;p=git.git

diff --git a/ident.c b/ident.c
index 0fe81f69..562f5f18 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);
@@ -41,7 +72,6 @@ int setup_ident(void)
 		real_email[len++] = '.';
 		getdomainname(real_email+len, sizeof(real_email)-len);
 	}
-
 	/* And set the default date */
 	datestamp(real_date, sizeof(real_date));
 	return 0;
@@ -149,10 +179,10 @@ char *get_ident(const char *name, const char *email, const char *date_str)
 
 char *git_author_info(void)
 {
-	return get_ident(gitenv("GIT_AUTHOR_NAME"), gitenv("GIT_AUTHOR_EMAIL"), gitenv("GIT_AUTHOR_DATE"));
+	return get_ident(getenv("GIT_AUTHOR_NAME"), getenv("GIT_AUTHOR_EMAIL"), getenv("GIT_AUTHOR_DATE"));
 }
 
 char *git_committer_info(void)
 {
-	return get_ident(gitenv("GIT_COMMITTER_NAME"), gitenv("GIT_COMMITTER_EMAIL"), gitenv("GIT_COMMITTER_DATE"));
+	return get_ident(getenv("GIT_COMMITTER_NAME"), getenv("GIT_COMMITTER_EMAIL"), getenv("GIT_COMMITTER_DATE"));
 }