Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
postgres-lambda-diff
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Huber
postgres-lambda-diff
Commits
d235d9b8
Commit
d235d9b8
authored
23 years ago
by
Peter Eisentraut
Browse files
Options
Downloads
Patches
Plain Diff
Reset parenthesis level counter upon \r.
parent
2442e79e
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/bin/psql/command.c
+11
-6
11 additions, 6 deletions
src/bin/psql/command.c
src/bin/psql/command.h
+3
-2
3 additions, 2 deletions
src/bin/psql/command.h
src/bin/psql/mainloop.c
+3
-2
3 additions, 2 deletions
src/bin/psql/mainloop.c
src/bin/psql/startup.c
+2
-2
2 additions, 2 deletions
src/bin/psql/startup.c
with
19 additions
and
12 deletions
src/bin/psql/command.c
+
11
−
6
View file @
d235d9b8
...
...
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.7
0
2002/03/
19 02:32:21 momjian
Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.7
1
2002/03/
27 19:16:13 petere
Exp $
*/
#include
"postgres_fe.h"
#include
"command.h"
...
...
@@ -52,7 +52,8 @@
static
backslashResult
exec_command
(
const
char
*
cmd
,
const
char
*
options_string
,
const
char
**
continue_parse
,
PQExpBuffer
query_buf
);
PQExpBuffer
query_buf
,
volatile
int
*
paren_level
);
/* different ways for scan_option to handle parameter words */
enum
option_type
...
...
@@ -94,7 +95,8 @@ static bool do_shell(const char *command);
backslashResult
HandleSlashCmds
(
const
char
*
line
,
PQExpBuffer
query_buf
,
const
char
**
end_of_cmd
)
const
char
**
end_of_cmd
,
volatile
int
*
paren_level
)
{
backslashResult
status
=
CMD_SKIP_LINE
;
char
*
my_line
;
...
...
@@ -132,7 +134,7 @@ HandleSlashCmds(const char *line,
my_line
[
blank_loc
]
=
'\0'
;
}
status
=
exec_command
(
my_line
,
options_string
,
&
continue_parse
,
query_buf
);
status
=
exec_command
(
my_line
,
options_string
,
&
continue_parse
,
query_buf
,
paren_level
);
if
(
status
==
CMD_UNKNOWN
)
{
...
...
@@ -147,7 +149,7 @@ HandleSlashCmds(const char *line,
new_cmd
[
1
]
=
'\0'
;
/* use line for options, because my_line was clobbered above */
status
=
exec_command
(
new_cmd
,
line
+
1
,
&
continue_parse
,
query_buf
);
status
=
exec_command
(
new_cmd
,
line
+
1
,
&
continue_parse
,
query_buf
,
paren_level
);
/*
* continue_parse must be relative to my_line for calculation
...
...
@@ -192,7 +194,8 @@ static backslashResult
exec_command
(
const
char
*
cmd
,
const
char
*
options_string
,
const
char
**
continue_parse
,
PQExpBuffer
query_buf
)
PQExpBuffer
query_buf
,
volatile
int
*
paren_level
)
{
bool
success
=
true
;
/* indicate here if the command ran ok or
* failed */
...
...
@@ -636,6 +639,8 @@ exec_command(const char *cmd,
else
if
(
strcmp
(
cmd
,
"r"
)
==
0
||
strcmp
(
cmd
,
"reset"
)
==
0
)
{
resetPQExpBuffer
(
query_buf
);
if
(
paren_level
)
*
paren_level
=
0
;
if
(
!
quiet
)
puts
(
gettext
(
"Query buffer reset (cleared)."
));
}
...
...
This diff is collapsed.
Click to expand it.
src/bin/psql/command.h
+
3
−
2
View file @
d235d9b8
...
...
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.1
3
200
1/11/05 17:46:30 momjian
Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.1
4
200
2/03/27 19:16:13 petere
Exp $
*/
#ifndef COMMAND_H
#define COMMAND_H
...
...
@@ -28,7 +28,8 @@ typedef enum _backslashResult
backslashResult
HandleSlashCmds
(
const
char
*
line
,
PQExpBuffer
query_buf
,
const
char
**
end_of_cmd
);
const
char
**
end_of_cmd
,
volatile
int
*
paren_level
);
int
process_file
(
char
*
filename
);
...
...
This diff is collapsed.
Click to expand it.
src/bin/psql/mainloop.c
+
3
−
2
View file @
d235d9b8
...
...
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.4
6
2002/0
2/18 05:57:41 momjian
Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.4
7
2002/0
3/27 19:16:13 petere
Exp $
*/
#include
"postgres_fe.h"
#include
"mainloop.h"
...
...
@@ -465,7 +465,8 @@ MainLoop(FILE *source)
/* handle backslash command */
slashCmdStatus
=
HandleSlashCmds
(
&
line
[
i
],
query_buf
->
len
>
0
?
query_buf
:
previous_buf
,
&
end_of_cmd
);
&
end_of_cmd
,
&
paren_level
);
success
=
slashCmdStatus
!=
CMD_ERROR
;
...
...
This diff is collapsed.
Click to expand it.
src/bin/psql/startup.c
+
2
−
2
View file @
d235d9b8
...
...
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.5
4
200
1/11/05 17:46:31 momjian
Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.5
5
200
2/03/27 19:16:13 petere
Exp $
*/
#include
"postgres_fe.h"
...
...
@@ -256,7 +256,7 @@ main(int argc, char *argv[])
if
((
value
=
GetVariable
(
pset
.
vars
,
"ECHO"
))
&&
strcmp
(
value
,
"all"
)
==
0
)
puts
(
options
.
action_string
);
successResult
=
HandleSlashCmds
(
options
.
action_string
,
NULL
,
NULL
)
!=
CMD_ERROR
successResult
=
HandleSlashCmds
(
options
.
action_string
,
NULL
,
NULL
,
NULL
)
!=
CMD_ERROR
?
EXIT_SUCCESS
:
EXIT_FAILURE
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment