From patchwork Sat Dec 17 16:52:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 62097 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D47213AA981C for ; Sat, 17 Dec 2022 16:54:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D47213AA981C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671296047; bh=qwJgBBNjzh3C1Zy4D5aPZHGdjlMelNYdlY7t7qckEWU=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Help:List-Subscribe:From: Reply-To:From; b=IlM9wNlVKaglhDIUUzl8wk5R9VkxKN+a8bcBV4W7lop/bCUqtTQDV0HJO5CFM/dUl NG+7cUrP6Q9itgF9CwIQB5av8nvt++3PZXo+kDGQa8Dwv2l7Jn6hWXAjgPStCHkZIt bEXI3e+UDLfuWs84qhHtp3iv5RZtgFziuAfRZ1Ww= X-Original-To: elfutils-devel@sourceware.org Delivered-To: elfutils-devel@sourceware.org Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by sourceware.org (Postfix) with ESMTPS id C3C0A3AA9802 for ; Sat, 17 Dec 2022 16:52:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C3C0A3AA9802 Received: by mail-pj1-x102e.google.com with SMTP id u5so5280133pjy.5 for ; Sat, 17 Dec 2022 08:52:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qwJgBBNjzh3C1Zy4D5aPZHGdjlMelNYdlY7t7qckEWU=; b=8P1eNaD1J0Zh1X/1N7bd13KBd11WGMb2AxYVS560CrizBE3wZhcDNpjXJ5gQ+kXH7p tUSdoAKJvzt5okiOzgWKREYf6cRhiC4iFkNH4wWBXcM40G6CzXZGPGO+oFT+gsn95g8m qgQA4ZMRsttCsHRTdMKJ+u3SYkAepSWOgMNuIaTAi/Om+nnoeA0mQGLJNUSq6hI+ezpg b7P1vUtUvSHwHpcT2PySRO6bH6NEU11zEPQKF8FDGpv/fKlNTmOsg5/ay9OAhHg/UjcY GgQRvl11jtHiSS9Pd16OWxVi23IBrzbQCj7HS4a4lZOP4PmIQoBLGQUhw8hbv2EQlO4Q Nqpg== X-Gm-Message-State: ANoB5pnZU/tzRdGLw1sykgyot+SmUjdCOE/I51QVl6zHMPcgIJaScPyc p8hpJhcPZS4JnIfEvm/OwpXKN9wumn0= X-Google-Smtp-Source: AA0mqf6ww4+A8w28Ly500yHhGmv5c/L/N3hNbpgrnsEQaFkFLkMehRWR4p1wgVKHoO6FS691F2VrIQ== X-Received: by 2002:a17:90a:ea0a:b0:219:211f:e2ae with SMTP id w10-20020a17090aea0a00b00219211fe2aemr38434565pjy.49.1671295968509; Sat, 17 Dec 2022 08:52:48 -0800 (PST) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id s92-20020a17090a2f6500b002191873187dsm6643229pjd.33.2022.12.17.08.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Dec 2022 08:52:47 -0800 (PST) To: elfutils-devel@sourceware.org Cc: Yonggang Luo Subject: [PATCH v2 08/16] lib: Implement error properly even when not HAVE_ERR_H Date: Sun, 18 Dec 2022 00:52:05 +0800 Message-Id: <20221217165213.152-9-luoyonggang@gmail.com> X-Mailer: git-send-email 2.36.1.windows.1 In-Reply-To: <20221217165213.152-1-luoyonggang@gmail.com> References: <20221217165213.152-1-luoyonggang@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Yonggang Luo via Elfutils-devel From: Yonggang Luo Reply-To: Yonggang Luo Errors-To: elfutils-devel-bounces+patchwork=sourceware.org@sourceware.org Sender: "Elfutils-devel" on win32, there is no err.h Signed-off-by: Yonggang Luo --- lib/error.c | 16 +++++++++++++++- lib/system.h | 4 +--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lib/error.c b/lib/error.c index 5186fc15..d4cbf0ff 100644 --- a/lib/error.c +++ b/lib/error.c @@ -28,12 +28,14 @@ #include -#if !defined(HAVE_ERROR_H) && defined(HAVE_ERR_H) +#if !defined(HAVE_ERROR_H) #include #include #include #include +#if defined(HAVE_ERR_H) #include +#endif unsigned int error_message_count = 0; @@ -44,6 +46,7 @@ void error(int status, int errnum, const char *format, ...) { fflush (stdout); va_start(argp, format); +#if defined(HAVE_ERR_H) if (status) { if (errnum) @@ -64,6 +67,17 @@ void error(int status, int errnum, const char *format, ...) { else vwarnx (format, argp); } +#else + if (errnum) + { + errno = errnum; + } + vfprintf(stderr, format, argp); + if (status) + { + _exit(status); + } +#endif va_end(argp); fflush (stderr); diff --git a/lib/system.h b/lib/system.h index 561d3e03..7f9f2a91 100644 --- a/lib/system.h +++ b/lib/system.h @@ -50,11 +50,9 @@ #if defined(HAVE_ERROR_H) #include -#elif defined(HAVE_ERR_H) +#else extern int error_message_count; void error(int status, int errnum, const char *format, ...); -#else -#error "err.h or error.h must be available" #endif /* error (EXIT_FAILURE, ...) should be noreturn but on some systems it