From dde29859642fd82a7225450c269d82583b3e449e Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Fri, 14 Nov 2008 16:25:34 +0000 Subject: [PATCH] Fixed test for output_filename == stdout. --- src/interfaces/ecpg/preproc/ecpg.header | 3 ++- src/interfaces/ecpg/preproc/preproc.y | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header index 95cca4b5cc..78aca9afdc 100644 --- a/src/interfaces/ecpg/preproc/ecpg.header +++ b/src/interfaces/ecpg/preproc/ecpg.header @@ -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); } diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 9cb91678f8..399ac42004 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -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); } @@ -9343,6 +9344,8 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to backend\ /* trailer */ +/* $PostgreSQL$ */ + statements: /*EMPTY*/ | statements statement ; -- 2.39.5