summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/src/sgml/install-windows.sgml3
-rw-r--r--doc/src/sgml/installation.sgml2
-rw-r--r--src/backend/libpq/auth.c6
-rw-r--r--src/bin/initdb/initdb.c11
-rw-r--r--src/common/exec.c132
-rw-r--r--src/port/getaddrinfo.c12
6 files changed, 13 insertions, 153 deletions
diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windows.sgml
index 08556b6ebe7..e492d8957ca 100644
--- a/doc/src/sgml/install-windows.sgml
+++ b/doc/src/sgml/install-windows.sgml
@@ -46,8 +46,7 @@
<productname>Cygwin</productname> is not recommended for running a
production server, and it should only be used for running on
older versions of <productname>Windows</productname> where
- the native build does not work, such as
- <productname>Windows 98</productname>. The official
+ the native build does not work. The official
binaries are built using <productname>Visual Studio</productname>.
</para>
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index f1adcc3c559..cc242dccee6 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -2087,7 +2087,7 @@ export MANPATH
<para>
<productname>PostgreSQL</productname> can be expected to work on these operating
- systems: Linux (all recent distributions), Windows (Win2000 SP4 and later),
+ systems: Linux (all recent distributions), Windows (XP and later),
FreeBSD, OpenBSD, NetBSD, macOS, AIX, HP/UX, and Solaris.
Other Unix-like systems may also work but are not currently
being tested. In most cases, all CPU architectures supported by
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index c4f5a553ac4..e1057f9fc75 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -2503,9 +2503,9 @@ InitializeLDAPConnection(Port *port, LDAP **ldap)
if (_ldap_start_tls_sA == NULL)
{
/*
- * Need to load this function dynamically because it does not
- * exist on Windows 2000, and causes a load error for the whole
- * exe if referenced.
+ * Need to load this function dynamically because it may not exist
+ * on Windows, and causes a load error for the whole exe if
+ * referenced.
*/
HANDLE ldaphandle;
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 7f1534aebb4..53029733793 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -2007,7 +2007,7 @@ make_postgres(FILE *cmdfd)
* signal handler in case we are interrupted.
*
* The Windows runtime docs at
- * http://msdn.microsoft.com/library/en-us/vclib/html/_crt_signal.asp
+ * https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/signal
* specifically forbid a number of things being done from a signal handler,
* including IO, memory allocation and system calls, and only allow jmpbuf
* if you are handling SIGFPE.
@@ -2016,11 +2016,10 @@ make_postgres(FILE *cmdfd)
* exit() directly.
*
* Also note the behaviour of Windows with SIGINT, which says this:
- * Note SIGINT is not supported for any Win32 application, including
- * Windows 98/Me and Windows NT/2000/XP. When a CTRL+C interrupt occurs,
- * Win32 operating systems generate a new thread to specifically handle
- * that interrupt. This can cause a single-thread application such as UNIX,
- * to become multithreaded, resulting in unexpected behavior.
+ * SIGINT is not supported for any Win32 application. When a CTRL+C interrupt
+ * occurs, Win32 operating systems generate a new thread to specifically
+ * handle that interrupt. This can cause a single-thread application, such as
+ * one in UNIX, to become multithreaded and cause unexpected behavior.
*
* I have no idea how to handle this. (Strange they call UNIX an application!)
* So this will need some testing on Windows.
diff --git a/src/common/exec.c b/src/common/exec.c
index 359442cf0c9..88400daa471 100644
--- a/src/common/exec.c
+++ b/src/common/exec.c
@@ -354,17 +354,11 @@ find_other_exec(const char *argv0, const char *target,
/*
- * The runtime library's popen() on win32 does not work when being
- * called from a service when running on windows <= 2000, because
- * there is no stdin/stdout/stderr.
- *
- * Executing a command in a pipe and reading the first line from it
- * is all we need.
+ * Execute a command in a pipe and read the first line from it.
*/
static char *
pipe_read_line(char *cmd, char *line, int maxsize)
{
-#ifndef WIN32
FILE *pgver;
/* flush output buffers in case popen does not... */
@@ -393,130 +387,6 @@ pipe_read_line(char *cmd, char *line, int maxsize)
return NULL;
return line;
-#else /* WIN32 */
-
- SECURITY_ATTRIBUTES sattr;
- HANDLE childstdoutrd,
- childstdoutwr,
- childstdoutrddup;
- PROCESS_INFORMATION pi;
- STARTUPINFO si;
- char *retval = NULL;
-
- sattr.nLength = sizeof(SECURITY_ATTRIBUTES);
- sattr.bInheritHandle = TRUE;
- sattr.lpSecurityDescriptor = NULL;
-
- if (!CreatePipe(&childstdoutrd, &childstdoutwr, &sattr, 0))
- return NULL;
-
- if (!DuplicateHandle(GetCurrentProcess(),
- childstdoutrd,
- GetCurrentProcess(),
- &childstdoutrddup,
- 0,
- FALSE,
- DUPLICATE_SAME_ACCESS))
- {
- CloseHandle(childstdoutrd);
- CloseHandle(childstdoutwr);
- return NULL;
- }
-
- CloseHandle(childstdoutrd);
-
- ZeroMemory(&pi, sizeof(pi));
- ZeroMemory(&si, sizeof(si));
- si.cb = sizeof(si);
- si.dwFlags = STARTF_USESTDHANDLES;
- si.hStdError = childstdoutwr;
- si.hStdOutput = childstdoutwr;
- si.hStdInput = INVALID_HANDLE_VALUE;
-
- if (CreateProcess(NULL,
- cmd,
- NULL,
- NULL,
- TRUE,
- 0,
- NULL,
- NULL,
- &si,
- &pi))
- {
- /* Successfully started the process */
- char *lineptr;
-
- ZeroMemory(line, maxsize);
-
- /* Try to read at least one line from the pipe */
- /* This may require more than one wait/read attempt */
- for (lineptr = line; lineptr < line + maxsize - 1;)
- {
- DWORD bytesread = 0;
-
- /* Let's see if we can read */
- if (WaitForSingleObject(childstdoutrddup, 10000) != WAIT_OBJECT_0)
- break; /* Timeout, but perhaps we got a line already */
-
- if (!ReadFile(childstdoutrddup, lineptr, maxsize - (lineptr - line),
- &bytesread, NULL))
- break; /* Error, but perhaps we got a line already */
-
- lineptr += strlen(lineptr);
-
- if (!bytesread)
- break; /* EOF */
-
- if (strchr(line, '\n'))
- break; /* One or more lines read */
- }
-
- if (lineptr != line)
- {
- /* OK, we read some data */
- int len;
-
- /* If we got more than one line, cut off after the first \n */
- lineptr = strchr(line, '\n');
- if (lineptr)
- *(lineptr + 1) = '\0';
-
- len = strlen(line);
-
- /*
- * If EOL is \r\n, convert to just \n. Because stdout is a
- * text-mode stream, the \n output by the child process is
- * received as \r\n, so we convert it to \n. The server main.c
- * sets setvbuf(stdout, NULL, _IONBF, 0) which has the effect of
- * disabling \n to \r\n expansion for stdout.
- */
- if (len >= 2 && line[len - 2] == '\r' && line[len - 1] == '\n')
- {
- line[len - 2] = '\n';
- line[len - 1] = '\0';
- len--;
- }
-
- /*
- * We emulate fgets() behaviour. So if there is no newline at the
- * end, we add one...
- */
- if (len == 0 || line[len - 1] != '\n')
- strcat(line, "\n");
-
- retval = line;
- }
-
- CloseHandle(pi.hProcess);
- CloseHandle(pi.hThread);
- }
-
- CloseHandle(childstdoutwr);
- CloseHandle(childstdoutrddup);
-
- return retval;
-#endif /* WIN32 */
}
diff --git a/src/port/getaddrinfo.c b/src/port/getaddrinfo.c
index b8b7827356b..c59a10fbbcd 100644
--- a/src/port/getaddrinfo.c
+++ b/src/port/getaddrinfo.c
@@ -69,10 +69,9 @@ haveNativeWindowsIPv6routines(void)
return (getaddrinfo_ptr != NULL);
/*
- * For Windows XP and Windows 2003 (and longhorn/vista), the IPv6 routines
- * are present in the WinSock 2 library (ws2_32.dll). Try that first
+ * For Windows XP and later versions, the IPv6 routines are present in the
+ * WinSock 2 library (ws2_32.dll).
*/
-
hLibrary = LoadLibraryA("ws2_32");
if (hLibrary == NULL || GetProcAddress(hLibrary, "getaddrinfo") == NULL)
@@ -83,13 +82,6 @@ haveNativeWindowsIPv6routines(void)
*/
if (hLibrary != NULL)
FreeLibrary(hLibrary);
-
- /*
- * In Windows 2000, there was only the IPv6 Technology Preview look in
- * the IPv6 WinSock library (wship6.dll).
- */
-
- hLibrary = LoadLibraryA("wship6");
}
/* If hLibrary is null, we couldn't find a dll with functions */
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-14 13:58:41 +0000