summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-08 16:16:38 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-08 16:16:38 (GMT)
commitbf0c6e839c692142784caf07b523cd69442e57a5 (patch)
tree82e9dc75087c715ef4a9da6fc89674aa74efee1c
parente497ea2a9b6c378f01d092c210af20cbee762475 (diff)
downloadgit-bf0c6e839c692142784caf07b523cd69442e57a5.zip
git-bf0c6e839c692142784caf07b523cd69442e57a5.tar.gz
git-bf0c6e839c692142784caf07b523cd69442e57a5.tar.bz2
Make "cat-file" output the file contents to stdout.
New syntax: "cat-file -t <sha1>" shows the tag, while "cat-file <tag> <sha1>" outputs the file contents after checking that the supplied tag matches.
-rw-r--r--cache.h1
-rw-r--r--cat-file.c44
2 files changed, 35 insertions, 10 deletions
diff --git a/cache.h b/cache.h
index 98a32a9..b1313c5 100644
--- a/cache.h
+++ b/cache.h
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdlib.h>
#include <stdarg.h>
+#include <string.h>
#include <errno.h>
#include <sys/mman.h>
diff --git a/cat-file.c b/cat-file.c
index d8f0121..3071672 100644
--- a/cat-file.c
+++ b/cat-file.c
@@ -11,18 +11,42 @@ int main(int argc, char **argv)
char type[20];
void *buf;
unsigned long size;
- char template[] = "temp_git_file_XXXXXX";
int fd;
- if (argc != 2 || get_sha1_hex(argv[1], sha1))
- usage("cat-file: cat-file <sha1>");
+ if (argc != 3 || get_sha1_hex(argv[2], sha1))
+ usage("cat-file: cat-file [-t | tagname] <sha1>");
buf = read_sha1_file(sha1, type, &size);
- if (!buf)
+ if (!buf) {
+ fprintf(stderr, "cat-file %s: bad file\n", argv[2]);
exit(1);
- fd = mkstemp(template);
- if (fd < 0)
- usage("unable to create tempfile");
- if (write(fd, buf, size) != size)
- strcpy(type, "bad");
- printf("%s: %s\n", template, type);
+ }
+ if (!strcmp("-t", argv[1])) {
+ buf = type;
+ size = strlen(type);
+ type[size] = '\n';
+ size++;
+ } else if (strcmp(type, argv[1])) {
+ fprintf(stderr, "cat-file %s: bad tag\n", argv[2]);
+ exit(1); /* bad tag */
+ }
+
+ while (size > 0) {
+ long ret = write(1, buf, size);
+ if (ret < 0) {
+ if (errno == EAGAIN)
+ continue;
+ /* Ignore epipe */
+ if (errno == EPIPE)
+ break;
+ fprintf(stderr, "cat-file: %s\n", strerror(errno));
+ exit(1);
+ }
+ if (!ret) {
+ fprintf(stderr, "cat-file: disk full?");
+ exit(1);
+ }
+ size -= ret;
+ buf += ret;
+ }
+ return 0;
}