database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-05 09:19:17 +03:00
Code

Make HISTCONTROL=ignoredups work again (broken by misordering of

Browse Source 
operations during recent code refactoring).  Per bug #2840 from Ned Crigler.
This commit is contained in:
Tom Lane 2006-12-24 19:14:41 +00:00
parent 593d020ff6
commit 3b1645d119
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/psql/input.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2006, PostgreSQL Global Development Group * 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.60.2.1 2006/12/24 19:14:41 tgl Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
@ -111,6 +111,12 @@ pg_send_history(PQExpBuffer history_buf)
static char *prev_hist = NULL; static char *prev_hist = NULL;
char *s = history_buf->data; 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]) if (useHistory && s[0])
{ {
@ -123,12 +129,6 @@ pg_send_history(PQExpBuffer history_buf)
} }
else 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 */ /* Save each previous line for ignoredups processing */
if (prev_hist) if (prev_hist)
free(prev_hist); free(prev_hist);