about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-10-31 10:02:06 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-10-31 10:32:39 +0100
commita67377e7f708cf3141210ae4550932709b5262c7 (patch)
tree35f066f3e082aec663c3587ddd90d1e2f1c5159a
parent3ed7c33fa2915008ec861f25b2d54a0ccc59ca21 (diff)
downloadglibc-a67377e7f708cf3141210ae4550932709b5262c7.tar.gz
glibc-a67377e7f708cf3141210ae4550932709b5262c7.tar.xz
glibc-a67377e7f708cf3141210ae4550932709b5262c7.zip
hurd: Fix errno* generation
	* sysdeps/mach/hurd/errnos.awk: Avoid printing errnos.d.
	* sysdeps/gnu/errlist.c (EIEIO): Move text to...
	* manual/errno.texi (EIEIO): ... here.
	* sysdeps/gnu/errlist.c (EIEIO): Regenerate.
	* sysdeps/mach/hurd/bits/errno.h: Regenerate.
-rw-r--r--ChangeLog6
-rw-r--r--manual/errno.texi13
-rw-r--r--sysdeps/mach/hurd/bits/errno.h8
-rw-r--r--sysdeps/mach/hurd/errnos.awk3
4 files changed, 28 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c2d1d845db..b798b63f79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 2018-10-31  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
-	* sysdeps/gnu/errlist.c (EIEIO): Document how translators should
+	* manual/errno.texi (EIEIO): Document how translators should
 	translate the error message.
+	* sysdeps/mach/hurd/errnos.awk: Avoid printing errnos.d.  Avoid
+	printing trailing whitespaces refused by git.
+	* sysdeps/gnu/errlist.c (EIEIO): Regenerate.
+	* sysdeps/mach/hurd/bits/errno.h: Regenerate.
 
 2018-10-30  Joseph Myers  <joseph@codesourcery.com>
 
diff --git a/manual/errno.texi b/manual/errno.texi
index b195b635f1..8cb4ce8b48 100644
--- a/manual/errno.texi
+++ b/manual/errno.texi
@@ -810,6 +810,19 @@ You did @strong{what}?
 @standards{GNU, errno.h}
 @errno{EIEIO, 104, Computer bought the farm}
 Go home and have a glass of warm, dairy-fresh milk.
+@c Okay.  Since you are dying to know, I'll tell you.
+@c This is a joke, obviously.  There is a children's song which begins,
+@c "Old McDonald had a farm, e-i-e-i-o."  Every time I see the (real)
+@c errno macro EIO, I think about that song.  Probably most of my
+@c compatriots who program on Unix do, too.  One of them must have stayed
+@c up a little too late one night and decided to add it to Hurd or Glibc.
+@c Whoever did it should be castigated, but it made me laugh.
+@c  --jtobey@channel1.com
+@c
+@c "bought the farm" means "died".  -jtobey
+@c
+@c Translators, please do not translate this litteraly, translate it into
+@c an idiomatic funny way of saying that the computer died.
 @end deftypevr
 
 @deftypevr Macro int EGRATUITOUS
diff --git a/sysdeps/mach/hurd/bits/errno.h b/sysdeps/mach/hurd/bits/errno.h
index 8096fb9c05..8f2fbfd80f 100644
--- a/sysdeps/mach/hurd/bits/errno.h
+++ b/sysdeps/mach/hurd/bits/errno.h
@@ -1,9 +1,17 @@
 /* This file generated by errnos.awk from
      errno.texi
+     stdc-predef.h
+     libc-symbols.h
      mach/message.h
      mach/kern_return.h
+     mach/i386/kern_return.h
+     mach/port.h
+     mach/boolean.h
+     mach/i386/boolean.h
+     mach/i386/vm_types.h
      mach/mig_errors.h
      device/device_types.h
+     mach/std_types.h
    Do not edit this file; edit errnos.awk and regenerate it.  */
 
 #ifndef _BITS_ERRNO_H
diff --git a/sysdeps/mach/hurd/errnos.awk b/sysdeps/mach/hurd/errnos.awk
index dc19350eb0..24e37bdeb5 100644
--- a/sysdeps/mach/hurd/errnos.awk
+++ b/sysdeps/mach/hurd/errnos.awk
@@ -23,7 +23,8 @@ BEGIN {
     for (i = 1; i < ARGC; i++)
       {
 	arg = ARGV[i];
-	sub(/.*(manual|include)\//, "", arg)
+	sub(/.*(manual|include)\//, "", arg);
+	if (arg ~ /.*errnos.d/) continue;
 	print "     " arg;
       }
     print "   Do not edit this file; edit errnos.awk and regenerate it.  */";