Initial original import from: fuse-2.4.2-2.fc4

[captive.git] / src / libcaptive / include / captive / options.h

diff --git a/src/libcaptive/include/captive/options.h b/src/libcaptive/include/captive/options.h
index 41c1e15..02b4124 100644 (file)
--- a/src/libcaptive/include/captive/options.h
+++ b/src/libcaptive/include/captive/options.h
@@ -25,6 +25,7 @@
 #include <glib/giochannel.h>
 #include <popt.h>
 #include <glib/glist.h>
+#include "captive/options-module.h"
 
 
 G_BEGIN_DECLS
@@ -39,23 +40,32 @@ enum captive_option_rwmode {
        CAPTIVE_OPTION_RWMODE_BLIND,
        CAPTIVE_OPTION_RWMODE_RW,
        };
+typedef
+               enum captive_option_rwmode captive_option_rwmode_t;
 
 enum captive_option_media {
+       CAPTIVE_OPTION_MEDIA_UNKNOWN,
        CAPTIVE_OPTION_MEDIA_CDROM,
        CAPTIVE_OPTION_MEDIA_DISK,
        };
 
 struct captive_options {
-       gchar *filesystem;
+       struct captive_options_module filesystem;
        enum captive_option_rwmode rwmode;
        enum captive_option_media media;
        gboolean debug_messages;
        GIOChannel *image_iochannel;
-       GList *load_module;     /* of 'gchar *' */
+       GList *load_module;     /* of 'struct captive_options_module *' */
+       gboolean sandbox;
+       char **sandbox_server_argv;
+       gchar *sandbox_server_ior;
+       gchar *bug_pathname;
+       int syslog_facility;    /* LOG_*; -1 if not used */
        };
 
 /**
  * captive_options:
+ *
  * Current options set in one CORBA sandboxed child.
  * It is also set when run in non-CORBA debugging mode.
  * Set to %NULL in the CORBA master process.