Index: src/bin/psql/help.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/help.c,v
retrieving revision 1.102
diff -c -c -r1.102 help.c
*** src/bin/psql/help.c	14 Jun 2005 02:57:41 -0000	1.102
--- src/bin/psql/help.c	6 Jul 2005 02:18:59 -0000
***************
*** 305,356 ****
  	}
  	else
  	{
! 		int			i;
  		bool		help_found = false;
  		FILE	   *output;
! 		size_t		len;
  		int			nl_count = 0;
  		char	   *ch;
  
! 		/* don't care about trailing spaces or semicolons */
  		len = strlen(topic);
  		while (topic[len - 1] == ' ' || topic[len - 1] == ';')
! 			len--;
  
! 		/* Count newlines for pager */
! 		for (i = 0; QL_HELP[i].cmd; i++)
  		{
! 			if (pg_strncasecmp(topic, QL_HELP[i].cmd, len) == 0 ||
! 				strcmp(topic, "*") == 0)
! 			{
! 				nl_count += 5;
! 				for (ch = QL_HELP[i].syntax; *ch != '\0'; ch++)
! 					if (*ch == '\n')
! 						nl_count++;
! 				/* If we have an exact match, exit.  Fixes \h SELECT */
! 				if (pg_strcasecmp(topic, QL_HELP[i].cmd) == 0)
! 					break;
! 			}
! 		}
! 
! 		output = PageOutput(nl_count, pager);
! 
! 		for (i = 0; QL_HELP[i].cmd; i++)
! 		{
! 			if (pg_strncasecmp(topic, QL_HELP[i].cmd, len) == 0 ||
! 				strcmp(topic, "*") == 0)
! 			{
! 				help_found = true;
! 				fprintf(output, _("Command:     %s\n"
! 								  "Description: %s\n"
! 								  "Syntax:\n%s\n\n"),
! 						QL_HELP[i].cmd,
! 						_(QL_HELP[i].help),
! 						_(QL_HELP[i].syntax));
! 				/* If we have an exact match, exit.  Fixes \h SELECT */
! 				if (pg_strcasecmp(topic, QL_HELP[i].cmd) == 0)
! 					break;
! 			}
  		}
  
  		if (!help_found)
--- 305,382 ----
  	}
  	else
  	{
! 			int			i,j,x=0;
  		bool		help_found = false;
  		FILE	   *output;
! 		size_t		len, wordlen;
  		int			nl_count = 0;
  		char	   *ch;
  
! 		/* User gets two chances: exact match, then the first word */
! 		
! 		/* First pass : strip trailing spaces and semicolons */
  		len = strlen(topic);
  		while (topic[len - 1] == ' ' || topic[len - 1] == ';')
! 				len--;
  
! 		for (x=1; x<=3; x++) /* Three chances to guess that word... */
  		{
! 				if (x>1) /* Nothing on first pass - try the opening words */
! 				{
! 						wordlen=j=1;
! 						while (topic[j] != ' ' && j++<len)
! 								wordlen++;
! 						if (x==2)
! 						{
! 								j++;
! 								while (topic[j] != ' ' && j++<=len)
! 										wordlen++;
! 						}
! 						if (wordlen >= len) /* Don't try again if the same word */
! 						{
! 								output = PageOutput(nl_count, pager);
! 								break;
! 						}
! 						len = wordlen;
! 				}
! 
! 				/* Count newlines for pager */
! 				for (i = 0; QL_HELP[i].cmd; i++)
! 				{
! 						if (pg_strncasecmp(topic, QL_HELP[i].cmd, len) == 0 ||
! 								strcmp(topic, "*") == 0)
! 						{
! 								nl_count += 5;
! 								for (ch = QL_HELP[i].syntax; *ch != '\0'; ch++)
! 										if (*ch == '\n')
! 												nl_count++;
! 								/* If we have an exact match, exit.  Fixes \h SELECT */
! 								if (pg_strcasecmp(topic, QL_HELP[i].cmd) == 0)
! 										break;
! 						}
! 				}
! 				
! 				output = PageOutput(nl_count, pager);
! 				
! 				for (i = 0; QL_HELP[i].cmd; i++)
! 				{
! 						if (pg_strncasecmp(topic, QL_HELP[i].cmd, len) == 0 ||
! 								strcmp(topic, "*") == 0)
! 						{
! 								help_found = true;
! 								fprintf(output, _("Command:     %s\n"
! 																	"Description: %s\n"
! 																	"Syntax:\n%s\n\n"),
! 												QL_HELP[i].cmd,
! 												_(QL_HELP[i].help),
! 												_(QL_HELP[i].syntax));
! 								/* If we have an exact match, exit.  Fixes \h SELECT */
! 								if (pg_strcasecmp(topic, QL_HELP[i].cmd) == 0)
! 										break;
! 						}
! 				}
! 				if (help_found) /* Don't keep trying if we got a match */
! 						break;
  		}
  
  		if (!help_found)