diff options
author | June McEnroe <june@causal.agency> | 2021-06-08 14:30:12 -0400 |
---|---|---|
committer | June McEnroe <june@causal.agency> | 2021-06-08 14:34:33 -0400 |
commit | d7bd11e9b326caad68b88ae5804b7b97c9282c16 (patch) | |
tree | 14b07a9e9865abc4c57513189e31af0afb6358fa /www/git.causal.agency/cgit/ui-snapshot.c | |
parent | Fetch git .tar.gz for compatibility (diff) | |
parent | Squashed 'www/git.causal.agency/cgit/' changes from 55fa25ad..5258c297 (diff) | |
download | src-d7bd11e9b326caad68b88ae5804b7b97c9282c16.tar.gz src-d7bd11e9b326caad68b88ae5804b7b97c9282c16.zip |
Merge commit 'f46c4521d761a0b9909e17ef29065c0aa09c7ab7'
Diffstat (limited to '')
-rw-r--r-- | www/git.causal.agency/cgit/ui-snapshot.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/www/git.causal.agency/cgit/ui-snapshot.c b/www/git.causal.agency/cgit/ui-snapshot.c index 8b81e374..28013935 100644 --- a/www/git.causal.agency/cgit/ui-snapshot.c +++ b/www/git.causal.agency/cgit/ui-snapshot.c @@ -13,35 +13,35 @@ static int write_archive_type(const char *format, const char *hex, const char *prefix) { - struct argv_array argv = ARGV_ARRAY_INIT; + struct strvec argv = STRVEC_INIT; const char **nargv; int result; - argv_array_push(&argv, "snapshot"); - argv_array_push(&argv, format); + strvec_push(&argv, "snapshot"); + strvec_push(&argv, format); if (prefix) { struct strbuf buf = STRBUF_INIT; strbuf_addstr(&buf, prefix); strbuf_addch(&buf, '/'); - argv_array_push(&argv, "--prefix"); - argv_array_push(&argv, buf.buf); + strvec_push(&argv, "--prefix"); + strvec_push(&argv, buf.buf); strbuf_release(&buf); } - argv_array_push(&argv, hex); + strvec_push(&argv, hex); /* * Now we need to copy the pointers to arguments into a new * structure because write_archive will rearrange its arguments * which may result in duplicated/missing entries causing leaks - * or double-frees in argv_array_clear. + * or double-frees in strvec_clear. */ - nargv = xmalloc(sizeof(char *) * (argv.argc + 1)); - /* argv_array guarantees a trailing NULL entry. */ - memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1)); + nargv = xmalloc(sizeof(char *) * (argv.nr + 1)); + /* strvec guarantees a trailing NULL entry. */ + memcpy(nargv, argv.v, sizeof(char *) * (argv.nr + 1)); if (fflush(stdout)) return errno; - result = write_archive(argv.argc, nargv, NULL, the_repository, NULL, 0); - argv_array_clear(&argv); + result = write_archive(argv.nr, nargv, NULL, the_repository, NULL, 0); + strvec_clear(&argv); free(nargv); return result; } |