Free files on dir open failure in COPY.

bmomjian · bmomjian · commit 0cd8cb1a032b · 2002-02-24T02:32:26.000Z
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.146 2002/02/23 21:46:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.147 2002/02/24 02:32:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -337,7 +337,7 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,
       
       fstat(fileno(fp),&st);
       if( S_ISDIR(st.st_mode) ){
-        fclose(fp);
+		FreeFile(fp);
         elog(ERROR,"COPY: %s is a directory.",filename);
       }
 		}
@@ -389,7 +389,7 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,
 					 (int) geteuid(), filename, strerror(errno), errno);
       fstat(fileno(fp),&st);
       if( S_ISDIR(st.st_mode) ){
-        fclose(fp);
+		FreeFile(fp);
         elog(ERROR,"COPY: %s is a directory.",filename);
       }
 		}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.146 2002/02/23 21:46:02 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.147 2002/02/24 02:32:26 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -337,7 +337,7 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,`
`337`	`337`
`338`	`338`	`fstat(fileno(fp),&st);`
`339`	`339`	`if( S_ISDIR(st.st_mode) ){`
`340`		`- fclose(fp);`
	`340`	`+ FreeFile(fp);`
`341`	`341`	`elog(ERROR,"COPY: %s is a directory.",filename);`
`342`	`342`	`}`
`343`	`343`	`}`
`@@ -389,7 +389,7 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,`
`389`	`389`	`(int) geteuid(), filename, strerror(errno), errno);`
`390`	`390`	`fstat(fileno(fp),&st);`
`391`	`391`	`if( S_ISDIR(st.st_mode) ){`
`392`		`- fclose(fp);`
	`392`	`+ FreeFile(fp);`
`393`	`393`	`elog(ERROR,"COPY: %s is a directory.",filename);`
`394`	`394`	`}`
`395`	`395`	`}`