mirror of https://github.com/djcb/mu.git
* mu: fix some problems with the option parser (so e.g. --version works again)
This commit is contained in:
parent
0aa1cd573d
commit
631e9c20f8
|
@ -479,9 +479,14 @@ cmd_from_string (const char *str)
|
||||||
for (i = 0; i != G_N_ELEMENTS(cmd_map); ++i)
|
for (i = 0; i != G_N_ELEMENTS(cmd_map); ++i)
|
||||||
if (strcmp (str, cmd_map[i].name) == 0)
|
if (strcmp (str, cmd_map[i].name) == 0)
|
||||||
return cmd_map[i].cmd;
|
return cmd_map[i].cmd;
|
||||||
|
#ifdef BUILD_GUILE
|
||||||
|
/* if we don't recognize it and it's not an option, it may be
|
||||||
|
* some script */
|
||||||
|
if (str[0] == '-')
|
||||||
|
return MU_CONFIG_CMD_SCRIPT;
|
||||||
|
#endif /*BUILD_GUILE*/
|
||||||
|
|
||||||
/* if we don't recognize it, it may be some script */
|
return MU_CONFIG_CMD_UNKNOWN;
|
||||||
return MU_CONFIG_CMD_SCRIPT;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -511,6 +516,14 @@ parse_cmd (int *argcp, char ***argvp, GError **err)
|
||||||
}
|
}
|
||||||
#endif /*!BUILD_GUILE*/
|
#endif /*!BUILD_GUILE*/
|
||||||
|
|
||||||
|
if (MU_CONFIG.cmdstr && MU_CONFIG.cmdstr[0] != '-' &&
|
||||||
|
MU_CONFIG.cmd == MU_CONFIG_CMD_UNKNOWN) {
|
||||||
|
mu_util_g_set_error (err, MU_ERROR_IN_PARAMETERS,
|
||||||
|
"unknown command '%s'",
|
||||||
|
MU_CONFIG.cmdstr);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue