From: Angus Hammond Date: Thu, 10 May 2012 19:06:09 GMT Subject: [PATCH 1/2] Change error messages in ident.c Make error messages caused by failed reads of the /etc/passwd file easier to understand. Signed-off-by: Angus Hammond Message-ID: <1336676770-17965-1-git-send-email-angusgh@gmail.com> --- ident.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ident.c b/ident.c index 87c697c..51a7a73 100644 --- a/ident.c +++ b/ident.c @@ -46,7 +46,7 @@ static void copy_gecos(const struct passwd *w, char *name, size_t sz) if (len < sz) name[len] = 0; else - die("Your parents must have hated you!"); + die("Your GECOS field is too long."); } @@ -106,7 +106,7 @@ static void copy_email(const struct passwd *pw) */ size_t len = strlen(pw->pw_name); if (len > sizeof(git_default_email)/2) - die("Your sysadmin must hate you!"); + die("Your name field in is too long."); memcpy(git_default_email, pw->pw_name, len); git_default_email[len++] = '@'; @@ -125,7 +125,7 @@ static void setup_ident(const char **name, const char **emailp) if (!*name && !git_default_name[0]) { pw = getpwuid(getuid()); if (!pw) - die("You don't exist. Go away!"); + die("Could not read your GECOS field."); copy_gecos(pw, git_default_name, sizeof(git_default_name)); } if (!*name) @@ -142,7 +142,7 @@ static void setup_ident(const char **name, const char **emailp) if (!pw) pw = getpwuid(getuid()); if (!pw) - die("You don't exist. Go away!"); + die("Could not read your GECOS field."); copy_email(pw); } } @@ -325,7 +325,7 @@ const char *fmt_ident(const char *name, const char *email, die("empty ident %s <%s> not allowed", name, email); pw = getpwuid(getuid()); if (!pw) - die("You don't exist. Go away!"); + die("Could not read your GECOS field."); strlcpy(git_default_name, pw->pw_name, sizeof(git_default_name)); name = git_default_name; -- 1.7.9.5