X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=ident.c;h=0df2d979242bd6ee246bd280ffebdf8299408a8c;hb=b595ed1478e6240593df4c927c4a240575f53d44;hp=faff44175bb32eb1982f1eaf1de70d960ae2b65c;hpb=6aa33f4035d547ac2bd629b1cfd9c46262809d73;p=git.git

diff --git a/ident.c b/ident.c
index faff4417..0df2d979 100644
--- a/ident.c
+++ b/ident.c
@@ -26,22 +26,23 @@ int setup_ident(void)
 	/* Get the name ("gecos") */
 	len = strlen(pw->pw_gecos);
 	if (len >= sizeof(real_name))
-		die("Your parents must have hated you");
+		die("Your parents must have hated you!");
 	memcpy(real_name, pw->pw_gecos, len+1);
 
 	/* Make up a fake email address (name + '@' + hostname [+ '.' + domainname]) */
 	len = strlen(pw->pw_name);
 	if (len > sizeof(real_email)/2)
-		die("Your parents must have hated you");
+		die("Your sysadmin must hate you!");
 	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;
@@ -58,14 +59,24 @@ static int add_raw(char *buf, int size, int offset, const char *str)
 
 static int crud(unsigned char c)
 {
-	static const char crud_array[256] = {
-		[0 ... 31] = 1,
-		[' '] = 1,
-		['.'] = 1, [','] = 1,
-		[':'] = 1, [';'] = 1,
-		['<'] = 1, ['>'] = 1,
-		['"'] = 1, ['\''] = 1,
-	};
+	static char crud_array[256];
+	static int crud_array_initialized = 0;
+
+	if (!crud_array_initialized) {
+		int k;
+
+		for (k = 0; k <= 31; ++k) crud_array[k] = 1;
+		crud_array[' '] = 1;
+		crud_array['.'] = 1;
+		crud_array[','] = 1;
+		crud_array[':'] = 1;
+		crud_array[';'] = 1;
+		crud_array['<'] = 1;
+		crud_array['>'] = 1;
+		crud_array['"'] = 1;
+		crud_array['\''] = 1;
+		crud_array_initialized = 1;
+	}
 	return crud_array[c];
 }
 
@@ -136,3 +147,13 @@ char *get_ident(const char *name, const char *email, const char *date_str)
 	buffer[i] = 0;
 	return buffer;
 }
+
+char *git_author_info(void)
+{
+	return get_ident(getenv("GIT_AUTHOR_NAME"), getenv("GIT_AUTHOR_EMAIL"), getenv("GIT_AUTHOR_DATE"));
+}
+
+char *git_committer_info(void)
+{
+	return get_ident(getenv("GIT_COMMITTER_NAME"), getenv("GIT_COMMITTER_EMAIL"), getenv("GIT_COMMITTER_DATE"));
+}