|
1 | 1 | /* header */
|
2 |
| -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.383 2008/11/13 11:54:39 meskes Exp $ */ |
| 2 | +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.384 2008/11/14 16:25:34 meskes Exp $ */ |
3 | 3 |
|
4 | 4 | /* Copyright comment */
|
5 | 5 | %{
|
@@ -95,7 +95,8 @@ mmerror(int error_code, enum errortype type, char * error, ...)
|
95 | 95 | fclose(yyin);
|
96 | 96 | if (yyout)
|
97 | 97 | fclose(yyout);
|
98 |
| - if (unlink(output_filename) != 0 && *output_filename != '-') |
| 98 | + |
| 99 | + if (strcmp(output_filename, "-") != 0 && unlink(output_filename) != 0) |
99 | 100 | fprintf(stderr, _("could not remove output file \"%s\"\n"), output_filename);
|
100 | 101 | exit(error_code);
|
101 | 102 | }
|
@@ -390,7 +391,7 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
|
390 | 391 | struct prep prep;
|
391 | 392 | }
|
392 | 393 | /* tokens */
|
393 |
| -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.383 2008/11/13 11:54:39 meskes Exp $ */ |
| 394 | +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.384 2008/11/14 16:25:34 meskes Exp $ */ |
394 | 395 | /* special embedded SQL token */
|
395 | 396 | %token SQL_ALLOCATE SQL_AUTOCOMMIT SQL_BOOL SQL_BREAK
|
396 | 397 | SQL_CALL SQL_CARDINALITY SQL_CONNECT
|
@@ -847,7 +848,7 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
|
847 | 848 | %type <str> reserved_keyword
|
848 | 849 | %type <str> SpecialRuleRelation
|
849 | 850 | /* ecpgtype */
|
850 |
| -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.383 2008/11/13 11:54:39 meskes Exp $ */ |
| 851 | +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.384 2008/11/14 16:25:34 meskes Exp $ */ |
851 | 852 | %type <str> ECPGAllocateDescr
|
852 | 853 | %type <str> ECPGCKeywords
|
853 | 854 | %type <str> ECPGColId
|
@@ -9343,6 +9344,8 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to backend\
|
9343 | 9344 |
|
9344 | 9345 |
|
9345 | 9346 | /* trailer */
|
| 9347 | +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.384 2008/11/14 16:25:34 meskes Exp $ */ |
| 9348 | + |
9346 | 9349 | statements: /*EMPTY*/
|
9347 | 9350 | | statements statement
|
9348 | 9351 | ;
|
|
0 commit comments