Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc55de22

Browse files
committed
Enable service use by Cygwin of pg_ctl.
1 parent4855d7e commitc55de22

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

‎src/bin/pg_ctl/pg_ctl.c

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
66
*
7-
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.34 2004/10/12 21:54:43 petere Exp $
7+
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.35 2004/10/13 10:35:05 momjian Exp $
88
*
99
*-------------------------------------------------------------------------
1010
*/
@@ -21,6 +21,10 @@
2121
#include"libpq/pqsignal.h"
2222
#include"getopt_long.h"
2323

24+
#if defined(__CYGWIN__)
25+
#include<windows.h>
26+
#endif
27+
2428
#ifndefHAVE_OPTRESET
2529
intoptreset;
2630
#endif
@@ -95,7 +99,7 @@ static void do_reload(void);
9599
staticvoiddo_status(void);
96100
staticvoiddo_kill(pgpid_tpid);
97101

98-
#ifdefWIN32
102+
#if defined(WIN32)|| defined(__CYGWIN__)
99103
staticboolpgwin32_IsInstalled(SC_HANDLE);
100104
staticchar*pgwin32_CommandLine(bool);
101105
staticvoidpgwin32_doRegister();
@@ -116,7 +120,7 @@ static char pid_file[MAXPGPATH];
116120
staticcharconf_file[MAXPGPATH];
117121

118122

119-
#ifdefWIN32
123+
#if defined(WIN32)|| defined(__CYGWIN__)
120124
staticvoid
121125
write_eventlog(intlevel,constchar*line)
122126
{
@@ -154,7 +158,7 @@ write_stderr(const char *fmt,...)
154158
va_listap;
155159

156160
va_start(ap,fmt);
157-
#ifndefWIN32
161+
#if !defined(WIN32)&& !defined(__CYGWIN__)
158162
/* On Unix, we just fprintf to stderr */
159163
vfprintf(stderr,fmt,ap);
160164
#else
@@ -318,15 +322,15 @@ start_postmaster(void)
318322
* http://dev.remotenetworktechnology.com/cmd/cmdfaq.htm
319323
*/
320324
if (log_file!=NULL)
321-
#ifndefWIN32
325+
#if !defined(WIN32)&& !defined(__CYGWIN__)
322326
snprintf(cmd,MAXPGPATH,"%s\"%s\" %s%s < \"%s\" >> \"%s\" 2>&1 &%s",
323327
#else
324328
snprintf(cmd,MAXPGPATH,"%sSTART /B \"\" \"%s\" %s%s < \"%s\" >> \"%s\" 2>&1%s",
325329
#endif
326330
SYSTEMQUOTE,postgres_path,pgdata_opt,post_opts,
327331
DEVNULL,log_file,SYSTEMQUOTE);
328332
else
329-
#ifndefWIN32
333+
#if !defined(WIN32)&& !defined(__CYGWIN__)
330334
snprintf(cmd,MAXPGPATH,"%s\"%s\" %s%s < \"%s\" 2>&1 &%s",
331335
#else
332336
snprintf(cmd,MAXPGPATH,"%sSTART /B \"\" \"%s\" %s%s < \"%s\" 2>&1%s",
@@ -807,7 +811,7 @@ do_kill(pgpid_t pid)
807811
}
808812
}
809813

810-
#ifdefWIN32
814+
#if defined(WIN32)|| defined(__CYGWIN__)
811815

812816
staticbool
813817
pgwin32_IsInstalled(SC_HANDLEhSCM)
@@ -1085,14 +1089,14 @@ do_help(void)
10851089
printf(_(" %s reload [-D DATADIR] [-s]\n"),progname);
10861090
printf(_(" %s status [-D DATADIR]\n"),progname);
10871091
printf(_(" %s kill SIGNALNAME PROCESSID\n"),progname);
1088-
#ifdefWIN32
1092+
#if defined(WIN32)|| defined(__CYGWIN__)
10891093
printf(_(" %s register [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR] [-w] [-o \"OPTIONS\"]\n"),progname);
10901094
printf(_(" %s unregister [-N SERVICENAME]\n"),progname);
10911095
#endif
10921096
printf(_("Common options:\n"));
10931097
printf(_(" -D, --pgdata DATADIR location of the database storage area\n"));
10941098
printf(_(" -s, --silent only print errors, no informational messages\n"));
1095-
#ifdefWIN32
1099+
#if defined(WIN32)|| defined(__CYGWIN__)
10961100
printf(_(" -N service name with which to register PostgreSQL server\n"));
10971101
printf(_(" -P password of account to register PostgreSQL server\n"));
10981102
printf(_(" -U user name of account to register PostgreSQL server\n"));
@@ -1201,7 +1205,7 @@ main(int argc, char **argv)
12011205
intc;
12021206
pgpid_tkillproc=0;
12031207

1204-
#ifdefWIN32
1208+
#if defined(WIN32)|| defined(__CYGWIN__)
12051209
setvbuf(stderr,NULL,_IONBF,0);
12061210
#endif
12071211

@@ -1348,7 +1352,7 @@ main(int argc, char **argv)
13481352
set_sig(argv[++optind]);
13491353
killproc=atol(argv[++optind]);
13501354
}
1351-
#ifdefWIN32
1355+
#if defined(WIN32)|| defined(__CYGWIN__)
13521356
elseif (strcmp(argv[optind], "register")==0)
13531357
ctl_command=REGISTER_COMMAND;
13541358
elseif (strcmp(argv[optind], "unregister")==0)
@@ -1438,7 +1442,7 @@ main(int argc, char **argv)
14381442
caseKILL_COMMAND:
14391443
do_kill(killproc);
14401444
break;
1441-
#ifdefWIN32
1445+
#if defined(WIN32)|| defined(__CYGWIN__)
14421446
caseREGISTER_COMMAND:
14431447
pgwin32_doRegister();
14441448
break;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp