database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-23 14:01:44 +03:00
Code Activity

Fixed psql's Control-C handling when COPY in progress

Browse Source
This commit is contained in:
Peter Eisentraut
2000-02-21 19:40:42 +00:00
parent fc8e6c7746
commit c8009959c9
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/psql/copy.c
View File

@ -3,13 +3,14 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.10 2000/02/16 13:15:26 momjian Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.11 2000/02/21 19:40:41 petere Exp $
*/
#include "postgres.h"
#include "copy.h"
#include <errno.h>
#include <assert.h>
#include <signal.h>
#ifndef WIN32
#include <unistd.h> /* for isatty */
#else
@ -17,6 +18,7 @@
#endif
#include "libpq-fe.h"
#include "pqsignal.h"
#include "settings.h"
#include "common.h"
@ -26,6 +28,8 @@
#define strcasecmp(x,y) stricmp(x,y)
#endif
bool copy_state;
/*
* parse_slash_copy
* -- parses \copy command line
@ -358,7 +362,9 @@ handleCopyOut(PGconn *conn, FILE *copystream)
}
}
fflush(copystream);
return !PQendcopy(conn);
ret = !PQendcopy(conn);
copy_state = false;
return ret;
}
@ -386,6 +392,7 @@ handleCopyIn(PGconn *conn, FILE *copystream, const char *prompt)
char *s;
int bufleft;
int c = 0;
int ret;
if (prompt) /* disable prompt if not interactive */
{
@ -435,5 +442,7 @@ handleCopyIn(PGconn *conn, FILE *copystream, const char *prompt)
}
PQputline(conn, "\n");
}
return !PQendcopy(conn);
ret = !PQendcopy(conn);
copy_state = false;
return ret;
}