summaryrefslogtreecommitdiff
path: root/src/bin/psql/command.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2008-06-26 01:35:45 +0000
committerBruce Momjian <bruce@momjian.us>2008-06-26 01:35:45 +0000
commita1183238be9a26be09438c72785d773907592f9b (patch)
treefa569a3b1f70d6b88de8a81126de85b7f677dd6e /src/bin/psql/command.c
parent124c22d5fdc6f6e9a9774af348889ef53856b2b9 (diff)
Use SYSTEMQUOTE as concatentation to strings, rather than %s printf
patterns, for clarity.
Diffstat (limited to 'src/bin/psql/command.c')
-rw-r--r--src/bin/psql/command.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 1a1241bd5c7..e6167d7ee00 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2008, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.190 2008/06/11 10:48:17 heikki Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.191 2008/06/26 01:35:45 momjian Exp $
*/
#include "postgres_fe.h"
#include "command.h"
@@ -1288,8 +1288,7 @@ editFile(const char *fname)
#ifndef WIN32
sprintf(sys, "exec %s '%s'", editorName, fname);
#else
- sprintf(sys, "%s\"%s\" \"%s\"%s",
- SYSTEMQUOTE, editorName, fname, SYSTEMQUOTE);
+ sprintf(sys, SYSTEMQUOTE "\"%s\" \"%s\"" SYSTEMQUOTE, editorName, fname);
#endif
result = system(sys);
if (result == -1)
@@ -1790,9 +1789,8 @@ do_shell(const char *command)
/* See EDITOR handling comment for an explaination */
"exec %s", shellName);
#else
- sprintf(sys,
/* See EDITOR handling comment for an explaination */
- "%s\"%s\"%s", SYSTEMQUOTE, shellName, SYSTEMQUOTE);
+ sprintf(sys, SYSTEMQUOTE "\"%s\"" SYSTEMQUOTE, shellName);
#endif
result = system(sys);
free(sys);