X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Ffile.c;h=3f07ffc12e2288f2fb52fc922f1fec16917e00fd;hb=373a9ad0abb09ee079da834d251a744cdbe9ae70;hp=43c875cc7eda5548b5252fb4cd637bdc913e0e59;hpb=44da812b424f5e10e268d47149d012d49edf858b;p=libguestfs.git

diff --git a/daemon/file.c b/daemon/file.c
index 43c875c..3f07ffc 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>
@@ -32,15 +30,16 @@
 #include "actions.h"
 
 int
-do_touch (const char *path)
+do_touch (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,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;
 
@@ -240,3 +248,131 @@ do_chown (int owner, int group, const char *path)
 
   return 0;
 }
+
+int
+do_exists (char *path)
+{
+  int r;
+
+  NEED_ROOT (-1);
+  ABS_PATH (path, -1);
+
+  CHROOT_IN;
+  r = access (path, F_OK);
+  CHROOT_OUT;
+
+  return r == 0;
+}
+
+int
+do_is_file (char *path)
+{
+  int r;
+  struct stat buf;
+
+  NEED_ROOT (-1);
+  ABS_PATH (path, -1);
+
+  CHROOT_IN;
+  r = lstat (path, &buf);
+  CHROOT_OUT;
+
+  if (r == -1) {
+    if (errno != ENOENT && errno != ENOTDIR) {
+      reply_with_perror ("stat: %s", path);
+      return -1;
+    }
+    else
+      return 0;			/* Not a file. */
+  }
+
+  return S_ISREG (buf.st_mode);
+}
+
+int
+do_write_file (char *path, char *content, int size)
+{
+  int fd;
+
+  NEED_ROOT (-1);
+  ABS_PATH (path, -1);
+
+  if (size == 0)
+    size = strlen (content);
+
+  CHROOT_IN;
+  fd = open (path, O_WRONLY | O_TRUNC | O_CREAT | O_NOCTTY, 0666);
+  CHROOT_OUT;
+
+  if (fd == -1) {
+    reply_with_perror ("open: %s", path);
+    return -1;
+  }
+
+  if (xwrite (fd, content, size) == -1) {
+    reply_with_perror ("write");
+    close (fd);
+    return -1;
+  }
+
+  if (close (fd) == -1) {
+    reply_with_perror ("close: %s", path);
+    return -1;
+  }
+
+  return 0;
+}
+
+/* This runs the 'file' command. */
+char *
+do_file (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 */
+}