mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-02-08 19:34:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

(mc_setup_by_args): refactoring of arguments handling.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2015-05-09 16:33:27 +03:00
parent bc3f049885
commit 3ba8109fe9
1 changed files with 34 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/args.c
View File

@ -172,15 +172,16 @@ static const GOptionEntry argument_main_table[] = {
}, },
#endif /* ENABLE_VFS_SMB */ #endif /* ENABLE_VFS_SMB */
/* single file operations */
{ {
"view", 'v', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, /* handle arguments manually */
"view", 'v', G_OPTION_FLAG_IN_MAIN | G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
parse_mc_v_argument, parse_mc_v_argument,
N_("Launches the file viewer on a file"), N_("Launches the file viewer on a file"),
"<file>" "<file>"
}, },
{ {
/* handle arguments manually */
"edit", 'e', G_OPTION_FLAG_IN_MAIN | G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, "edit", 'e', G_OPTION_FLAG_IN_MAIN | G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
parse_mc_e_argument, parse_mc_e_argument,
N_("Edit files"), N_("Edit files"),
@ -461,7 +462,6 @@ parse_mc_v_argument (const gchar * option_name, const gchar * value, gpointer da
mc_return_val_if_error (mcerror, FALSE); mc_return_val_if_error (mcerror, FALSE);
mc_global.mc_run_mode = MC_RUN_VIEWER; mc_global.mc_run_mode = MC_RUN_VIEWER;
mc_run_param0 = g_strdup (value);
return TRUE; return TRUE;
} }
@ -616,7 +616,6 @@ mc_args_parse (int *argc, char ***argv, const char *translation_domain, GError *
if (!g_option_context_parse (context, argc, argv, mcerror)) if (!g_option_context_parse (context, argc, argv, mcerror))
{ {
if (*mcerror == NULL) if (*mcerror == NULL)
mc_propagate_error (mcerror, 0, "%s\n", _("Arguments parse error!")); mc_propagate_error (mcerror, 0, "%s\n", _("Arguments parse error!"));
else else
@ -732,76 +731,60 @@ mc_setup_by_args (int argc, char **argv, GError ** mcerror)
if (strncmp (base, "mce", 3) == 0 || strcmp (base, "vi") == 0) if (strncmp (base, "mce", 3) == 0 || strcmp (base, "vi") == 0)
{ {
/* mce* or vi is link to mc */ /* mce* or vi is link to mc */
mc_run_param0 = parse_mcedit_arguments (argc - 1, &argv[1]);
mc_global.mc_run_mode = MC_RUN_EDITOR; mc_global.mc_run_mode = MC_RUN_EDITOR;
} }
else if (strncmp (base, "mcv", 3) == 0 || strcmp (base, "view") == 0) else if (strncmp (base, "mcv", 3) == 0 || strcmp (base, "view") == 0)
{ {
/* mcv* or view is link to mc */ /* mcv* or view is link to mc */
if (tmp != NULL)
mc_run_param0 = g_strdup (tmp);
else
{
mc_propagate_error (mcerror, 0, "%s\n", _("No arguments given to the viewer."));
return FALSE;
}
mc_global.mc_run_mode = MC_RUN_VIEWER; mc_global.mc_run_mode = MC_RUN_VIEWER;
} }
#ifdef USE_DIFF_VIEW #ifdef USE_DIFF_VIEW
else if (strncmp (base, "mcd", 3) == 0 || strcmp (base, "diff") == 0) else if (strncmp (base, "mcd", 3) == 0 || strcmp (base, "diff") == 0)
{ {
/* mcd* or diff is link to mc */ /* mcd* or diff is link to mc */
mc_global.mc_run_mode = MC_RUN_DIFFVIEWER;
}
#endif /* USE_DIFF_VIEW */
if (argc < 3) switch (mc_global.mc_run_mode)
{
case MC_RUN_EDITOR:
mc_run_param0 = parse_mcedit_arguments (argc - 1, &argv[1]);
break;
case MC_RUN_VIEWER:
if (tmp == NULL)
{ {
mc_propagate_error (mcerror, 0, "%s\n", mc_propagate_error (mcerror, 0, "%s\n", _("No arguments given to the viewer."));
_("Two files are required to evoke the diffviewer."));
return FALSE; return FALSE;
} }
mc_run_param0 = g_strdup (tmp);
break;
#ifdef USE_DIFF_VIEW
case MC_RUN_DIFFVIEWER:
if (argc < 3)
{
mc_propagate_error (mcerror, 0, "%s\n",
_("Two files are required to envoke the diffviewer."));
return FALSE;
}
/* fallthrough */
#endif /* USE_DIFF_VIEW */
case MC_RUN_FULL:
default:
/* set the current dir and the other dir for filemanager,
or two files for diff viewer */
if (tmp != NULL) if (tmp != NULL)
{ {
mc_run_param0 = g_strdup (tmp); mc_run_param0 = g_strdup (tmp);
tmp = (argc > 1) ? argv[2] : NULL; tmp = (argc > 1) ? argv[2] : NULL;
if (tmp != NULL) if (tmp != NULL)
mc_run_param1 = g_strdup (tmp); mc_run_param1 = g_strdup (tmp);
mc_global.mc_run_mode = MC_RUN_DIFFVIEWER;
}
}
#endif /* USE_DIFF_VIEW */
else
{
/* MC is run as mc */
switch (mc_global.mc_run_mode)
{
case MC_RUN_EDITOR:
mc_run_param0 = parse_mcedit_arguments (argc - 1, &argv[1]);
break;
case MC_RUN_VIEWER:
/* mc_run_param0 is set up in parse_mc_v_argument() */
break;
case MC_RUN_DIFFVIEWER:
/* not implemented yet */
break;
case MC_RUN_FULL:
default:
/* sets the current dir and the other dir */
if (tmp != NULL)
{
mc_run_param0 = g_strdup (tmp);
tmp = (argc > 1) ? argv[2] : NULL;
if (tmp != NULL)
mc_run_param1 = g_strdup (tmp);
}
mc_global.mc_run_mode = MC_RUN_FULL;
break;
} }
break;
} }
return TRUE; return TRUE;