X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Ffile.c;h=8847d2622aedb090ba0c09636dab71dfa556bd33;hb=f6e36bf361c587e0dbb2f0c71f5d22a7cf7f4f42;hp=c09de71f669cd3b58ca3eb13adcee953f851cb3f;hpb=161018ed1e90c796e6e099859979da02d5f3e410;p=libguestfs.git

diff --git a/daemon/file.c b/daemon/file.c
index c09de71..8847d26 100644
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -18,8 +18,6 @@
 
 #include <config.h>
 
-#define _GNU_SOURCE		/* for futimens(2) and getline(3) */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -35,12 +33,13 @@ int
 do_touch (const char *path)
 {
   int fd;
+  int r;
 
   NEED_ROOT (-1);
   ABS_PATH (path, -1);
 
   CHROOT_IN;
-  fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY | O_NONBLOCK, 0666);
+  fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY, 0666);
   CHROOT_OUT;
 
   if (fd == -1) {
@@ -48,7 +47,12 @@ do_touch (const char *path)
     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;
@@ -293,7 +297,7 @@ do_write_file (const char *path, const char *content, int size)
     size = strlen (content);
 
   CHROOT_IN;
-  fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY | O_NONBLOCK, 0666);
+  fd = open (path, O_WRONLY | O_TRUNC | O_CREAT | O_NOCTTY, 0666);
   CHROOT_OUT;
 
   if (fd == -1) {
@@ -323,7 +327,7 @@ do_file (const char *path)
   int r, len, freeit = 0;
   char *buf;
 
-  /*NEED_ROOT (NULL); - no: we allow people to run this on /dev devices. */
+  NEED_ROOT_OR_IS_DEVICE (path, NULL);
   ABS_PATH (path, NULL);
 
   if (strncmp (path, "/dev/", 5) == 0)