From 74e75378ae680c1fea4904f8e53152bd9db4dcba Mon Sep 17 00:00:00 2001 From: "J. Alexander Treuman" Date: Sun, 8 Apr 2007 15:26:48 +0000 Subject: If current_command is NULL when calling commandError, print the error message and trailing new line to STDERR_FILENO along with the ACK, instead of sending them over the socket. git-svn-id: https://svn.musicpd.org/mpd/trunk@5890 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/command.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/command.c') diff --git a/src/command.c b/src/command.c index 5f5be15ea..27e493046 100644 --- a/src/command.c +++ b/src/command.c @@ -1211,13 +1211,16 @@ mpd_fprintf_ void commandError(int fd, int error, const char *fmt, ...) if (current_command) { fdprintf(fd, "ACK [%i@%i] {%s} ", - (int)error, command_listNum, current_command); + (int)error, command_listNum, current_command); + vfdprintf(fd, fmt, args); + fdprintf(fd, "\n"); current_command = NULL; - } else + } else { fdprintf(STDERR_FILENO, "ACK [%i@%i] ", - (int)error, command_listNum); + (int)error, command_listNum); + vfdprintf(STDERR_FILENO, fmt, args); + fdprintf(STDERR_FILENO, "\n"); + } - vfdprintf(fd, fmt, args); va_end(args); - fdprintf(fd, "\n"); } -- cgit v1.2.3