External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

virBufferEscapeShell: Emit quotes for the empty string

Browse Source 
Make the empty string return '' to match cmdEcho's behavior.
This commit is contained in:
Guido Günther 2011-10-13 23:48:40 +02:00
parent dad15a2e02
commit 04323fbcb4
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/util/buf.c
View File

@ -507,15 +507,20 @@ virBufferEscapeShell(virBufferPtr buf, const char *str)
return;
/* Only quote if str includes shell metacharacters. */
if (!strpbrk(str, "\r\t\n !\"#$&'()*;<>?[\\]^`{|}~")) {
if (*str && !strpbrk(str, "\r\t\n !\"#$&'()*;<>?[\\]^`{|}~")) {
virBufferAdd(buf, str, -1);
return;
}
len = strlen(str);
if (xalloc_oversized(4, len) ||
VIR_ALLOC_N(escaped, 4 * len + 3) < 0) {
virBufferSetError(buf);
if (*str) {
len = strlen(str);
if (xalloc_oversized(4, len) ||
VIR_ALLOC_N(escaped, 4 * len + 3) < 0) {
virBufferSetError(buf);
return;
}
} else {
virBufferAdd(buf, "''", 2);
return;
}