git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Wincent Colaiuta <win@wincent.com>
Cc: git@vger.kernel.org, peff@peff.net
Subject: [PATCH] builtin-add: fix command line building to call interactive
Date: Sun, 25 Nov 2007 10:07:55 -0800	[thread overview]
Message-ID: <7vd4tynqpw.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1195996542-86074-1-git-send-email-win@wincent.com> (Wincent Colaiuta's message of "Sun, 25 Nov 2007 14:15:39 +0100")

The earlier 7c0ab4458994aa895855abc4a504cf693ecc0cf1 (Teach builtin-add
to pass multiple paths to git-add--interactive) did not allocate enough,
and had unneeded (void*) pointer arithmetic.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

 builtin-add.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/builtin-add.c b/builtin-add.c
index dd895df..7c6a296 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -138,9 +138,10 @@ static void refresh(int verbose, const char **pathspec)
 int interactive_add(int argc, const char **argv)
 {
 	int status;
-	const char **args = xmalloc(sizeof(const char *) * (argc + 1));
+	const char **args = xcalloc(sizeof(const char *), (argc + 2));
+
 	args[0] = "add--interactive";
-	memcpy((void *)args + sizeof(const char *), argv, sizeof(const char *) * argc);
+	memcpy(&(args[1]), argv, sizeof(const char *) * argc);
 	args[argc + 1] = NULL;
 
 	status = run_command_v_opt(args, RUN_GIT_CMD);
-- 
1.5.3.6.2014.g7500f

  parent reply	other threads:[~2007-11-25 18:08 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-25 13:15 [PATCH 0/3] Updates to git-add--interactive Wincent Colaiuta
2007-11-25 13:15 ` [PATCH 1/3] Rename patch_update_file function to patch_update_pathspec Wincent Colaiuta
2007-11-25 13:15   ` [PATCH 2/3] Move pathspec validation into interactive_add Wincent Colaiuta
2007-11-25 13:15     ` [PATCH 3/3] Add "--patch" option to git-add--interactive Wincent Colaiuta
2007-11-25 18:11   ` [PATCH 1/3] Rename patch_update_file function to patch_update_pathspec Junio C Hamano
2007-11-25 18:07 ` Junio C Hamano [this message]
2007-11-25 18:27   ` [PATCH] builtin-add: fix command line building to call interactive Wincent Colaiuta
2007-11-25 18:36     ` Junio C Hamano
2007-11-25 19:02       ` Wincent Colaiuta
2007-11-25 19:48         ` Junio C Hamano
2007-11-26  4:14           ` Jeff King
2007-11-25 18:10 ` [PATCH] add -i: Fix running from a subdirectory Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vd4tynqpw.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=win@wincent.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).