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.

diff --git a/ChangeLog b/ChangeLog
index c2d1d845db27c0165959f0fe8e14fd666ebf60ac..b798b63f79176f70b934396e48e226f3059a1e68 100644 (file)
--- 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 b195b635f1042d284dbcec1e7e2b42d352aa5f4b..8cb4ce8b489dbbc6b3decef023cb3cafa471a32b 100644 (file)
--- 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 8096fb9c05d824b7b54a52acd1ae2ce0730c49c4..8f2fbfd80ffd3dc3c765a7635203d69b1329ead4 100644 (file)
--- 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 dc19350eb0b9a9b255803d59101a3872600d7930..24e37bdeb5157cc877732ceb0e0bae3687c53fbf 100644 (file)
--- 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.  */";