X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Ffind.c;h=c5097200dcff2b2a3bdbd80edb1d02847e83b0d0;hp=b659eb64a9a304ad6bf549ca05137707e519eab3;hb=9ba779ea367b2ea7077da7bdd75e813cd06c7eea;hpb=42c89f2e6bd956f738080b5aec53b7520f4f96da

diff --git a/daemon/find.c b/daemon/find.c
index b659eb6..c509720 100644
--- a/daemon/find.c
+++ b/daemon/find.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -23,9 +23,10 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <sys/stat.h>
 
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 
@@ -85,6 +86,7 @@ do_find (const char *dir)
     free (sysrootdir);
     return NULL;
   }
+  free (sysrootdir);
 
   if (verbose)
     fprintf (stderr, "%s\n", cmd);
@@ -98,9 +100,6 @@ do_find (const char *dir)
   free (cmd);
 
   while ((r = input_to_nul (fp, str, PATH_MAX)) > 0) {
-    if (verbose)
-      printf ("find string: %s\n", str);
-
     len = strlen (str);
     if (len <= sysrootdirlen)
       continue;
@@ -112,7 +111,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 +126,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
@@ -195,9 +194,6 @@ do_find0 (const char *dir)
   reply (NULL, NULL);
 
   while ((r = input_to_nul (fp, str, GUESTFS_MAX_CHUNK_SIZE)) > 0) {
-    if (verbose)
-      printf ("find0 string: %s\n", str);
-
     len = strlen (str);
     if (len <= sysrootdirlen)
       continue;
@@ -211,20 +207,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;
 }
-