From patchwork Mon May 13 11:12:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 1934679 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=1xCMuUOH; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=9cy9O3lU; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=023gbVDj; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=YyBRD037; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdH0F0xrZz1ymg for ; Mon, 13 May 2024 21:13:01 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4DE3C38708F9 for ; Mon, 13 May 2024 11:12:59 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id F15AA3870844 for ; Mon, 13 May 2024 11:12:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F15AA3870844 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org F15AA3870844 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715598763; cv=none; b=kulfobKtyXLPek23L0L6yYNZ5wH2Z6iAqI/1GOgRqCGoaAQ8rQ8ehOdA0+Bzbw2hd4md6+ooZJ2l5IfJFbu4zEdKIQU7HlXPs++vn5H8LBbdb2TZoCAUSlDoDotlXkCHWlSbJTKeFFdVtPBSvtfVQI/krBy3xYA+8B0Q9SeQYHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715598763; c=relaxed/simple; bh=ItRcuY5m4wodQYNzfKmk9jT+nf4lCywCXrX39PL+9nU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=of1vlb7G4HuHEDhm/cb5CPufGcmPCVsaCEKF80/ecmqdayqV24RUB1AcrYbjaxkEF8wxuqf79dJzJlY4KCfvJnZMoEAd3M11xthIrvyUJ9atTGIe4mklO93nypUvxeTuroR1zDAbtZVN0PY2ol4P+LTnYvLWrpeulapVG3/wsko= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from hawking.nue2.suse.org (unknown [IPv6:2a07:de40:a101:3:10:168:4:11]) by smtp-out2.suse.de (Postfix) with ESMTP id E512320D3C for ; Mon, 13 May 2024 11:12:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715598761; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=uoVPJdc6xWrTs0K528wC9OLdyd2+ISWHCG45nMvGJfw=; b=1xCMuUOHtwR4XoqrixsD8xX1MedxPu+usU5aMmvbkH28/gEkHeCpPXlyb3i3oiBP0/Xb/U 91mgDgqgBUAjgK/W7dPK92XijE8R3G2qRgLDPl7pwmUnTY9DKcNvn0X9PJkfS28g+fAPDa KYBPloQSMlAxsG5+70q59MucX4TZFsw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715598761; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=uoVPJdc6xWrTs0K528wC9OLdyd2+ISWHCG45nMvGJfw=; b=9cy9O3lUgAO/zFV2PDutJZ3dyAlosoPaeSOCum9fGzkLc0eAZZ+W4/mpqB4e62aPM2SwHY Fcul0kT1Lk9ul9Dw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=023gbVDj; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=YyBRD037 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715598760; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=uoVPJdc6xWrTs0K528wC9OLdyd2+ISWHCG45nMvGJfw=; b=023gbVDjOeiBUixxs7y/9RkigOxcQyKfwGCZ5+OnGlXkyqbuLIRyN4w3zxSr+kd4gVZC3M LDlMiar6cK12649Mb2ZEmlqcdVNt9Nx5aY84M5VhHwfLSsnquK/NFR/tbFv8UGPEk0VeXo a0NWZDHy+VA6rgZUT+U0sGZz6JuP9Sg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715598760; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=uoVPJdc6xWrTs0K528wC9OLdyd2+ISWHCG45nMvGJfw=; b=YyBRD037mcvPGHIaemCmTBVgMi7JHI8lVyl/jcn6e3h0eQzWv8D94Y4yifBb9zcq+BhKRi yadNK/KnwRChcSCQ== Received: by hawking.nue2.suse.org (Postfix, from userid 17005) id CA7FC4A0518; Mon, 13 May 2024 13:12:40 +0200 (CEST) From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] Unify output from backtrace_symbols_fd with backtrace_symbols (bug 31730) X-Yow: Hiccuping & trembling into the WASTE DUMPS of New Jersey like some drunken CABBAGE PATCH DOLL, coughing in line at FIORUCCI'S!! Date: Mon, 13 May 2024 13:12:40 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spamd-Result: default: False [1.61 / 50.00]; BAYES_HAM(-2.99)[99.94%]; HFILTER_HOSTNAME_UNKNOWN(2.50)[]; ONCE_RECEIVED(1.20)[]; HFILTER_HELO_IP_A(1.00)[hawking.nue2.suse.org]; RDNS_NONE(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; HFILTER_HELO_NORES_A_OR_MX(0.30)[hawking.nue2.suse.org]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.988]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; MX_GOOD(-0.01)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DIRECT_TO_MX(0.00)[Gnus/5.13 (Gnus v5.13)]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:email] X-Spam-Score: 1.61 X-Rspamd-Queue-Id: E512320D3C X-Spamd-Bar: + X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org --- debug/backtracesymsfd.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/debug/backtracesymsfd.c b/debug/backtracesymsfd.c index ce784a9b2b..f68a4830e7 100644 --- a/debug/backtracesymsfd.c +++ b/debug/backtracesymsfd.c @@ -95,8 +95,14 @@ __backtrace_symbols_fd (void *const *array, int size, int fd) - (char *) iov[last].iov_base); ++last; - iov[last].iov_base = (void *) ")"; - iov[last].iov_len = 1; + iov[last].iov_base = (void *) ") "; + iov[last].iov_len = 2; + ++last; + } + else + { + iov[last].iov_base = (void *) "() "; + iov[last].iov_len = 3; ++last; } }