database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Fixed psql -c "\slashcmd"

Browse Source
This commit is contained in:
Peter Eisentraut
2000-03-18 22:48:29 +00:00
parent f4d452c13c
commit 7d392f257b
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/psql/command.c
View File

@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.24 2000/03/01 21:09:58 petere Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.25 2000/03/18 22:48:29 petere Exp $
*/ */
#include "postgres.h" #include "postgres.h"
#include "command.h" #include "command.h"
@ -149,11 +149,13 @@ HandleSlashCmds(const char *line,
if (continue_parse && *continue_parse && *(continue_parse + 1) == '\\') if (continue_parse && *continue_parse && *(continue_parse + 1) == '\\')
continue_parse += 2; continue_parse += 2;
if (end_of_cmd)
if (continue_parse) {
*end_of_cmd = line + (continue_parse - my_line); if (continue_parse)
else *end_of_cmd = line + (continue_parse - my_line);
*end_of_cmd = line + strlen(line); else
*end_of_cmd = line + strlen(line);
}
free(my_line); free(my_line);

5
src/bin/psql/startup.c
View File

@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.27 2000/03/01 21:09:58 petere Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.28 2000/03/18 22:48:29 petere Exp $
*/ */
#include "postgres.h" #include "postgres.h"
@ -357,7 +357,10 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
case 'c': case 'c':
options->action_string = optarg; options->action_string = optarg;
if (optarg[0] == '\\') if (optarg[0] == '\\')
{
options->action = ACT_SINGLE_SLASH; options->action = ACT_SINGLE_SLASH;
options->action_string++;
}
else else
options->action = ACT_SINGLE_QUERY; options->action = ACT_SINGLE_QUERY;
break; break;