mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'be/tag'
* be/tag: add more informative error messages to git-mktag remove the artificial restriction tagsize < 8kb
This commit is contained in:
commit
a861b58bbf
1
cache.h
1
cache.h
|
@ -155,6 +155,7 @@ extern int ce_match_stat(struct cache_entry *ce, struct stat *st, int);
|
|||
extern int ce_modified(struct cache_entry *ce, struct stat *st, int);
|
||||
extern int ce_path_match(const struct cache_entry *ce, const char **pathspec);
|
||||
extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, const char *type);
|
||||
extern int read_pipe(int fd, char** return_buf, unsigned long* return_size);
|
||||
extern int index_pipe(unsigned char *sha1, int fd, const char *type, int write_object);
|
||||
extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object);
|
||||
extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
|
||||
|
|
45
mktag.c
45
mktag.c
|
@ -45,42 +45,46 @@ static int verify_tag(char *buffer, unsigned long size)
|
|||
unsigned char sha1[20];
|
||||
const char *object, *type_line, *tag_line, *tagger_line;
|
||||
|
||||
if (size < 64 || size > MAXSIZE-1)
|
||||
return -1;
|
||||
if (size < 64)
|
||||
return error("wanna fool me ? you obviously got the size wrong !\n");
|
||||
|
||||
buffer[size] = 0;
|
||||
|
||||
/* Verify object line */
|
||||
object = buffer;
|
||||
if (memcmp(object, "object ", 7))
|
||||
return -1;
|
||||
return error("char%d: does not start with \"object \"\n", 0);
|
||||
|
||||
if (get_sha1_hex(object + 7, sha1))
|
||||
return -1;
|
||||
return error("char%d: could not get SHA1 hash\n", 7);
|
||||
|
||||
/* Verify type line */
|
||||
type_line = object + 48;
|
||||
if (memcmp(type_line - 1, "\ntype ", 6))
|
||||
return -1;
|
||||
return error("char%d: could not find \"\\ntype \"\n", 47);
|
||||
|
||||
/* Verify tag-line */
|
||||
tag_line = strchr(type_line, '\n');
|
||||
if (!tag_line)
|
||||
return -1;
|
||||
return error("char%td: could not find next \"\\n\"\n", type_line - buffer);
|
||||
tag_line++;
|
||||
if (memcmp(tag_line, "tag ", 4) || tag_line[4] == '\n')
|
||||
return -1;
|
||||
return error("char%td: no \"tag \" found\n", tag_line - buffer);
|
||||
|
||||
/* Get the actual type */
|
||||
typelen = tag_line - type_line - strlen("type \n");
|
||||
if (typelen >= sizeof(type))
|
||||
return -1;
|
||||
return error("char%td: type too long\n", type_line+5 - buffer);
|
||||
|
||||
memcpy(type, type_line+5, typelen);
|
||||
type[typelen] = 0;
|
||||
|
||||
/* Verify that the object matches */
|
||||
if (get_sha1_hex(object + 7, sha1))
|
||||
return -1;
|
||||
return error("char%d: could not get SHA1 hash but this is really odd since i got it before !\n", 7);
|
||||
|
||||
if (verify_object(sha1, type))
|
||||
return -1;
|
||||
return error("char%d: could not verify object %s\n", 7, sha1);
|
||||
|
||||
/* Verify the tag-name: we don't allow control characters or spaces in it */
|
||||
tag_line += 4;
|
||||
|
@ -90,14 +94,14 @@ static int verify_tag(char *buffer, unsigned long size)
|
|||
break;
|
||||
if (c > ' ')
|
||||
continue;
|
||||
return -1;
|
||||
return error("char%td: could not verify tag name\n", tag_line - buffer);
|
||||
}
|
||||
|
||||
/* Verify the tagger line */
|
||||
tagger_line = tag_line;
|
||||
|
||||
if (memcmp(tagger_line, "tagger", 6) || (tagger_line[6] == '\n'))
|
||||
return -1;
|
||||
return error("char%td: could not find \"tagger\"\n", tagger_line - buffer);
|
||||
|
||||
/* The actual stuff afterwards we don't care about.. */
|
||||
return 0;
|
||||
|
@ -105,8 +109,8 @@ static int verify_tag(char *buffer, unsigned long size)
|
|||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
unsigned long size;
|
||||
char buffer[MAXSIZE];
|
||||
unsigned long size = 4096;
|
||||
char *buffer = malloc(size);
|
||||
unsigned char result_sha1[20];
|
||||
|
||||
if (argc != 1)
|
||||
|
@ -114,13 +118,9 @@ int main(int argc, char **argv)
|
|||
|
||||
setup_git_directory();
|
||||
|
||||
// Read the signature
|
||||
size = 0;
|
||||
for (;;) {
|
||||
int ret = xread(0, buffer + size, MAXSIZE - size);
|
||||
if (ret <= 0)
|
||||
break;
|
||||
size += ret;
|
||||
if (read_pipe(0, &buffer, &size)) {
|
||||
free(buffer);
|
||||
die("could not read from stdin");
|
||||
}
|
||||
|
||||
// Verify it for some basic sanity: it needs to start with "object <sha1>\ntype\ntagger "
|
||||
|
@ -129,6 +129,9 @@ int main(int argc, char **argv)
|
|||
|
||||
if (write_sha1_file(buffer, size, tag_type, result_sha1) < 0)
|
||||
die("unable to write tag file");
|
||||
|
||||
free(buffer);
|
||||
|
||||
printf("%s\n", sha1_to_hex(result_sha1));
|
||||
return 0;
|
||||
}
|
||||
|
|
46
sha1_file.c
46
sha1_file.c
|
@ -1645,16 +1645,24 @@ int has_sha1_file(const unsigned char *sha1)
|
|||
return find_sha1_file(sha1, &st) ? 1 : 0;
|
||||
}
|
||||
|
||||
int index_pipe(unsigned char *sha1, int fd, const char *type, int write_object)
|
||||
/*
|
||||
* reads from fd as long as possible into a supplied buffer of size bytes.
|
||||
* If neccessary the buffer's size is increased using realloc()
|
||||
*
|
||||
* returns 0 if anything went fine and -1 otherwise
|
||||
*
|
||||
* NOTE: both buf and size may change, but even when -1 is returned
|
||||
* you still have to free() it yourself.
|
||||
*/
|
||||
int read_pipe(int fd, char** return_buf, unsigned long* return_size)
|
||||
{
|
||||
unsigned long size = 4096;
|
||||
char *buf = malloc(size);
|
||||
int iret, ret;
|
||||
char* buf = *return_buf;
|
||||
unsigned long size = *return_size;
|
||||
int iret;
|
||||
unsigned long off = 0;
|
||||
unsigned char hdr[50];
|
||||
int hdrlen;
|
||||
|
||||
do {
|
||||
iret = read(fd, buf + off, size - off);
|
||||
iret = xread(fd, buf + off, size - off);
|
||||
if (iret > 0) {
|
||||
off += iret;
|
||||
if (off == size) {
|
||||
|
@ -1663,16 +1671,34 @@ int index_pipe(unsigned char *sha1, int fd, const char *type, int write_object)
|
|||
}
|
||||
}
|
||||
} while (iret > 0);
|
||||
if (iret < 0) {
|
||||
|
||||
*return_buf = buf;
|
||||
*return_size = off;
|
||||
|
||||
if (iret < 0)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int index_pipe(unsigned char *sha1, int fd, const char *type, int write_object)
|
||||
{
|
||||
unsigned long size = 4096;
|
||||
char *buf = malloc(size);
|
||||
int ret;
|
||||
unsigned char hdr[50];
|
||||
int hdrlen;
|
||||
|
||||
if (read_pipe(fd, &buf, &size)) {
|
||||
free(buf);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!type)
|
||||
type = blob_type;
|
||||
if (write_object)
|
||||
ret = write_sha1_file(buf, off, type, sha1);
|
||||
ret = write_sha1_file(buf, size, type, sha1);
|
||||
else {
|
||||
write_sha1_file_prepare(buf, off, type, sha1, hdr, &hdrlen);
|
||||
write_sha1_file_prepare(buf, size, type, sha1, hdr, &hdrlen);
|
||||
ret = 0;
|
||||
}
|
||||
free(buf);
|
||||
|
|
Loading…
Reference in a new issue