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

diff --git a/src/client/cmdline/cmd_cd.c b/src/client/cmdline/cmd_cd.c
index 4dde314..2b0c762 100644 (file)
--- a/src/client/cmdline/cmd_cd.c
+++ b/src/client/cmdline/cmd_cd.c
@@ -51,7 +51,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_cd_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 

diff --git a/src/client/cmdline/cmd_commit.c b/src/client/cmdline/cmd_commit.c
index 5a90646..3f886dd 100644 (file)
--- a/src/client/cmdline/cmd_commit.c
+++ b/src/client/cmdline/cmd_commit.c
@@ -43,7 +43,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_commit_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 

diff --git a/src/client/cmdline/cmd_get.c b/src/client/cmdline/cmd_get.c
index f73d61e..3d815a9 100644 (file)
--- a/src/client/cmdline/cmd_get.c
+++ b/src/client/cmdline/cmd_get.c
@@ -49,7 +49,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_get_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 

diff --git a/src/client/cmdline/cmd_help.c b/src/client/cmdline/cmd_help.c
index ada33cb..4744f26 100644 (file)
--- a/src/client/cmdline/cmd_help.c
+++ b/src/client/cmdline/cmd_help.c
@@ -42,7 +42,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_help_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 

diff --git a/src/client/cmdline/cmd_info.c b/src/client/cmdline/cmd_info.c
index 0d5edea..edc4f8d 100644 (file)
--- a/src/client/cmdline/cmd_info.c
+++ b/src/client/cmdline/cmd_info.c
@@ -44,7 +44,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_info_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 

diff --git a/src/client/cmdline/cmd_lcd.c b/src/client/cmdline/cmd_lcd.c
index bb0b5ac..b2f1c8d 100644 (file)
--- a/src/client/cmdline/cmd_lcd.c
+++ b/src/client/cmdline/cmd_lcd.c
@@ -30,6 +30,7 @@
 #include <glib/gmem.h>
 
 #include "cmd_lcd.h"   /* self */
+#include "main.h"      /* for CMDLINE_POPT_AUTOHELP */
 
 
 const gchar *cmdline_cwd;
@@ -47,7 +48,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_lcd_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 

diff --git a/src/client/cmdline/cmd_ls.c b/src/client/cmdline/cmd_ls.c
index c1a5fda..e594629 100644 (file)
--- a/src/client/cmdline/cmd_ls.c
+++ b/src/client/cmdline/cmd_ls.c
@@ -44,7 +44,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_ls_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 

diff --git a/src/client/cmdline/cmd_mkdir.c b/src/client/cmdline/cmd_mkdir.c
index caacacb..1a6c4f3 100644 (file)
--- a/src/client/cmdline/cmd_mkdir.c
+++ b/src/client/cmdline/cmd_mkdir.c
@@ -41,7 +41,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_mkdir_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 

diff --git a/src/client/cmdline/cmd_mv.c b/src/client/cmdline/cmd_mv.c
index a86b414..7ccfdae 100644 (file)
--- a/src/client/cmdline/cmd_mv.c
+++ b/src/client/cmdline/cmd_mv.c
@@ -41,7 +41,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_mv_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 

diff --git a/src/client/cmdline/cmd_quit.c b/src/client/cmdline/cmd_quit.c
index a924eb4..e7b0f43 100644 (file)
--- a/src/client/cmdline/cmd_quit.c
+++ b/src/client/cmdline/cmd_quit.c
@@ -41,7 +41,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_quit_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 

diff --git a/src/client/cmdline/cmd_rm.c b/src/client/cmdline/cmd_rm.c
index a8737f0..bf7e847 100644 (file)
--- a/src/client/cmdline/cmd_rm.c
+++ b/src/client/cmdline/cmd_rm.c
@@ -41,7 +41,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_rm_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 

diff --git a/src/client/cmdline/cmd_rmdir.c b/src/client/cmdline/cmd_rmdir.c
index 73c482a..5084e50 100644 (file)
--- a/src/client/cmdline/cmd_rmdir.c
+++ b/src/client/cmdline/cmd_rmdir.c
@@ -41,7 +41,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_rmdir_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 

diff --git a/src/client/cmdline/cmd_shell.c b/src/client/cmdline/cmd_shell.c
index 5e5b3fd..3ea8b44 100644 (file)
--- a/src/client/cmdline/cmd_shell.c
+++ b/src/client/cmdline/cmd_shell.c
@@ -55,7 +55,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_shell_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 

diff --git a/src/client/cmdline/cmd_volume.c b/src/client/cmdline/cmd_volume.c
index ec7bfd9..efa0d26 100644 (file)
--- a/src/client/cmdline/cmd_volume.c
+++ b/src/client/cmdline/cmd_volume.c
@@ -43,7 +43,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_volume_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };