Merge branch 'fix'

diff --git a/ident.c b/ident.c
index 1bfbc6ff350baf61c15debf5bba45c0669ec107d..09d4d716cec39810bba412f32ddabaae69b9042d 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -8,7 +8,7 @@
 #include "cache.h"
 
 #include <pwd.h>
-#include <time.h>
+#include <netdb.h>
 
 static char git_default_date[50];
 
@@ -46,6 +46,15 @@ static void copy_gecos(struct passwd *w, char *name, int sz)
 
 }
 
+static const char au_env[] = "GIT_AUTHOR_NAME";
+static const char co_env[] = "GIT_COMMITTER_NAME";
+static const char env_hint[] =
+"\n*** Environment problem:\n"
+"*** Your name cannot be determined from your system services (gecos).\n"
+"*** You would need to set %s and %s\n"
+"*** environment variables; otherwise you won't be able to perform\n"
+"*** certain operations because of \"empty ident\" errors.\n\n";
+
 int setup_ident(void)
 {
        int len;
@@ -57,6 +66,11 @@ int setup_ident(void)
        /* Get the name ("gecos") */
        copy_gecos(pw, git_default_name, sizeof(git_default_name));
 
+       if (!*git_default_name) {
+               if (!getenv(au_env) || !getenv(co_env))
+                       fprintf(stderr, env_hint, au_env, co_env);
+       }
+
        /* Make up a fake email address (name + '@' + hostname [+ '.' + domainname]) */
        len = strlen(pw->pw_name);
        if (len > sizeof(git_default_email)/2)
@@ -65,9 +79,16 @@ int setup_ident(void)
        git_default_email[len++] = '@';
        gethostname(git_default_email + len, sizeof(git_default_email) - len);
        if (!strchr(git_default_email+len, '.')) {
+               struct hostent *he = gethostbyname(git_default_email + len);
+               char *domainname;
+
                len = strlen(git_default_email);
                git_default_email[len++] = '.';
-               getdomainname(git_default_email+len, sizeof(git_default_email)-len);
+               if (he && (domainname = strchr(he->h_name, '.')))
+                       strncpy(git_default_email + len, domainname + 1, sizeof(git_default_email) - len);
+               else
+                       strncpy(git_default_email + len, "(none)", sizeof(git_default_email) - len);
+               git_default_email[sizeof(git_default_email) - 1] = 0;
        }
        /* And set the default date */
        datestamp(git_default_date, sizeof(git_default_date));
@@ -133,7 +154,7 @@ static int copy(char *buf, int size, int offset, const char *src)
 
        /*
         * Copy the rest to the buffer, but avoid the special
-        * characters '\n' '<' and '>' that act as delimeters on
+        * characters '\n' '<' and '>' that act as delimiters on
         * a identification line
         */
        for (i = 0; i < len; i++) {
@@ -149,7 +170,8 @@ static int copy(char *buf, int size, int offset, const char *src)
        return offset;
 }
 
-char *get_ident(const char *name, const char *email, const char *date_str)
+static const char *get_ident(const char *name, const char *email,
+                            const char *date_str)
 {
        static char buffer[1000];
        char date[50];
@@ -159,6 +181,11 @@ char *get_ident(const char *name, const char *email, const char *date_str)
                name = git_default_name;
        if (!email)
                email = git_default_email;
+
+       if (!*name || !*email)
+               die("empty ident %s <%s> not allowed",
+                   name, email);
+
        strcpy(date, git_default_date);
        if (date_str)
                parse_date(date_str, date, sizeof(date));
@@ -174,12 +201,16 @@ char *get_ident(const char *name, const char *email, const char *date_str)
        return buffer;
 }
 
-char *git_author_info(void)
+const char *git_author_info(void)
 {
-       return get_ident(getenv("GIT_AUTHOR_NAME"), getenv("GIT_AUTHOR_EMAIL"), getenv("GIT_AUTHOR_DATE"));
+       return get_ident(getenv("GIT_AUTHOR_NAME"),
+                        getenv("GIT_AUTHOR_EMAIL"),
+                        getenv("GIT_AUTHOR_DATE"));
 }
 
-char *git_committer_info(void)
+const char *git_committer_info(void)
 {
-       return get_ident(getenv("GIT_COMMITTER_NAME"), getenv("GIT_COMMITTER_EMAIL"), getenv("GIT_COMMITTER_DATE"));
+       return get_ident(getenv("GIT_COMMITTER_NAME"),
+                        getenv("GIT_COMMITTER_EMAIL"),
+                        getenv("GIT_COMMITTER_DATE"));
 }