git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix four memory leaks in guestfs.c revealed by valgrind.
[libguestfs.git]
/
daemon
/
file.c
diff --git
a/daemon/file.c
b/daemon/file.c
index
2439833
..
8847d26
100644
(file)
--- a/
daemon/file.c
+++ b/
daemon/file.c
@@
-18,8
+18,6
@@
#include <config.h>
#include <config.h>
-#define _GNU_SOURCE /* for futimens(2) and getline(3) */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-35,6
+33,7
@@
int
do_touch (const char *path)
{
int fd;
do_touch (const char *path)
{
int fd;
+ int r;
NEED_ROOT (-1);
ABS_PATH (path, -1);
NEED_ROOT (-1);
ABS_PATH (path, -1);
@@
-48,7
+47,12
@@
do_touch (const char *path)
return -1;
}
return -1;
}
- if (futimens (fd, NULL) == -1) {
+#ifdef HAVE_FUTIMENS
+ r = futimens (fd, NULL);
+#else
+ r = futimes (fd, NULL);
+#endif
+ if (r == -1) {
reply_with_perror ("futimens: %s", path);
close (fd);
return -1;
reply_with_perror ("futimens: %s", path);
close (fd);
return -1;