Make HISTCONTROL=ignoredups work again (broken by misordering of

operations during recent code refactoring).  Per bug #2840 from Ned Crigler.

diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index befee8635712c082300ca06f8eedfc300101aeca..9d2b8c9d96299abae27e638f6460097abd4fe442 100644 (file)
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.60 2006/10/04 00:30:06 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.61 2006/12/24 19:14:28 tgl Exp $
  */
 #include "postgres_fe.h"
 
@@ -111,6 +111,12 @@ pg_send_history(PQExpBuffer history_buf)
        static char *prev_hist = NULL;
 
        char       *s = history_buf->data;
+       int                     i;
+
+       /* Trim any trailing \n's (OK to scribble on history_buf) */
+       for (i = strlen(s) - 1; i >= 0 && s[i] == '\n'; i--)
+               ;
+       s[i + 1] = '\0';
 
        if (useHistory && s[0])
        {
@@ -123,12 +129,6 @@ pg_send_history(PQExpBuffer history_buf)
                }
                else
                {
-                       int                     i;
-
-                       /* Trim any trailing \n's (OK to scribble on history_buf) */
-                       for (i = strlen(s) - 1; i >= 0 && s[i] == '\n'; i--)
-                               ;
-                       s[i + 1] = '\0';
                        /* Save each previous line for ignoredups processing */
                        if (prev_hist)
                                free(prev_hist);