[libvirt] [PATCH v2] rpc: remove trailing whitespace character in error string

Instead of only removing the ending newline character, it is better to remove all of standard whitespace character for the sake of log format. One example that we have to do this is: After three times incorrect password input, virsh command virsh -c qemu://remoteserver/system will report error like: : Connection reset by peerey,gssapi-keyex,gssapi-with-mic,password). But it should be: Permission denied (publickey,gssapi-keyex,gssapi-with-mic,password). : Connection reset by peer The reason is that we dropped the newline, but have a '\r' left. The terminal interprets it as "move the cursor back to the start of the current line", so the error string is messed up. --- src/rpc/virnetsocket.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 08dfbb0..eeee309 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -35,6 +35,7 @@ # include <netinet/tcp.h> #endif +#include "c-ctype.h" #include "virnetsocket.h" #include "util.h" #include "memory.h" @@ -985,8 +986,9 @@ reread: virFileReadLimFD(sock->errfd, 1024, &errout) >= 0 && errout != NULL) { size_t elen = strlen(errout); - if (elen && errout[elen-1] == '\n') - errout[elen-1] = '\0'; + /* remove trailing whitespace */ + while (elen && c_isspace(errout[elen - 1])) + errout[--elen] = '\0'; } if (ret < 0) { -- 1.7.7.5