Fix up recent object model cleanups

[git.git] / sha1_file.c

diff --git a/sha1_file.c b/sha1_file.c
index 6f7228e..db2880e 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -11,6 +11,16 @@
 
 const char *sha1_file_directory = NULL;
 
+#ifndef O_NOATIME
+#if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
+#define O_NOATIME 01000000
+#else
+#define O_NOATIME 0
+#endif
+#endif
+
+static unsigned int sha1_file_open_flag = O_NOATIME;
+
 static unsigned hexval(char c)
 {
        if (c >= '0' && c <= '9')
@@ -63,7 +73,7 @@ char *sha1_file_name(const unsigned char *sha1)
        if (!base) {
                char *sha1_file_directory = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;
                int len = strlen(sha1_file_directory);
-               base = malloc(len + 60);
+               base = xmalloc(len + 60);
                memcpy(base, sha1_file_directory, len);
                memset(base+len, 0, 60);
                base[len] = '/';
@@ -96,13 +106,26 @@ int check_sha1_signature(unsigned char *sha1, void *map, unsigned long size, con
 void *map_sha1_file(const unsigned char *sha1, unsigned long *size)
 {
        char *filename = sha1_file_name(sha1);
-       int fd = open(filename, O_RDONLY);
        struct stat st;
        void *map;
+       int fd;
 
+       fd = open(filename, O_RDONLY | sha1_file_open_flag);
        if (fd < 0) {
-               perror(filename);
-               return NULL;
+               /* See if it works without O_NOATIME */
+               switch (sha1_file_open_flag) {
+               default:
+                       fd = open(filename, O_RDONLY);
+                       if (fd >= 0)
+                               break;
+               /* Fallthrough */
+               case 0:
+                       perror(filename);
+                       return NULL;
+               }
+
+               /* If it failed once, it will probably fail again. Stop using O_NOATIME */
+               sha1_file_open_flag = 0;
        }
        if (fstat(fd, &st) < 0) {
                close(fd);
@@ -132,13 +155,13 @@ void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned l
 
        inflateInit(&stream);
        ret = inflate(&stream, 0);
+       if (ret < Z_OK)
+               return NULL;
        if (sscanf(buffer, "%10s %lu", type, size) != 2)
                return NULL;
 
        bytes = strlen(buffer) + 1;
-       buf = malloc(*size);
-       if (!buf)
-               return NULL;
+       buf = xmalloc(*size);
 
        memcpy(buf, buffer + bytes, stream.total_out - bytes);
        bytes = stream.total_out - bytes;
@@ -206,7 +229,7 @@ void *read_tree_with_tree_or_commit_sha1(const unsigned char *sha1,
        return buffer;
 }
 
-int write_sha1_file(char *buf, unsigned len, unsigned char *returnsha1)
+int write_sha1_file(char *buf, unsigned long len, const char *type, unsigned char *returnsha1)
 {
        int size;
        char *compressed;
@@ -214,10 +237,15 @@ int write_sha1_file(char *buf, unsigned len, unsigned char *returnsha1)
        unsigned char sha1[20];
        SHA_CTX c;
        char *filename;
-       int fd;
+       char hdr[50];
+       int fd, hdrlen;
+
+       /* Generate the header */
+       hdrlen = sprintf(hdr, "%s %lu", type, len)+1;
 
        /* Sha1.. */
        SHA1_Init(&c);
+       SHA1_Update(&c, hdr, hdrlen);
        SHA1_Update(&c, buf, len);
        SHA1_Final(sha1, &c);
 
@@ -240,14 +268,22 @@ int write_sha1_file(char *buf, unsigned len, unsigned char *returnsha1)
        /* Set it up */
        memset(&stream, 0, sizeof(stream));
        deflateInit(&stream, Z_BEST_COMPRESSION);
-       size = deflateBound(&stream, len);
-       compressed = malloc(size);
+       size = deflateBound(&stream, len+hdrlen);
+       compressed = xmalloc(size);
 
        /* Compress it */
-       stream.next_in = buf;
-       stream.avail_in = len;
        stream.next_out = compressed;
        stream.avail_out = size;
+
+       /* First header.. */
+       stream.next_in = hdr;
+       stream.avail_in = hdrlen;
+       while (deflate(&stream, 0) == Z_OK)
+               /* nothing */
+
+       /* Then the data itself.. */
+       stream.next_in = buf;
+       stream.avail_in = len;
        while (deflate(&stream, Z_FINISH) == Z_OK)
                /* nothing */;
        deflateEnd(&stream);
@@ -305,3 +341,75 @@ int write_sha1_buffer(const unsigned char *sha1, void *buf, unsigned int size)
        close(fd);
        return 0;
 }
+
+int write_sha1_from_fd(const unsigned char *sha1, int fd)
+{
+       char *filename = sha1_file_name(sha1);
+
+       int local;
+       z_stream stream;
+       unsigned char real_sha1[20];
+       char buf[4096];
+       char discard[4096];
+       int ret;
+       SHA_CTX c;
+
+       local = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0666);
+
+       if (local < 0)
+               return error("Couldn't open %s\n", filename);
+
+       memset(&stream, 0, sizeof(stream));
+
+       inflateInit(&stream);
+
+       SHA1_Init(&c);
+
+       do {
+               ssize_t size;
+               size = read(fd, buf, 4096);
+               if (size <= 0) {
+                       close(local);
+                       unlink(filename);
+                       if (!size)
+                               return error("Connection closed?");
+                       perror("Reading from connection");
+                       return -1;
+               }
+               write(local, buf, size);
+               stream.avail_in = size;
+               stream.next_in = buf;
+               do {
+                       stream.next_out = discard;
+                       stream.avail_out = sizeof(discard);
+                       ret = inflate(&stream, Z_SYNC_FLUSH);
+                       SHA1_Update(&c, discard, sizeof(discard) -
+                                   stream.avail_out);
+               } while (stream.avail_in && ret == Z_OK);
+               
+       } while (ret == Z_OK);
+       inflateEnd(&stream);
+
+       close(local);
+       SHA1_Final(real_sha1, &c);
+       if (ret != Z_STREAM_END) {
+               unlink(filename);
+               return error("File %s corrupted", sha1_to_hex(sha1));
+       }
+       if (memcmp(sha1, real_sha1, 20)) {
+               unlink(filename);
+               return error("File %s has bad hash\n", sha1_to_hex(sha1));
+       }
+       
+       return 0;
+}
+
+int has_sha1_file(const unsigned char *sha1)
+{
+       char *filename = sha1_file_name(sha1);
+       struct stat st;
+
+       if (!stat(filename, &st))
+               return 1;
+       return 0;
+}