From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10507 invoked by alias); 7 Aug 2015 02:37:28 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 10471 invoked by uid 89); 7 Aug 2015 02:37:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 07 Aug 2015 02:37:22 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 313EA8E3C6 for ; Fri, 7 Aug 2015 02:37:20 +0000 (UTC) Received: from valrhona.uglyboxes.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t76JKKCI011755 for ; Thu, 6 Aug 2015 15:20:21 -0400 Subject: [PATCH v3 15/19] Implement completion limiting for scmcmd_add_completion. From: Keith Seitz To: gdb-patches@sourceware.org Date: Fri, 07 Aug 2015 02:37:00 -0000 Message-ID: <20150806191959.32159.97237.stgit@valrhona.uglyboxes.com> In-Reply-To: <20150806191404.32159.50755.stgit@valrhona.uglyboxes.com> References: <20150806191404.32159.50755.stgit@valrhona.uglyboxes.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2015-08/txt/msg00191.txt.bz2 Differences in this revision: 1. Free string memory after passing to add_completion. --- This patch converts scmcmd_add_completion to use add_completion and adds some tests for this new behavior. gdb/ChangeLog * guile/scm-cmd.c (cmdscm_add_completion): Add completer_data argument. All callers updated. Use add_completion. Free memory associated with `item'. gdb/testsuite/ChangeLog * gdb.guile/scm-cmd.exp: Add completion limiting tests. --- gdb/guile/scm-cmd.c | 11 ++++++----- gdb/testsuite/gdb.guile/scm-cmd.exp | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/gdb/guile/scm-cmd.c b/gdb/guile/scm-cmd.c index 58c79c8..1544c2b 100644 --- a/gdb/guile/scm-cmd.c +++ b/gdb/guile/scm-cmd.c @@ -348,7 +348,8 @@ cmdscm_bad_completion_result (const char *msg, SCM completion) The result is a boolean indicating success. */ static int -cmdscm_add_completion (SCM completion, VEC (char_ptr) **result) +cmdscm_add_completion (SCM completion, struct completer_data *cdata, + VEC (char_ptr) **result) { char *item; SCM except_scm; @@ -370,8 +371,8 @@ cmdscm_add_completion (SCM completion, VEC (char_ptr) **result) return 0; } - VEC_safe_push (char_ptr, *result, item); - + (void) add_completion (cdata, result, item, NULL, NULL); + xfree (item); return 1; } @@ -418,7 +419,7 @@ cmdscm_completer (struct completer_data *cdata, { SCM next = scm_car (list); - if (!cmdscm_add_completion (next, &result)) + if (!cmdscm_add_completion (next, cdata, &result)) { VEC_free (char_ptr, result); goto done; @@ -442,7 +443,7 @@ cmdscm_completer (struct completer_data *cdata, goto done; } - if (!cmdscm_add_completion (next, &result)) + if (!cmdscm_add_completion (next, cdata, &result)) { VEC_free (char_ptr, result); goto done; diff --git a/gdb/testsuite/gdb.guile/scm-cmd.exp b/gdb/testsuite/gdb.guile/scm-cmd.exp index 53c0fdf..ac721c3 100644 --- a/gdb/testsuite/gdb.guile/scm-cmd.exp +++ b/gdb/testsuite/gdb.guile/scm-cmd.exp @@ -196,6 +196,30 @@ gdb_test "test-scheme-error-cmd ugh" \ "Error occurred in Scheme-implemented GDB command." \ "call scheme-error command" +# Test completion limiting. +set max_completions 2 +gdb_test_no_output "set max-completions $max_completions" +set end "\\\*\\\*\\\* List may be truncated, " +append end "max-completions reached\\\. \\\*\\\*\\\*" +set test "limit complete completer-as-function 42\." +gdb_test_multiple "complete completer-as-function 42\." $test { + "complete completer-as-function 42\\\." { exp_continue } + -re "completer-as-function 42\\\.\[1-3\]\r\n" { + incr seen + exp_continue + } + -re ".*$end\r\n$gdb_prompt $" { + if {$seen == $max_completions} { + pass $test + } else { + fail "$test ($seen/$max_completions)" + } + } + -re ".*$gdb_prompt $" { + fail "$test (unlimited)" + } +} + # If there is a problem with object management, this can often trigger it. # It is useful to do this last, after we've created a bunch of command objects.