Fixed psql -c "\slashcmd"

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index e515f1e151b0168bf9261833323e5a2642d55c20..db250f02b6e225dec4c8e2fdc03684d849d01d26 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * 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 "command.h"
@@ -149,11 +149,13 @@ HandleSlashCmds(const char *line,
    if (continue_parse && *continue_parse && *(continue_parse + 1) == '\\')
        continue_parse += 2;
 
-
-    if (continue_parse)
-        *end_of_cmd = line + (continue_parse - my_line);
-    else
-        *end_of_cmd = line + strlen(line);
+    if (end_of_cmd)
+    {
+        if (continue_parse)
+            *end_of_cmd = line + (continue_parse - my_line);
+        else
+            *end_of_cmd = line + strlen(line);
+    }
 
    free(my_line);
 

diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 81c21a225b0834f27d0cbe5a1a0913345344c7dd..e0e3ea4a1c23eb4130269ef56ea2d2226122212a 100644 (file)
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * 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"
 
@@ -357,7 +357,10 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
            case 'c':
                options->action_string = optarg;
                if (optarg[0] == '\\')
+               {
                    options->action = ACT_SINGLE_SLASH;
+                   options->action_string++;
+               }
                else
                    options->action = ACT_SINGLE_QUERY;
                break;