X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Ffile.c;h=24398339b408f343cb0dec971921ef8be009ffab;hb=24ccbb29ac475187f51a27dcd318db2b4824a0c1;hp=d8759f0d70757b6dbd6e699e96aab24dedd58a5b;hpb=42283403886da648bb239177369aa65c0a659255;p=libguestfs.git

diff --git a/daemon/file.c b/daemon/file.c
index d8759f0..2439833 100644
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -40,7 +40,7 @@ do_touch (const char *path)
   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) {
@@ -293,7 +293,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) {
@@ -320,19 +320,24 @@ char *
 do_file (const char *path)
 {
   char *out, *err;
-  int r, len;
+  int r, len, freeit = 0;
   char *buf;
 
-  NEED_ROOT (NULL);
+  NEED_ROOT_OR_IS_DEVICE (path, NULL);
   ABS_PATH (path, NULL);
 
-  len = strlen (path) + 9;
-  buf = malloc (len);
-  if (!buf) {
-    reply_with_perror ("malloc");
-    return 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;
   }
-  snprintf (buf, len, "/sysroot%s", path);
 
   /* 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
@@ -340,13 +345,13 @@ do_file (const char *path)
    * first.
    */
   if (access (buf, R_OK) == -1) {
-    free (buf);
+    if (freeit) free (buf);
     reply_with_perror ("access: %s", path);
     return NULL;
   }
 
   r = command (&out, &err, "file", "-bsL", buf, NULL);
-  free (buf);
+  if (freeit) free (buf);
 
   if (r == -1) {
     free (out);