66 *
77 *
88 * IDENTIFICATION
9- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.56 1998/08/2905:27:15 momjian Exp $
9+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.57 1998/08/2918:19:59 momjian Exp $
1010 *
1111 *-------------------------------------------------------------------------
1212 */
@@ -108,12 +108,21 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,
108108 the class.
109109----------------------------------------------------------------------------*/
110110
111- FILE * fp ;
111+ static FILE * fp ;/* static for cleanup */
112+ static bool file_opened = false;/* static for cleanup */
112113Relation rel ;
113114extern char * UserName ;/* defined in global.c */
114115const AclMode required_access = from ?ACL_WR :ACL_RD ;
115116int result ;
116117
118+ /*
119+ *Close previous file opened for COPY but failed with elog().
120+ *There should be a better way, but would not be modular.
121+ *Prevents file descriptor leak. bjm 1998/08/29
122+ */
123+ if (file_opened )
124+ FreeFile (fp );
125+
117126rel = heap_openr (relname );
118127if (rel == NULL )
119128elog (ERROR ,"COPY command failed. Class %s "
@@ -146,14 +155,13 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,
146155}
147156else
148157{
149- /* if we elog() out, the file stays open */
150158fp = AllocateFile (filename ,"r" );
151159if (fp == NULL )
152160elog (ERROR ,"COPY command, running in backend with "
153161"effective uid %d, could not open file '%s' for "
154162"reading. Errno = %s (%d)." ,
155163geteuid (),filename ,strerror (errno ),errno );
156- /* Above should not return */
164+ file_opened = true;
157165}
158166CopyFrom (rel ,binary ,oids ,fp ,delim );
159167}
@@ -174,20 +182,22 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,
174182mode_t oumask ;/* Pre-existing umask value */
175183
176184oumask = umask ((mode_t )0 );
177- /* if we elog() out, the file stays open */
178185fp = AllocateFile (filename ,"w" );
179186umask (oumask );
180187if (fp == NULL )
181188elog (ERROR ,"COPY command, running in backend with "
182189"effective uid %d, could not open file '%s' for "
183190"writing. Errno = %s (%d)." ,
184191geteuid (),filename ,strerror (errno ),errno );
185- /* Above should not return */
192+ file_opened = true;
186193}
187194CopyTo (rel ,binary ,oids ,fp ,delim );
188195}
189196if (!pipe )
197+ {
190198FreeFile (fp );
199+ file_opened = false;
200+ }
191201else if (!from && !binary )
192202{
193203fputs ("\\.\n" ,fp );