mirror of
https://github.com/postgres/postgres.git
synced 2025-04-29 13:56:47 +03:00
a692ee5870
It's easy to forget using SYSTEMQUOTEs when constructing command strings for system() or popen(). Even if we fix all the places missing it now, it is bound to be forgotten again in the future. Introduce wrapper functions that do the the extra quoting for you, and get rid of SYSTEMQUOTEs in all the callers. We previosly used SYSTEMQUOTEs in all the hard-coded command strings, and this doesn't change the behavior of those. But user-supplied commands, like archive_command, restore_command, COPY TO/FROM PROGRAM calls, as well as pgbench's \shell, will now gain an extra pair of quotes. That is desirable, but if you have existing scripts or config files that include an extra pair of quotes, those might need to be adjusted. Reviewed by Amit Kapila and Tom Lane
118 lines
2.5 KiB
C
118 lines
2.5 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* system.c
|
|
* Win32 system() and popen() replacements
|
|
*
|
|
*
|
|
* Win32 needs double quotes at the beginning and end of system()
|
|
* strings. If not, it gets confused with multiple quoted strings.
|
|
* It also requires double-quotes around the executable name and
|
|
* any files used for redirection. Other args can use single-quotes.
|
|
*
|
|
* Generated using Win32 "CMD /?":
|
|
*
|
|
* 1. If all of the following conditions are met, then quote characters
|
|
* on the command line are preserved:
|
|
*
|
|
* - no /S switch
|
|
* - exactly two quote characters
|
|
* - no special characters between the two quote characters, where special
|
|
* is one of: &<>()@^|
|
|
* - there are one or more whitespace characters between the two quote
|
|
* characters
|
|
* - the string between the two quote characters is the name of an
|
|
* executable file.
|
|
*
|
|
* 2. Otherwise, old behavior is to see if the first character is a quote
|
|
* character and if so, strip the leading character and remove the last
|
|
* quote character on the command line, preserving any text after the last
|
|
* quote character.
|
|
*
|
|
* Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
|
|
*
|
|
* src/port/system.c
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
|
|
#if defined(WIN32) && !defined(__CYGWIN__)
|
|
|
|
#ifndef FRONTEND
|
|
#include "postgres.h"
|
|
#else
|
|
#include "postgres_fe.h"
|
|
#endif
|
|
|
|
#include <windows.h>
|
|
#include <fcntl.h>
|
|
|
|
#undef system
|
|
#undef popen
|
|
|
|
int
|
|
pgwin32_system(const char *command)
|
|
{
|
|
size_t cmdlen = strlen(command);
|
|
char *buf;
|
|
int save_errno;
|
|
int res;
|
|
|
|
/*
|
|
* Create a malloc'd copy of the command string, enclosed with an extra
|
|
* pair of quotes
|
|
*/
|
|
buf = malloc(cmdlen + 2 + 1);
|
|
if (buf == NULL)
|
|
{
|
|
errno = ENOMEM;
|
|
return -1;
|
|
}
|
|
buf[0] = '"';
|
|
memcpy(&buf[1], command, cmdlen);
|
|
buf[cmdlen + 1] = '"';
|
|
buf[cmdlen + 2] = '\0';
|
|
|
|
res = system(buf);
|
|
|
|
save_errno = errno;
|
|
free(buf);
|
|
errno = save_errno;
|
|
|
|
return res;
|
|
}
|
|
|
|
|
|
FILE *
|
|
pgwin32_popen(const char *command, const char *type)
|
|
{
|
|
size_t cmdlen = strlen(command);
|
|
char *buf;
|
|
int save_errno;
|
|
FILE *res;
|
|
|
|
/*
|
|
* Create a malloc'd copy of the command string, enclosed with an extra
|
|
* pair of quotes
|
|
*/
|
|
buf = malloc(cmdlen + 2 + 1);
|
|
if (buf == NULL)
|
|
{
|
|
errno = ENOMEM;
|
|
return NULL;
|
|
}
|
|
buf[0] = '"';
|
|
memcpy(&buf[1], command, cmdlen);
|
|
buf[cmdlen + 1] = '"';
|
|
buf[cmdlen + 2] = '\0';
|
|
|
|
res = _popen(buf, type);
|
|
|
|
save_errno = errno;
|
|
free(buf);
|
|
errno = save_errno;
|
|
|
|
return res;
|
|
}
|
|
|
|
#endif
|