Syntax change: <cmd> [<cmd_args>] <image> -> <image> <cmd> [<cmd_args>]

diff --git a/src/client/cmdline/main.c b/src/client/cmdline/main.c
index 29643c9..b70e29d 100644 (file)
--- a/src/client/cmdline/main.c
+++ b/src/client/cmdline/main.c
@@ -224,11 +224,15 @@ const char *cmd_cd_root_args[]={"/",NULL};
        if (TRUE!=captive_init(NULL,    /* captive_args; already parsed above */
                        (               /* image_iochannel */
                                        !cmd_argc ? NULL : g_io_channel_new_file(       /* FIXME: g_io_channel_new_file() is NOT 64-bit compliant! */
-                                                       cmd_argv[cmd_argc-1],   /* filename */
+                                                       cmd_argv[0],    /* filename */
                                                        (captive_option_rwmode==CAPTIVE_OPTION_RWMODE_RW ? "r+" : "r"), /* mode */
                                                        NULL))))        /* error */
                g_error(_("captive_init image_iochannel FAIL"));
-       cmd_argc--;     /* image file */
+       if (cmd_argc>0) {
+               /* image file */
+               cmd_argc--;
+               cmd_argv++;
+               }
 
        cmd_cd(cmd_cd_root_args,&gerr);
        if (gerr) {