Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
9b3d66ec
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9b3d66ec
编写于
8月 20, 2000
作者:
P
Peter Eisentraut
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Introduce HAVE_UNIX_SOCKETS symbol to replace repeatedly listing all the
unsupported platforms.
上级
4b8f1bcb
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
28 addition
and
21 deletion
+28
-21
src/backend/postmaster/postmaster.c
src/backend/postmaster/postmaster.c
+8
-10
src/bin/psql/prompt.c
src/bin/psql/prompt.c
+9
-8
src/include/config.h.in
src/include/config.h.in
+9
-1
src/interfaces/libpq/fe-connect.c
src/interfaces/libpq/fe-connect.c
+2
-2
未找到文件。
src/backend/postmaster/postmaster.c
浏览文件 @
9b3d66ec
...
...
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.1
59 2000/08/07 00:51:30 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.1
60 2000/08/20 10:55:33 petere
Exp $
*
* NOTES
*
...
...
@@ -169,14 +169,12 @@ static volatile bool got_SIGHUP = false;
*/
static
int
ServerSock_INET
=
INVALID_SOCK
;
/* stream socket server */
#if
!defined(__CYGWIN32__) && !defined(__QNX__)
#if
def HAVE_UNIX_SOCKETS
static
int
ServerSock_UNIX
=
INVALID_SOCK
;
/* stream socket server */
#endif
#ifdef USE_SSL
static
SSL_CTX
*
SSL_context
=
NULL
;
/* Global SSL context */
#endif
/*
...
...
@@ -589,7 +587,7 @@ PostmasterMain(int argc, char *argv[])
}
}
#if
!defined(__CYGWIN32__) && !defined(__QNX__)
#if
def HAVE_UNIX_SOCKETS
status
=
StreamServerPort
(
AF_UNIX
,
(
unsigned
short
)
PostPortName
,
&
ServerSock_UNIX
);
if
(
status
!=
STATUS_OK
)
{
...
...
@@ -856,7 +854,7 @@ ServerLoop(void)
/* new connection pending on our well-known port's socket */
#if
!defined(__CYGWIN32__) && !defined(__QNX__)
#if
def HAVE_UNIX_SOCKETS
if
(
ServerSock_UNIX
!=
INVALID_SOCK
&&
FD_ISSET
(
ServerSock_UNIX
,
&
rmask
)
&&
(
port
=
ConnCreate
(
ServerSock_UNIX
))
!=
NULL
)
...
...
@@ -1015,7 +1013,7 @@ initMasks(fd_set *rmask, fd_set *wmask)
FD_ZERO
(
rmask
);
FD_ZERO
(
wmask
);
#if
!defined(__CYGWIN32__) && !defined(__QNX__)
#if
def HAVE_UNIX_SOCKETS
if
(
ServerSock_UNIX
!=
INVALID_SOCK
)
{
FD_SET
(
ServerSock_UNIX
,
rmask
);
...
...
@@ -1832,7 +1830,7 @@ DoBackend(Port *port)
if
(
NetServer
)
StreamClose
(
ServerSock_INET
);
ServerSock_INET
=
INVALID_SOCK
;
#if
!defined(__CYGWIN32__) && !defined(__QNX__)
#if
def HAVE_UNIX_SOCKETS
StreamClose
(
ServerSock_UNIX
);
ServerSock_UNIX
=
INVALID_SOCK
;
#endif
...
...
@@ -1962,7 +1960,7 @@ ExitPostmaster(int status)
if
(
ServerSock_INET
!=
INVALID_SOCK
)
StreamClose
(
ServerSock_INET
);
ServerSock_INET
=
INVALID_SOCK
;
#if
!defined(__CYGWIN32__) && !defined(__QNX__)
#if
def HAVE_UNIX_SOCKETS
if
(
ServerSock_UNIX
!=
INVALID_SOCK
)
StreamClose
(
ServerSock_UNIX
);
ServerSock_UNIX
=
INVALID_SOCK
;
...
...
@@ -2134,7 +2132,7 @@ SSDataBase(bool startup)
if
(
NetServer
)
StreamClose
(
ServerSock_INET
);
ServerSock_INET
=
INVALID_SOCK
;
#if
!defined(__CYGWIN32__) && !defined(__QNX__)
#if
def HAVE_UNIX_SOCKETS
StreamClose
(
ServerSock_UNIX
);
ServerSock_UNIX
=
INVALID_SOCK
;
#endif
...
...
src/bin/psql/prompt.c
浏览文件 @
9b3d66ec
...
...
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.1
2 2000/04/12 17:16:23 momjian
Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.1
3 2000/08/20 10:55:34 petere
Exp $
*/
#include "postgres.h"
#include "prompt.h"
...
...
@@ -19,9 +19,9 @@
#include <win32.h>
#endif
#if
!defined(WIN32) && !defined(__CYGWIN32__) && !defined(__QNX__)
#include <unistd.h>
#include <netdb.h>
#if
def HAVE_UNIX_SOCKETS
#
include <unistd.h>
#
include <netdb.h>
#endif
/*--------------------------
...
...
@@ -64,7 +64,7 @@
/*
* We need hostname information, only if connection is via UNIX socket
*/
#if
!defined(WIN32) && !defined(__CYGWIN32__) && !defined(__QNX__)
#if
def HAVE_UNIX_SOCKETS
#define DOMAINNAME 1
#define HOSTNAME 2
...
...
@@ -104,7 +104,8 @@ localhost(int type, char *buf, int siz)
return
buf
;
}
#endif
#endif
/* HAVE_UNIX_SOCKETS */
char
*
get_prompt
(
promptStatus_t
status
)
...
...
@@ -173,7 +174,7 @@ get_prompt(promptStatus_t status)
buf
[
strcspn
(
buf
,
"."
)]
=
'\0'
;
}
/* UNIX socket */
#if
!defined(WIN32) && !defined(__CYGWIN32__) && !defined(__QNX__)
#if
def HAVE_UNIX_SOCKETS
else
{
if
(
*
p
==
'm'
)
...
...
@@ -181,7 +182,7 @@ get_prompt(promptStatus_t status)
else
localhost
(
DOMAINNAME
,
buf
,
MAX_PROMPT_SIZE
);
}
#endif
#endif
/* HAVE_UNIX_SOCKETS */
}
break
;
/* DB server port number */
...
...
src/include/config.h.in
浏览文件 @
9b3d66ec
...
...
@@ -8,7 +8,7 @@
* or in config.h afterwards. Of course, if you edit config.h, then your
* changes will be overwritten the next time you run configure.
*
* $Id: config.h.in,v 1.13
0 2000/08/07 20:15:44 tgl
Exp $
* $Id: config.h.in,v 1.13
1 2000/08/20 10:55:34 petere
Exp $
*/
#ifndef CONFIG_H
...
...
@@ -223,6 +223,14 @@
*/
#define BITSPERBYTE 8
/*
* Define this is your operating system kernel supports AF_UNIX family
* sockets.
*/
#if !defined(__CYGWIN32__) && !defined(__QNX__)
# define HAVE_UNIX_SOCKETS 1
#endif
/*
*------------------------------------------------------------------------
* These hand-configurable symbols are for enabling debugging code,
...
...
src/interfaces/libpq/fe-connect.c
浏览文件 @
9b3d66ec
...
...
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.13
1 2000/07/09 13:14:17
petere Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.13
2 2000/08/20 10:55:35
petere Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -738,7 +738,7 @@ connectDBStart(PGconn *conn)
conn
->
raddr
.
in
.
sin_port
=
htons
((
unsigned
short
)
(
portno
));
conn
->
raddr_len
=
sizeof
(
struct
sockaddr_in
);
}
#if
!defined(WIN32) && !defined(__CYGWIN32__)
#if
def HAVE_UNIX_SOCKETS
else
conn
->
raddr_len
=
UNIXSOCK_PATH
(
conn
->
raddr
.
un
,
portno
);
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录