[PATCH 2/2] * cli/cli-decode.c (apropos_cmd): Skip traversing abbreviations for prefix commands to avoid duplicates in the output.

[PATCH 2/2] * cli/cli-decode.c (apropos_cmd): Skip traversing abbreviations for prefix commands to avoid duplicates in the output.

[Samuel Bronson]

Signed-off-by: Samuel Bronson <naesten@gmail.com>
---
 gdb/cli/cli-decode.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index e2647fc..73c06bc 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -789,8 +789,11 @@ apropos_cmd (struct ui_file *stream, struct cmd_list_element *commandlist,
 				      0 /* don't recurse */, stream);
 	    }
 	}
-      /* Check if this command has subcommands */
-      if (c->prefixlist != NULL)
+      /* Check if this command has subcommands and is not an abbreviation.
+	 We skip listing subcommands of abbreviations in order to avoid
+	 duplicates in the output.
+       */
+      if (c->prefixlist != NULL && !c->abbrev_flag)
 	{
 	  /* Recursively call ourselves on the subcommand list,
 	     passing the right prefix in.
-- 
1.6.3.1

[PATCH 1/2] * cli/cli-decode.c (apropos_cmd): Fix avoidance of double printing.

[Samuel Bronson]

Signed-off-by: Samuel Bronson <naesten@gmail.com>
---
 gdb/cli/cli-decode.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 4ebf6dc..e2647fc 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -766,7 +766,7 @@ apropos_cmd (struct ui_file *stream, struct cmd_list_element *commandlist,
 			 struct re_pattern_buffer *regex, char *prefix)
 {
   struct cmd_list_element *c;
-  int returnvalue=1; /*Needed to avoid double printing*/
+  int returnvalue=-1; /*Needed to avoid double printing*/
   /* Walk through the commands */
   for (c=commandlist;c;c=c->next)
     {
@@ -780,7 +780,7 @@ apropos_cmd (struct ui_file *stream, struct cmd_list_element *commandlist,
 				      0 /* don't recurse */, stream);
 	    }
 	}
-      if (c->doc != NULL && returnvalue != 0)
+      if (c->doc != NULL && returnvalue < 0)
 	{
 	  /* Try to match against documentation */
 	  if (re_search(regex,c->doc,strlen(c->doc),0,strlen(c->doc),NULL) >=0)
-- 
1.6.3.1

Re: [PATCH 1/2] * cli/cli-decode.c (apropos_cmd): Fix avoidance of double printing.

[Tom Tromey]

>>>>> "Samuel" == Samuel Bronson <naesten@gmail.com> writes:

Samuel> Signed-off-by: Samuel Bronson <naesten@gmail.com>
Samuel> ---
Samuel>  gdb/cli/cli-decode.c |    4 ++--
Samuel>  1 files changed, 2 insertions(+), 2 deletions(-)

Needs a ChangeLog entry...

Samuel> -  int returnvalue=1; /*Needed to avoid double printing*/
Samuel> +  int returnvalue=-1; /*Needed to avoid double printing*/
Samuel>    /* Walk through the commands */
Samuel>    for (c=commandlist;c;c=c->next)
Samuel>      {

Shouldn't this reinitialize returnvalue to -1 each time through the
loop?

Tom

Re: [PATCH 2/2] * cli/cli-decode.c (apropos_cmd): Skip traversing abbreviations for prefix commands to avoid duplicates in the output.

[Tom Tromey]

>>>>> "Samuel" == Samuel Bronson <naesten@gmail.com> writes:

Samuel> Signed-off-by: Samuel Bronson <naesten@gmail.com>
Samuel> ---
Samuel>  gdb/cli/cli-decode.c |    7 +++++--
Samuel>  1 files changed, 5 insertions(+), 2 deletions(-)

Needs a ChangeLog entry.

Otherwise this looks good.
It is even small enough to go in before your paperwork arrives.

Tom

Re: [PATCH 1/2] * cli/cli-decode.c (apropos_cmd): Fix avoidance of double printing.

[Samuel Bronson]

On Wed, Jun 17, 2009 at 1:26 PM, Tom Tromey<tromey@redhat.com> wrote:
>>>>>> "Samuel" == Samuel Bronson <naesten@gmail.com> writes:
>
> Samuel> Signed-off-by: Samuel Bronson <naesten@gmail.com>
> Samuel> ---
> Samuel>  gdb/cli/cli-decode.c |    4 ++--
> Samuel>  1 files changed, 2 insertions(+), 2 deletions(-)

Oh, oops, I forgot that git uses the first line of the commit message
for the Subject.

> Samuel> -  int returnvalue=1; /*Needed to avoid double printing*/
> Samuel> +  int returnvalue=-1; /*Needed to avoid double printing*/
> Samuel>    /* Walk through the commands */
> Samuel>    for (c=commandlist;c;c=c->next)
> Samuel>      {
>
> Shouldn't this reinitialize returnvalue to -1 each time through the
> loop?

Oh ... true! Oops.

[PATCH 1/2] Fix for PR gdb/9903 (part 1)

[Samuel Bronson]

	* cli/cli-decode.c (apropos_cmd): Fix avoidance of double
	printing.

Signed-off-by: Samuel Bronson <naesten@gmail.com>
---
 gdb/cli/cli-decode.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 4ebf6dc..cd4c984 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -766,10 +766,11 @@ apropos_cmd (struct ui_file *stream, struct cmd_list_element *commandlist,
 			 struct re_pattern_buffer *regex, char *prefix)
 {
   struct cmd_list_element *c;
-  int returnvalue=1; /*Needed to avoid double printing*/
+  int returnvalue;
   /* Walk through the commands */
   for (c=commandlist;c;c=c->next)
     {
+      returnvalue = -1; /*Needed to avoid double printing*/
       if (c->name != NULL)
 	{
 	  /* Try to match against the name*/
@@ -780,7 +781,7 @@ apropos_cmd (struct ui_file *stream, struct cmd_list_element *commandlist,
 				      0 /* don't recurse */, stream);
 	    }
 	}
-      if (c->doc != NULL && returnvalue != 0)
+      if (c->doc != NULL && returnvalue < 0)
 	{
 	  /* Try to match against documentation */
 	  if (re_search(regex,c->doc,strlen(c->doc),0,strlen(c->doc),NULL) >=0)
-- 
1.6.3.1

[PATCH 2/2] Fix for PR gdb/9903 (part 2)

[Samuel Bronson]

	* cli/cli-decode.c (apropos_cmd): Skip traversing abbreviations
        for prefix commands to avoid duplicates in the output.

Signed-off-by: Samuel Bronson <naesten@gmail.com>
---
 gdb/cli/cli-decode.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index cd4c984..c842889 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -790,8 +790,11 @@ apropos_cmd (struct ui_file *stream, struct cmd_list_element *commandlist,
 				      0 /* don't recurse */, stream);
 	    }
 	}
-      /* Check if this command has subcommands */
-      if (c->prefixlist != NULL)
+      /* Check if this command has subcommands and is not an abbreviation.
+	 We skip listing subcommands of abbreviations in order to avoid
+	 duplicates in the output.
+       */
+      if (c->prefixlist != NULL && !c->abbrev_flag)
 	{
 	  /* Recursively call ourselves on the subcommand list,
 	     passing the right prefix in.
-- 
1.6.3.1

Re: [PATCH 1/2] Fix for PR gdb/9903 (part 1)

[Tom Tromey]

>>>>> "Samuel" == Samuel Bronson <naesten@gmail.com> writes:

Samuel> 	* cli/cli-decode.c (apropos_cmd): Fix avoidance of double
Samuel> 	printing.

These two patches look good to me.  Since they are very small I will
commit them (a bit later).  However, future patches, regardless of
size, will have to wait for your paperwork to clear.

In a case like this, where someone else is committing the patch, it is
simpler for us if you send a complete ChangeLog entry, including the
header.  (Or if not simpler, it is at least traditional :-)

Also in this particular case I would add the PR number to the
entry.  Like:

2009-06-17  Samuel Bronson  <naesten@gmail.com>

	PR cli/9930:
	* cli/cli-decode.c (apropos_cmd): Fix avoidance of double
	printing.

This addition means that the commit message will automatically be
logged in bugzilla.

Tom