X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Ffind.c;h=535e46f6d1c7d02e74e567176ced2fd5d081024b;hp=b659eb64a9a304ad6bf549ca05137707e519eab3;hb=71b02d6654395ff04689055f3820b3ad4e54ec00;hpb=42c89f2e6bd956f738080b5aec53b7520f4f96da diff --git a/daemon/find.c b/daemon/find.c index b659eb6..535e46f 100644 --- a/daemon/find.c +++ b/daemon/find.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include "../src/guestfs_protocol.h" @@ -85,6 +86,7 @@ do_find (const char *dir) free (sysrootdir); return NULL; } + free (sysrootdir); if (verbose) fprintf (stderr, "%s\n", cmd); @@ -112,7 +114,7 @@ do_find (const char *dir) } } if (pclose (fp) != 0) { - reply_with_perror ("pclose: find"); + reply_with_perror ("pclose"); free_stringslen (res, size); return NULL; } @@ -127,7 +129,7 @@ do_find (const char *dir) sort_strings (res, size-1); - return res; /* caller frees */ + return res; /* caller frees */ } /* The code below assumes each path returned can fit into a protocol @@ -211,20 +213,19 @@ do_find0 (const char *dir) if (ferror (fp)) { perror (dir); - send_file_end (1); /* Cancel. */ + send_file_end (1); /* Cancel. */ pclose (fp); return -1; } if (pclose (fp) != 0) { perror (dir); - send_file_end (1); /* Cancel. */ + send_file_end (1); /* Cancel. */ return -1; } - if (send_file_end (0)) /* Normal end of file. */ + if (send_file_end (0)) /* Normal end of file. */ return -1; return 0; } -