summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTatsuo Ishii <ishii@postgresql.org>2002-05-14 02:08:22 +0000
committerTatsuo Ishii <ishii@postgresql.org>2002-05-14 02:08:22 +0000
commit964f1fa734a29cf6b03a1fa0b28e1df8c01f0027 (patch)
tree8e567b1487789f768733c35abc0bde11bcc849f9 /src
parent77c4ba63b80af440ffe1721f5424228494d3c0b0 (diff)
Fix bug in pg_dump and psql (to reproduce the bug, just try pg_dump
--nonexistingoption). per report from sugita@sra.co.jp on Thu, 09 May 2002 11:57:51 +0900 (JST) at pgsql-patches list. Illegal long options to pg_dump makes core on some systems, since it lacks the last null sentinel of struct option array. Attached is a patch made by Mr. Ishida Akio <iakio@pjam.jpweb.net>.
Diffstat (limited to 'src')
-rw-r--r--src/bin/pg_dump/pg_dump.c5
-rw-r--r--src/bin/psql/startup.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 64b4887e29c..f6e67719f08 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -22,7 +22,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.241 2002/02/11 00:18:20 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.241.2.1 2002/05/14 02:08:22 ishii Exp $
*
*-------------------------------------------------------------------------
*/
@@ -701,7 +701,8 @@ main(int argc, char **argv)
* the following options don't have an equivalent short option
* letter, but are available as '-X long-name'
*/
- {"use-set-session-authorization", no_argument, &use_setsessauth, 1}
+ {"use-set-session-authorization", no_argument, &use_setsessauth, 1},
+ {NULL, 0, NULL, 0}
};
int optindex;
#endif
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 9e4185de3be..00c696135f4 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.54 2001/11/05 17:46:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.54.2.1 2002/05/14 02:08:22 ishii Exp $
*/
#include "postgres_fe.h"
@@ -361,6 +361,7 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
{"expanded", no_argument, NULL, 'x'},
{"no-psqlrc", no_argument, NULL, 'X'},
{"help", no_argument, NULL, '?'},
+ {NULL, 0, NULL, 0}
};
int optindex;