git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blkid: Use -c /dev/null option to kill the cache.
[libguestfs.git]
/
src
/
guestfs.c
diff --git
a/src/guestfs.c
b/src/guestfs.c
index
488b658
..
98b0595
100644
(file)
--- a/
src/guestfs.c
+++ b/
src/guestfs.c
@@
-214,12
+214,12
@@
guestfs_close (guestfs_h *g)
g->sock = -1;
/* Wait for subprocess(es) to exit. */
g->sock = -1;
/* Wait for subprocess(es) to exit. */
- waitpid (g->pid, NULL, 0);
+
if (g->pid > 0)
waitpid (g->pid, NULL, 0);
if (g->recoverypid > 0) waitpid (g->recoverypid, NULL, 0);
/* Remove tmpfiles. */
if (g->tmpdir) {
if (g->recoverypid > 0) waitpid (g->recoverypid, NULL, 0);
/* Remove tmpfiles. */
if (g->tmpdir) {
- snprintf (filename, sizeof filename, "%s/sock", g->tmpdir);
+ snprintf (filename, sizeof filename, "%s/
guestfsd.
sock", g->tmpdir);
unlink (filename);
rmdir (g->tmpdir);
unlink (filename);
rmdir (g->tmpdir);