Skip to content

Commit

Permalink
Make "cat-file" output the file contents to stdout.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Linus Torvalds committed Apr 8, 2005
1 parent e497ea2 commit bf0c6e8
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 10 deletions.
1 change: 1 addition & 0 deletions cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <errno.h>
#include <sys/mman.h>

Expand Down
44 changes: 34 additions & 10 deletions cat-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

0 comments on commit bf0c6e8

Please sign in to comment.