Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
7450ea6d
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,发现更多精彩内容 >>
提交
7450ea6d
编写于
7月 28, 1996
作者:
M
Marc G. Fournier
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cosmetic changes: char* x changed to char *x
submitted by: bruce
上级
0e887c54
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
61 addition
and
61 deletion
+61
-61
src/bin/psql/psql.c
src/bin/psql/psql.c
+41
-41
src/bin/psql/psqlHelp.h
src/bin/psql/psqlHelp.h
+4
-4
src/bin/psql/stringutils.c
src/bin/psql/stringutils.c
+11
-11
src/bin/psql/stringutils.h
src/bin/psql/stringutils.h
+5
-5
未找到文件。
src/bin/psql/psql.c
浏览文件 @
7450ea6d
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.1
2 1996/07/28 06:59:4
3 scrappy Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.1
3 1996/07/28 07:08:1
3 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -60,18 +60,18 @@ typedef struct _psqlSettings {
}
PsqlSettings
;
/* declarations for functions in this file */
static
void
usage
(
char
*
progname
);
static
void
usage
(
char
*
progname
);
static
void
slashUsage
();
static
void
handleCopyOut
(
PGresult
*
res
,
bool
quiet
);
static
void
handleCopyIn
(
PGresult
*
res
,
bool
quiet
);
static
int
tableList
(
PsqlSettings
*
ps
,
bool
deep_tablelist
);
static
int
tableDesc
(
PsqlSettings
*
ps
,
char
*
table
);
char
*
gets_noreadline
(
char
*
prompt
,
FILE
*
source
);
char
*
gets_readline
(
char
*
prompt
,
FILE
*
source
);
char
*
gets_fromFile
(
char
*
prompt
,
FILE
*
source
);
char
*
gets_noreadline
(
char
*
prompt
,
FILE
*
source
);
char
*
gets_readline
(
char
*
prompt
,
FILE
*
source
);
char
*
gets_fromFile
(
char
*
prompt
,
FILE
*
source
);
int
listAllDbs
(
PsqlSettings
*
settings
);
int
SendQuery
(
PsqlSettings
*
settings
,
char
*
query
);
int
SendQuery
(
PsqlSettings
*
settings
,
char
*
query
);
int
HandleSlashCmds
(
PsqlSettings
*
settings
,
char
*
line
,
char
*
query
);
...
...
@@ -82,7 +82,7 @@ void PQprint(FILE *fp,
PQprintOpt
*
po
);
FILE
*
setFout
(
PsqlSettings
*
ps
,
char
*
fname
);
FILE
*
setFout
(
PsqlSettings
*
ps
,
char
*
fname
);
/*
* usage
...
...
@@ -90,7 +90,7 @@ FILE* setFout(PsqlSettings *ps, char *fname);
*/
static
void
usage
(
char
*
progname
)
usage
(
char
*
progname
)
{
fprintf
(
stderr
,
"Usage: %s [options] [dbname]
\n
"
,
progname
);
fprintf
(
stderr
,
"
\t
-a authsvc set authentication service
\n
"
);
...
...
@@ -187,7 +187,7 @@ int
listAllDbs
(
PsqlSettings
*
ps
)
{
PGresult
*
results
;
char
*
query
=
"select * from pg_database;"
;
char
*
query
=
"select * from pg_database;"
;
if
(
!
(
results
=
PSQLexec
(
ps
,
query
)))
return
1
;
...
...
@@ -213,10 +213,10 @@ tableList (PsqlSettings *ps, bool deep_tablelist)
char
listbuf
[
256
];
int
nColumns
;
int
i
;
char
*
rk
;
char
*
rr
;
char
*
rk
;
char
*
rr
;
PGresult
*
res
;
PGresult
*
res
;
listbuf
[
0
]
=
'\0'
;
strcat
(
listbuf
,
"SELECT usename, relname, relkind, relhasrules"
);
...
...
@@ -242,7 +242,7 @@ tableList (PsqlSettings *ps, bool deep_tablelist)
if
(
table
==
NULL
)
perror
(
"malloc"
);
/* load table table*/
/* load table table
*/
for
(
i
=
0
;
i
<
nColumns
;
i
++
)
{
table
[
i
]
=
(
char
*
)
malloc
(
PQgetlength
(
res
,
i
,
1
)
*
sizeof
(
char
)
+
1
);
if
(
table
[
i
]
==
NULL
)
...
...
@@ -304,7 +304,7 @@ tableDesc (PsqlSettings *ps, char *table)
int
i
;
int
rsize
;
PGresult
*
res
;
PGresult
*
res
;
/* Build the query */
...
...
@@ -380,13 +380,13 @@ tableDesc (PsqlSettings *ps, char *table)
}
}
typedef
char
*
(
*
READ_ROUTINE
)(
char
*
prompt
,
FILE
*
source
);
typedef
char
*
(
*
READ_ROUTINE
)(
char
*
prompt
,
FILE
*
source
);
/* gets_noreadline prompt source
gets a line of input without calling readline, the source is ignored
*/
char
*
gets_noreadline
(
char
*
prompt
,
FILE
*
source
)
char
*
gets_noreadline
(
char
*
prompt
,
FILE
*
source
)
{
fputs
(
prompt
,
stdout
);
fflush
(
stdout
);
...
...
@@ -398,8 +398,8 @@ gets_noreadline(char* prompt, FILE* source)
* the routine to get input from GNU readline(), the source is ignored
* the prompt argument is used as the prompting string
*/
char
*
gets_readline
(
char
*
prompt
,
FILE
*
source
)
char
*
gets_readline
(
char
*
prompt
,
FILE
*
source
)
{
return
(
readline
(
prompt
));
}
...
...
@@ -408,12 +408,12 @@ gets_readline(char* prompt, FILE* source)
* gets_fromFile prompt source
*
* the routine to read from a file, the prompt argument is ignored
* the source argument is a FILE
*
* the source argument is a FILE
*
*/
char
*
gets_fromFile
(
char
*
prompt
,
FILE
*
source
)
char
*
gets_fromFile
(
char
*
prompt
,
FILE
*
source
)
{
char
*
line
;
char
*
line
;
int
len
;
line
=
malloc
(
MAX_QUERY_BUFFER
+
1
);
...
...
@@ -440,8 +440,8 @@ gets_fromFile(char* prompt, FILE* source)
int
SendQuery
(
PsqlSettings
*
settings
,
char
*
query
)
{
PGresult
*
results
;
PGnotify
*
notify
;
PGresult
*
results
;
PGnotify
*
notify
;
int
status
=
0
;
if
(
settings
->
singleStep
)
...
...
@@ -610,7 +610,7 @@ decode(char *s)
*/
int
HandleSlashCmds
(
PsqlSettings
*
settings
,
char
*
line
,
char
*
line
,
char
*
query
)
{
int
status
=
1
;
...
...
@@ -766,7 +766,7 @@ HandleSlashCmds(PsqlSettings *settings,
break
;
case
'h'
:
{
char
*
cmd
;
char
*
cmd
;
int
i
,
numCmds
;
int
all_help
=
0
;
...
...
@@ -814,7 +814,7 @@ HandleSlashCmds(PsqlSettings *settings,
}
case
'i'
:
/* \i is include file */
{
FILE
*
fd
;
FILE
*
fd
;
if
(
!
optarg
)
{
fprintf
(
stderr
,
"
\\
i must be followed by a file name
\n
"
);
...
...
@@ -852,7 +852,7 @@ HandleSlashCmds(PsqlSettings *settings,
break
;
case
'r'
:
{
FILE
*
fd
;
FILE
*
fd
;
static
char
*
lastfile
;
struct
stat
st
,
st2
;
if
(
optarg
)
...
...
@@ -974,9 +974,9 @@ HandleSlashCmds(PsqlSettings *settings,
*/
int
MainLoop
(
PsqlSettings
*
settings
,
FILE
*
source
)
MainLoop
(
PsqlSettings
*
settings
,
FILE
*
source
)
{
char
*
line
;
/* line of input
*/
char
*
line
;
/* line of input
*/
int
len
;
/* length of the line */
char
query
[
MAX_QUERY_BUFFER
];
/* multi-line query storage */
int
exitStatus
=
0
;
...
...
@@ -1028,7 +1028,7 @@ MainLoop(PsqlSettings *settings, FILE* source)
/* filter out comment lines that begin with --,
this could be incorrect if -- is part of a quoted string.
But we won't go through the trouble of detecting that. If you have
-- in your quoted string, be careful and don't start a line with it*/
-- in your quoted string, be careful and don't start a line with it
*/
if
(
line
[
0
]
==
'-'
&&
line
[
1
]
==
'-'
)
{
if
(
settings
->
singleStep
)
/* in single step mode, show comments */
fprintf
(
stdout
,
"%s
\n
"
,
line
);
...
...
@@ -1106,20 +1106,20 @@ MainLoop(PsqlSettings *settings, FILE* source)
}
int
main
(
int
argc
,
char
**
argv
)
main
(
int
argc
,
char
**
argv
)
{
extern
char
*
optarg
;
extern
char
*
optarg
;
extern
int
optind
;
char
*
dbname
=
NULL
;
char
*
host
=
NULL
;
char
*
port
=
NULL
;
char
*
qfilename
=
NULL
;
char
*
dbname
=
NULL
;
char
*
host
=
NULL
;
char
*
port
=
NULL
;
char
*
qfilename
=
NULL
;
char
errbuf
[
ERROR_MSG_LENGTH
];
PsqlSettings
settings
;
char
*
singleQuery
=
NULL
;
char
*
singleQuery
=
NULL
;
bool
listDatabases
=
0
;
int
exitStatus
=
0
;
...
...
@@ -1358,10 +1358,10 @@ handleCopyIn(PGresult *res, bool quiet)
PQendcopy
(
res
->
conn
);
}
/* try to open fname and return a FILE*,
/* try to open fname and return a FILE
*,
if it fails, use stdout, instead */
FILE
*
FILE
*
setFout
(
PsqlSettings
*
ps
,
char
*
fname
)
{
if
(
ps
->
queryFout
&&
ps
->
queryFout
!=
stdout
)
...
...
src/bin/psql/psqlHelp.h
浏览文件 @
7450ea6d
...
...
@@ -5,15 +5,15 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: psqlHelp.h,v 1.
1.1.1 1996/07/09 06:22:15
scrappy Exp $
* $Id: psqlHelp.h,v 1.
2 1996/07/28 07:08:14
scrappy Exp $
*
*-------------------------------------------------------------------------
*/
struct
_helpStruct
{
char
*
cmd
;
/* the command name */
char
*
help
;
/* the help associated with it */
char
*
syntax
;
/* the syntax associated with it */
char
*
cmd
;
/* the command name */
char
*
help
;
/* the help associated with it */
char
*
syntax
;
/* the syntax associated with it */
}
;
static
struct
_helpStruct
QL_HELP
[]
=
{
...
...
src/bin/psql/stringutils.c
浏览文件 @
7450ea6d
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.
1.1.1 1996/07/09 06:22
:15 scrappy Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.
2 1996/07/28 07:08
:15 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -21,9 +21,9 @@
/* removes whitespaces from the left, right and both sides of a string */
/* MODIFIES the string passed in and returns the head of it */
char
*
leftTrim
(
char
*
s
)
char
*
leftTrim
(
char
*
s
)
{
char
*
s2
=
s
;
char
*
s2
=
s
;
int
shift
=
0
;
int
j
=
0
;
...
...
@@ -38,9 +38,9 @@ char* leftTrim(char* s)
return
s2
;
}
char
*
rightTrim
(
char
*
s
)
char
*
rightTrim
(
char
*
s
)
{
char
*
sEnd
;
char
*
sEnd
;
sEnd
=
s
+
strlen
(
s
)
-
1
;
while
(
isspace
(
*
sEnd
))
sEnd
--
;
...
...
@@ -51,7 +51,7 @@ char* rightTrim(char* s)
return
s
;
}
char
*
doubleTrim
(
char
*
s
)
char
*
doubleTrim
(
char
*
s
)
{
strcpy
(
s
,
leftTrim
(
rightTrim
(
s
)));
return
s
;
...
...
@@ -59,10 +59,10 @@ char* doubleTrim(char* s)
/* dupstr : copies a string, while allocating space for it.
the CALLER is responsible for freeing the space
returns NULL if the argument is NULL*/
char
*
dupstr
(
char
*
s
)
returns NULL if the argument is NULL
*/
char
*
dupstr
(
char
*
s
)
{
char
*
result
;
char
*
result
;
if
(
s
==
NULL
)
return
NULL
;
...
...
@@ -76,7 +76,7 @@ char* dupstr(char *s)
#ifdef STRINGUTILS_TEST
void
testStringUtils
()
{
static
char
*
tests
[]
=
{
" goodbye
\n
"
,
/* space on both ends */
static
char
*
tests
[]
=
{
" goodbye
\n
"
,
/* space on both ends */
"hello world"
,
/* no spaces to trim */
""
,
/* empty string */
"a"
,
/* string with one char*/
...
...
@@ -86,7 +86,7 @@ void testStringUtils()
int
i
=
0
;
while
(
tests
[
i
]
!=
NULL_STR
)
{
char
*
t
;
char
*
t
;
t
=
dupstr
(
tests
[
i
]);
printf
(
"leftTrim(%s) = "
,
t
);
printf
(
"%sEND
\n
"
,
leftTrim
(
t
));
...
...
src/bin/psql/stringutils.h
浏览文件 @
7450ea6d
...
...
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: stringutils.h,v 1.
1.1.1 1996/07/09 06:22:16
scrappy Exp $
* $Id: stringutils.h,v 1.
2 1996/07/28 07:08:15
scrappy Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -27,14 +27,14 @@
/* removes whitespaces from the left, right and both sides of a string */
/* MODIFIES the string passed in and returns the head of it */
extern
char
*
leftTrim
(
char
*
s
);
extern
char
*
rightTrim
(
char
*
s
);
extern
char
*
doubleTrim
(
char
*
s
);
extern
char
*
leftTrim
(
char
*
s
);
extern
char
*
rightTrim
(
char
*
s
);
extern
char
*
doubleTrim
(
char
*
s
);
/* dupstr : copies a string, while making room for it */
/* the CALLER is responsible for freeing the space */
/* returns NULL if the argument is NULL */
extern
char
*
dupstr
(
char
*
s
);
extern
char
*
dupstr
(
char
*
s
);
#ifdef STRINGUTILS_TEST
extern
void
testStringUtils
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录