X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fuse%2Fguestmount.c;h=6adf140427c06b94cbbdaf59e55d8e8cfdf45d31;hb=cf26ef818e918c8c32658399e8aa9e31289109a7;hp=068f7ded6116e9f16eae9fc4d2da353a6a720115;hpb=c66d6f215e8303d4eaf8ccfdb6a58cff04ccc485;p=libguestfs.git

diff --git a/fuse/guestmount.c b/fuse/guestmount.c
index 068f7de..6adf140 100644
--- a/fuse/guestmount.c
+++ b/fuse/guestmount.c
@@ -59,45 +59,25 @@
 
 guestfs_h *g = NULL;
 int read_only = 0;
+int live = 0;
 int verbose = 0;
 int inspector = 0;
+int keys_from_stdin = 0;
+int echo_keys = 0;
 const char *libvirt_uri;
 int dir_cache_timeout = 60;
+static int trace_calls = 0;
 
-/* This is ugly: guestfs errors are strings, FUSE wants -errno.  We
- * have to do the conversion as best we can.
- */
-#define MAX_ERRNO 256
+#define TRACE_CALL(fs,...)                                              \
+  if (trace_calls) {                                                    \
+    fprintf (stderr, "%s: %s (" fs ")\n",                               \
+             program_name, __func__, __VA_ARGS__);                      \
+  }
 
 static int
 error (void)
 {
-  int i;
-  const char *err = guestfs_last_error (g);
-
-  if (!err)
-    return -EINVAL;
-
-  if (verbose)
-    fprintf (stderr, "%s\n", err);
-
-  /* Add a few of our own ... */
-
-  /* This indicates guestfsd died.  Translate into a hard EIO error.
-   * Arguably we could relaunch the guest if we hit this error.
-   */
-  if (strstr (err, "call launch before using this function"))
-    return -EIO;
-
-  /* See if it matches an errno string in the host. */
-  for (i = 0; i < MAX_ERRNO; ++i) {
-    const char *e = strerror (i);
-    if (e && strstr (err, e) != NULL)
-      return -i;
-  }
-
-  /* Too bad, return a generic error. */
-  return -EINVAL;
+  return -guestfs_last_errno (g);
 }
 
 static struct guestfs_xattr_list *
@@ -134,6 +114,8 @@ static int
 fg_readdir (const char *path, void *buf, fuse_fill_dir_t filler,
             off_t offset, struct fuse_file_info *fi)
 {
+  TRACE_CALL ("%s, %p, %ld", path, buf, (long) offset);
+
   time_t now;
   time (&now);
 
@@ -255,6 +237,8 @@ fg_readdir (const char *path, void *buf, fuse_fill_dir_t filler,
 static int
 fg_getattr (const char *path, struct stat *statbuf)
 {
+  TRACE_CALL ("%s, %p", path, statbuf);
+
   const struct stat *buf;
 
   buf = lsc_lookup (path);
@@ -295,6 +279,8 @@ fg_getattr (const char *path, struct stat *statbuf)
 static int
 fg_access (const char *path, int mask)
 {
+  TRACE_CALL ("%s, %d", path, mask);
+
   struct stat statbuf;
   int r;
 
@@ -330,6 +316,8 @@ fg_access (const char *path, int mask)
 static int
 fg_readlink (const char *path, char *buf, size_t size)
 {
+  TRACE_CALL ("%s, %p, %zu", path, buf, size);
+
   const char *r;
   int free_it = 0;
 
@@ -362,6 +350,8 @@ fg_readlink (const char *path, char *buf, size_t size)
 static int
 fg_mknod (const char *path, mode_t mode, dev_t rdev)
 {
+  TRACE_CALL ("%s, 0%o, 0x%lx", path, mode, (long) rdev);
+
   int r;
 
   if (read_only) return -EROFS;
@@ -378,6 +368,8 @@ fg_mknod (const char *path, mode_t mode, dev_t rdev)
 static int
 fg_mkdir (const char *path, mode_t mode)
 {
+  TRACE_CALL ("%s, 0%o", path, mode);
+
   int r;
 
   if (read_only) return -EROFS;
@@ -394,6 +386,8 @@ fg_mkdir (const char *path, mode_t mode)
 static int
 fg_unlink (const char *path)
 {
+  TRACE_CALL ("%s", path);
+
   int r;
 
   if (read_only) return -EROFS;
@@ -410,6 +404,8 @@ fg_unlink (const char *path)
 static int
 fg_rmdir (const char *path)
 {
+  TRACE_CALL ("%s", path);
+
   int r;
 
   if (read_only) return -EROFS;
@@ -426,6 +422,8 @@ fg_rmdir (const char *path)
 static int
 fg_symlink (const char *from, const char *to)
 {
+  TRACE_CALL ("%s, %s", from, to);
+
   int r;
 
   if (read_only) return -EROFS;
@@ -442,6 +440,8 @@ fg_symlink (const char *from, const char *to)
 static int
 fg_rename (const char *from, const char *to)
 {
+  TRACE_CALL ("%s, %s", from, to);
+
   int r;
 
   if (read_only) return -EROFS;
@@ -463,6 +463,8 @@ fg_rename (const char *from, const char *to)
 static int
 fg_link (const char *from, const char *to)
 {
+  TRACE_CALL ("%s, %s", from, to);
+
   int r;
 
   if (read_only) return -EROFS;
@@ -480,6 +482,8 @@ fg_link (const char *from, const char *to)
 static int
 fg_chmod (const char *path, mode_t mode)
 {
+  TRACE_CALL ("%s, 0%o", path, mode);
+
   int r;
 
   if (read_only) return -EROFS;
@@ -496,6 +500,8 @@ fg_chmod (const char *path, mode_t mode)
 static int
 fg_chown (const char *path, uid_t uid, gid_t gid)
 {
+  TRACE_CALL ("%s, %ld, %ld", path, (long) uid, (long) gid);
+
   int r;
 
   if (read_only) return -EROFS;
@@ -512,6 +518,8 @@ fg_chown (const char *path, uid_t uid, gid_t gid)
 static int
 fg_truncate (const char *path, off_t size)
 {
+  TRACE_CALL ("%s, %ld", path, (long) size);
+
   int r;
 
   if (read_only) return -EROFS;
@@ -528,6 +536,9 @@ fg_truncate (const char *path, off_t size)
 static int
 fg_utimens (const char *path, const struct timespec ts[2])
 {
+  TRACE_CALL ("%s, [{ %ld, %ld }, { %ld, %ld }]",
+              path, ts[0].tv_sec, ts[0].tv_nsec, ts[1].tv_sec, ts[1].tv_nsec);
+
   int r;
 
   if (read_only) return -EROFS;
@@ -563,53 +574,18 @@ fg_utimens (const char *path, const struct timespec ts[2])
   return 0;
 }
 
-/* This call is quite hard to emulate through the guestfs(3) API.  In
- * one sense it's a little like access (see above) because it tests
- * whether opening a file would succeed given the flags.  But it also
- * has side effects such as truncating the file if O_TRUNC is given.
- * Therefore we need to emulate it ... painfully.
+/* All this function needs to do is to check that the requested open
+ * flags are valid.  See the notes in <fuse/fuse.h>.
  */
 static int
 fg_open (const char *path, struct fuse_file_info *fi)
 {
-  int r, exists;
+  TRACE_CALL ("%s, 0%o", path, fi->flags);
+             
+  int flags = fi->flags & 3;
 
-  if (fi->flags & O_WRONLY) {
-    if (read_only)
-      return -EROFS;
-  }
-
-  exists = guestfs_exists (g, path);
-  if (exists == -1)
-    return error ();
-
-  if (fi->flags & O_CREAT) {
-    if (read_only)
-      return -EROFS;
-
-    dir_cache_invalidate (path);
-
-    /* Exclusive?  File must not exist already. */
-    if (fi->flags & O_EXCL) {
-      if (exists)
-        return -EEXIST;
-    }
-
-    /* Create?  Touch it and optionally truncate it. */
-    r = guestfs_touch (g, path);
-    if (r == -1)
-      return error ();
-
-    if (fi->flags & O_TRUNC) {
-      r = guestfs_truncate (g, path);
-      if (r == -1)
-        return error ();
-    }
-  } else {
-    /* Not create, just check it exists. */
-    if (!exists)
-      return -ENOENT;
-  }
+  if (read_only && flags != O_RDONLY)
+    return -EROFS;
 
   return 0;
 }
@@ -618,6 +594,8 @@ static int
 fg_read (const char *path, char *buf, size_t size, off_t offset,
          struct fuse_file_info *fi)
 {
+  TRACE_CALL ("%s, %p, %zu, %ld", path, buf, size, offset);
+             
   char *r;
   size_t rsize;
 
@@ -653,6 +631,8 @@ static int
 fg_write (const char *path, const char *buf, size_t size,
           off_t offset, struct fuse_file_info *fi)
 {
+  TRACE_CALL ("%s, %p, %zu, %ld", path, buf, size, offset);
+
   if (read_only) return -EROFS;
 
   dir_cache_invalidate (path);
@@ -673,6 +653,8 @@ fg_write (const char *path, const char *buf, size_t size,
 static int
 fg_statfs (const char *path, struct statvfs *stbuf)
 {
+  TRACE_CALL ("%s, %p", path, stbuf);
+
   struct guestfs_statvfs *r;
 
   r = guestfs_statvfs (g, path);
@@ -699,6 +681,8 @@ fg_statfs (const char *path, struct statvfs *stbuf)
 static int
 fg_release (const char *path, struct fuse_file_info *fi)
 {
+  TRACE_CALL ("%s", path);
+
   /* Just a stub. This method is optional and can safely be left
    * unimplemented.
    */
@@ -709,6 +693,8 @@ fg_release (const char *path, struct fuse_file_info *fi)
 static int fg_fsync(const char *path, int isdatasync,
                      struct fuse_file_info *fi)
 {
+  TRACE_CALL ("%s, %d", path, isdatasync);
+
   int r;
 
   r = guestfs_sync (g);
@@ -722,6 +708,8 @@ static int
 fg_setxattr (const char *path, const char *name, const char *value,
              size_t size, int flags)
 {
+  TRACE_CALL ("%s, %s, %p, %zu", path, name, value, size);
+
   int r;
 
   if (read_only) return -EROFS;
@@ -744,6 +732,8 @@ static int
 fg_getxattr (const char *path, const char *name, char *value,
              size_t size)
 {
+  TRACE_CALL ("%s, %s, %p, %zu", path, name, value, size);
+
   const struct guestfs_xattr_list *xattrs;
   int free_attrs = 0;
 
@@ -778,6 +768,8 @@ fg_getxattr (const char *path, const char *name, char *value,
 static int
 fg_listxattr (const char *path, char *list, size_t size)
 {
+  TRACE_CALL ("%s, %p, %zu", path, list, size);
+
   const struct guestfs_xattr_list *xattrs;
   int free_attrs = 0;
 
@@ -813,6 +805,8 @@ fg_listxattr (const char *path, char *list, size_t size)
 static int
 fg_removexattr(const char *path, const char *name)
 {
+  TRACE_CALL ("%s, %s", path, name);
+
   int r;
 
   if (read_only) return -EROFS;
@@ -880,10 +874,13 @@ usage (int status)
              "  -c|--connect uri     Specify libvirt URI for -d option\n"
              "  --dir-cache-timeout  Set readdir cache timeout (default 5 sec)\n"
              "  -d|--domain guest    Add disks from libvirt guest\n"
+             "  --echo-keys          Don't turn off echo for passphrases\n"
              "  --format[=raw|..]    Force disk format for -a option\n"
              "  --fuse-help          Display extra FUSE options\n"
              "  -i|--inspector       Automatically mount filesystems\n"
              "  --help               Display help message and exit\n"
+             "  --keys-from-stdin    Read passphrases from stdin\n"
+             "  --live               Connect to a live virtual machine\n"
              "  -m|--mount dev[:mnt] Mount dev on mnt (if omitted, /)\n"
              "  -n|--no-sync         Don't autosync\n"
              "  -o|--option opt      Pass extra option to FUSE\n"
@@ -910,20 +907,24 @@ main (int argc, char *argv[])
   /* The command line arguments are broadly compatible with (a subset
    * of) guestfish.  Thus we have to deal mainly with -a, -m and --ro.
    */
-  static const char *options = "a:c:d:im:no:rv?Vx";
+  static const char *options = "a:c:d:im:no:rv?Vwx";
   static const struct option long_options[] = {
     { "add", 1, 0, 'a' },
     { "connect", 1, 0, 'c' },
     { "dir-cache-timeout", 1, 0, 0 },
     { "domain", 1, 0, 'd' },
+    { "echo-keys", 0, 0, 0 },
     { "format", 2, 0, 0 },
     { "fuse-help", 0, 0, 0 },
     { "help", 0, 0, HELP_OPTION },
     { "inspector", 0, 0, 'i' },
+    { "keys-from-stdin", 0, 0, 0 },
+    { "live", 0, 0, 0 },
     { "mount", 1, 0, 'm' },
     { "no-sync", 0, 0, 'n' },
     { "option", 1, 0, 'o' },
     { "ro", 0, 0, 'r' },
+    { "rw", 0, 0, 'w' },
     { "selinux", 0, 0, 0 },
     { "trace", 0, 0, 'x' },
     { "verbose", 0, 0, 'v' },
@@ -1015,8 +1016,13 @@ main (int argc, char *argv[])
           format = NULL;
         else
           format = optarg;
-      }
-      else {
+      } else if (STREQ (long_options[option_index].name, "keys-from-stdin")) {
+        keys_from_stdin = 1;
+      } else if (STREQ (long_options[option_index].name, "echo-keys")) {
+        echo_keys = 1;
+      } else if (STREQ (long_options[option_index].name, "live")) {
+        live = 1;
+      } else {
         fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),
                  program_name, long_options[option_index].name, option_index);
         exit (EXIT_FAILURE);
@@ -1064,10 +1070,15 @@ main (int argc, char *argv[])
       OPTION_V;
       break;
 
+    case 'w':
+      OPTION_w;
+      break;
+
     case 'x':
       OPTION_x;
       ADD_FUSE_ARG ("-f");
       guestfs_set_recovery_proc (g, 1);
+      trace_calls = 1;
       break;
 
     case HELP_OPTION: