From patchwork Fri Jun 5 15:03:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 39481 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 4840F3851C3A; Fri, 5 Jun 2020 15:03:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4840F3851C3A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1591369410; bh=OQln0eRjARHIv0RmjDGFP8sZ75uO2Q3KwJjwPIVU53s=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=R7Gj6yV5UYRUhgoDCa0JS92EhiH7JuqvWKLhcrxJiFO+C1+44Czr37tOvjnYJ5LR9 Gd1tbJznVX4GCgx2uqE5QvHbuOqjSrdFYHOhBTbdrdSC4iOgGPRpda4b0O/L/xHwrY ai4fCb4t+K0lfK1/sJ6CUvAO9HxF8XNUqlL59o98= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by sourceware.org (Postfix) with ESMTPS id 770223851C28 for ; Fri, 5 Jun 2020 15:03:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 770223851C28 Received: by mail-pl1-x641.google.com with SMTP id n9so3748257plk.1 for ; Fri, 05 Jun 2020 08:03:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=OQln0eRjARHIv0RmjDGFP8sZ75uO2Q3KwJjwPIVU53s=; b=QYs46eJ/p06ctgJmKpB5yy6p1/Y3RQsYrW1XNNF0q5LdmiCpVzD0r505xiBoypgWxs o/0JhtDAbSWSxGP0AVGlVtkBQN1athTaFsNxrt3M1NkycWxAct3cRNXBZN6arFZdb+hU 60BA28hMZUJLVCvWQKM2R+E9ECqX4bAZhhFm7eRuKvhlH0uDBebVXu2SgA7m1HPI201j W0KDBEohrv2M0BdejeW6dsN4v2ZcM5qIqXS4uUY06U3yj93iirhfv0ZGqifGyAOVf/s7 ons+jlQR/v3Bn9Oc2GjTsH8GIaJiSI9Qj3lZA/BQt6WJzkKgc4dmZLtI8pwiUWNYg89w biEw== X-Gm-Message-State: AOAM53061m7iPZWVLaiz36I7Xhyf+QF66Nit9m3+yMJV9XIKlqysznwi 9HkRe1CSwI7M+n1FaYkEtrPAU9xH X-Google-Smtp-Source: ABdhPJzVzrkExmO1WUg2W8rt/IjtIQYIxka8rzdJSw52337PFmf/JXHq3cdsbrMzlPeoJLqxFvzHuA== X-Received: by 2002:a17:90a:fe92:: with SMTP id co18mr3559104pjb.69.1591369406169; Fri, 05 Jun 2020 08:03:26 -0700 (PDT) Received: from gnu-cfl-2.localdomain (c-69-181-90-243.hsd1.ca.comcast.net. [69.181.90.243]) by smtp.gmail.com with ESMTPSA id 140sm7619060pfy.95.2020.06.05.08.03.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:03:25 -0700 (PDT) Received: from gnu-cfl-2.localdomain (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 33C131A023E for ; Fri, 5 Jun 2020 08:03:24 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH] Add "%d" support to _dl_debug_vdprintf Date: Fri, 5 Jun 2020 08:03:24 -0700 Message-Id: <20200605150324.460300-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 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.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" "%d" will be used to print out signed value. --- elf/dl-misc.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/elf/dl-misc.c b/elf/dl-misc.c index ab70481fda..c82c8ae6fa 100644 --- a/elf/dl-misc.c +++ b/elf/dl-misc.c @@ -167,6 +167,7 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg) switch (*fmt) { /* Integer formatting. */ + case 'd': case 'u': case 'x': { @@ -179,11 +180,34 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg) #else unsigned long int num = va_arg (arg, unsigned int); #endif + bool negative = false; + if (*fmt == 'd') + { +#if LONG_MAX != INT_MAX + if (long_mod) + { + if ((long) num < 0) + negative = true; + } + else + { + if ((int) num < 0) + { + num = (unsigned int) num; + negative = true; + } + } +#else + if ((int) num < 0) + negative = true; +#endif + } + /* We use alloca() to allocate the buffer with the most pessimistic guess for the size. Using alloca() allows having more than one integer formatting in a call. */ - char *buf = (char *) alloca (3 * sizeof (unsigned long int)); - char *endp = &buf[3 * sizeof (unsigned long int)]; + char *buf = (char *) alloca (1 + 3 * sizeof (unsigned long int)); + char *endp = &buf[1 + 3 * sizeof (unsigned long int)]; char *cp = _itoa (num, endp, *fmt == 'x' ? 16 : 10, 0); /* Pad to the width the user specified. */ @@ -191,6 +215,9 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg) while (endp - cp < width) *--cp = fill; + if (negative) + *--cp = '-'; + iov[niov].iov_base = cp; iov[niov].iov_len = endp - cp; ++niov;