External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix parsing of 'info chardev' line endings

Browse Source 
This change makes the 'info chardev' parser ignore any trailing
whitespace on a line. This fixes a specific problem handling a '\r\n'
line ending.

* src/qemu/qemu_monitor_text.c: Ignore trailing whitespace in
  'info chardev' output.
This commit is contained in:
Matthew Booth 2010-01-06 17:09:04 +01:00 committed by Daniel Veillard
parent aee70b7482
commit c0a9b6a533
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/qemu/qemu_monitor_text.c
View File

@ -1705,15 +1705,26 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon,
goto cleanup;
}
char *pos = reply; /* The current start of searching */
char *end = pos + strlen(reply); /* The end of the reply string */
char *pos; /* The current start of searching */
char *next = reply; /* The start of the next line */
char *eol; /* The character which ends the current line */
char *end = reply + strlen(reply); /* The end of the reply string */
while (next) {
pos = next;
while (pos < end) {
/* Split the output into lines */
eol = memchr(pos, '\n', end - pos);
if (eol == NULL)
if (eol == NULL) {
eol = end;
next = NULL;
} else {
next = eol + 1;
}
/* Ignore all whitespace immediately before eol */
while (eol > pos && c_isspace(*(eol-1)))
eol -= 1;
/* Look for 'filename=pty:' */
#define NEEDLE "filename=pty:"
@ -1721,13 +1732,13 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon,
/* If it's not there we can ignore this line */
if (!needle)
goto next;
continue;
/* id is everthing from the beginning of the line to the ':'
* find ':' and turn it into a terminator */
char *colon = memchr(pos, ':', needle - pos);
if (colon == NULL)
goto next;
continue;
*colon = '\0';
char *id = pos;
@ -1747,9 +1758,6 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon,
goto cleanup;
}
#undef NEEDLE
next:
pos = eol + 1;
}
ret = 0;