Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
ed7a17dc
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,发现更多精彩内容 >>
提交
ed7a17dc
编写于
8月 27, 1997
作者:
B
Bruce Momjian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove unneeded stat calls.
上级
75c6c2b6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
35 addition
and
52 deletion
+35
-52
src/backend/libpq/hba.c
src/backend/libpq/hba.c
+6
-7
src/backend/utils/init/findbe.c
src/backend/utils/init/findbe.c
+2
-2
src/backend/utils/init/postinit.c
src/backend/utils/init/postinit.c
+7
-15
src/utils/version.c
src/utils/version.c
+20
-28
未找到文件。
src/backend/libpq/hba.c
浏览文件 @
ed7a17dc
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.1
8 1997/08/18 02:14:37
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.1
9 1997/08/27 03:48:31
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -15,9 +15,9 @@
#include <string.h>
#include <errno.h>
#include <pwd.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
#include <sys/socket.h>
#include <sys/types.h>
/* needed by in.h on Ultrix */
#include <netinet/in.h>
#include <arpa/inet.h>
#include <unistd.h>
...
...
@@ -299,8 +299,7 @@ find_hba_entry(const char DataDir[], const struct in_addr ip_addr,
system.
---------------------------------------------------------------------------*/
int
rc
;
struct
stat
statbuf
;
int
fd
;
FILE
*
file
;
/* The config file we have to read */
...
...
@@ -315,9 +314,9 @@ find_hba_entry(const char DataDir[], const struct in_addr ip_addr,
strlen
(
OLD_CONF_FILE
)
+
2
)
*
sizeof
(
char
));
sprintf
(
old_conf_file
,
"%s/%s"
,
DataDir
,
OLD_CONF_FILE
);
rc
=
stat
(
old_conf_file
,
&
statbuf
);
if
(
rc
==
0
)
{
if
((
fd
=
open
(
old_conf_file
,
O_RDONLY
,
0
))
!=
-
1
)
{
/* Old config file exists. Tell this guy he needs to upgrade. */
close
(
fd
);
sprintf
(
PQerrormsg
,
"A file exists by the name used for host-based authentication "
"in prior releases of Postgres (%s). The name and format of "
...
...
src/backend/utils/init/findbe.c
浏览文件 @
ed7a17dc
...
...
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.
4 1997/08/12 20:16:12
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.
5 1997/08/27 03:48:38
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -14,8 +14,8 @@
#include <grp.h>
#include <pwd.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include "postgres.h"
...
...
src/backend/utils/init/postinit.c
浏览文件 @
ed7a17dc
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.1
1 1997/08/19 21:35:50
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.1
2 1997/08/27 03:48:39
momjian Exp $
*
* NOTES
* InitPostgres() is the function called from PostgresMain
...
...
@@ -30,7 +30,6 @@
#include <stdio.h>
#include <string.h>
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <math.h>
#include <unistd.h>
...
...
@@ -79,15 +78,6 @@ static void InitUserid(void);
static
IPCKey
PostgresIpcKey
;
#ifndef private
#ifndef EBUG
#define private static
#else
/* !defined(EBUG) */
#define private
#endif
/* !defined(EBUG) */
#endif
/* !defined(private) */
/* ----------------------------------------------------------------
* InitPostgres support
* ----------------------------------------------------------------
...
...
@@ -141,7 +131,7 @@ InitMyDatabaseId()
sprintf
(
dbfname
,
"%s%cpg_database"
,
DataDir
,
SEP_CHAR
);
fileflags
=
O_RDONLY
;
if
((
dbfd
=
open
(
dbfname
,
O_RDONLY
,
0
666
))
<
0
)
if
((
dbfd
=
open
(
dbfname
,
O_RDONLY
,
0
))
<
0
)
elog
(
FATAL
,
"Cannot open %s"
,
dbfname
);
pfree
(
dbfname
);
...
...
@@ -261,10 +251,10 @@ static void
DoChdirAndInitDatabaseNameAndPath
(
char
*
name
)
{
char
*
reason
;
/* Failure reason returned by some function. NULL if no failure */
struct
stat
statbuf
;
int
fd
;
char
errormsg
[
1000
];
if
(
stat
(
DataDir
,
&
statbuf
)
<
0
)
if
(
(
fd
=
open
(
DataDir
,
O_RDONLY
,
0
))
==
-
1
)
sprintf
(
errormsg
,
"Database system does not exist. "
"PGDATA directory '%s' not found. Normally, you "
"create a database system by running initdb."
,
...
...
@@ -272,13 +262,14 @@ DoChdirAndInitDatabaseNameAndPath(char *name) {
else
{
char
myPath
[
MAXPGPATH
];
/* DatabasePath points here! */
close
(
fd
);
if
(
strlen
(
DataDir
)
+
strlen
(
name
)
+
10
>
sizeof
(
myPath
))
sprintf
(
errormsg
,
"Internal error in postinit.c: database "
"pathname exceeds maximum allowable length."
);
else
{
sprintf
(
myPath
,
"%s/base/%s"
,
DataDir
,
name
);
if
(
stat
(
myPath
,
&
statbuf
)
<
0
)
if
(
(
fd
=
open
(
myPath
,
O_RDONLY
,
0
))
==
-
1
)
sprintf
(
errormsg
,
"Database '%s' does not exist. "
"(We know this because the directory '%s' "
...
...
@@ -288,6 +279,7 @@ DoChdirAndInitDatabaseNameAndPath(char *name) {
"of '%s/base/'."
,
name
,
myPath
,
DataDir
);
else
{
close
(
fd
);
ValidatePgVersion
(
DataDir
,
&
reason
);
if
(
reason
!=
NULL
)
sprintf
(
errormsg
,
...
...
src/utils/version.c
浏览文件 @
ed7a17dc
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/utils/Attic/version.c,v 1.
5 1997/07/28 00:57:08
momjian Exp $
* $Header: /cvsroot/pgsql/src/utils/Attic/version.c,v 1.
6 1997/08/27 03:48:50
momjian Exp $
*
* NOTES
* XXX eventually, should be able to handle version identifiers
...
...
@@ -63,42 +63,34 @@ ValidatePgVersion(const char *path, char **reason_p) {
int
fd
;
char
version
[
4
];
char
full_path
[
MAXPGPATH
+
1
];
struct
stat
statbuf
;
PathSetVersionFilePath
(
path
,
full_path
);
if
(
stat
(
full_path
,
&
statbuf
)
<
0
)
{
if
(
(
fd
=
open
(
full_path
,
O_RDONLY
,
0
))
==
-
1
)
{
*
reason_p
=
malloc
(
200
);
sprintf
(
*
reason_p
,
"File '%s' does not exist."
,
full_path
);
sprintf
(
*
reason_p
,
"File '%s' does not exist
or no read permission
."
,
full_path
);
}
else
{
fd
=
open
(
full_path
,
O_RDONLY
,
0
);
if
(
fd
<
0
)
{
if
(
read
(
fd
,
version
,
4
)
<
4
||
!
isascii
(
version
[
0
])
||
!
isdigit
(
version
[
0
])
||
version
[
1
]
!=
'.'
||
!
isascii
(
version
[
2
])
||
!
isdigit
(
version
[
2
])
||
version
[
3
]
!=
'\n'
)
{
*
reason_p
=
malloc
(
200
);
sprintf
(
*
reason_p
,
"
Unable to open file '%s'. Errno = %s (%d)."
,
full_path
,
strerror
(
errno
),
errno
);
sprintf
(
*
reason_p
,
"
File '%s' does not have a valid format "
"for a PG_VERSION file."
,
full_path
);
}
else
{
if
(
read
(
fd
,
version
,
4
)
<
4
||
!
isascii
(
version
[
0
])
||
!
isdigit
(
version
[
0
])
||
version
[
1
]
!=
'.'
||
!
isascii
(
version
[
2
])
||
!
isdigit
(
version
[
2
])
||
version
[
3
]
!=
'\n'
)
{
if
(
version
[
2
]
!=
'0'
+
PG_VERSION
||
version
[
0
]
!=
'0'
+
PG_RELEASE
)
{
*
reason_p
=
malloc
(
200
);
sprintf
(
*
reason_p
,
"File '%s' does not have a valid format "
"for a PG_VERSION file."
,
full_path
);
}
else
{
if
(
version
[
2
]
!=
'0'
+
PG_VERSION
||
version
[
0
]
!=
'0'
+
PG_RELEASE
)
{
*
reason_p
=
malloc
(
200
);
sprintf
(
*
reason_p
,
"Version number in file '%s' should be %d.%d, "
"not %c.%c."
,
full_path
,
PG_RELEASE
,
PG_VERSION
,
version
[
0
],
version
[
2
]);
}
else
*
reason_p
=
NULL
;
}
close
(
fd
);
sprintf
(
*
reason_p
,
"Version number in file '%s' should be %d.%d, "
"not %c.%c."
,
full_path
,
PG_RELEASE
,
PG_VERSION
,
version
[
0
],
version
[
2
]);
}
else
*
reason_p
=
NULL
;
}
close
(
fd
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录