Skip to content

Commit

Permalink
fix lxc-info printing duplicate lines
Browse files Browse the repository at this point in the history
When lxc-info's stdout is not line buffered (ie. "lxc-info -n foo |more")
the first three lines will be duplicated. This is because c->get_ips()
comes next and it forks and the child will exit() causing its fds to be
closed which flushes out its (fork duplicated) stdio buffers. The lines are
then duplicated when the parent actually gets around to flushing out its
stdio. This causes problems for programs (such as the lxc-webpanel) which
are popen()ing lxc-info.

The fix here isn't necessarily the right one, but does show what the
problem is. Seems like maybe we should fix this inside of get_ips(), for
other API callers as well.

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
  • Loading branch information
Dwight Engen authored and stgraber committed Apr 4, 2014
1 parent 24073c8 commit 26d6d1c
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/lxc/lxc_info.c
Expand Up @@ -313,6 +313,7 @@ static int print_info(const char *name, const char *lxcpath)
}

if (ips) {
fflush(stdout);
char **addresses = c->get_ips(c, NULL, NULL, 0);
if (addresses) {
char *address;
Expand Down

0 comments on commit 26d6d1c

Please sign in to comment.