git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
filesystems: Fix memory leak found by valgrind.
[libguestfs.git]
/
daemon
/
find.c
diff --git
a/daemon/find.c
b/daemon/find.c
index
98895ab
..
c509720
100644
(file)
--- a/
daemon/find.c
+++ b/
daemon/find.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* 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
*
* 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
*
* 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>
*/
#include <config.h>
@@
-23,9
+23,10
@@
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
+#include <limits.h>
#include <sys/stat.h>
#include <sys/stat.h>
-#include "
../src/
guestfs_protocol.h"
+#include "guestfs_protocol.h"
#include "daemon.h"
#include "actions.h"
#include "daemon.h"
#include "actions.h"
@@
-99,9
+100,6
@@
do_find (const char *dir)
free (cmd);
while ((r = input_to_nul (fp, str, PATH_MAX)) > 0) {
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;
len = strlen (str);
if (len <= sysrootdirlen)
continue;
@@
-113,7
+111,7
@@
do_find (const char *dir)
}
}
if (pclose (fp) != 0) {
}
}
if (pclose (fp) != 0) {
- reply_with_perror ("pclose
: find
");
+ reply_with_perror ("pclose");
free_stringslen (res, size);
return NULL;
}
free_stringslen (res, size);
return NULL;
}
@@
-196,9
+194,6
@@
do_find0 (const char *dir)
reply (NULL, NULL);
while ((r = input_to_nul (fp, str, GUESTFS_MAX_CHUNK_SIZE)) > 0) {
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;
len = strlen (str);
if (len <= sysrootdirlen)
continue;