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

[captive.git] / src / client / cmdline / main.c

diff --git a/src/client/cmdline/main.c b/src/client/cmdline/main.c
index 2bf5bd0..76a5be7 100644 (file)
--- a/src/client/cmdline/main.c
+++ b/src/client/cmdline/main.c
@@ -29,6 +29,7 @@
 #include <locale.h>
 
 #include <captive/client-vfs.h>
+#include <captive/client.h>
 
 #include "main.h"      /* self */
 #include "cmd_shell.h"
@@ -260,17 +261,7 @@ struct captive_options options;
         * to restart failed children due to communication-failure alarms.
         */
 
-       /* Prevent output block buffering if redirecting stdout to file. */
-       setvbuf(stdout,(char *)NULL,_IONBF,0);
-       setvbuf(stderr,(char *)NULL,_IONBF,0);
-
-       /* Initialize the i18n stuff */
-       setlocale(LC_ALL,"");
-       bindtextdomain(PACKAGE,LOCALEDIR);
-       textdomain(PACKAGE);
-
-       /* Initialize GObject subsystem of GLib. */
-       g_type_init();
+       captive_standalone_init();
 
        captive_options_init(&options);
        captive_options=&options;       /* for parsing by 'CAPTIVE_POPT_INCLUDE' */