From patchwork Wed May 13 22:17:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 6720 Received: (qmail 71973 invoked by alias); 13 May 2015 22:17:40 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 71963 invoked by uid 89); 13 May 2015 22:17:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 X-HELO: mail-qk0-f179.google.com Received: from mail-qk0-f179.google.com (HELO mail-qk0-f179.google.com) (209.85.220.179) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Wed, 13 May 2015 22:17:38 +0000 Received: by qkgy4 with SMTP id y4so38523024qkg.2 for ; Wed, 13 May 2015 15:17:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=d4xXWIgWWSS5bVPTih9h0J4V1euLZkmCXYMMSiIA4jk=; b=NhByJcJkYD/vfM98MhNQOy2/MCHLGzufUykSlG08hGvelM2GmdqiFZD5dFehBetSXH wjn724bV+9o0R+sAfryN1IFVkVzZmeNGkko3YpZias8LU7GLkeUG9mauNq/FaeMtX6D3 GQuIQ8rEwdqe5mWvBi9XyufBJMwaE+LdP30VanchACcXDgDh7M1UIu4N+1GUcA85F+v4 rmYtKY/6g3B7MoJUEgsTZbZezcnlpeL8ZmhUUa5qedFPr8aGllSMdXklROGuHq0r5h3z W5RT0P6swVz6X2gtZ2T/uUPF85hW4GNmkPYtO2wl1PgUCNzTZWapjoujs/Hb2xtCeIjs VbMA== X-Gm-Message-State: ALoCoQlrVohBtKY0X3wgPwJw0rnlIhW9AZScXxBC4CAt3du7QY/0BxGdoLZF5JQ3yIRG5dnmIFxq X-Received: by 10.140.144.76 with SMTP id 73mr1604065qhq.28.1431555455943; Wed, 13 May 2015 15:17:35 -0700 (PDT) Received: from localhost.localdomain (ool-4353acd8.dyn.optonline.net. [67.83.172.216]) by mx.google.com with ESMTPSA id c8sm16703530qgf.6.2015.05.13.15.17.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 May 2015 15:17:35 -0700 (PDT) From: Patrick Palka To: gdb-patches@sourceware.org Cc: Patrick Palka Subject: [PATCH] Fix PR gdb/16999 Date: Wed, 13 May 2015 18:17:30 -0400 Message-Id: <1431555450-15493-1-git-send-email-patrick@parcs.ath.cx> When GDB reads a nonsensical value for the HISTSIZE environment variable variable, i.e. one that is non-numeric or negative, GDB then sets its history size to 0. This behavior is contrary to that of bash, which defaults the history size to unlimited in such cases. This patch makes the behavior of invalid HISTSIZE match that of bash. When we encounter an invalid HISTSIZE we now set the history size to unlimited instead of 0. gdb/ChangeLog: PR gdb/16999 * top.c (init_history): For invalid HISTSIZE, set history size to unlimited. gdb/testsuite/ChangeLog: PR gdb/16999 * gdb.base/histsize-history.exp: New test. --- gdb/testsuite/gdb.base/histsize-history.exp | 54 +++++++++++++++++++++++++++++ gdb/top.c | 16 ++++----- 2 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 gdb/testsuite/gdb.base/histsize-history.exp diff --git a/gdb/testsuite/gdb.base/histsize-history.exp b/gdb/testsuite/gdb.base/histsize-history.exp new file mode 100644 index 0000000..b7b13cf --- /dev/null +++ b/gdb/testsuite/gdb.base/histsize-history.exp @@ -0,0 +1,54 @@ +# Copyright 2015 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This file is part of the gdb testsuite. + +# Test the setting of "history size" via the HISTSIZE environment variable + + +# Check that the history size is properly set to SIZE when env(HISTSIZE) is set +# to HISTSIZE. + +proc test_histsize_history_setting { histsize size } { + global env + + if [info exists env(HISTSIZE)] { + set old_histsize $env(HISTSIZE) + } + set env(HISTSIZE) $histsize + + gdb_exit + gdb_start + + gdb_test "show history size" "The size of the command history is $size." + + if { $size == "0" } { + gdb_test_no_output "show commands" + } elseif { $size != "1" } { + gdb_test "show commands" " . show history size\r\n . show commands" + } + + if [info exists old_histsize] { + set env(HISTSIZE) $old_histsize + } else { + unset env(HISTSIZE) + } +} + +test_histsize_history_setting "0" "0" +test_histsize_history_setting "20" "20" +test_histsize_history_setting "-5" "unlimited" +test_histsize_history_setting "not_an_integer" "unlimited" +test_histsize_history_setting "10zab" "unlimited" diff --git a/gdb/top.c b/gdb/top.c index 74e1e07..00fee8d 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1684,15 +1684,15 @@ init_history (void) if (tmpenv) { int var; + char *endptr; - var = atoi (tmpenv); - if (var < 0) - { - /* Prefer ending up with no history rather than overflowing - readline's history interface, which uses signed 'int' - everywhere. */ - var = 0; - } + var = strtol (tmpenv, &endptr, 10); + + /* For the sake of consistency with bash, if HISTSIZE is + non-numeric or if HISTSIZE is negative then set our history + size to unlimited. */ + if (*endptr != '\0' || var < 0) + var = -1; history_size_setshow_var = var; }