提交 5b924be9 编写于 作者: G Guannan Ren

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.
上级 99f1faf7
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
# include <netinet/tcp.h> # include <netinet/tcp.h>
#endif #endif
#include "c-ctype.h"
#include "virnetsocket.h" #include "virnetsocket.h"
#include "util.h" #include "util.h"
#include "memory.h" #include "memory.h"
...@@ -981,8 +982,9 @@ reread: ...@@ -981,8 +982,9 @@ reread:
virFileReadLimFD(sock->errfd, 1024, &errout) >= 0 && virFileReadLimFD(sock->errfd, 1024, &errout) >= 0 &&
errout != NULL) { errout != NULL) {
size_t elen = strlen(errout); size_t elen = strlen(errout);
if (elen && errout[elen-1] == '\n') /* remove trailing whitespace */
errout[elen-1] = '\0'; while (elen && c_isspace(errout[elen - 1]))
errout[--elen] = '\0';
} }
if (ret < 0) { if (ret < 0) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册