X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fguestfs.c;h=98b0595b78e0a8af66289a8b63f8b06a54607583;hb=880374c6df2a694bb1457231f110d9ef7035e5b7;hp=488b6586ed031acefc9f412dadb48eafb88789d4;hpb=f445d25d7b6bb65470564c96d7198d63538880a3;p=libguestfs.git

diff --git a/src/guestfs.c b/src/guestfs.c
index 488b658..98b0595 100644
--- 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. */
-  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) {
-    snprintf (filename, sizeof filename, "%s/sock", g->tmpdir);
+    snprintf (filename, sizeof filename, "%s/guestfsd.sock", g->tmpdir);
     unlink (filename);
 
     rmdir (g->tmpdir);