mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make adjustment for MS VC and BCC compile of psql, from Dave Page.

Browse Source
This commit is contained in:
Bruce Momjian 2004-09-27 22:06:41 +00:00
parent f6b896b17a
commit 866627f84d
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/psql/win32.mak
View File

@ -60,7 +60,8 @@ CLEAN :
CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
/I ..\..\include /I ..\..\interfaces\libpq /D "HAVE_STRDUP" /D "FRONTEND"
/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \
/D "HAVE_STRDUP" /D "FRONTEND"
CPP_OBJS=.\Release/
CPP_SBRS=.
@ -71,6 +72,8 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
/pdb:"$(OUTDIR)\psql.pdb" /machine:I386 /out:"$(OUTDIR)\psql.exe"
LINK32_OBJS= \
"$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\exec.obj" \
"$(INTDIR)\command.obj" \
"$(INTDIR)\common.obj" \
"$(INTDIR)\help.obj" \
@ -118,6 +121,16 @@ LINK32_OBJS= \
$(CPP_PROJ) ..\..\port\path.c
<<
"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c
<<
"$(INTDIR)\exec.obj" : ..\..\port\exec.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\exec.c
<<
.c{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<

14
src/port/exec.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/port/exec.c,v 1.25 2004/08/29 05:07:02 momjian Exp $
* $PostgreSQL: pgsql/src/port/exec.c,v 1.26 2004/09/27 22:06:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -22,7 +22,11 @@
#include <pwd.h>
#include <sys/stat.h>
#include <sys/wait.h>
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
#include <unistd.h>
#else
#include "port/win32.h"
#endif
#include "miscadmin.h"
@ -71,7 +75,7 @@ validate_exec(const char *path)
int in_grp = 0;
#else
char path_exe[MAXPGPATH + 2 + strlen(".exe")];
char path_exe[MAXPGPATH + sizeof(".exe") - 1];
#endif
int is_r = 0;
int is_x = 0;
@ -176,7 +180,11 @@ find_my_exec(const char *argv0, char *retpath)
test_path[MAXPGPATH];
char *path;
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
if (!getcwd(cwd, MAXPGPATH))
#else
if (!GetCurrentDirectory(MAXPGPATH, cwd))
#endif
cwd[0] = '\0';
/*
@ -387,8 +395,8 @@ pipe_read_line(char *cmd, char *line, int maxsize)
bytesread > 0)
{
/* So we read some data */
retval = line;
int len = strlen(line);
retval = line;
/*
* If EOL is \r\n, convert to just \n. Because stdout is a