Posix-only fix for CORE-3600: temp files fb_query_xxxx remains after …

…ISQL has been closed
FirebirdSQL · Oct 5, 2011 · af4d1d8 · af4d1d8
1 parent acc4af9
commit af4d1d8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/gpre/gpre.cpp b/src/gpre/gpre.cpp
@@ -1335,6 +1335,9 @@ static SLONG compile_module( SLONG start_position, const TEXT* base_directory)
 	const Firebird::PathName filename = Firebird::TempFile::create(SCRATCH);
 	strcpy(trace_file_name, filename.c_str());
 	trace_file = fopen(trace_file_name, "w+b");
+#ifdef UNIX
+	unlink(trace_file_name);
+#endif
 
 	if (!trace_file)
 	{

diff --git a/src/isql/isql.epp b/src/isql/isql.epp
@@ -4137,6 +4137,9 @@ static void do_isql()
 		const Firebird::PathName filename = TempFile::create(SCRATCH);
 		const char* Tmpfile = filename.c_str();
 		FILE* f = fopen(Tmpfile, "w+"); // It was w+b
+#ifdef UNIX
+		unlink(Tmpfile);
+#endif
 		if (f)
 			Filelist->Ofp().init(f, Tmpfile, Tmpfile);
 		else

diff --git a/src/qli/lex.cpp b/src/qli/lex.cpp
@@ -512,6 +512,9 @@ void LEX_init()
 	const Firebird::PathName filename = TempFile::create(SCRATCH);
 	strcpy(trace_file_name, filename.c_str());
 	trace_file = fopen(trace_file_name, "w+b");
+#ifdef UNIX
+	unlink(trace_file_name);
+#endif
 	if (!trace_file)
 		IBERROR(61);			// Msg 61 couldn't open scratch file