Richard W.M. Jones
2009-Oct-30 17:56 UTC
[Libguestfs] [PATCH 0/2 v 2 FOR DISCUSSION ONLY] Add FUSE support
Second round of patches. These work so far that you can get directory listings and stuff like that ... Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://et.redhat.com/~rjones/libguestfs/ See what it can do: http://et.redhat.com/~rjones/libguestfs/recipes.html
Richard W.M. Jones
2009-Oct-30 17:57 UTC
[Libguestfs] [PATCH 1/2] New API calls: truncate, truncate_size, mkdir_mode, utimens.
-- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora -------------- next part -------------->From ca0ea205beeb8d05fe3e57d6f911c2ec27989d11 Mon Sep 17 00:00:00 2001From: Richard Jones <rjones at redhat.com> Date: Fri, 30 Oct 2009 16:10:45 +0000 Subject: [PATCH 1/2] New API calls: truncate, truncate_size, mkdir_mode, utimens. truncate, truncate_size: Used to truncate files to a particular size, or to zero bytes. mkdir_mode: Like mkdir but allows you to also specify the initial permissions for the new directory. utimens: Set timestamp on a file with nanosecond accuracy. The implementation is complicated by the fact that we had to add an Int64 parameter type to the generator. --- TODO | 2 - bindtests | 13 ++++ daemon/Makefile.am | 2 + daemon/dir.c | 17 ++++++ daemon/truncate.c | 65 +++++++++++++++++++++ daemon/utimens.c | 81 ++++++++++++++++++++++++++ perl/typemap | 1 + po/POTFILES.in | 2 + src/MAX_PROC_NR | 2 +- src/generator.ml | 161 ++++++++++++++++++++++++++++++++++++++++++++-------- 10 files changed, 318 insertions(+), 28 deletions(-) create mode 100644 daemon/truncate.c create mode 100644 daemon/utimens.c diff --git a/TODO b/TODO index 2833d46..fc14cdc 100644 --- a/TODO +++ b/TODO @@ -145,9 +145,7 @@ Ideas for extra commands General glibc / core programs: chgrp dd (?) - utime / utimes / futimes / futimens / l.. more mk*temp calls - trunc[ate??] ext2 properties: chattr diff --git a/bindtests b/bindtests index 6fbec99..e1772db 100644 --- a/bindtests +++ b/bindtests @@ -3,6 +3,7 @@ def [] false 0 +0 123 456 abc @@ -10,6 +11,7 @@ null [] false 0 +0 123 456 @@ -17,6 +19,7 @@ def [] false 0 +0 123 456 @@ -24,6 +27,7 @@ false [] false 0 +0 123 456 abc @@ -31,6 +35,7 @@ def ["1"] false 0 +0 123 456 abc @@ -38,6 +43,7 @@ def ["1", "2"] false 0 +0 123 456 abc @@ -45,6 +51,7 @@ def ["1"] true 0 +0 123 456 abc @@ -52,6 +59,7 @@ def ["1"] false -1 +-1 123 456 abc @@ -59,6 +67,7 @@ def ["1"] false -2 +-2 123 456 abc @@ -66,6 +75,7 @@ def ["1"] false 1 +1 123 456 abc @@ -73,6 +83,7 @@ def ["1"] false 2 +2 123 456 abc @@ -80,6 +91,7 @@ def ["1"] false 4095 +4095 123 456 abc @@ -87,6 +99,7 @@ def ["1"] false 0 +0 EOF diff --git a/daemon/Makefile.am b/daemon/Makefile.am index dce868a..db311ab 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -74,8 +74,10 @@ guestfsd_SOURCES = \ swap.c \ sync.c \ tar.c \ + truncate.c \ umask.c \ upload.c \ + utimens.c \ wc.c \ xattr.c \ zero.c \ diff --git a/daemon/dir.c b/daemon/dir.c index 1ca6286..b603cfd 100644 --- a/daemon/dir.c +++ b/daemon/dir.c @@ -99,6 +99,23 @@ do_mkdir (const char *path) return 0; } +int +do_mkdir_mode (const char *path, int mode) +{ + int r; + + CHROOT_IN; + r = mkdir (path, mode); + CHROOT_OUT; + + if (r == -1) { + reply_with_perror ("mkdir_mode: %s", path); + return -1; + } + + return 0; +} + static int recursive_mkdir (const char *path) { diff --git a/daemon/truncate.c b/daemon/truncate.c new file mode 100644 index 0000000..c2da382 --- /dev/null +++ b/daemon/truncate.c @@ -0,0 +1,65 @@ +/* libguestfs - the guestfsd daemon + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/types.h> + +#include "../src/guestfs_protocol.h" +#include "daemon.h" +#include "actions.h" + +int +do_truncate_size (const char *path, int64_t size) +{ + int fd; + int r; + + CHROOT_IN; + fd = open (path, O_WRONLY | O_NOCTTY); + CHROOT_OUT; + + if (fd == -1) { + reply_with_perror ("open: %s", path); + return -1; + } + + r = ftruncate (fd, (off_t) size); + if (r == -1) { + reply_with_perror ("ftruncate: %s", path); + close (fd); + return -1; + } + + if (close (fd) == -1) { + reply_with_perror ("close: %s", path); + return -1; + } + + return 0; +} + +int +do_truncate (const char *path) +{ + return do_truncate_size (path, 0); +} diff --git a/daemon/utimens.c b/daemon/utimens.c new file mode 100644 index 0000000..2d0e3bf --- /dev/null +++ b/daemon/utimens.c @@ -0,0 +1,81 @@ +/* libguestfs - the guestfsd daemon + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/stat.h> + +#include "../src/guestfs_protocol.h" +#include "daemon.h" +#include "actions.h" + +int +do_utimens (const char *path, + int64_t atsecs, int64_t atnsecs, + int64_t mtsecs, int64_t mtnsecs) +{ +#ifndef HAVE_FUTIMENS + reply_with_error ("utimens: not supported in this appliance"); + return -1; +#else + int fd; + int r; + + CHROOT_IN; + fd = open (path, O_WRONLY | O_NOCTTY); + CHROOT_OUT; + + if (fd == -1) { + reply_with_perror ("open: %s", path); + return -1; + } + + if (atnsecs == -1) + atnsecs = UTIME_NOW; + if (atnsecs == -2) + atnsecs = UTIME_OMIT; + if (mtnsecs == -1) + mtnsecs = UTIME_NOW; + if (mtnsecs == -2) + mtnsecs = UTIME_OMIT; + + struct timespec times[2]; + times[0].tv_sec = atsecs; + times[0].tv_nsec = atnsecs; + times[1].tv_sec = mtsecs; + times[1].tv_nsec = mtnsecs; + + r = futimens (fd, times); + if (r == -1) { + reply_with_perror ("futimens: %s", path); + close (fd); + return -1; + } + + if (close (fd) == -1) { + reply_with_perror ("close: %s", path); + return -1; + } + + return 0; +#endif /* HAVE_FUTIMENS */ +} diff --git a/perl/typemap b/perl/typemap index 97788d3..752ca0d 100644 --- a/perl/typemap +++ b/perl/typemap @@ -2,6 +2,7 @@ TYPEMAP char * T_PV const char * T_PV guestfs_h * O_OBJECT_guestfs_h +int64_t T_IV INPUT O_OBJECT_guestfs_h diff --git a/po/POTFILES.in b/po/POTFILES.in index f6afb60..8c3c8f5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -49,8 +49,10 @@ daemon/stubs.c daemon/swap.c daemon/sync.c daemon/tar.c +daemon/truncate.c daemon/umask.c daemon/upload.c +daemon/utimens.c daemon/wc.c daemon/xattr.c daemon/zero.c diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR index ca55a6c..8f897c8 100644 --- a/src/MAX_PROC_NR +++ b/src/MAX_PROC_NR @@ -1 +1 @@ -198 +202 diff --git a/src/generator.ml b/src/generator.ml index 4e056e2..347ad9c 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -142,6 +142,7 @@ and argt | DeviceList of string(* list of Device names (each cannot be NULL) *) | Bool of string (* boolean *) | Int of string (* int (smallish ints, signed, <= 31 bits) *) + | Int64 of string (* any 64 bit int *) (* These are treated as filenames (simple string parameters) in * the C API and bindings. But in the RPC protocol, we transfer * the actual file content up to or down from the daemon. @@ -364,6 +365,7 @@ let test_all_args = [ StringList "strlist"; Bool "b"; Int "integer"; + Int64 "integer64"; FileIn "filein"; FileOut "fileout"; ] @@ -3715,6 +3717,60 @@ Usually the result is the name of the Linux VFS module that is used to mount this device (probably determined automatically if you used the C<guestfs_mount> call)."); + ("truncate", (RErr, [Pathname "path"]), 199, [], + [InitBasicFS, Always, TestOutputStruct ( + [["write_file"; "/test"; "some stuff so size is not zero"; "0"]; + ["truncate"; "/test"]; + ["stat"; "/test"]], [CompareWithInt ("size", 0)])], + "truncate a file to zero size", + "\ +This command truncates C<path> to a zero-length file. The +file must exist already."); + + ("truncate_size", (RErr, [Pathname "path"; Int64 "size"]), 200, [], + [InitBasicFS, Always, TestOutputStruct ( + [["touch"; "/test"]; + ["truncate_size"; "/test"; "1000"]; + ["stat"; "/test"]], [CompareWithInt ("size", 1000)])], + "truncate a file to a particular size", + "\ +This command truncates C<path> to size C<size> bytes. The file +must exist already. If the file is smaller than C<size> then +the file is extended to the required size with null bytes."); + + ("utimens", (RErr, [Pathname "path"; Int64 "atsecs"; Int64 "atnsecs"; Int64 "mtsecs"; Int64 "mtnsecs"]), 201, [], + [InitBasicFS, Always, TestOutputStruct ( + [["touch"; "/test"]; + ["utimens"; "/test"; "12345"; "67890"; "9876"; "5432"]; + ["stat"; "/test"]], [CompareWithInt ("mtime", 9876)])], + "set timestamp of a file with nanosecond precision", + "\ +This command sets the timestamps of a file with nanosecond +precision. + +C<atsecs, atnsecs> are the last access time (atime) in secs and +nanoseconds from the epoch. + +C<mtsecs, mtnsecs> are the last modification time (mtime) in +secs and nanoseconds from the epoch. + +If the C<*nsecs> field contains the special value C<-1> then +the corresponding timestamp is set to the current time. (The +C<*secs> field is ignored in this case). + +If the C<*nsecs> field contains the special value C<-2> then +the corresponding timestamp is left unchanged. (The +C<*secs> field is ignored in this case)."); + + ("mkdir_mode", (RErr, [Pathname "path"; Int "mode"]), 202, [], + [InitBasicFS, Always, TestOutputStruct ( + [["mkdir_mode"; "/test"; "0o111"]; + ["stat"; "/test"]], [CompareWithInt ("mode", 0o40111)])], + "create a directory with a particular mode", + "\ +This command creates a directory, setting the initial permissions +of the directory to C<mode>. See also C<guestfs_mkdir>."); + ] let all_functions = non_daemon_functions @ daemon_functions @@ -3965,6 +4021,7 @@ type callt | CallOptString of string option | CallStringList of string list | CallInt of int + | CallInt64 of int64 | CallBool of bool (* Used to memoize the result of pod2text. *) @@ -4102,7 +4159,7 @@ let mapi f xs let name_of_argt = function | Pathname n | Device n | Dev_or_Path n | String n | OptString n - | StringList n | DeviceList n | Bool n | Int n + | StringList n | DeviceList n | Bool n | Int n | Int64 n | FileIn n | FileOut n -> n let java_name_of_struct typ @@ -4518,11 +4575,13 @@ and generate_xdr () pr "struct %s_args {\n" name; List.iter ( function - | Pathname n | Device n | Dev_or_Path n | String n -> pr " string %s<>;\n" n + | Pathname n | Device n | Dev_or_Path n | String n -> + pr " string %s<>;\n" n | OptString n -> pr " str *%s;\n" n | StringList n | DeviceList n -> pr " str %s<>;\n" n | Bool n -> pr " bool %s;\n" n | Int n -> pr " int %s;\n" n + | Int64 n -> pr " hyper %s;\n" n | FileIn _ | FileOut _ -> () ) args; pr "};\n\n" @@ -4711,6 +4770,8 @@ and generate_client_actions () pr "\ #include <stdio.h> #include <stdlib.h> +#include <stdint.h> +#include <inttypes.h> #include \"guestfs.h\" #include \"guestfs-internal-actions.h\" @@ -4813,6 +4874,8 @@ check_state (guestfs_h *g, const char *caller) pr " fputs (%s ? \" true\" : \" false\", stdout);\n" n | Int n -> (* int *) pr " printf (\" %%d\", %s);\n" n + | Int64 n -> + pr " printf (\" %%\" PRIi64, %s);\n" n ) (snd style); pr " putchar ('\\n');\n"; pr " }\n"; @@ -4902,6 +4965,8 @@ check_state (guestfs_h *g, const char *caller) pr " args.%s = %s;\n" n n | Int n -> pr " args.%s = %s;\n" n n + | Int64 n -> + pr " args.%s = %s;\n" n n | FileIn _ | FileOut _ -> () ) args; pr " serial = guestfs___send (g, GUESTFS_PROC_%s,\n" @@ -5104,6 +5169,7 @@ and generate_daemon_actions () | StringList n | DeviceList n -> pr " char **%s;\n" n | Bool n -> pr " int %s;\n" n | Int n -> pr " int %s;\n" n + | Int64 n -> pr " int64_t %s;\n" n | FileIn _ | FileOut _ -> () ) args ); @@ -5155,6 +5221,7 @@ and generate_daemon_actions () pr " }\n"; | Bool n -> pr " %s = args.%s;\n" n n | Int n -> pr " %s = args.%s;\n" n n + | Int64 n -> pr " %s = args.%s;\n" n n | FileIn _ | FileOut _ -> () ) args; pr "\n" @@ -6057,6 +6124,7 @@ and generate_test_command_call ?(expect_error = false) ?test test_name cmd | OptString n, arg -> pr " const char *%s = \"%s\";\n" n (c_quote arg); | Int _, _ + | Int64 _, _ | Bool _, _ | FileIn _, _ | FileOut _, _ -> () | StringList n, arg | DeviceList n, arg -> @@ -6115,6 +6183,12 @@ and generate_test_command_call ?(expect_error = false) ?test test_name cmd with Failure "int_of_string" -> failwithf "%s: expecting an int, but got '%s'" test_name arg in pr ", %d" i + | Int64 _, arg -> + let i + try Int64.of_string arg + with Failure "int_of_string" -> + failwithf "%s: expecting an int64, but got '%s'" test_name arg in + pr ", %Ld" i | Bool _, arg -> let b = bool_of_string arg in pr ", %d" (if b then 1 else 0) ) (List.combine (snd style) args); @@ -6379,6 +6453,7 @@ and generate_fish_cmds () | StringList n | DeviceList n -> pr " char **%s;\n" n | Bool n -> pr " int %s;\n" n | Int n -> pr " int %s;\n" n + | Int64 n -> pr " int64_t %s;\n" n ) (snd style); (* Check and convert parameters. *) @@ -6415,6 +6490,8 @@ and generate_fish_cmds () pr " %s = is_true (argv[%d]) ? 1 : 0;\n" name i | Int name -> pr " %s = atoi (argv[%d]);\n" name i + | Int64 name -> + pr " %s = atoll (argv[%d]);\n" name i ) (snd style); (* Call C API function. *) @@ -6429,7 +6506,7 @@ and generate_fish_cmds () function | Device name | String name | OptString name | FileIn name | FileOut name | Bool name - | Int name -> () + | Int name | Int64 name -> () | Pathname name | Dev_or_Path name -> pr " free (%s);\n" name | StringList name | DeviceList name -> @@ -6648,6 +6725,7 @@ and generate_fish_actions_pod () | StringList n | DeviceList n -> pr " '%s ...'" n | Bool _ -> pr " true|false" | Int n -> pr " %s" n + | Int64 n -> pr " %s" n | FileIn n | FileOut n -> pr " (%s|-)" n ) (snd style); pr "\n"; @@ -6720,6 +6798,7 @@ and generate_prototype ?(extern = true) ?(static = false) ?(semicolon = true) pr "char *const *%s" n | Bool n -> next (); pr "int %s" n | Int n -> next (); pr "int %s" n + | Int64 n -> next (); pr "int64_t %s" n | FileIn n | FileOut n -> if not in_daemon then (next (); pr "const char *%s" n) @@ -7002,6 +7081,8 @@ copy_table (char * const * argv) pr " int %s = Bool_val (%sv);\n" n n | Int n -> pr " int %s = Int_val (%sv);\n" n n + | Int64 n -> + pr " int64_t %s = Int64_val (%sv);\n" n n ) (snd style); let error_code match fst style with @@ -7040,7 +7121,8 @@ copy_table (char * const * argv) function | StringList n | DeviceList n -> pr " ocaml_guestfs_free_strings (%s);\n" n; - | Pathname _ | Device _ | Dev_or_Path _ | String _ | OptString _ | Bool _ | Int _ + | Pathname _ | Device _ | Dev_or_Path _ | String _ | OptString _ + | Bool _ | Int _ | Int64 _ | FileIn _ | FileOut _ -> () ) (snd style); @@ -7132,6 +7214,7 @@ and generate_ocaml_prototype ?(is_external = false) name style | StringList _ | DeviceList _ -> pr "string array -> " | Bool _ -> pr "bool -> " | Int _ -> pr "int -> " + | Int64 _ -> pr "int64 -> " ) (snd style); (match fst style with | RErr -> pr "unit" (* all errors are turned into exceptions *) @@ -7283,12 +7366,14 @@ DESTROY (g) | StringList n | DeviceList n -> pr " char **%s;\n" n | Bool n -> pr " int %s;\n" n | Int n -> pr " int %s;\n" n + | Int64 n -> pr " int64_t %s;\n" n ) (snd style); let do_cleanups () List.iter ( function - | Pathname _ | Device _ | Dev_or_Path _ | String _ | OptString _ | Bool _ | Int _ + | Pathname _ | Device _ | Dev_or_Path _ | String _ | OptString _ + | Bool _ | Int _ | Int64 _ | FileIn _ | FileOut _ -> () | StringList n | DeviceList n -> pr " free (%s);\n" n ) (snd style) @@ -7660,7 +7745,7 @@ and generate_perl_prototype name style comma := true; match arg with | Pathname n | Device n | Dev_or_Path n | String n - | OptString n | Bool n | Int n | FileIn n | FileOut n -> + | OptString n | Bool n | Int n | Int64 n | FileIn n | FileOut n -> pr "$%s" n | StringList n | DeviceList n -> pr "\\@%s" n @@ -7927,6 +8012,7 @@ py_guestfs_close (PyObject *self, PyObject *args) pr " char **%s;\n" n | Bool n -> pr " int %s;\n" n | Int n -> pr " int %s;\n" n + | Int64 n -> pr " long long %s;\n" n ) (snd style); pr "\n"; @@ -7940,6 +8026,9 @@ py_guestfs_close (PyObject *self, PyObject *args) | StringList _ | DeviceList _ -> pr "O" | Bool _ -> pr "i" (* XXX Python has booleans? *) | Int _ -> pr "i" + | Int64 _ -> pr "L" (* XXX Whoever thought it was a good idea to + * emulate C's int/long/long long in Python? + *) ) (snd style); pr ":guestfs_%s\",\n" name; pr " &py_g"; @@ -7950,6 +8039,7 @@ py_guestfs_close (PyObject *self, PyObject *args) | StringList n | DeviceList n -> pr ", &py_%s" n | Bool n -> pr ", &%s" n | Int n -> pr ", &%s" n + | Int64 n -> pr ", &%s" n ) (snd style); pr "))\n"; @@ -7959,7 +8049,7 @@ py_guestfs_close (PyObject *self, PyObject *args) List.iter ( function | Pathname _ | Device _ | Dev_or_Path _ | String _ - | FileIn _ | FileOut _ | OptString _ | Bool _ | Int _ -> () + | FileIn _ | FileOut _ | OptString _ | Bool _ | Int _ | Int64 _ -> () | StringList n | DeviceList n -> pr " %s = get_string_list (py_%s);\n" n n; pr " if (!%s) return NULL;\n" n @@ -7974,7 +8064,7 @@ py_guestfs_close (PyObject *self, PyObject *args) List.iter ( function | Pathname _ | Device _ | Dev_or_Path _ | String _ - | FileIn _ | FileOut _ | OptString _ | Bool _ | Int _ -> () + | FileIn _ | FileOut _ | OptString _ | Bool _ | Int _ | Int64 _ -> () | StringList n | DeviceList n -> pr " free (%s);\n" n ) (snd style); @@ -8304,6 +8394,8 @@ static VALUE ruby_guestfs_close (VALUE gv) pr " int %s = RTEST (%sv);\n" n n | Int n -> pr " int %s = NUM2INT (%sv);\n" n n + | Int64 n -> + pr " long long %s = NUM2LL (%sv);\n" n n ) (snd style); pr "\n"; @@ -8331,7 +8423,7 @@ static VALUE ruby_guestfs_close (VALUE gv) List.iter ( function | Pathname _ | Device _ | Dev_or_Path _ | String _ - | FileIn _ | FileOut _ | OptString _ | Bool _ | Int _ -> () + | FileIn _ | FileOut _ | OptString _ | Bool _ | Int _ | Int64 _ -> () | StringList n | DeviceList n -> pr " free (%s);\n" n ) (snd style); @@ -8654,6 +8746,8 @@ and generate_java_prototype ?(public=false) ?(privat=false) ?(native=false) pr "boolean %s" n | Int n -> pr "int %s" n + | Int64 n -> + pr "long %s" n ) (snd style); pr ")\n"; @@ -8773,6 +8867,8 @@ Java_com_redhat_et_libguestfs_GuestFS__1close pr ", jboolean j%s" n | Int n -> pr ", jint j%s" n + | Int64 n -> + pr ", jlong j%s" n ) (snd style); pr ")\n"; pr "{\n"; @@ -8826,6 +8922,8 @@ Java_com_redhat_et_libguestfs_GuestFS__1close | Bool n | Int n -> pr " int %s;\n" n + | Int64 n -> + pr " int64_t %s;\n" n ) (snd style); let needs_i @@ -8867,7 +8965,8 @@ Java_com_redhat_et_libguestfs_GuestFS__1close pr " }\n"; pr " %s[%s_len] = NULL;\n" n n; | Bool n - | Int n -> + | Int n + | Int64 n -> pr " %s = j%s;\n" n n ) (snd style); @@ -8896,7 +8995,8 @@ Java_com_redhat_et_libguestfs_GuestFS__1close pr " }\n"; pr " free (%s);\n" n | Bool n - | Int n -> () + | Int n + | Int64 n -> () ) (snd style); (* Check for errors. *) @@ -9158,7 +9258,7 @@ last_error h = do | Pathname n | Device n | Dev_or_Path n | String n -> pr "withCString %s $ \\%s -> " n n | OptString n -> pr "maybeWith withCString %s $ \\%s -> " n n | StringList n | DeviceList n -> pr "withMany withCString %s $ \\%s -> withArray0 nullPtr %s $ \\%s -> " n n n n - | Bool _ | Int _ -> () + | Bool _ | Int _ | Int64 _ -> () ) (snd style); (* Convert integer arguments. *) let args @@ -9166,6 +9266,7 @@ last_error h = do function | Bool n -> sprintf "(fromBool %s)" n | Int n -> sprintf "(fromIntegral %s)" n + | Int64 n -> sprintf "(fromIntegral %s)" n | FileIn n | FileOut n | Pathname n | Device n | Dev_or_Path n | String n | OptString n | StringList n | DeviceList n -> n ) (snd style) in @@ -9222,6 +9323,7 @@ and generate_haskell_prototype ~handle ?(hs = false) style | StringList _ | DeviceList _ -> if hs then pr "[String]" else pr "Ptr CString" | Bool _ -> pr "%s" bool | Int _ -> pr "%s" int + | Int64 _ -> pr "%s" int | FileIn _ -> pr "%s" string | FileOut _ -> pr "%s" string ); @@ -9302,6 +9404,7 @@ print_strings (char *const *argv) | StringList n | DeviceList n -> pr " print_strings (%s);\n" n | Bool n -> pr " printf (\"%%s\\n\", %s ? \"true\" : \"false\");\n" n | Int n -> pr " printf (\"%%d\\n\", %s);\n" n + | Int64 n -> pr " printf (\"%%\" PRIi64 \"\\n\", %s);\n" n ) (snd style); pr " /* Java changes stdout line buffering so we need this: */\n"; pr " fflush (stdout);\n"; @@ -9417,6 +9520,8 @@ let () "[|" ^ String.concat ";" (List.map (sprintf "\"%s\"") xs) ^ "|]" | CallInt i when i >= 0 -> string_of_int i | CallInt i (* when i < 0 *) -> "(" ^ string_of_int i ^ ")" + | CallInt64 i when i >= 0L -> Int64.to_string i ^ "L" + | CallInt64 i (* when i < 0L *) -> "(" ^ Int64.to_string i ^ "L)" | CallBool b -> string_of_bool b ) args ) @@ -9450,6 +9555,7 @@ my $g = Sys::Guestfs->new (); | CallStringList xs -> "[" ^ String.concat "," (List.map (sprintf "\"%s\"") xs) ^ "]" | CallInt i -> string_of_int i + | CallInt64 i -> Int64.to_string i | CallBool b -> if b then "1" else "0" ) args ) @@ -9480,6 +9586,7 @@ g = guestfs.GuestFS () | CallStringList xs -> "[" ^ String.concat "," (List.map (sprintf "\"%s\"") xs) ^ "]" | CallInt i -> string_of_int i + | CallInt64 i -> Int64.to_string i | CallBool b -> if b then "1" else "0" ) args ) @@ -9510,6 +9617,7 @@ g = Guestfs::create() | CallStringList xs -> "[" ^ String.concat "," (List.map (sprintf "\"%s\"") xs) ^ "]" | CallInt i -> string_of_int i + | CallInt64 i -> Int64.to_string i | CallBool b -> string_of_bool b ) args ) @@ -9545,6 +9653,7 @@ public class Bindtests { "new String[]{" ^ String.concat "," (List.map (sprintf "\"%s\"") xs) ^ "}" | CallInt i -> string_of_int i + | CallInt64 i -> Int64.to_string i | CallBool b -> string_of_bool b ) args ) @@ -9587,6 +9696,8 @@ main = do "[" ^ String.concat "," (List.map (sprintf "\"%s\"") xs) ^ "]" | CallInt i when i < 0 -> "(" ^ string_of_int i ^ ")" | CallInt i -> string_of_int i + | CallInt64 i when i < 0L -> "(" ^ Int64.to_string i ^ ")" + | CallInt64 i -> Int64.to_string i | CallBool true -> "True" | CallBool false -> "False" ) args @@ -9605,43 +9716,43 @@ main = do and generate_lang_bindtests call call "test0" [CallString "abc"; CallOptString (Some "def"); CallStringList []; CallBool false; - CallInt 0; CallString "123"; CallString "456"]; + CallInt 0; CallInt64 0L; CallString "123"; CallString "456"]; call "test0" [CallString "abc"; CallOptString None; CallStringList []; CallBool false; - CallInt 0; CallString "123"; CallString "456"]; + CallInt 0; CallInt64 0L; CallString "123"; CallString "456"]; call "test0" [CallString ""; CallOptString (Some "def"); CallStringList []; CallBool false; - CallInt 0; CallString "123"; CallString "456"]; + CallInt 0; CallInt64 0L; CallString "123"; CallString "456"]; call "test0" [CallString ""; CallOptString (Some ""); CallStringList []; CallBool false; - CallInt 0; CallString "123"; CallString "456"]; + CallInt 0; CallInt64 0L; CallString "123"; CallString "456"]; call "test0" [CallString "abc"; CallOptString (Some "def"); CallStringList ["1"]; CallBool false; - CallInt 0; CallString "123"; CallString "456"]; + CallInt 0; CallInt64 0L; CallString "123"; CallString "456"]; call "test0" [CallString "abc"; CallOptString (Some "def"); CallStringList ["1"; "2"]; CallBool false; - CallInt 0; CallString "123"; CallString "456"]; + CallInt 0; CallInt64 0L; CallString "123"; CallString "456"]; call "test0" [CallString "abc"; CallOptString (Some "def"); CallStringList ["1"]; CallBool true; - CallInt 0; CallString "123"; CallString "456"]; + CallInt 0; CallInt64 0L; CallString "123"; CallString "456"]; call "test0" [CallString "abc"; CallOptString (Some "def"); CallStringList ["1"]; CallBool false; - CallInt (-1); CallString "123"; CallString "456"]; + CallInt (-1); CallInt64 (-1L); CallString "123"; CallString "456"]; call "test0" [CallString "abc"; CallOptString (Some "def"); CallStringList ["1"]; CallBool false; - CallInt (-2); CallString "123"; CallString "456"]; + CallInt (-2); CallInt64 (-2L); CallString "123"; CallString "456"]; call "test0" [CallString "abc"; CallOptString (Some "def"); CallStringList ["1"]; CallBool false; - CallInt 1; CallString "123"; CallString "456"]; + CallInt 1; CallInt64 1L; CallString "123"; CallString "456"]; call "test0" [CallString "abc"; CallOptString (Some "def"); CallStringList ["1"]; CallBool false; - CallInt 2; CallString "123"; CallString "456"]; + CallInt 2; CallInt64 2L; CallString "123"; CallString "456"]; call "test0" [CallString "abc"; CallOptString (Some "def"); CallStringList ["1"]; CallBool false; - CallInt 4095; CallString "123"; CallString "456"]; + CallInt 4095; CallInt64 4095L; CallString "123"; CallString "456"]; call "test0" [CallString "abc"; CallOptString (Some "def"); CallStringList ["1"]; CallBool false; - CallInt 0; CallString ""; CallString ""] + CallInt 0; CallInt64 0L; CallString ""; CallString ""] (* XXX Add here tests of the return and error functions. *) -- 1.6.5.rc2
Richard W.M. Jones
2009-Oct-30 18:03 UTC
[Libguestfs] [PATCH 2/2] FUSE filesystem support.
If you wish to try it, pick a guest or image and do (as root) the following command. You'll have to adjust the drives and mount point(s) suitably, just like with guestfish. # ./fuse/guestmount -a guest.img -m /dev/sda1 --ro --trace -- -f /mnt/tmp Those parameters will produce lots of debugging information and the guestmount command will stay in the foreground so you can see what's going on. Then, also as root, look around the /mnt/tmp directory. read(2) and write(2) aren't implemented (will return EINVAL) so you can't actually read any of the files.>From my limited observations it seems like nothing much is cached. Ifwe added a big "get absolutely everything about this directory" call to the guestfs(3) API and invoked that the first time that FUSE does an lstat(2) (or readdir(2)) call on a directory, that would massively speed up directory listings. There are likely to be lots of opportunities like that. It's not segfaulted on me yet, but I'm guessing there's a first time for everything ... Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top -------------- next part -------------->From d6eb58b353789e018ad24107ceb3172316087a25 Mon Sep 17 00:00:00 2001From: Richard Jones <rjones at redhat.com> Date: Fri, 30 Oct 2009 16:13:13 +0000 Subject: [PATCH 2/2] FUSE filesystem support. This implements FUSE filesystem support so that any libguestfs- accessible disk image can be mounted as a local filesystem. The API needs more test coverage, particularly lesser-used system calls. The big unresolved issue is UID/GID mapping between guest filesystem IDs and the host. It's not easy to automate this because you need extra details about the guest itself in order to get to its UID->username map (eg. /etc/passwd from the guest). --- .gitignore | 1 + HACKING | 3 + Makefile.am | 4 + README | 2 + TODO | 35 +-- configure.ac | 9 + fuse/Makefile.am | 38 +++ fuse/fusexmp.c | 385 ++++++++++++++++++++++++ fuse/fusexmp_fh.c | 495 +++++++++++++++++++++++++++++++ fuse/guestmount.c | 844 +++++++++++++++++++++++++++++++++++++++++++++++++++++ po/POTFILES.in | 3 + 11 files changed, 1793 insertions(+), 26 deletions(-) create mode 100644 fuse/Makefile.am create mode 100644 fuse/fusexmp.c create mode 100644 fuse/fusexmp_fh.c create mode 100644 fuse/guestmount.c diff --git a/.gitignore b/.gitignore index ffa9764..f4b772b 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ fish/completion.c fish/guestfish fish/rc_protocol.c fish/rc_protocol.h +fuse/guestmount guestfish.1 guestfish-actions.pod guestfs.3 diff --git a/HACKING b/HACKING index cc5b1c2..5752ec3 100644 --- a/HACKING +++ b/HACKING @@ -83,6 +83,9 @@ examples/ fish/ Guestfish (the command-line program / shell) +fuse/ + FUSE (userspace filesystem) built on top of libguestfs. + haskell/ Haskell bindings. diff --git a/Makefile.am b/Makefile.am index 0b905ca..05f6dd0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,6 +34,10 @@ if HAVE_TOOLS SUBDIRS += tools endif +if HAVE_FUSE +SUBDIRS += fuse +endif + if HAVE_OCAML SUBDIRS += ocaml ocaml/examples endif diff --git a/README b/README index 41902ea..0877775 100644 --- a/README +++ b/README @@ -52,6 +52,8 @@ Requirements - libxml2 +- (Optional) FUSE to build the FUSE module + - (Optional) Augeas (http://augeas.net/) - perldoc (pod2man, pod2text) to generate the manual pages and diff --git a/TODO b/TODO index fc14cdc..9c09557 100644 --- a/TODO +++ b/TODO @@ -12,33 +12,16 @@ Python bindings Ideas for the Python bindings: https://www.redhat.com/archives/fedora-virt/2009-April/msg00114.html -FTP server or FUSE? -------------------- +FUSE API +-------- + +The API needs more test coverage, particularly lesser-used system +calls. -Originally we had intended to implement an NFS server inside the -appliance, which would allow the guest filesystems to be mounted on -the host, and large changes to be made. We eventually rejected the -idea of using NFS, partly because it requires root to mount -filesystems in the host, and partly because of problems handling UID -mappings between host and guest filesystem. - -Then we look at implementing an FTP server instead. FTP clients are -widely available for many languages, don't require root, and don't -have any UID mapping problems. However there is the problem of -getting the TCP connection into the guest, and that FTP requires a -secondary data connection either in or out of the guest (the NFS -situation is even more dire). - -Thirdly we looked at implementing a FUSE-based filesystem. This is -plausible - it could be implemented just by adding the additional FUSE -operations to the standard guestfs(3) API, and then implementing a -simple FUSE daemon. (The FUSE website has some very helpful -documentation and examples). I [RWMJ] am not particularly convinced -that a FUSE-based filesystem would really be useful to anyone, but am -prepared to accept patches if someone does all the work. - -See also the mountlo project: -http://sourceforge.net/project/showfiles.php?group_id=121684&package_id=150116 +The big unresolved issue is UID/GID mapping between guest filesystem +IDs and the host. It's not easy to automate this because you need +extra details about the guest itself in order to get to its +UID->username map (eg. /etc/passwd from the guest). BufferIn -------- diff --git a/configure.ac b/configure.ac index b31c193..b500b5b 100644 --- a/configure.ac +++ b/configure.ac @@ -421,6 +421,13 @@ PKG_CHECK_MODULES([LIBXML2], [libxml-2.0]) AC_SUBST([LIBXML2_CFLAGS]) AC_SUBST([LIBXML2_LIBS]) +dnl FUSE is optional to build the FUSE module. +HAVE_FUSE=yes +PKG_CHECK_MODULES([FUSE],[fuse],,[ + HAVE_FUSE=no + AC_MSG_WARN([FUSE library and headers are missing, so optional FUSE module won't be built])]) +AM_CONDITIONAL([HAVE_FUSE],[test "x$HAVE_FUSE" = "xyes"]) + dnl Check for OCaml (optional, for OCaml bindings). AC_PROG_OCAML AC_PROG_FINDLIB @@ -729,6 +736,7 @@ AC_CONFIG_FILES([Makefile gnulib/lib/Makefile gnulib/tests/Makefile hivex/Makefile + fuse/Makefile ocaml/META perl/Makefile.PL]) AC_OUTPUT @@ -758,6 +766,7 @@ if test "x$HAVE_INSPECTOR" = "x"; then echo "yes"; else echo "no"; fi echo -n "virt-* tools ........................ " if test "x$HAVE_TOOLS" = "x"; then echo "yes"; else echo "no"; fi echo "supermin appliance .................. $enable_supermin" +echo "FUSE filesystem ..................... $HAVE_FUSE" echo echo "If any optional component is configured 'no' when you expected 'yes'" echo "then you should check the preceeding messages." diff --git a/fuse/Makefile.am b/fuse/Makefile.am new file mode 100644 index 0000000..2bf66c9 --- /dev/null +++ b/fuse/Makefile.am @@ -0,0 +1,38 @@ +# libguestfs +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +EXTRA_DIST = fusexmp.c fusexmp_fh.c + +if HAVE_FUSE + +bin_PROGRAMS = guestmount + +guestmount_SOURCES = guestmount.c + +guestmount_CFLAGS = \ + -I$(top_srcdir)/src -I$(top_builddir)/src \ + -I$(srcdir)/../gnulib/lib -I../gnulib/lib \ + -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \ + $(FUSE_CFLAGS) \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) + +guestmount_LDADD = \ + $(FUSE_LIBS) -lulockmgr \ + $(top_builddir)/src/libguestfs.la \ + ../gnulib/lib/libgnu.la + +endif diff --git a/fuse/fusexmp.c b/fuse/fusexmp.c new file mode 100644 index 0000000..083bbea --- /dev/null +++ b/fuse/fusexmp.c @@ -0,0 +1,385 @@ +/* + FUSE: Filesystem in Userspace + Copyright (C) 2001-2007 Miklos Szeredi <miklos at szeredi.hu> + + This program can be distributed under the terms of the GNU GPL. + See the file COPYING. + + gcc -Wall `pkg-config fuse --cflags --libs` fusexmp.c -o fusexmp +*/ + +#define FUSE_USE_VERSION 26 + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#ifdef linux +/* For pread()/pwrite() */ +#define _XOPEN_SOURCE 500 +#endif + +#include <fuse.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <fcntl.h> +#include <dirent.h> +#include <errno.h> +#include <sys/time.h> +#ifdef HAVE_SETXATTR +#include <sys/xattr.h> +#endif + +static int xmp_getattr(const char *path, struct stat *stbuf) +{ + int res; + + res = lstat(path, stbuf); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_access(const char *path, int mask) +{ + int res; + + res = access(path, mask); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_readlink(const char *path, char *buf, size_t size) +{ + int res; + + res = readlink(path, buf, size - 1); + if (res == -1) + return -errno; + + buf[res] = '\0'; + return 0; +} + + +static int xmp_readdir(const char *path, void *buf, fuse_fill_dir_t filler, + off_t offset, struct fuse_file_info *fi) +{ + DIR *dp; + struct dirent *de; + + (void) offset; + (void) fi; + + dp = opendir(path); + if (dp == NULL) + return -errno; + + while ((de = readdir(dp)) != NULL) { + struct stat st; + memset(&st, 0, sizeof(st)); + st.st_ino = de->d_ino; + st.st_mode = de->d_type << 12; + if (filler(buf, de->d_name, &st, 0)) + break; + } + + closedir(dp); + return 0; +} + +static int xmp_mknod(const char *path, mode_t mode, dev_t rdev) +{ + int res; + + /* On Linux this could just be 'mknod(path, mode, rdev)' but this + is more portable */ + if (S_ISREG(mode)) { + res = open(path, O_CREAT | O_EXCL | O_WRONLY, mode); + if (res >= 0) + res = close(res); + } else if (S_ISFIFO(mode)) + res = mkfifo(path, mode); + else + res = mknod(path, mode, rdev); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_mkdir(const char *path, mode_t mode) +{ + int res; + + res = mkdir(path, mode); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_unlink(const char *path) +{ + int res; + + res = unlink(path); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_rmdir(const char *path) +{ + int res; + + res = rmdir(path); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_symlink(const char *from, const char *to) +{ + int res; + + res = symlink(from, to); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_rename(const char *from, const char *to) +{ + int res; + + res = rename(from, to); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_link(const char *from, const char *to) +{ + int res; + + res = link(from, to); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_chmod(const char *path, mode_t mode) +{ + int res; + + res = chmod(path, mode); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_chown(const char *path, uid_t uid, gid_t gid) +{ + int res; + + res = lchown(path, uid, gid); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_truncate(const char *path, off_t size) +{ + int res; + + res = truncate(path, size); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_utimens(const char *path, const struct timespec ts[2]) +{ + int res; + struct timeval tv[2]; + + tv[0].tv_sec = ts[0].tv_sec; + tv[0].tv_usec = ts[0].tv_nsec / 1000; + tv[1].tv_sec = ts[1].tv_sec; + tv[1].tv_usec = ts[1].tv_nsec / 1000; + + res = utimes(path, tv); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_open(const char *path, struct fuse_file_info *fi) +{ + int res; + + res = open(path, fi->flags); + if (res == -1) + return -errno; + + close(res); + return 0; +} + +static int xmp_read(const char *path, char *buf, size_t size, off_t offset, + struct fuse_file_info *fi) +{ + int fd; + int res; + + (void) fi; + fd = open(path, O_RDONLY); + if (fd == -1) + return -errno; + + res = pread(fd, buf, size, offset); + if (res == -1) + res = -errno; + + close(fd); + return res; +} + +static int xmp_write(const char *path, const char *buf, size_t size, + off_t offset, struct fuse_file_info *fi) +{ + int fd; + int res; + + (void) fi; + fd = open(path, O_WRONLY); + if (fd == -1) + return -errno; + + res = pwrite(fd, buf, size, offset); + if (res == -1) + res = -errno; + + close(fd); + return res; +} + +static int xmp_statfs(const char *path, struct statvfs *stbuf) +{ + int res; + + res = statvfs(path, stbuf); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_release(const char *path, struct fuse_file_info *fi) +{ + /* Just a stub. This method is optional and can safely be left + unimplemented */ + + (void) path; + (void) fi; + return 0; +} + +static int xmp_fsync(const char *path, int isdatasync, + struct fuse_file_info *fi) +{ + /* Just a stub. This method is optional and can safely be left + unimplemented */ + + (void) path; + (void) isdatasync; + (void) fi; + return 0; +} + +#ifdef HAVE_SETXATTR +/* xattr operations are optional and can safely be left unimplemented */ +static int xmp_setxattr(const char *path, const char *name, const char *value, + size_t size, int flags) +{ + int res = lsetxattr(path, name, value, size, flags); + if (res == -1) + return -errno; + return 0; +} + +static int xmp_getxattr(const char *path, const char *name, char *value, + size_t size) +{ + int res = lgetxattr(path, name, value, size); + if (res == -1) + return -errno; + return res; +} + +static int xmp_listxattr(const char *path, char *list, size_t size) +{ + int res = llistxattr(path, list, size); + if (res == -1) + return -errno; + return res; +} + +static int xmp_removexattr(const char *path, const char *name) +{ + int res = lremovexattr(path, name); + if (res == -1) + return -errno; + return 0; +} +#endif /* HAVE_SETXATTR */ + +static struct fuse_operations xmp_oper = { + .getattr = xmp_getattr, + .access = xmp_access, + .readlink = xmp_readlink, + .readdir = xmp_readdir, + .mknod = xmp_mknod, + .mkdir = xmp_mkdir, + .symlink = xmp_symlink, + .unlink = xmp_unlink, + .rmdir = xmp_rmdir, + .rename = xmp_rename, + .link = xmp_link, + .chmod = xmp_chmod, + .chown = xmp_chown, + .truncate = xmp_truncate, + .utimens = xmp_utimens, + .open = xmp_open, + .read = xmp_read, + .write = xmp_write, + .statfs = xmp_statfs, + .release = xmp_release, + .fsync = xmp_fsync, +#ifdef HAVE_SETXATTR + .setxattr = xmp_setxattr, + .getxattr = xmp_getxattr, + .listxattr = xmp_listxattr, + .removexattr = xmp_removexattr, +#endif +}; + +int main(int argc, char *argv[]) +{ + umask(0); + return fuse_main(argc, argv, &xmp_oper, NULL); +} diff --git a/fuse/fusexmp_fh.c b/fuse/fusexmp_fh.c new file mode 100644 index 0000000..b86d3f6 --- /dev/null +++ b/fuse/fusexmp_fh.c @@ -0,0 +1,495 @@ +/* + FUSE: Filesystem in Userspace + Copyright (C) 2001-2007 Miklos Szeredi <miklos at szeredi.hu> + + This program can be distributed under the terms of the GNU GPL. + See the file COPYING. + + gcc -Wall `pkg-config fuse --cflags --libs` -lulockmgr fusexmp_fh.c -o fusexmp_fh +*/ + +#define FUSE_USE_VERSION 26 + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#define _GNU_SOURCE + +#include <fuse.h> +#include <ulockmgr.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <fcntl.h> +#include <dirent.h> +#include <errno.h> +#include <sys/time.h> +#ifdef HAVE_SETXATTR +#include <sys/xattr.h> +#endif + +static int xmp_getattr(const char *path, struct stat *stbuf) +{ + int res; + + res = lstat(path, stbuf); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_fgetattr(const char *path, struct stat *stbuf, + struct fuse_file_info *fi) +{ + int res; + + (void) path; + + res = fstat(fi->fh, stbuf); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_access(const char *path, int mask) +{ + int res; + + res = access(path, mask); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_readlink(const char *path, char *buf, size_t size) +{ + int res; + + res = readlink(path, buf, size - 1); + if (res == -1) + return -errno; + + buf[res] = '\0'; + return 0; +} + +struct xmp_dirp { + DIR *dp; + struct dirent *entry; + off_t offset; +}; + +static int xmp_opendir(const char *path, struct fuse_file_info *fi) +{ + int res; + struct xmp_dirp *d = malloc(sizeof(struct xmp_dirp)); + if (d == NULL) + return -ENOMEM; + + d->dp = opendir(path); + if (d->dp == NULL) { + res = -errno; + free(d); + return res; + } + d->offset = 0; + d->entry = NULL; + + fi->fh = (unsigned long) d; + return 0; +} + +static inline struct xmp_dirp *get_dirp(struct fuse_file_info *fi) +{ + return (struct xmp_dirp *) (uintptr_t) fi->fh; +} + +static int xmp_readdir(const char *path, void *buf, fuse_fill_dir_t filler, + off_t offset, struct fuse_file_info *fi) +{ + struct xmp_dirp *d = get_dirp(fi); + + (void) path; + if (offset != d->offset) { + seekdir(d->dp, offset); + d->entry = NULL; + d->offset = offset; + } + while (1) { + struct stat st; + off_t nextoff; + + if (!d->entry) { + d->entry = readdir(d->dp); + if (!d->entry) + break; + } + + memset(&st, 0, sizeof(st)); + st.st_ino = d->entry->d_ino; + st.st_mode = d->entry->d_type << 12; + nextoff = telldir(d->dp); + if (filler(buf, d->entry->d_name, &st, nextoff)) + break; + + d->entry = NULL; + d->offset = nextoff; + } + + return 0; +} + +static int xmp_releasedir(const char *path, struct fuse_file_info *fi) +{ + struct xmp_dirp *d = get_dirp(fi); + (void) path; + closedir(d->dp); + free(d); + return 0; +} + +static int xmp_mknod(const char *path, mode_t mode, dev_t rdev) +{ + int res; + + if (S_ISFIFO(mode)) + res = mkfifo(path, mode); + else + res = mknod(path, mode, rdev); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_mkdir(const char *path, mode_t mode) +{ + int res; + + res = mkdir(path, mode); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_unlink(const char *path) +{ + int res; + + res = unlink(path); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_rmdir(const char *path) +{ + int res; + + res = rmdir(path); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_symlink(const char *from, const char *to) +{ + int res; + + res = symlink(from, to); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_rename(const char *from, const char *to) +{ + int res; + + res = rename(from, to); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_link(const char *from, const char *to) +{ + int res; + + res = link(from, to); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_chmod(const char *path, mode_t mode) +{ + int res; + + res = chmod(path, mode); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_chown(const char *path, uid_t uid, gid_t gid) +{ + int res; + + res = lchown(path, uid, gid); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_truncate(const char *path, off_t size) +{ + int res; + + res = truncate(path, size); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_ftruncate(const char *path, off_t size, + struct fuse_file_info *fi) +{ + int res; + + (void) path; + + res = ftruncate(fi->fh, size); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_utimens(const char *path, const struct timespec ts[2]) +{ + int res; + struct timeval tv[2]; + + tv[0].tv_sec = ts[0].tv_sec; + tv[0].tv_usec = ts[0].tv_nsec / 1000; + tv[1].tv_sec = ts[1].tv_sec; + tv[1].tv_usec = ts[1].tv_nsec / 1000; + + res = utimes(path, tv); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_create(const char *path, mode_t mode, struct fuse_file_info *fi) +{ + int fd; + + fd = open(path, fi->flags, mode); + if (fd == -1) + return -errno; + + fi->fh = fd; + return 0; +} + +static int xmp_open(const char *path, struct fuse_file_info *fi) +{ + int fd; + + fd = open(path, fi->flags); + if (fd == -1) + return -errno; + + fi->fh = fd; + return 0; +} + +static int xmp_read(const char *path, char *buf, size_t size, off_t offset, + struct fuse_file_info *fi) +{ + int res; + + (void) path; + res = pread(fi->fh, buf, size, offset); + if (res == -1) + res = -errno; + + return res; +} + +static int xmp_write(const char *path, const char *buf, size_t size, + off_t offset, struct fuse_file_info *fi) +{ + int res; + + (void) path; + res = pwrite(fi->fh, buf, size, offset); + if (res == -1) + res = -errno; + + return res; +} + +static int xmp_statfs(const char *path, struct statvfs *stbuf) +{ + int res; + + res = statvfs(path, stbuf); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_flush(const char *path, struct fuse_file_info *fi) +{ + int res; + + (void) path; + /* This is called from every close on an open file, so call the + close on the underlying filesystem. But since flush may be + called multiple times for an open file, this must not really + close the file. This is important if used on a network + filesystem like NFS which flush the data/metadata on close() */ + res = close(dup(fi->fh)); + if (res == -1) + return -errno; + + return 0; +} + +static int xmp_release(const char *path, struct fuse_file_info *fi) +{ + (void) path; + close(fi->fh); + + return 0; +} + +static int xmp_fsync(const char *path, int isdatasync, + struct fuse_file_info *fi) +{ + int res; + (void) path; + +#ifndef HAVE_FDATASYNC + (void) isdatasync; +#else + if (isdatasync) + res = fdatasync(fi->fh); + else +#endif + res = fsync(fi->fh); + if (res == -1) + return -errno; + + return 0; +} + +#ifdef HAVE_SETXATTR +/* xattr operations are optional and can safely be left unimplemented */ +static int xmp_setxattr(const char *path, const char *name, const char *value, + size_t size, int flags) +{ + int res = lsetxattr(path, name, value, size, flags); + if (res == -1) + return -errno; + return 0; +} + +static int xmp_getxattr(const char *path, const char *name, char *value, + size_t size) +{ + int res = lgetxattr(path, name, value, size); + if (res == -1) + return -errno; + return res; +} + +static int xmp_listxattr(const char *path, char *list, size_t size) +{ + int res = llistxattr(path, list, size); + if (res == -1) + return -errno; + return res; +} + +static int xmp_removexattr(const char *path, const char *name) +{ + int res = lremovexattr(path, name); + if (res == -1) + return -errno; + return 0; +} +#endif /* HAVE_SETXATTR */ + +static int xmp_lock(const char *path, struct fuse_file_info *fi, int cmd, + struct flock *lock) +{ + (void) path; + + return ulockmgr_op(fi->fh, cmd, lock, &fi->lock_owner, + sizeof(fi->lock_owner)); +} + +static struct fuse_operations xmp_oper = { + .getattr = xmp_getattr, + .fgetattr = xmp_fgetattr, + .access = xmp_access, + .readlink = xmp_readlink, + .opendir = xmp_opendir, + .readdir = xmp_readdir, + .releasedir = xmp_releasedir, + .mknod = xmp_mknod, + .mkdir = xmp_mkdir, + .symlink = xmp_symlink, + .unlink = xmp_unlink, + .rmdir = xmp_rmdir, + .rename = xmp_rename, + .link = xmp_link, + .chmod = xmp_chmod, + .chown = xmp_chown, + .truncate = xmp_truncate, + .ftruncate = xmp_ftruncate, + .utimens = xmp_utimens, + .create = xmp_create, + .open = xmp_open, + .read = xmp_read, + .write = xmp_write, + .statfs = xmp_statfs, + .flush = xmp_flush, + .release = xmp_release, + .fsync = xmp_fsync, +#ifdef HAVE_SETXATTR + .setxattr = xmp_setxattr, + .getxattr = xmp_getxattr, + .listxattr = xmp_listxattr, + .removexattr = xmp_removexattr, +#endif + .lock = xmp_lock, + + .flag_nullpath_ok = 1, +}; + +int main(int argc, char *argv[]) +{ + umask(0); + return fuse_main(argc, argv, &xmp_oper, NULL); +} diff --git a/fuse/guestmount.c b/fuse/guestmount.c new file mode 100644 index 0000000..c949e6a --- /dev/null +++ b/fuse/guestmount.c @@ -0,0 +1,844 @@ +/* guestmount - mount guests using libguestfs and FUSE + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Derived from the example program 'fusexmp.c': + * Copyright (C) 2001-2007 Miklos Szeredi <miklos at szeredi.hu> + * + * This program can be distributed under the terms of the GNU GPL. + * See the file COPYING. + */ + +#define FUSE_USE_VERSION 26 + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <string.h> +#include <unistd.h> +#include <getopt.h> +#include <fcntl.h> +#include <dirent.h> +#include <errno.h> +#include <signal.h> +#include <sys/time.h> +#include <sys/types.h> + +#include <fuse.h> +#include <guestfs.h> + +#include "progname.h" + +/* See <attr/xattr.h> */ +#ifndef ENOATTR +#define ENOATTR ENODATA +#endif + +#ifdef HAVE_GETTEXT +#include "gettext.h" +#define _(str) dgettext(PACKAGE, (str)) +//#define N_(str) dgettext(PACKAGE, (str)) +#else +#define _(str) str +//#define N_(str) str +#endif + +static inline char * +bad_cast (char const *s) +{ + return (char *) s; +} + +static guestfs_h *g = NULL; +static int read_only = 0; +static int verbose = 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 + +static int +error (void) +{ + int i; + const char *err = guestfs_last_error (g); + + if (!err) + return -EINVAL; + + /* Print the real error message on stderr. */ + fprintf (stderr, "%s\n", err); + + /* Now 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; +} + +static int +fg_getattr (const char *path, struct stat *statbuf) +{ + struct guestfs_stat *r; + + r = guestfs_lstat (g, path); + if (r == NULL) + return error (); + + statbuf->st_dev = r->dev; + statbuf->st_ino = r->ino; + statbuf->st_mode = r->mode; + statbuf->st_nlink = r->nlink; + statbuf->st_uid = r->uid; + statbuf->st_gid = r->gid; + statbuf->st_rdev = r->rdev; + statbuf->st_size = r->size; + statbuf->st_blksize = r->blksize; + statbuf->st_blocks = r->blocks; + statbuf->st_atime = r->atime; + statbuf->st_mtime = r->mtime; + statbuf->st_ctime = r->ctime; + + guestfs_free_stat (r); + + return 0; +} + +/* XXX It's not clear what access is being tested here. If this + * daemon runs as root, then access always succeeds. The guestfsd + * always runs as root, so no access test there is possible. + */ +static int +fg_access (const char *path, int mask) +{ + int r = guestfs_exists (g, path); + if (r == -1) + return error (); + + if (mask == F_OK) + return r ? 0 : -EACCES; + + int ok = 1; + /* if the file exists, it's readable */ + if (mask & R_OK) + ok &= r; + /* if the file exists and we're not mounted r/o, it's writable */ + if (mask & W_OK) + ok &= r & !read_only; + /* if the file exists, presume it's executable here */ + if (mask & X_OK) + ok &= r; + return ok; +} + +static int +fg_readlink (const char *path, char *buf, size_t size) +{ + char *r; + + r = guestfs_readlink (g, path); + if (r == NULL) + return error (); + + /* Note this is different from the real readlink(2) syscall. FUSE wants + * the string to be always nul-terminated, even if truncated. + */ + size_t len = strlen (r); + if (len > size - 1) + len = size - 1; + + memcpy (buf, r, len); + buf[len] = '\0'; + + free (r); + + return 0; +} + +static int +fg_readdir (const char *path, void *buf, fuse_fill_dir_t filler, + off_t offset, struct fuse_file_info *fi) +{ + struct guestfs_dirent_list *ents; + + ents = guestfs_readdir (g, path); + if (ents == NULL) + return error (); + + size_t i; + for (i = 0; i < ents->len; ++i) { + struct stat stat; + memset (&stat, 0, sizeof stat); + + stat.st_ino = ents->val[i].ino; + switch (ents->val[i].ftyp) { + case 'b': stat.st_mode = S_IFBLK; break; + case 'c': stat.st_mode = S_IFCHR; break; + case 'd': stat.st_mode = S_IFDIR; break; + case 'f': stat.st_mode = S_IFIFO; break; + case 'l': stat.st_mode = S_IFLNK; break; + case 'r': stat.st_mode = S_IFREG; break; + case 's': stat.st_mode = S_IFSOCK; break; + case 'u': + case '?': + default: stat.st_mode = 0; + } + + /* Copied from the example, which also ignores 'offset'. I'm + * not quite sure how this is ever supposed to work on large + * directories. XXX + */ + if (filler (buf, ents->val[i].name, &stat, 0)) + break; + } + + guestfs_free_dirent_list (ents); + + return 0; +} + +static int +fg_mknod (const char *path, mode_t mode, dev_t rdev) +{ + int r; + + r = guestfs_mknod (g, mode, major (rdev), minor (rdev), path); + if (r == -1) + return error (); + + return 0; +} + +static int +fg_mkdir (const char *path, mode_t mode) +{ + int r; + + r = guestfs_mkdir_mode (g, path, mode); + if (r == -1) + return error (); + + return 0; +} + +static int +fg_unlink (const char *path) +{ + int r; + + r = guestfs_rm (g, path); + if (r == -1) + return error (); + + return 0; +} + +static int +fg_rmdir (const char *path) +{ + int r; + + r = guestfs_rmdir (g, path); + if (r == -1) + return error (); + + return 0; +} + +static int +fg_symlink (const char *from, const char *to) +{ + int r; + + r = guestfs_ln_s (g, to, from); + if (r == -1) + return error (); + + return 0; +} + +static int +fg_rename (const char *from, const char *to) +{ + int r; + + /* XXX It's not clear how close the 'mv' command is to the + * rename syscall. We might need to add the rename syscall + * to the guestfs(3) API. + */ + r = guestfs_mv (g, from, to); + if (r == -1) + return error (); + + return 0; +} + +static int +fg_link (const char *from, const char *to) +{ + int r; + + r = guestfs_ln (g, to, from); + if (r == -1) + return error (); + + return 0; +} + +static int +fg_chmod (const char *path, mode_t mode) +{ + int r; + + r = guestfs_chmod (g, mode, path); + if (r == -1) + return error (); + + return 0; +} + +static int +fg_chown (const char *path, uid_t uid, gid_t gid) +{ + int r; + + /* XXX Example uses lchown here. */ + r = guestfs_chown (g, uid, gid, path); + if (r == -1) + return error (); + + return 0; +} + +static int +fg_truncate (const char *path, off_t size) +{ + int r; + + r = guestfs_truncate_size (g, path, size); + if (r == -1) + return error (); + + return 0; +} + +static int +fg_utimens (const char *path, const struct timespec ts[2]) +{ + int r; + + time_t atsecs = ts[0].tv_sec; + long atnsecs = ts[0].tv_nsec; + time_t mtsecs = ts[1].tv_sec; + long mtnsecs = ts[1].tv_nsec; + + if (atnsecs == UTIME_NOW) + atnsecs = -1; + if (atnsecs == UTIME_OMIT) + atnsecs = -2; + if (mtnsecs == UTIME_NOW) + mtnsecs = -1; + if (mtnsecs == UTIME_OMIT) + mtnsecs = -2; + + r = guestfs_utimens (g, path, atsecs, atnsecs, mtsecs, mtnsecs); + if (r == -1) + return error (); + + 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. + */ +static int +fg_open (const char *path, struct fuse_file_info *fi) +{ + int r, exists; + + 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) { + /* 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; + } + + return 0; +} + +static int +fg_read (const char *path, char *buf, size_t size, off_t offset, + struct fuse_file_info *fi) +{ + return -ENOSYS; /* XXX */ +} + +static int +fg_write (const char *path, const char *buf, size_t size, + off_t offset, struct fuse_file_info *fi) +{ + return -ENOSYS; /* XXX */ +} + +static int +fg_statfs (const char *path, struct statvfs *stbuf) +{ + struct guestfs_statvfs *r; + + r = guestfs_statvfs (g, path); + if (r == NULL) + return error (); + + stbuf->f_bsize = r->bsize; + stbuf->f_frsize = r->frsize; + stbuf->f_blocks = r->blocks; + stbuf->f_bfree = r->bfree; + stbuf->f_bavail = r->bavail; + stbuf->f_files = r->files; + stbuf->f_ffree = r->ffree; + stbuf->f_favail = r->favail; + stbuf->f_fsid = r->fsid; + stbuf->f_flag = r->flag; + stbuf->f_namemax = r->namemax; + + guestfs_free_statvfs (r); + + return 0; +} + +static int +fg_release (const char *path, struct fuse_file_info *fi) +{ + /* Just a stub. This method is optional and can safely be left + * unimplemented. + */ + return 0; +} + +/* Emulate this by calling sync. */ +static int fg_fsync(const char *path, int isdatasync, + struct fuse_file_info *fi) +{ + int r; + + r = guestfs_sync (g); + if (r == -1) + return error (); + + return 0; +} + +static int +fg_setxattr (const char *path, const char *name, const char *value, + size_t size, int flags) +{ + int r; + + /* XXX Underlying guestfs(3) API doesn't understand the flags. */ + r = guestfs_lsetxattr (g, name, value, size, path); + if (r == -1) + return error (); + + return 0; +} + +/* The guestfs(3) API for getting xattrs is much easier to use + * than the real syscall. Unfortunately we now have to emulate + * the real syscall using that API :-( + */ +static int +fg_getxattr (const char *path, const char *name, char *value, + size_t size) +{ + struct guestfs_xattr_list *attrs; + + attrs = guestfs_lgetxattrs (g, path); + if (attrs == NULL) + return error (); + + size_t i; + int r = -ENOATTR; + for (i = 0; i < attrs->len; ++i) { + if (strcmp (attrs->val[i].attrname, name) == 0) { + size_t sz = attrs->val[i].attrval_len; + if (sz > size) + sz = size; + memcpy (value, attrs->val[i].attrval, sz); + r = 0; + break; + } + } + + guestfs_free_xattr_list (attrs); + + return r; +} + +/* Ditto as above. */ +static int +fg_listxattr (const char *path, char *list, size_t size) +{ + struct guestfs_xattr_list *attrs; + + attrs = guestfs_lgetxattrs (g, path); + if (attrs == NULL) + return error (); + + size_t i; + ssize_t copied = 0; + for (i = 0; i < attrs->len; ++i) { + size_t len = strlen (attrs->val[i].attrname) + 1; + if (size >= len) { + memcpy (list, attrs->val[i].attrname, len); + size -= len; + list += len; + copied += len; + } else { + copied = -ERANGE; + break; + } + } + + guestfs_free_xattr_list (attrs); + + return copied; +} + +static int +fg_removexattr(const char *path, const char *name) +{ + int r; + + r = guestfs_lremovexattr (g, name, path); + if (r == -1) + return error (); + + return 0; +} + +static struct fuse_operations fg_operations = { + .getattr = fg_getattr, + .access = fg_access, + .readlink = fg_readlink, + .readdir = fg_readdir, + .mknod = fg_mknod, + .mkdir = fg_mkdir, + .symlink = fg_symlink, + .unlink = fg_unlink, + .rmdir = fg_rmdir, + .rename = fg_rename, + .link = fg_link, + .chmod = fg_chmod, + .chown = fg_chown, + .truncate = fg_truncate, + .utimens = fg_utimens, + .open = fg_open, + .read = fg_read, + .write = fg_write, + .statfs = fg_statfs, + .release = fg_release, + .fsync = fg_fsync, + .setxattr = fg_setxattr, + .getxattr = fg_getxattr, + .listxattr = fg_listxattr, + .removexattr = fg_removexattr, +}; + +struct drv { + struct drv *next; + char *filename; +}; + +struct mp { + struct mp *next; + char *device; + char *mountpoint; +}; + +static void add_drives (struct drv *); +static void mount_mps (struct mp *); + +static void __attribute__((noreturn)) +usage (int status) +{ + if (status != EXIT_SUCCESS) + fprintf (stderr, _("Try `%s --help' for more information.\n"), + program_name); + else { + fprintf (stdout, + _("%s: FUSE module for libguestfs\n" + "%s lets you mount a virtual machine filesystem\n" + "Copyright (C) 2009 Red Hat Inc.\n" + "Usage:\n" + " %s [--options] [-- [--fuse-options]] mountpoint\n" + "Options:\n" + " -a|--add image Add image\n" + " -f|--file file Read commands from file\n" + " -m|--mount dev[:mnt] Mount dev on mnt (if omitted, /)\n" + " -n|--no-sync Don't autosync\n" + " -r|--ro Mount read-only\n" + " --selinux Enable SELinux support\n" + " --trace Trace guestfs API calls (to stderr)\n" + " -v|--verbose Verbose messages\n" + " -V|--version Display version and exit\n" + "FUSE options aren't documented here. To get a list of options\n" + "supported by FUSE itself, do:\n" + " %s -- --help\n" + ), + program_name, program_name, program_name, program_name); + } + exit (status); +} + +int +main (int argc, char *argv[]) +{ + enum { HELP_OPTION = CHAR_MAX + 1 }; + + /* 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:m:nrv?V"; + static const struct option long_options[] = { + { "add", 1, 0, 'a' }, + { "help", 0, 0, HELP_OPTION }, + { "mount", 1, 0, 'm' }, + { "no-sync", 0, 0, 'n' }, + { "ro", 0, 0, 'r' }, + { "selinux", 0, 0, 0 }, + { "trace", 0, 0, 0 }, + { "verbose", 0, 0, 'v' }, + { "version", 0, 0, 'V' }, + { 0, 0, 0, 0 } + }; + + struct drv *drvs = NULL; + struct drv *drv; + struct mp *mps = NULL; + struct mp *mp; + char *p; + int c, i; + int option_index; + struct sigaction sa; + + /* LC_ALL=C is required so we can parse error messages. */ + setenv ("LC_ALL", "C", 1); + + /* Set global program name that is not polluted with libtool artifacts. */ + set_program_name (argv[0]); + + memset (&sa, 0, sizeof sa); + sa.sa_handler = SIG_IGN; + sa.sa_flags = SA_RESTART; + sigaction (SIGPIPE, &sa, NULL); + + g = guestfs_create (); + if (g == NULL) { + fprintf (stderr, _("guestfs_create: failed to create handle\n")); + exit (1); + } + + guestfs_set_autosync (g, 1); + + /* If developing, add ./appliance to the path. Note that libtools + * interferes with this because uninstalled guestfish is a shell + * script that runs the real program with an absolute path. Detect + * that too. + * + * BUT if LIBGUESTFS_PATH environment variable is already set by + * the user, then don't override it. + */ + if (getenv ("LIBGUESTFS_PATH") == NULL && + argv[0] && + (argv[0][0] != '/' || strstr (argv[0], "/.libs/lt-") != NULL)) + guestfs_set_path (g, "appliance:" GUESTFS_DEFAULT_PATH); + + for (;;) { + c = getopt_long (argc, argv, options, long_options, &option_index); + if (c == -1) break; + + switch (c) { + case 0: /* options which are long only */ + if (strcmp (long_options[option_index].name, "selinux") == 0) + guestfs_set_selinux (g, 1); + else if (strcmp (long_options[option_index].name, "trace") == 0) + guestfs_set_trace (g, 1); + else { + fprintf (stderr, _("%s: unknown long option: %s (%d)\n"), + program_name, long_options[option_index].name, option_index); + exit (1); + } + break; + + case 'a': + if (access (optarg, R_OK) != 0) { + perror (optarg); + exit (1); + } + drv = malloc (sizeof (struct drv)); + if (!drv) { + perror ("malloc"); + exit (1); + } + drv->filename = optarg; + drv->next = drvs; + drvs = drv; + break; + + case 'm': + mp = malloc (sizeof (struct mp)); + if (!mp) { + perror ("malloc"); + exit (1); + } + p = strchr (optarg, ':'); + if (p) { + *p = '\0'; + mp->mountpoint = p+1; + } else + mp->mountpoint = bad_cast ("/"); + mp->device = optarg; + mp->next = mps; + mps = mp; + break; + + case 'n': + guestfs_set_autosync (g, 0); + break; + + case 'r': + read_only = 1; + break; + + case 'v': + verbose++; + guestfs_set_verbose (g, verbose); + break; + + case 'V': + printf ("%s %s\n", program_name, PACKAGE_VERSION); + exit (0); + + case HELP_OPTION: + usage (0); + + default: + usage (1); + } + } + + /* We must have at least one -a and at least one -m. */ + if (!drvs || !mps) { + fprintf (stderr, + _("%s: must have at least one -a and at least one -m option\n"), + program_name); + exit (1); + } + + add_drives (drvs); + if (guestfs_launch (g) == -1) + exit (1); + mount_mps (mps); + + /* FUSE example does this, not clear if it's necessary, but ... */ + if (guestfs_umask (g, 0) == -1) + exit (1); + + /* At the last minute, remove the libguestfs error handler. In code + * above this point, the default error handler has been used which + * sends all errors to stderr. Now before entering FUSE itself we + * want to silence errors so we can convert them (see error() + * function above). + */ + guestfs_set_error_handler (g, NULL, NULL); + + /* Skip our args. Rest are passed to FUSE. */ + argc -= optind-1; + for (i = 1; i <= argc; ++i) + argv[i] = argv[optind+i-1]; + + /* Enter FUSE main loop. */ + return fuse_main (argc, argv, &fg_operations, NULL); +} + +/* List is built in reverse order, so add them in reverse order. */ +static void +add_drives (struct drv *drv) +{ + int r; + + if (drv) { + add_drives (drv->next); + if (!read_only) + r = guestfs_add_drive (g, drv->filename); + else + r = guestfs_add_drive_ro (g, drv->filename); + if (r == -1) + exit (1); + } +} + +/* List is built in reverse order, so mount them in reverse order. */ +static void +mount_mps (struct mp *mp) +{ + int r; + + if (mp) { + mount_mps (mp->next); + if (!read_only) + r = guestfs_mount (g, mp->device, mp->mountpoint); + else + r = guestfs_mount_ro (g, mp->device, mp->mountpoint); + if (r == -1) + exit (1); + } +} diff --git a/po/POTFILES.in b/po/POTFILES.in index 8c3c8f5..d2bfcc0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -71,6 +71,9 @@ fish/rc.c fish/reopen.c fish/tilde.c fish/time.c +fuse/fusexmp.c +fuse/fusexmp_fh.c +fuse/guestmount.c hivex/hivex.c hivex/hivexget.c hivex/hivexml.c -- 1.6.5.rc2
Reasonably Related Threads
- [PATCH 0/3 VERSION 3 FOR DISCUSSION ONLY] FUSE support for libguestfs
- [PATCH 0/9] FOR DISCUSSION ONLY: daemon error handling
- libguestfs mounting solaris 10 ZFS guest
- [ANNOUNCE] libguestfs 1.8.0 - tools for accessing and modifying VM disk images
- Use of guestmount