X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Ffile.c;h=8847d2622aedb090ba0c09636dab71dfa556bd33;hb=5cd39c83e23eb300d1bdfa806902a31b409ff420;hp=0b8b463ce5380d9f802657ad2a84f0c95e04d4ea;hpb=b4d2a01828e5de85e5eee3631f7fe3925a0312ca;p=libguestfs.git

diff --git a/daemon/file.c b/daemon/file.c
index 0b8b463..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) {
@@ -314,3 +318,57 @@ do_write_file (const char *path, const char *content, int size)
 
   return 0;
 }
+
+/* This runs the 'file' command. */
+char *
+do_file (const char *path)
+{
+  char *out, *err;
+  int r, len, freeit = 0;
+  char *buf;
+
+  NEED_ROOT_OR_IS_DEVICE (path, NULL);
+  ABS_PATH (path, NULL);
+
+  if (strncmp (path, "/dev/", 5) == 0)
+    buf = (char *) path;
+  else {
+    len = strlen (path) + 9;
+    buf = malloc (len);
+    if (!buf) {
+      reply_with_perror ("malloc");
+      return NULL;
+    }
+    snprintf (buf, len, "/sysroot%s", path);
+    freeit = 1;
+  }
+
+  /* file(1) manpage claims "file returns 0 on success, and non-zero on
+   * error", but this is evidently not true.  It always returns 0, in
+   * every scenario I can think up.  So check the target is readable
+   * first.
+   */
+  if (access (buf, R_OK) == -1) {
+    if (freeit) free (buf);
+    reply_with_perror ("access: %s", path);
+    return NULL;
+  }
+
+  r = command (&out, &err, "file", "-bsL", buf, NULL);
+  if (freeit) free (buf);
+
+  if (r == -1) {
+    free (out);
+    reply_with_error ("file: %s: %s", path, err);
+    free (err);
+    return NULL;
+  }
+  free (err);
+
+  /* We need to remove the trailing \n from output of file(1). */
+  len = strlen (out);
+  if (out[len-1] == '\n')
+    out[len-1] = '\0';
+
+  return out;			/* caller frees */
+}