This is accomplished using the ALLOC_GROW macro.
5 cells are initially allocated for the argv array, allowing
four actual arguments without reallocating memory.
Signed-off-by: Stephan Beyer <s-beyer@xxxxxxx>
---
I was a little unsure if it looks better to
initialize i = 0, alloc = 0
and do:
ALLOC_GROW(argv, i + 1, alloc);
argv[i++] = git_path("hooks/%s", name);
instead of the xmalloc().
Do some people care about details like that?
Documentation/technical/api-run-command.txt | 2 +-
run-command.c | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Documentation/technical/api-run-command.txt b/Documentation/technical/api-run-command.txt
index 13e7b63..2efe7a4 100644
--- a/Documentation/technical/api-run-command.txt
+++ b/Documentation/technical/api-run-command.txt
@@ -58,7 +58,7 @@ Functions
The first argument is a pathname to an index file, or NULL
if the hook uses the default index file or no index is needed.
The second argument is the name of the hook.
- The further arguments (up to 9) correspond to the hook arguments.
+ The further arguments correspond to the hook arguments.
The last argument has to be NULL to terminate the arguments list.
If the hook does not exist or is not executable, the return
value will be zero.
diff --git a/run-command.c b/run-command.c
index fc54c07..22abd09 100644
--- a/run-command.c
+++ b/run-command.c
@@ -346,23 +346,22 @@ int finish_async(struct async *async)
int run_hook(const char *index_file, const char *name, ...)
{
struct child_process hook;
- const char *argv[10], *env[2];
+ const char **argv, *env[2];
char index[PATH_MAX];
va_list args;
int ret;
- int i;
+ size_t i = 1, alloc = 5;
if (access(git_path("hooks/%s", name), X_OK) < 0)
return 0;
va_start(args, name);
+ argv = xmalloc(alloc * sizeof(const char *));
argv[0] = git_path("hooks/%s", name);
- i = 0;
- do {
- if (++i >= ARRAY_SIZE(argv))
- die("run_hook(): too many arguments");
- argv[i] = va_arg(args, const char *);
- } while (argv[i]);
+ while (argv[i-1]) {
+ ALLOC_GROW(argv, i + 1, alloc);
+ argv[i++] = va_arg(args, const char *);
+ }
va_end(args);
memset(&hook, 0, sizeof(hook));
@@ -377,6 +376,7 @@ int run_hook(const char *index_file, const char *name, ...)
}
ret = start_command(&hook);
+ free(argv);
if (ret) {
warning("Could not spawn %s", argv[0]);
return ret;
--
1.6.1.160.gecdb
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
