Fixed 'command_name --help' to prevent exit of captive-cmdline(1).

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

diff --git a/src/client/cmdline/cmd_mv.c b/src/client/cmdline/cmd_mv.c
index 942f859..7ccfdae 100644 (file)
--- a/src/client/cmdline/cmd_mv.c
+++ b/src/client/cmdline/cmd_mv.c
@@ -22,7 +22,7 @@
 #include <glib/gmessages.h>
 #include <glib/gerror.h>
 #include <popt.h>
-#include "captive/client-file.h"
+#include <captive/client-file.h>
 
 #include "cmd_mv.h"    /* self */
 #include "cmd_cd.h"    /* for cmdline_path_from_cwd() */
@@ -41,7 +41,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_mv_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 
@@ -58,6 +58,7 @@ const gchar *sourcefile,*targetfile;
 
        if (!errvfsresult_to_gerr(errp,captive_file_new_open(
                        &captive_file_object,   /* captive_file_object_return */
+                       cmdline_captive_vfs_object,     /* captive_vfs_object */
                        sourcefile,     /* pathname */
                        GNOME_VFS_OPEN_NONE))) {        /* mode */
                err_cleanup(errp);