From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 7DA133857011 for ; Sun, 18 Feb 2024 13:32:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7DA133857011 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 7DA133857011 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708263129; cv=none; b=Eh8kWH4tnROFhBw3odSEKFrCRlQmWonNL9rh8nFxx5T14W2WEJnt/mb5bD8hHmX307KrA8Hov5WJayW//xcYU6LEOX5UasQDJ2c3AbFvej14+FOcWvUTc4Q4nx8YTmgDMgGVtT0O25SgFwIvGT9Za2y7COGdS2I+89Q7OBf3G8I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708263129; c=relaxed/simple; bh=4f4HhObPPcbTdmziCW+4hSrfZBIDyK48F/wswATYWdo=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=uyceuoAvIxJLTMPWGvpSlbqwuWJXHdUiERPJiHyrOpPyFIEvmIpwnnCH0GCEHuK9Fyh2fBekD0WQX1PvFBRVZzlo+ZoYb8M/EbjR2fm5gzs7jT63NKroxqweckHAq8w8NQDI437mbU91+/nhXJv1zgW673+eySYLhANEFYuL56Q= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 804EB21DCA for ; Sun, 18 Feb 2024 13:32:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708263126; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jL5eJte1lhtKEQqPasZfczhJrOm9x1fMVtD0BFfd3GU=; b=bCYB3t4aG+pD55nMgk1dQ6IUdLpM6Uq5dABgXHIjoI5EQSSAAKvJEDGRkfKx9arUA18YMQ s5KLuJiT+i9yKe44VF1Lk2vJ+6A/Ev38S3i/nup3nzwp/bqYUeLOCrLtdhtnppk5m4YUuV wgMWxEjdl9wLnFZPNi+9CgwWeYLSIJg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708263126; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jL5eJte1lhtKEQqPasZfczhJrOm9x1fMVtD0BFfd3GU=; b=5vN9irQL400EudiltTaVDJ7ebhF0HVQxNmQ4q5uyc4gXoVV0k7RfPcgySKGRqTt4PMKFgr SKKmtE0xA7VP0rDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708263126; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jL5eJte1lhtKEQqPasZfczhJrOm9x1fMVtD0BFfd3GU=; b=bCYB3t4aG+pD55nMgk1dQ6IUdLpM6Uq5dABgXHIjoI5EQSSAAKvJEDGRkfKx9arUA18YMQ s5KLuJiT+i9yKe44VF1Lk2vJ+6A/Ev38S3i/nup3nzwp/bqYUeLOCrLtdhtnppk5m4YUuV wgMWxEjdl9wLnFZPNi+9CgwWeYLSIJg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708263126; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jL5eJte1lhtKEQqPasZfczhJrOm9x1fMVtD0BFfd3GU=; b=5vN9irQL400EudiltTaVDJ7ebhF0HVQxNmQ4q5uyc4gXoVV0k7RfPcgySKGRqTt4PMKFgr SKKmtE0xA7VP0rDg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 6853013A73 for ; Sun, 18 Feb 2024 13:32:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id itz2F9YG0mX2LAAAD6G6ig (envelope-from ) for ; Sun, 18 Feb 2024 13:32:06 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb] Don't init history in batch mode Date: Sun, 18 Feb 2024 14:31:53 +0100 Message-Id: <20240218133153.2032-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=bCYB3t4a; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=5vN9irQL X-Spamd-Result: default: False [1.55 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_MED(-2.00)[suse.de:dkim]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-1.14)[88.60%] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: 1.55 X-Rspamd-Queue-Id: 804EB21DCA X-Spamd-Bar: + X-Spam-Status: No, score=-12.2 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,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: I noticed in captured_main_1 that init_history is called just before bailing out if batch_flag is true. The history is used only in an interactive session, so there's no need to initialize it in batch mode. Fix this by moving init_history to after the batch mode check. Tested on x86_64-linux. --- gdb/main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gdb/main.c b/gdb/main.c index 2dc76756e98..17826fae95e 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -1303,10 +1303,6 @@ captured_main_1 (struct captured_main_args *context) /* Process '-x' and '-ex' options. */ execute_cmdargs (&cmdarg_vec, CMDARG_FILE, CMDARG_COMMAND, &ret); - /* Read in the old history after all the command files have been - read. */ - init_history (); - if (batch_flag) { int error_status = EXIT_FAILURE; @@ -1315,6 +1311,14 @@ captured_main_1 (struct captured_main_args *context) /* We have hit the end of the batch file. */ quit_force (exit_arg, 0); } + + /* We are starting an interactive session. */ + + /* Read in the history. This is after all the command files have been read, + so that the user can change the history file via a .gdbinit file. This + is also after the batch_flag check, because we don't need the history in + batch mode. */ + init_history (); } static void base-commit: 989aa9b8e8e340ba65f386cbfd239009a3aba68f -- 2.35.3