git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compile rpcgen-generated files with -fno-strict-aliasing
[libguestfs.git]
/
src
/
appliance.c
diff --git
a/src/appliance.c
b/src/appliance.c
index
30eb6fd
..
906b6a9
100644
(file)
--- a/
src/appliance.c
+++ b/
src/appliance.c
@@
-320,7
+320,6
@@
check_for_cached_appliance (guestfs_h *g,
snprintf (filename, len, "%s/checksum", cachedir);
(void) mkdir (cachedir, 0755);
snprintf (filename, len, "%s/checksum", cachedir);
(void) mkdir (cachedir, 0755);
- (void) utime (cachedir, NULL);
/* See if the cache directory exists and passes some simple checks
* to make sure it has not been tampered with.
/* See if the cache directory exists and passes some simple checks
* to make sure it has not been tampered with.
@@
-344,13
+343,19
@@
check_for_cached_appliance (guestfs_h *g,
return -1;
}
return -1;
}
+ (void) utime (cachedir, NULL);
+
garbage_collect_appliances (cachedir);
/* Try to open and acquire a lock on the checksum file. */
int fd = open (filename, O_RDONLY);
if (fd == -1)
return 0;
garbage_collect_appliances (cachedir);
/* Try to open and acquire a lock on the checksum file. */
int fd = open (filename, O_RDONLY);
if (fd == -1)
return 0;
+#ifdef HAVE_FUTIMENS
(void) futimens (fd, NULL);
(void) futimens (fd, NULL);
+#else
+ (void) futimes (fd, NULL);
+#endif
struct flock fl;
fl.l_type = F_RDLCK;
fl.l_whence = SEEK_SET;
struct flock fl;
fl.l_type = F_RDLCK;
fl.l_whence = SEEK_SET;