X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Ffile.c;h=3ef7441df26d40ab7892b6978c49a713b35089bb;hp=16dfb009873be63306609f783a53f293b5c46ee2;hb=a7b73d4a1e09f12b2002083618056f0c823c1dcf;hpb=05712b2457a44ee0f0020eced77db03c2aa419a1

diff --git a/daemon/file.c b/daemon/file.c
index 16dfb00..3ef7441 100644
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 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
@@ -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>
@@ -32,9 +30,10 @@
 #include "actions.h"
 
 int
-do_touch (const char *path)
+do_touch (char *path)
 {
   int fd;
+  int r;
 
   NEED_ROOT (-1);
   ABS_PATH (path, -1);
@@ -48,18 +47,27 @@ 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;
   }
 
-  close (fd);
+  if (close (fd) == -1) {
+    reply_with_perror ("close: %s", path);
+    return -1;
+  }
+
   return 0;
 }
 
 char *
-do_cat (const char *path)
+do_cat (char *path)
 {
   int fd;
   int alloc, size, r, max;
@@ -130,7 +138,7 @@ do_cat (const char *path)
 }
 
 char **
-do_read_lines (const char *path)
+do_read_lines (char *path)
 {
   char **r = NULL;
   int size = 0, alloc = 0;
@@ -182,7 +190,7 @@ do_read_lines (const char *path)
 }
 
 int
-do_rm (const char *path)
+do_rm (char *path)
 {
   int r;
 
@@ -202,7 +210,7 @@ do_rm (const char *path)
 }
 
 int
-do_chmod (int mode, const char *path)
+do_chmod (int mode, char *path)
 {
   int r;
 
@@ -222,7 +230,7 @@ do_chmod (int mode, const char *path)
 }
 
 int
-do_chown (int owner, int group, const char *path)
+do_chown (int owner, int group, char *path)
 {
   int r;
 
@@ -242,7 +250,7 @@ do_chown (int owner, int group, const char *path)
 }
 
 int
-do_exists (const char *path)
+do_exists (char *path)
 {
   int r;
 
@@ -257,7 +265,7 @@ do_exists (const char *path)
 }
 
 int
-do_is_file (const char *path)
+do_is_file (char *path)
 {
   int r;
   struct stat buf;
@@ -282,7 +290,7 @@ do_is_file (const char *path)
 }
 
 int
-do_write_file (const char *path, const char *content, int size)
+do_write_file (char *path, char *content, int size)
 {
   int fd;
 
@@ -317,13 +325,13 @@ do_write_file (const char *path, const char *content, int size)
 
 /* This runs the 'file' command. */
 char *
-do_file (const char *path)
+do_file (char *path)
 {
   char *out, *err;
   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)