[PATCH 2/6] ident.c: Disambiguate the error messages in setup_ident

Eric W. Biederman· Jul 15, 2005, 00:52 UTC · lore

If your user name is too long it is your sysadmin who hates you not your parents!

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---

 ident.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

935f88376b79fc19df6dff85ba57ed94f06d79f0

Show changes to ident.c +2 −2

diff --git a/ident.c b/ident.c
--- a/ident.c
+++ b/ident.c
@@ -26,13 +26,13 @@ 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 have hate you!");
 	memcpy(real_email, pw->pw_name, len);
 	real_email[len++] = '@';
 	gethostname(real_email + len, sizeof(real_email) - len);

Eric W. Biederman· Jul 15, 2005, 02:10 UTC · lore

[PATCH] Complain about sysadmins in the present tense.

Junio C Hamano <junkio@cox.net> writes:

Show 9 quoted lines

> ebiederm@xmission.com (Eric W. Biederman) writes:
>
>> Actually I could not see something the system administrator
>> had bone being anything but present tense.  If you have to type
>> 500+ characters just to login, I think you would have noticed
>> and complained to your sysadmin earlier...
>
> I think "must have hate you" is simply an incorrect grammar, not
> present tense.  You mean "must hate you", perhaps?

Yes. It looks like I failed to delete the have :( Somethings you just can't see when you know what you meant.

Here is a patch to fix it up.

Eric

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> 
---

 Documentation/git-commit-tree.txt |    2 +-
 Documentation/git-var.txt         |    2 +-
 ident.c                           |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

554595e307653e90e5945bcef739fde935d7bcef

Show changes to 3 files +3 −3

Documentation/git-commit-tree.txt, Documentation/git-var.txt, ident.c

diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -70,7 +70,7 @@ You don't exist. Go away!::
     The passwd(5) gecos field couldn't be read
 Your parents must have hated you!::
     The password(5) gecos field is longer than a giant static buffer.
-Your sysadmin must have hate you!::
+Your sysadmin must hate you!::
     The password(5) name field is longer than a giant static buffer.
 
 See Also
diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt
--- a/Documentation/git-var.txt
+++ b/Documentation/git-var.txt
@@ -38,7 +38,7 @@ You don't exist. Go away!::
     The passwd(5) gecos field couldn't be read
 Your parents must have hated you!::
     The password(5) gecos field is longer than a giant static buffer.
-Your sysadmin must have hate you!::
+Your sysadmin must hate you!::
     The password(5) name field is longer than a giant static buffer.
 
 See Also
diff --git a/ident.c b/ident.c
--- a/ident.c
+++ b/ident.c
@@ -32,7 +32,7 @@ int setup_ident(void)
 	/* Make up a fake email address (name + '@' + hostname [+ '.' + domainname]) */
 	len = strlen(pw->pw_name);
 	if (len > sizeof(real_email)/2)
-		die("Your sysadmin must have hate 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);

patch, 6 partsident.c: Disambiguate the error messages in setup_ident