packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Make argument parsing more robust against "lt-ostree" name 

When running uninstalled, we were parsing our argv[0] incorrectly.
This commit is contained in:
Colin Walters 2012-05-14 11:31:53 -04:00
parent 102180c5f2
commit 6d9de91672
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ostree/ot-main.c
View File

@ -90,6 +90,8 @@ ostree_main (int argc,
char **cmd_argv = NULL; char **cmd_argv = NULL;
gboolean am_root; gboolean am_root;
gboolean have_repo_arg; gboolean have_repo_arg;
const char *binname = NULL;
const char *slash = NULL;
const char *cmd = NULL; const char *cmd = NULL;
const char *repo = NULL; const char *repo = NULL;
GFile *repo_file = NULL; GFile *repo_file = NULL;
@ -118,9 +120,16 @@ ostree_main (int argc,
if (repo) if (repo)
repo_file = ot_gfile_new_for_path (repo); repo_file = ot_gfile_new_for_path (repo);
cmd = strchr (argv[0], '-'); slash = strrchr (argv[0], '/');
if (cmd) if (slash)
binname = slash+1;
else
binname = argv[0];
if (g_str_has_prefix (binname, "ostree-"))
{ {
cmd = strchr (binname, '-');
g_assert (cmd);
cmd += 1; cmd += 1;
arg_off = 1; arg_off = 1;
if (have_repo_arg) if (have_repo_arg)
@ -147,7 +156,8 @@ ostree_main (int argc,
if (!builtin->name) if (!builtin->name)
{ {
set_error_print_usage (&error, builtins, "Unknown command", argv); ot_lfree char *msg = g_strdup_printf ("Unknown command '%s'", cmd);
set_error_print_usage (&error, builtins, msg, argv);
goto out; goto out;
} }