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);