Skip to content

P
Postgres FD Implementation
Commit a76e98f0 authored by Michael Meskes's avatar Michael Meskes
Browse files
Options

Fixed test for output_filename == stdout.

parent f06b7604
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
src/interfaces/ecpg/preproc/ecpg.header
View file @ a76e98f0
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.1 2008/11/14 10:03:33 meskes Exp $ */
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.2 2008/11/14 16:25:34 meskes Exp $ */
/* Copyright comment */
%{
......@@ -94,7 +94,8 @@ mmerror(int error_code, enum errortype type, char * error, ...)
fclose(yyin);
if (yyout)
fclose(yyout);
if (unlink(output_filename) != 0 && *output_filename != '-')
if (strcmp(output_filename, "-") != 0 && unlink(output_filename) != 0)
fprintf(stderr, _("could not remove output file \"%s\"\n"), output_filename);
exit(error_code);
}
......
src/interfaces/ecpg/preproc/preproc.y
View file @ a76e98f0
/* header */
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.383 2008/11/13 11:54:39 meskes Exp $ */
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.384 2008/11/14 16:25:34 meskes Exp $ */
/* Copyright comment */
%{
......@@ -95,7 +95,8 @@ mmerror(int error_code, enum errortype type, char * error, ...)
fclose(yyin);
if (yyout)
fclose(yyout);
if (unlink(output_filename) != 0 && *output_filename != '-')
if (strcmp(output_filename, "-") != 0 && unlink(output_filename) != 0)
fprintf(stderr, _("could not remove output file \"%s\"\n"), output_filename);
exit(error_code);
}
......@@ -390,7 +391,7 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
struct prep prep;
}
/* tokens */
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.383 2008/11/13 11:54:39 meskes Exp $ */
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.384 2008/11/14 16:25:34 meskes Exp $ */
/* special embedded SQL token */
%token SQL_ALLOCATE SQL_AUTOCOMMIT SQL_BOOL SQL_BREAK
SQL_CALL SQL_CARDINALITY SQL_CONNECT
......@@ -847,7 +848,7 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
%type <str> reserved_keyword
%type <str> SpecialRuleRelation
/* ecpgtype */
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.383 2008/11/13 11:54:39 meskes Exp $ */
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.384 2008/11/14 16:25:34 meskes Exp $ */
%type <str> ECPGAllocateDescr
%type <str> ECPGCKeywords
%type <str> ECPGColId
......@@ -9343,6 +9344,8 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to backend\
/* trailer */
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.384 2008/11/14 16:25:34 meskes Exp $ */
statements: /*EMPTY*/
| statements statement
;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment