summaryrefslogtreecommitdiffstats
path: root/daemon/command.c
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2009-04-14 14:38:31 +0100
committerRichard Jones <rjones@redhat.com>2009-04-14 14:38:31 +0100
commit374af1d1c85580a7768967bf2f199f10182b011e (patch)
tree65462cda558f665a4603feaca5376e949314875b /daemon/command.c
parent5a563bbd9b2779640e3358f4bf1eaac622b58cae (diff)
downloadlibguestfs-374af1d1c85580a7768967bf2f199f10182b011e.tar.gz
libguestfs-374af1d1c85580a7768967bf2f199f10182b011e.tar.xz
libguestfs-374af1d1c85580a7768967bf2f199f10182b011e.zip
Better handling of trailing \n problem.
Diffstat (limited to 'daemon/command.c')
-rw-r--r--daemon/command.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/daemon/command.c b/daemon/command.c
index 589ca769..03537f03 100644
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -79,10 +79,10 @@ do_command_lines (char * const * const argv)
if (pend) {
*pend = '\0';
pend++;
- }
- /* Final \n? Don't return an empty final element. */
- if (pend && *pend == '\0') break;
+ /* Final \n? Don't return an empty final element. */
+ if (*pend == '\0') break;
+ }
if (add_string (&lines, &size, &alloc, p) == -1) {
free (out);
@@ -97,5 +97,5 @@ do_command_lines (char * const * const argv)
if (add_string (&lines, &size, &alloc, NULL) == -1)
return NULL;
- return lines;
+ return lines; /* Caller frees. */
}