Fix: error out on leftover arguments
A message that is not in the archive (sent off-list or not yet received): [email protected]
Merged in master, stable-2.10, and stable-2.9.
Thanks,
Jérémie
Quoted 385 lines · Julien Desfossez
All the commands currently ignore leftover arguments, this can lead to wrong usage of the commands and waste of time debugging. For example, this command enables the vpid context on all channels instead of only on the "mychan" channel:
$ lttng add-context -u mychan -t vpidThe correct usage is:
$ lttng add-context -u -c mychan -t vpidWe now output an error on leftover arguments:
$ lttng add-context -u mychan -t vpid Error: Unknown argument: mychan Error: Command errorSome commands accept one leftover argument (create, start, stop, destroy), so we check if there are other leftovers:
$ lttng create mysess allo Error: Unknown argument: allo Error: Command errorOnly the snapshot command is not handled since it has a second level of command and does not consume the popt arguments.
Signed-off-by Julien Desfossez <[email protected]>--- src/bin/lttng/commands/add_context.c | 8 ++++++++ src/bin/lttng/commands/create.c | 8 ++++++++ src/bin/lttng/commands/destroy.c | 9 +++++++++ src/bin/lttng/commands/disable_channels.c | 8 ++++++++ src/bin/lttng/commands/disable_events.c | 8 ++++++++ src/bin/lttng/commands/enable_channels.c | 9 +++++++++ src/bin/lttng/commands/enable_events.c | 8 ++++++++ src/bin/lttng/commands/list.c | 9 ++++++++- src/bin/lttng/commands/load.c | 8 ++++++++ src/bin/lttng/commands/save.c | 9 ++++++++- src/bin/lttng/commands/start.c | 8 ++++++++ src/bin/lttng/commands/stop.c | 8 ++++++++ src/bin/lttng/commands/view.c | 8 ++++++++ 13 files changed, 106 insertions(+), 2 deletions(-)src/bin/lttng/commands/add_context.c +8
-0@@ -898,6 +898,7 @@ int cmd_add_context(int argc, const char **argv)static poptContext pc;struct ctx_type *type, *tmptype;char *session_name =NULL ; +const char *leftover =NULL ;if (argc <2 ) { ret =CMD_ERROR ;@@ -944,6 +945,13 @@ int cmd_add_context(int argc, const char **argv) } } + leftover =poptGetArg (pc); +if (leftover) { +ERR ("Unknown argument: %s" , leftover); + ret =CMD_ERROR ; + goto end; + } + ret =print_missing_or_multiple_domains (opt_kernel + opt_userspace + opt_jul + opt_log4j);if (ret) {src/bin/lttng/commands/create.c +8
-0@@ -625,6 +625,7 @@ int cmd_create(int argc, const char **argv) {int opt, ret =CMD_SUCCESS , command_ret =CMD_SUCCESS , success =1 ;char *opt_arg =NULL ; +const char *leftover =NULL ;static poptContext pc; pc =poptGetContext (NULL , argc, argv, long_options,0 );@@ -719,6 +720,13 @@ int cmd_create(int argc, const char **argv) } opt_session_name = (char *)poptGetArg (pc); + leftover =poptGetArg (pc); +if (leftover) { +ERR ("Unknown argument: %s" , leftover); + ret =CMD_ERROR ; + goto end; + } + command_ret =create_session ();if (command_ret) { success =0 ;src/bin/lttng/commands/destroy.c +9
-0@@ -174,6 +174,7 @@ int cmd_destroy(int argc, const char **argv)int ret =CMD_SUCCESS , i, command_ret =CMD_SUCCESS , success =1 ;static poptContext pc;char *session_name =NULL ; +const char *leftover =NULL ;struct lttng_session *sessions;int count;@@ -280,6 +281,14 @@ int cmd_destroy(int argc, const char **argv) } } + leftover =poptGetArg (pc); +if (leftover) { +ERR ("Unknown argument: %s" , leftover); + ret =CMD_ERROR ; + success =0 ; + goto mi_closing; + } + mi_closing:/* Mi closing */ if (lttng_opt_mi) {src/bin/lttng/commands/disable_channels.c +8
-0@@ -216,6 +216,7 @@ int cmd_disable_channels(int argc, const char **argv)int opt, ret =CMD_SUCCESS , command_ret =CMD_SUCCESS , success =1 ;static poptContext pc;char *session_name =NULL ; +const char *leftover =NULL ; pc =poptGetContext (NULL , argc, argv, long_options,0 );poptReadDefaultConfig (pc,0 );@@ -250,6 +251,13 @@ int cmd_disable_channels(int argc, const char **argv) goto end; } + leftover =poptGetArg (pc); +if (leftover) { +ERR ("Unknown argument: %s" , leftover); + ret =CMD_ERROR ; + goto end; + } +if (!opt_session_name) { session_name =get_session_name ();if (session_name ==NULL ) {src/bin/lttng/commands/disable_events.c +8
-0@@ -328,6 +328,7 @@ int cmd_disable_events(int argc, const char **argv)int opt, ret =CMD_SUCCESS , command_ret =CMD_SUCCESS , success =1 ;static poptContext pc;char *session_name =NULL ; +const char *leftover =NULL ;int event_type =-1 ; pc =poptGetContext (NULL , argc, argv, long_options,0 );@@ -398,6 +399,13 @@ int cmd_disable_events(int argc, const char **argv) goto end; } + leftover =poptGetArg (pc); +if (leftover) { +ERR ("Unknown argument: %s" , leftover); + ret =CMD_ERROR ; + goto end; + } +if (!opt_session_name) { session_name =get_session_name ();if (session_name ==NULL ) {src/bin/lttng/commands/enable_channels.c +9
-0@@ -400,6 +400,7 @@ int cmd_enable_channels(int argc, const char **argv)static poptContext pc;char *session_name =NULL ;char *opt_arg =NULL ; +const char *leftover =NULL ;init_channel_config ();@@ -693,6 +694,14 @@ int cmd_enable_channels(int argc, const char **argv) goto mi_closing; } + leftover =poptGetArg (pc); +if (leftover) { +ERR ("Unknown argument: %s" , leftover); + ret =CMD_ERROR ; + success =0 ; + goto mi_closing; + } +if (!opt_session_name) { session_name =get_session_name ();if (session_name ==NULL ) {src/bin/lttng/commands/enable_events.c +8
-0@@ -1264,6 +1264,7 @@ int cmd_enable_events(int argc, const char **argv)int opt, ret =CMD_SUCCESS , command_ret =CMD_SUCCESS , success =1 ;static poptContext pc;char *session_name =NULL ; +const char *leftover =NULL ;int event_type =-1 ; pc =poptGetContext (NULL , argc, argv, long_options,0 );@@ -1363,6 +1364,13 @@ int cmd_enable_events(int argc, const char **argv) goto end; } + leftover =poptGetArg (pc); +if (leftover) { +ERR ("Unknown argument: %s" , leftover); + ret =CMD_ERROR ; + goto end; + } +if (!opt_session_name) { session_name =get_session_name ();if (session_name ==NULL ) {src/bin/lttng/commands/list.c +8
-1@@ -1776,7 +1776,7 @@ end:int cmd_list (int argc,const char **argv) {int opt, ret =CMD_SUCCESS ; -const char *session_name; +const char *session_name, *leftover =NULL ;static poptContext pc;struct lttng_domain domain;struct lttng_domain *domains =NULL ;@@ -1837,6 +1837,13 @@ int cmd_list(int argc, const char **argv) session_name =poptGetArg (pc);DBG2 ("Session name: %s" , session_name); + leftover =poptGetArg (pc); +if (leftover) { +ERR ("Unknown argument: %s" , leftover); + ret =CMD_ERROR ; + goto end; + } +if (opt_kernel) { domain.type =LTTNG_DOMAIN_KERNEL ; }else if (opt_userspace) {src/bin/lttng/commands/load.c +8
-0@@ -163,6 +163,7 @@ int cmd_load(int argc, const char **argv)poptContext pc;struct lttng_load_session_attr *session_attr =NULL ;char *input_path =NULL ; +const char *leftover =NULL ; pc =poptGetContext (NULL , argc, argv, load_opts,0 );poptReadDefaultConfig (pc,0 );@@ -206,6 +207,13 @@ int cmd_load(int argc, const char **argv) } } + leftover =poptGetArg (pc); +if (leftover) { +ERR ("Unknown argument: %s" , leftover); + ret =CMD_ERROR ; + goto end; + } +/* Mi check */ if (lttng_opt_mi) { writer =mi_lttng_writer_create (fileno (stdout), lttng_opt_mi);src/bin/lttng/commands/save.c +8
-1@@ -127,7 +127,7 @@ int cmd_save(int argc, const char **argv) {int ret =CMD_SUCCESS , command_ret =CMD_SUCCESS , success;int opt; -const char *session_name =NULL ; +const char *session_name =NULL , *leftover =NULL ;poptContext pc;struct lttng_save_session_attr *attr;@@ -164,6 +164,13 @@ int cmd_save(int argc, const char **argv) } } + leftover =poptGetArg (pc); +if (leftover) { +ERR ("Unknown argument: %s" , leftover); + ret =CMD_ERROR ; + goto end; + } + attr =lttng_save_session_attr_create ();if (!attr) { ret =CMD_FATAL ;src/bin/lttng/commands/start.c +8
-0@@ -144,6 +144,7 @@ int cmd_start(int argc, const char **argv) {int opt, ret =CMD_SUCCESS , command_ret =CMD_SUCCESS , success =1 ;static poptContext pc; +const char *leftover =NULL ; pc =poptGetContext (NULL , argc, argv, long_options,0 );poptReadDefaultConfig (pc,0 );@@ -164,6 +165,13 @@ int cmd_start(int argc, const char **argv) opt_session_name = (char *)poptGetArg (pc); + leftover =poptGetArg (pc); +if (leftover) { +ERR ("Unknown argument: %s" , leftover); + ret =CMD_ERROR ; + goto end; + } +/* Mi check */ if (lttng_opt_mi) { writer =mi_lttng_writer_create (fileno (stdout), lttng_opt_mi);src/bin/lttng/commands/stop.c +8
-0@@ -172,6 +172,7 @@ int cmd_stop(int argc, const char **argv) {int opt, ret =CMD_SUCCESS , command_ret =CMD_SUCCESS , success =1 ;static poptContext pc; +const char *leftover =NULL ; pc =poptGetContext (NULL , argc, argv, long_options,0 );poptReadDefaultConfig (pc,0 );@@ -228,6 +229,13 @@ int cmd_stop(int argc, const char **argv) opt_session_name = (char *)poptGetArg (pc); + leftover =poptGetArg (pc); +if (leftover) { +ERR ("Unknown argument: %s" , leftover); + ret =CMD_ERROR ; + goto end; + } + command_ret =stop_tracing ();if (command_ret) { success =0 ;src/bin/lttng/commands/view.c +8
-0@@ -415,6 +415,7 @@ int cmd_view(int argc, const char **argv) {int opt, ret =CMD_SUCCESS ;static poptContext pc; +const char *leftover =NULL ; pc =poptGetContext (NULL , argc, argv, long_options,0 );poptReadDefaultConfig (pc,0 );@@ -439,6 +440,13 @@ int cmd_view(int argc, const char **argv) opt_session_name = (char *)poptGetArg (pc); + leftover =poptGetArg (pc); +if (leftover) { +ERR ("Unknown argument: %s" , leftover); + ret =CMD_ERROR ; + goto end; + } + ret =view_trace (); end:Signature · 1 line
2.7.4
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev