mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
archive: define MAX_ARGS where it's needed
MAX_EXTRA_ARGS is not used anymore, so remove it. MAX_ARGS is used only in builtin-upload-archive.c, so define it there. Also report the actual value we're comparing against when the number of args is too big. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
c088543553
commit
7f4d0511af
|
@ -1,9 +1,6 @@
|
||||||
#ifndef ARCHIVE_H
|
#ifndef ARCHIVE_H
|
||||||
#define ARCHIVE_H
|
#define ARCHIVE_H
|
||||||
|
|
||||||
#define MAX_EXTRA_ARGS 32
|
|
||||||
#define MAX_ARGS (MAX_EXTRA_ARGS + 32)
|
|
||||||
|
|
||||||
struct archiver_args {
|
struct archiver_args {
|
||||||
const char *base;
|
const char *base;
|
||||||
size_t baselen;
|
size_t baselen;
|
||||||
|
|
|
@ -16,6 +16,7 @@ static const char deadchild[] =
|
||||||
static const char lostchild[] =
|
static const char lostchild[] =
|
||||||
"git upload-archive: archiver process was lost";
|
"git upload-archive: archiver process was lost";
|
||||||
|
|
||||||
|
#define MAX_ARGS (64)
|
||||||
|
|
||||||
static int run_upload_archive(int argc, const char **argv, const char *prefix)
|
static int run_upload_archive(int argc, const char **argv, const char *prefix)
|
||||||
{
|
{
|
||||||
|
@ -45,7 +46,7 @@ static int run_upload_archive(int argc, const char **argv, const char *prefix)
|
||||||
if (len == 0)
|
if (len == 0)
|
||||||
break; /* got a flush */
|
break; /* got a flush */
|
||||||
if (sent_argc > MAX_ARGS - 2)
|
if (sent_argc > MAX_ARGS - 2)
|
||||||
die("Too many options (>29)");
|
die("Too many options (>%d)", MAX_ARGS - 2);
|
||||||
|
|
||||||
if (p[len-1] == '\n') {
|
if (p[len-1] == '\n') {
|
||||||
p[--len] = 0;
|
p[--len] = 0;
|
||||||
|
|
Loading…
Reference in a new issue