summaryrefslogtreecommitdiff
path: root/lib-src/emacsclient.c
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2006-11-30 21:58:53 +0000
committerJuanma Barranquero <lekktu@gmail.com>2006-11-30 21:58:53 +0000
commit9219db75bfd2185408cfe4fea6fef0a424b853b4 (patch)
tree812b15186ffd32b0cd1be8785fa041bb7193182f /lib-src/emacsclient.c
parent690a8c05b7be8ca6bf66e923f4b707a93e6ba38c (diff)
(message): Make sure the message is properly written even if it contains printf
escapes, and flush the result. (set_tcp_socket): Make the message for non-local connections informational rather than an error.
Diffstat (limited to 'lib-src/emacsclient.c')
-rw-r--r--lib-src/emacsclient.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 6970c1ab9a..5985a98c39 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -193,7 +193,12 @@ message (int is_error, char *message, ...)
}
else
#endif
- fprintf (is_error ? stderr : stdout, msg);
+ {
+ FILE *f = is_error ? stderr : stdout;
+
+ fputs (msg, f);
+ fflush (f);
+ }
}
/* Decode the options from argv and argc.
@@ -589,7 +594,7 @@ set_tcp_socket ()
return INVALID_SOCKET;
if (server.sin_addr.s_addr != inet_addr ("127.0.0.1"))
- message (TRUE, "%s: connected to remote socket at %s\n",
+ message (FALSE, "%s: connected to remote socket at %s\n",
progname, inet_ntoa (server.sin_addr));
/*