Minor fixups for psql's process_file() function.
- Avoid closing stdin, since we didn't open it. Previously multiple inclusions of stdin would be terminated with a single quit, now a separate quit is needed for each invocation. Previous behavior also accessed stdin after it was fclose()d, which is undefined behavior per ANSI C. - Properly restore pset.inputfile, since the caller expects to be able to free that memory. Marti Raudsepp
This commit is contained in:
parent
5c38782cc8
commit
1fea0c05eb
|
@ -1987,7 +1987,10 @@ process_file(char *filename, bool single_txn)
|
|||
if ((res = PSQLexec("BEGIN", false)) == NULL)
|
||||
{
|
||||
if (pset.on_error_stop)
|
||||
return EXIT_USER;
|
||||
{
|
||||
result = EXIT_USER;
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
else
|
||||
PQclear(res);
|
||||
|
@ -2000,13 +2003,19 @@ process_file(char *filename, bool single_txn)
|
|||
if ((res = PSQLexec("COMMIT", false)) == NULL)
|
||||
{
|
||||
if (pset.on_error_stop)
|
||||
return EXIT_USER;
|
||||
{
|
||||
result = EXIT_USER;
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
else
|
||||
PQclear(res);
|
||||
}
|
||||
|
||||
fclose(fd);
|
||||
error:
|
||||
if (fd != stdin)
|
||||
fclose(fd);
|
||||
|
||||
pset.inputfile = oldfilename;
|
||||
return result;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue