index 8cbbef67e624d1d15bc4f2d7e2f9509be937c36d..23288781cf6caad62253130f75112e18eb4905aa 100644 (file)
--- a/mktag.c
+++ b/mktag.c
#include "cache.h"
#include "cache.h"
+#include "tag.h"
/*
* A signature file has a very simple fixed format: three lines
/*
* A signature file has a very simple fixed format: three lines
int typelen;
char type[20];
unsigned char sha1[20];
int typelen;
char type[20];
unsigned char sha1[20];
- const char *object, *type_line, *tag_line;
+ const char *object, *type_line, *tag_line, *tagger_line;
if (size < 64 || size > MAXSIZE-1)
return -1;
if (size < 64 || size > MAXSIZE-1)
return -1;
return -1;
}
return -1;
}
+ /* Verify the tagger line */
+ tagger_line = tag_line;
+
+ if (memcmp(tagger_line, "tagger", 6) || (tagger_line[6] == '\n'))
+ return -1;
+
/* The actual stuff afterwards we don't care about.. */
return 0;
}
/* The actual stuff afterwards we don't care about.. */
return 0;
}
if (argc != 1)
usage("cat <signaturefile> | git-mktag");
if (argc != 1)
usage("cat <signaturefile> | git-mktag");
+ setup_git_directory();
+
// Read the signature
size = 0;
for (;;) {
// Read the signature
size = 0;
for (;;) {
- int ret = read(0, buffer + size, MAXSIZE - size);
- if (!ret)
- break;
- if (ret < 0) {
- if (errno == EAGAIN)
- continue;
+ int ret = xread(0, buffer + size, MAXSIZE - size);
+ if (ret <= 0)
break;
break;
- }
size += ret;
}
size += ret;
}
- // Verify it for some basic sanity: it needs to start with "object <sha1>\ntype "
+ // Verify it for some basic sanity: it needs to start with "object <sha1>\ntype\ntagger "
if (verify_tag(buffer, size) < 0)
die("invalid tag signature file");
if (verify_tag(buffer, size) < 0)
die("invalid tag signature file");
- if (write_sha1_file(buffer, size, "tag", result_sha1) < 0)
+ if (write_sha1_file(buffer, size, tag_type, result_sha1) < 0)
die("unable to write tag file");
printf("%s\n", sha1_to_hex(result_sha1));
return 0;
die("unable to write tag file");
printf("%s\n", sha1_to_hex(result_sha1));
return 0;