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=.
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" \
$(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) $<
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
#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"
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;
test_path[MAXPGPATH];
char *path;
+#if !defined(_MSC_VER) && !defined(__BORLANDC__)
if (!getcwd(cwd, MAXPGPATH))
+#else
+ if (!GetCurrentDirectory(MAXPGPATH, cwd))
+#endif
cwd[0] = '\0';
/*
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