Version 1.7.6.

[libguestfs.git] / fish / options.h

diff --git a/fish/options.h b/fish/options.h
index b0bbdeb..9cb7f4b 100644 (file)
--- a/fish/options.h
+++ b/fish/options.h
@@ -69,6 +69,8 @@ extern guestfs_h *g;
 extern int read_only;
 extern int verbose;
 extern int inspector;
 extern int read_only;
 extern int verbose;
 extern int inspector;

+extern int keys_from_stdin;
+extern int echo_keys;

 extern const char *libvirt_uri;
 extern const char *program_name;
 
 extern const char *libvirt_uri;
 extern const char *program_name;
 


@@ -103,6 +105,9 @@ struct mp {
 extern void inspect_mount (void);
 extern void print_inspect_prompt (void);
 
 extern void inspect_mount (void);
 extern void print_inspect_prompt (void);
 

+/* in key.c */
+extern char *read_key (const char *param);
+

 /* in options.c */
 extern char add_drives (struct drv *drv, char next_drive);
 extern void mount_mps (struct mp *mp);
 /* in options.c */
 extern char add_drives (struct drv *drv, char next_drive);
 extern void mount_mps (struct mp *mp);


@@ -180,6 +185,13 @@ extern int add_libvirt_drives (const char *guest);
     exit (EXIT_SUCCESS);                                                \
   }
 
     exit (EXIT_SUCCESS);                                                \
   }
 

+#define OPTION_w                                                        \
+  if (read_only) {                                                      \
+    fprintf (stderr, _("%s: cannot mix --ro and --rw options\n"),       \
+             program_name);                                             \
+    exit (EXIT_FAILURE);                                                \
+  }
+

 #define OPTION_x                                \
   guestfs_set_trace (g, 1)
 
 #define OPTION_x                                \
   guestfs_set_trace (g, 1)