gitweb: Convert generated contents to utf8 in commitdiff_plain

diff --git a/mktag.c b/mktag.c
index be23e589fbf504cb165abc3b97bdf5adb7317f68..b05260c83fd8ef766eb2e16fa355501bf1f62fb5 100644 (file)
--- a/mktag.c
+++ b/mktag.c
@@ -11,29 +11,22 @@
  * The first three lines are guaranteed to be at least 63 bytes:
  * "object <sha1>\n" is 48 bytes, "type tag\n" at 9 bytes is the
  * shortest possible type-line, and "tag .\n" at 6 bytes is the
- * shortest single-character-tag line. 
- *
- * We also artificially limit the size of the full object to 8kB.
- * Just because I'm a lazy bastard, and if you can't fit a signature
- * in that size, you're doing something wrong.
+ * shortest single-character-tag line.
  */
 
-/* Some random size */
-#define MAXSIZE (8192)
-
 /*
  * We refuse to tag something we can't verify. Just because.
  */
 static int verify_object(unsigned char *sha1, const char *expected_type)
 {
        int ret = -1;
-       char type[100];
+       enum object_type type;
        unsigned long size;
-       void *buffer = read_sha1_file(sha1, type, &size);
+       void *buffer = read_sha1_file(sha1, &type, &size);
 
        if (buffer) {
-               if (!strcmp(type, expected_type))
-                       ret = check_sha1_signature(sha1, buffer, size, type);
+               if (type == type_from_string(expected_type))
+                       ret = check_sha1_signature(sha1, buffer, size, expected_type);
                free(buffer);
        }
        return ret;
@@ -118,8 +111,7 @@ static int verify_tag(char *buffer, unsigned long size)
 
 int main(int argc, char **argv)
 {
-       unsigned long size = 4096;
-       char *buffer = malloc(size);
+       struct strbuf buf;
        unsigned char result_sha1[20];
 
        if (argc != 1)
@@ -127,21 +119,20 @@ int main(int argc, char **argv)
 
        setup_git_directory();
 
-       if (read_pipe(0, &buffer, &size)) {
-               free(buffer);
+       strbuf_init(&buf, 0);
+       if (strbuf_read(&buf, 0, 4096) < 0) {
                die("could not read from stdin");
        }
 
        /* Verify it for some basic sanity: it needs to start with
           "object <sha1>\ntype\ntagger " */
-       if (verify_tag(buffer, size) < 0)
+       if (verify_tag(buf.buf, buf.len) < 0)
                die("invalid tag signature file");
 
-       if (write_sha1_file(buffer, size, tag_type, result_sha1) < 0)
+       if (write_sha1_file(buf.buf, buf.len, tag_type, result_sha1) < 0)
                die("unable to write tag file");
 
-       free(buffer);
-
+       strbuf_release(&buf);
        printf("%s\n", sha1_to_hex(result_sha1));
        return 0;
 }