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

If current_command is NULL when calling commandError, print the error
74e75378 · J. Alexander Treuman · c8254017 · 74e75378
Commit 74e75378 authored Apr 08, 2007 by J. Alexander Treuman
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

command.c src/command.c +8 -5

No files found.
--- 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");
 }