From baa6b22fcb831490c11506b6ec140d75fe8fff81 Mon Sep 17 00:00:00 2001 From: Tatsuo Ishii Date: Wed, 23 Nov 2005 12:19:12 +0000 Subject: [PATCH] Having blank lines in -f scripts was causing silent failures. per David Fetter --- contrib/pgbench/pgbench.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c index 70081be585..a5060204ce 100644 --- a/contrib/pgbench/pgbench.c +++ b/contrib/pgbench/pgbench.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.47 2005/11/23 04:23:28 momjian Exp $ + * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.48 2005/11/23 12:19:12 ishii Exp $ * * pgbench: a simple benchmark program for PostgreSQL * written by Tatsuo Ishii @@ -886,11 +886,17 @@ process_file(char *filename) { Command *commands; - commands = process_commands(buf); - if (commands == NULL) - { - fclose(fd); - return false; + + if (strncmp(buf, "\n", 1) != 0) { + commands = process_commands(buf); + if (commands == NULL) + { + fclose(fd); + return false; + } + } else { + lineno++; + continue; } my_commands[lineno] = commands;