[PATCH] getdomainname should be usable on SunOS with -lnsl

diff --git a/ident.c b/ident.c
index 9ef636ee879ad977a3db3a95500eec0b91316567..a2d241fba025f82fa4c77aeb345103db66168fa9 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -41,7 +41,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;
@@ -58,14 +57,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];
 }
 
@@ -139,10 +148,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"));
 }