database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-12 21:01:52 +03:00
Code Activity

Apply Win32 patch from Horak Daniel.

Browse Source
This commit is contained in:
Bruce Momjian
1999-01-17 06:20:06 +00:00
parent 298682d9e0
commit 7a6b562fdf
58 changed files with 484 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/bin/psql/psql.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.165 1998/12/14 04:59:58 momjian Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.166 1999/01/17 06:19:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -40,6 +40,9 @@
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
#ifdef __CYGWIN32__
#include <getopt.h>
#endif
#ifdef HAVE_LIBREADLINE
#ifdef HAVE_READLINE_H
@ -1436,9 +1439,17 @@ do_copy(const char *args, PsqlSettings *pset)
strcat(query, " TO stdout");
if (from)
#ifndef __CYGWIN32__
copystream = fopen(file, "r");
#else
copystream = fopen(file, "rb");
#endif
else
#ifndef __CYGWIN32__
copystream = fopen(file, "w");
#else
copystream = fopen(file, "wb");
#endif
if (copystream == NULL)
fprintf(stderr,
"Unable to open file %s which to copy, errno = %s (%d).",
@ -2139,7 +2150,11 @@ HandleSlashCmds(PsqlSettings *pset,
}
stat(lastfile, &st);
editFile(lastfile);
#ifndef __CYGWIN32__
if ((stat(lastfile, &st2) == -1) || ((fd = fopen(lastfile, "r")) == NULL))
#else
if ((stat(lastfile, &st2) == -1) || ((fd = fopen(lastfile, "rb")) == NULL))
#endif
{
perror(lastfile);
break;
@ -2209,7 +2224,11 @@ HandleSlashCmds(PsqlSettings *pset,
fprintf(stderr, "\\i must be followed by a file name\n");
break;
}
#ifndef __CYGWIN32__
if ((fd = fopen(optarg, "r")) == NULL)
#else
if ((fd = fopen(optarg, "rb")) == NULL)
#endif
{
fprintf(stderr, "file named %s could not be opened\n", optarg);
break;
@ -2305,7 +2324,11 @@ HandleSlashCmds(PsqlSettings *pset,
fprintf(stderr, "\\w must be followed by a file name\n");
break;
}
#ifndef __CYGWIN32__
if ((fd = fopen(optarg, "w")) == NULL)
#else
if ((fd = fopen(optarg, "w")) == NULL)
#endif
{
fprintf(stderr, "file named %s could not be opened\n", optarg);
break;
@ -3086,7 +3109,11 @@ setFout(PsqlSettings *pset, char *fname)
if (*fname == '|')
{
pqsignal(SIGPIPE, SIG_IGN);
#ifndef __CYGWIN32__
pset->queryFout = popen(fname + 1, "w");
#else
pset->queryFout = popen(fname + 1, "wb");
#endif
pset->pipe = 1;
}
else