circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-03-25 15:28:49 +00:00
Code Issues Projects Releases Wiki Activity

Make cmd_log_argv take a printf-like format for the prefix.

Browse Source
This commit is contained in:
nicm 2019-05-25 06:58:10 +00:00
parent 0dc8b7d5d8
commit 930245d7ff
3 changed files with 15 additions and 8 deletions

19
cmd.c
View File

@ -205,13 +205,20 @@ const struct cmd_entry *cmd_table[] = {
NULL NULL
}; };
void void printflike(3, 4)
cmd_log_argv(int argc, char **argv, const char *prefix) cmd_log_argv(int argc, char **argv, const char *fmt, ...)
{ {
int i; char *prefix;
va_list ap;
int i;
va_start(ap, fmt);
xvasprintf(&prefix, fmt, ap);
va_end(ap);
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
log_debug("%s: argv[%d]=%s", prefix, i, argv[i]); log_debug("%s: argv[%d]=%s", prefix, i, argv[i]);
free(prefix);
} }
void void
@ -245,7 +252,7 @@ cmd_pack_argv(int argc, char **argv, char *buf, size_t len)
if (argc == 0) if (argc == 0)
return (0); return (0);
cmd_log_argv(argc, argv, __func__); cmd_log_argv(argc, argv, "%s", __func__);
*buf = '\0'; *buf = '\0';
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
@ -282,7 +289,7 @@ cmd_unpack_argv(char *buf, size_t len, int argc, char ***argv)
buf += arglen; buf += arglen;
len -= arglen; len -= arglen;
} }
cmd_log_argv(argc, *argv, __func__); cmd_log_argv(argc, *argv, "%s", __func__);
return (0); return (0);
} }
@ -437,7 +444,7 @@ cmd_parse(int argc, char **argv, const char *file, u_int line, char **cause)
entry = cmd_find(name, cause); entry = cmd_find(name, cause);
if (entry == NULL) if (entry == NULL)
return (NULL); return (NULL);
cmd_log_argv(argc, argv, entry->name); cmd_log_argv(argc, argv, "%s: %s", __func__, entry->name);
args = args_parse(entry->args.template, argc, argv); args = args_parse(entry->args.template, argc, argv);
if (args == NULL) if (args == NULL)

2
spawn.c
View File

@ -329,7 +329,7 @@ spawn_pane(struct spawn_context *sc, char **cause)
} }
if (cwd != NULL) if (cwd != NULL)
log_debug("%s: cwd=%s", __func__, cwd); log_debug("%s: cwd=%s", __func__, cwd);
cmd_log_argv(new_wp->argc, new_wp->argv, __func__); cmd_log_argv(new_wp->argc, new_wp->argv, "%s", __func__);
environ_log(child, "%s: environment ", __func__); environ_log(child, "%s: environment ", __func__);
/* If the command is empty, don't fork a child process. */ /* If the command is empty, don't fork a child process. */

2
tmux.h
View File

@ -1987,7 +1987,7 @@ int cmd_find_from_mouse(struct cmd_find_state *,
int cmd_find_from_nothing(struct cmd_find_state *, int); int cmd_find_from_nothing(struct cmd_find_state *, int);
/* cmd.c */ /* cmd.c */
void cmd_log_argv(int, char **, const char *); void printflike(3, 4) cmd_log_argv(int, char **, const char *, ...);
void cmd_prepend_argv(int *, char ***, char *); void cmd_prepend_argv(int *, char ***, char *);
void cmd_append_argv(int *, char ***, char *); void cmd_append_argv(int *, char ***, char *);
int cmd_pack_argv(int, char **, char *, size_t); int cmd_pack_argv(int, char **, char *, size_t);