Commit162e8f1

committed

Make saveHistory work properly on OS X when HISTFILE is set to /dev/null.

Per discussion with Martin Atukunda.

1 parent445a612 commit162e8f1Copy full SHA for 162e8f1

File tree

-2

lines changed

-2

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2006, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.57 2006/07/14 14:52:26 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.58 2006/08/27 15:05:20 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`
`@@ -340,7 +340,14 @@ bool`
`340`	`340`	`saveHistory(char*fname,boolencodeFlag)`
`341`	`341`	`{`
`342`	`342`	`#ifdefUSE_READLINE`
`343`		`-if (useHistory&&fname)`
	`343`	`+/*`
	`344`	`+ * Suppressing the write attempt when HISTFILE is set to /dev/null`
	`345`	`+ * may look like a negligible optimization, but it's necessary on e.g.`
	`346`	`+ * Darwin, where write_history will fail because it tries to chmod`
	`347`	`+ * the target file.`
	`348`	`+ */`
	`349`	`+if (useHistory&&fname&&`
	`350`	`+strcmp(fname,DEVNULL)!=0)`
`344`	`351`	`{`
`345`	`352`	`if (encodeFlag)`
`346`	`353`	`encode_history();`

Comments

(0)