From patchwork Wed Oct 31 09:35:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 991312 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-96864-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="sPBJovFp"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42lNVh73vJz9s3T for ; Wed, 31 Oct 2018 20:35:40 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; q=dns; s=default; b=f+j 5MhpCUZoe1J6/RZNFWQEpb8DM1DiUVzKLS9NMAodnzWxys2kJ6c+4aBgVeI5QjtR uEksCyQq/WGOZmG8HSPzRdB6qGeI4KiGyh8uUm5FTrLEuf6Nu5q7h0zuJQQx+OCp jLKdG6S5QNG9OoX9SrXSnJutgcMiFPcPyXdqBfR8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; s=default; bh=luFXHwXe4 WTv7tKIOniMMKjzWPY=; b=sPBJovFp/FwTytnamdBwArXBEjRXn732BV399NwtQ kDZzF3ZgU5JCbCZxic1XggMz6kvTiLCdwwrcLVnA0TwCKu09wr2+BwSMPg9t58W4 JFgbv4OzjB5LFhwj2G0td6i1hFVIDU4CB6Ni/3UepyZvMOT8XS/tVKHOmqIWgKDB qc= Received: (qmail 41546 invoked by alias); 31 Oct 2018 09:35:34 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 41109 invoked by uid 89); 31 Oct 2018 09:35:33 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=refused X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited] hurd: Fix errno* generation Date: Wed, 31 Oct 2018 10:35:28 +0100 Message-Id: <20181031093528.28962-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 * 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. --- ChangeLog | 6 +++++- manual/errno.texi | 13 +++++++++++++ sysdeps/mach/hurd/bits/errno.h | 8 ++++++++ sysdeps/mach/hurd/errnos.awk | 3 ++- 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 - * 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 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. */";