From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id A01DC3858D20 for ; Tue, 20 Feb 2024 12:09:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A01DC3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A01DC3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708430993; cv=none; b=Zy/NtccoOf0jSbkaj52/+vVngwR4DSu47Pru4rRqegEehC1ChQYRJK1w/TY6m11t5arq9/A+SSbRtEtVHMdtDzhSvT+8pFcOVAjS1UAmUjGevmUH5n/0O1Elj+EMHjEqm1pFCvL3UcTEAlskMfvanc3d8aZFj+tUgxBMK3B3Ohs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708430993; c=relaxed/simple; bh=FoCHt6eYRPTPXTM3BujC6FkN247EfvnNgRZpUGN6e18=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=b7Tzb7pCeqnyZI+HR+87fk3Ym5bRRIDH4JZe163RAbVrhfFUMTEdYBbXFIgz8zEBgW/KA5cZmGwU+57Kj0MCJdY8OToHIxInJ4cqyrQ/Gwn0JUcFdpQRMw+KocM9CSk0IsHjGKMD2CRM+6wVnVw2uMTs0kBwbES+E/En7FICRng= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708430990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=7ospEPpU+fLPChlqc1nCZ3fzzQcRmYWFAhWjA8gMbQY=; b=iVXjE74LSfUlL2Qlgh5ax8+pvHNJ1wWKpCxRZnbxM5pNSDKHUCSp798BX+ZcKh3Lw5y3HT JSUl2RfFmtDLaYkgHr8hqysWxCfYjXCqOQoRTpsWTAaS7Tois+DwkguiKoZBHqY3XvI9wD 446nrJ5araSPsCec+XfEFj9Yq0DhDBg= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-426-2hH5PWpxNBqqa9AYRSeJLQ-1; Tue, 20 Feb 2024 07:09:49 -0500 X-MC-Unique: 2hH5PWpxNBqqa9AYRSeJLQ-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a2c4e9cb449so419331766b.1 for ; Tue, 20 Feb 2024 04:09:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708430988; x=1709035788; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7ospEPpU+fLPChlqc1nCZ3fzzQcRmYWFAhWjA8gMbQY=; b=PsOGSwgTAIhW+86E2cRcdswnw7sBN5ZfibODh0Zw8SgZZeWh+OPtmhnOGu9q2E9LAT FmvX542dT9SJ4T4VArGwz8ibxviClncfJQTbw8nzby/wFHeCM0ctsvzcjG/8nZWYn+sJ XHyzXvbwFRUcZTsgJQ8U59SgLQXNmnz/3r8qR0ctzqg3mHEUPhVp8/HCm8Le7fsONXLQ 9GjLwQ6rpiShM9LjBUfSyldCZUhJTcpct1YLhtFEWQYAEnzLmrTHbVkxew7uo0uDw9Xv pQjA0hwft2ckjPygA9vAyTvwjDlEA+OfcSAlDKUxtJk8iqPZTUAgMrgBNf0YBa9n2QJb SXOA== X-Forwarded-Encrypted: i=1; AJvYcCUc2vQsQPVttJTQscWmpCOY/wwb9tsLp+2okKBZYr/ZXrAQpDSA4Mo9ydFebZcB+v9Z/RVkj9FFE/Wwim5tGmFuQnOAAhg4bEIN8w== X-Gm-Message-State: AOJu0YyDuzhDLFk1jjTs9Uv5mu6AVwZqSqMH139Q8+BMX9e700vP/TjA IyeEwjjqBYOTyoGD2n8+wvtD2tzNakKYL2qukjoDYlL/c5up8XCHydjf5DbRl8tGN/0gfwrKVf5 LtCpNlkgvpBz3l16velEjHOiJByTwvTEAqFgLCEJiTBRHrtOLDTr8J4iLo0RvB28Es08= X-Received: by 2002:a17:906:d8db:b0:a3e:3d13:5b76 with SMTP id re27-20020a170906d8db00b00a3e3d135b76mr5470140ejb.73.1708430987942; Tue, 20 Feb 2024 04:09:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IE2Ivh27whIc87JbJA0yVr52G67SEFDLKjZlEoQIogKSnvCGBfqbwlONOb18KB/Kt2yIdGJPA== X-Received: by 2002:a17:906:d8db:b0:a3e:3d13:5b76 with SMTP id re27-20020a170906d8db00b00a3e3d135b76mr5470126ejb.73.1708430987615; Tue, 20 Feb 2024 04:09:47 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id ss1-20020a170907c00100b00a3e0c07c1a0sm3778894ejc.23.2024.02.20.04.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 04:09:47 -0800 (PST) From: Andrew Burgess To: Tom de Vries , gdb-patches@sourceware.org Subject: Re: [PATCH] [gdb] Don't init history in batch mode In-Reply-To: <20240218133153.2032-1-tdevries@suse.de> References: <20240218133153.2032-1-tdevries@suse.de> Date: Tue, 20 Feb 2024 12:09:46 +0000 Message-ID: <87a5nv5oc5.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,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: Tom de Vries writes: > 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. LGTM. Approved-By: Andrew Burgess Thanks, Andrew > > 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