git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] builtin-add: fix command line building to call interactive

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 25, 2007, 18:07 UTC
Message-ID
<7vd4tynqpw.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<1195996542-86074-1-git-send-email-win@wincent.com>

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
Previous: Junio C HamanoNext: Wincent Colaiuta
Message 6 of 12 in “Updates to git-add--interactive”
  1. 0/3 Updates to git-add--interactiveWincent Colaiuta, Nov 25, 2007
  2. 1/3 Rename patch_update_file function to patch_update_pathspecWincent Colaiuta, Nov 25, 2007
  3. 2/3 Move pathspec validation into interactive_addWincent Colaiuta, Nov 25, 2007
  4. 3/3 Add "--patch" option to git-add--interactiveWincent Colaiuta, Nov 25, 2007
  5. Junio C HamanoNov 25, 2007
  6. builtin-add: fix command line building to call interactiveJunio C Hamano, Nov 25, 2007
  7. Wincent ColaiutaNov 25, 2007
  8. Junio C HamanoNov 25, 2007
  9. Wincent ColaiutaNov 25, 2007
  10. Junio C HamanoNov 25, 2007
  11. Jeff KingNov 26, 2007
  12. add -i: Fix running from a subdirectoryJunio C Hamano, Nov 25, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.