X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=ident.c;h=562f5f18160166506e99aa4f6b5b417cbdc847d8;hb=babfaba23d530e2818db62161825a65e582adbdc;hp=0df2d979242bd6ee246bd280ffebdf8299408a8c;hpb=a9ab586a5db015d200dfdadcf5876d62f15dd36c;p=git.git

diff --git a/ident.c b/ident.c
index 0df2d979..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);
@@ -36,13 +67,11 @@ int setup_ident(void)
 	memcpy(real_email, pw->pw_name, len);
 	real_email[len++] = '@';
 	gethostname(real_email + len, sizeof(real_email) - len);
-#ifndef NO_GETDOMAINNAME
 	if (!strchr(real_email+len, '.')) {
 		len = strlen(real_email);
 		real_email[len++] = '.';
 		getdomainname(real_email+len, sizeof(real_email)-len);
 	}
-#endif
 	/* And set the default date */
 	datestamp(real_date, sizeof(real_date));
 	return 0;