@matheusbsbs / matheus-bagliano / commits / 52ba03cbb1
Fork 0

Built-in git-get-tar-commit-id

By being an internal command git-get-commit-id can make use of struct ustar_header and other stuff and stops wasting precious disk space. Note: I recycled one of the two "tar-tree" entries instead of splitting that cleanup into a separate patch. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>

Rene Scharfe committed Jun 10, 2006 at 16:13 UTC 52ba03cbb1c718093946f5254187082bd7b32845
5 files changed +29 -33
Makefile
+2 -2
@@ -144,7 +144,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
144
145 # The ones that do not have to link with lcrypto, lz nor xdiff.
146 SIMPLE_PROGRAMS = \
147 - git-get-tar-commit-id$X git-mailsplit$X \
147 + git-mailsplit$X \
148 git-stripspace$X git-daemon$X
149
150 # ... and all the rest that could be moved out of bindir to gitexecdir
@@ -169,7 +169,7 @@ BUILT_INS = git-log$X git-whatchanged$X git-show$X \
169 git-grep$X git-add$X git-rm$X git-rev-list$X \
170 git-check-ref-format$X git-rev-parse$X \
171 git-init-db$X git-tar-tree$X git-upload-tar$X git-format-patch$X \
172 - git-ls-files$X git-ls-tree$X \
172 + git-ls-files$X git-ls-tree$X git-get-tar-commit-id$X \
173 git-read-tree$X git-commit-tree$X \
174 git-apply$X git-show-branch$X git-diff-files$X \
175 git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X
builtin-tar-tree.c
+25
@@ -402,3 +402,28 @@ int cmd_tar_tree(int argc, const char **argv, char **envp)
402 return remote_tar(argc, argv);
403 return generate_tar(argc, argv, envp);
404 }
405 +
406 +/* ustar header + extended global header content */
407 +#define HEADERSIZE (2 * RECORDSIZE)
408 +
409 +int cmd_get_tar_commit_id(int argc, const char **argv, char **envp)
410 +{
411 + char buffer[HEADERSIZE];
412 + struct ustar_header *header = (struct ustar_header *)buffer;
413 + char *content = buffer + RECORDSIZE;
414 + ssize_t n;
415 +
416 + n = xread(0, buffer, HEADERSIZE);
417 + if (n < HEADERSIZE)
418 + die("git-get-tar-commit-id: read error");
419 + if (header->typeflag[0] != 'g')
420 + return 1;
421 + if (memcmp(content, "52 comment=", 11))
422 + return 1;
423 +
424 + n = xwrite(1, content + 11, 41);
425 + if (n < 41)
426 + die("git-get-tar-commit-id: write error");
427 +
428 + return 0;
429 +}
builtin.h
+1
@@ -32,6 +32,7 @@ extern int cmd_check_ref_format(int argc, const char **argv, char **envp);
32 extern int cmd_init_db(int argc, const char **argv, char **envp);
33 extern int cmd_tar_tree(int argc, const char **argv, char **envp);
34 extern int cmd_upload_tar(int argc, const char **argv, char **envp);
35 +extern int cmd_get_tar_commit_id(int argc, const char **argv, char **envp);
36 extern int cmd_ls_files(int argc, const char **argv, char **envp);
37 extern int cmd_ls_tree(int argc, const char **argv, char **envp);
38 extern int cmd_read_tree(int argc, const char **argv, char **envp);
get-tar-commit-id.c deleted
-30
@@ -1,30 +0,0 @@
1 -/*
2 - * Copyright (C) 2005 Rene Scharfe
3 - */
4 -#include <stdio.h>
5 -#include <string.h>
6 -#include <unistd.h>
7 -
8 -#define HEADERSIZE 1024
9 -
10 -int main(int argc, char **argv)
11 -{
12 - char buffer[HEADERSIZE];
13 - ssize_t n;
14 -
15 - n = read(0, buffer, HEADERSIZE);
16 - if (n < HEADERSIZE) {
17 - fprintf(stderr, "read error\n");
18 - return 3;
19 - }
20 - if (buffer[156] != 'g')
21 - return 1;
22 - if (memcmp(&buffer[512], "52 comment=", 11))
23 - return 1;
24 - n = write(1, &buffer[523], 41);
25 - if (n < 41) {
26 - fprintf(stderr, "write error\n");
27 - return 2;
28 - }
29 - return 0;
30 -}
git.c
+1 -1
@@ -163,7 +163,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
163 { "add", cmd_add },
164 { "rev-list", cmd_rev_list },
165 { "init-db", cmd_init_db },
166 - { "tar-tree", cmd_tar_tree },
166 + { "get-tar-commit-id", cmd_get_tar_commit_id },
167 { "upload-tar", cmd_upload_tar },
168 { "check-ref-format", cmd_check_ref_format },
169 { "ls-files", cmd_ls_files },