archive-tar: unindent write_tar_entry by one level

diff --git a/archive-tar.c b/archive-tar.c
index 20af0051a334a1357b055ea10d74f5380117ab68..6c8a0bd3bf524a962d18395e710a67e0358451b2 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -123,6 +123,43 @@ static size_t get_path_prefix(const char *path, size_t pathlen, size_t maxlen)
        return i;
 }
 
+static void prepare_header(struct archiver_args *args,
+                          struct ustar_header *header,
+                          unsigned int mode, unsigned long size)
+{
+       sprintf(header->mode, "%07o", mode & 07777);
+       sprintf(header->size, "%011lo", S_ISREG(mode) ? size : 0);
+       sprintf(header->mtime, "%011lo", (unsigned long) args->time);
+
+       sprintf(header->uid, "%07o", 0);
+       sprintf(header->gid, "%07o", 0);
+       strlcpy(header->uname, "root", sizeof(header->uname));
+       strlcpy(header->gname, "root", sizeof(header->gname));
+       sprintf(header->devmajor, "%07o", 0);
+       sprintf(header->devminor, "%07o", 0);
+
+       memcpy(header->magic, "ustar", 6);
+       memcpy(header->version, "00", 2);
+
+       sprintf(header->chksum, "%07o", ustar_header_chksum(header));
+}
+
+static int write_extended_header(struct archiver_args *args,
+                                const unsigned char *sha1,
+                                const void *buffer, unsigned long size)
+{
+       struct ustar_header header;
+       unsigned int mode;
+       memset(&header, 0, sizeof(header));
+       *header.typeflag = TYPEFLAG_EXT_HEADER;
+       mode = 0100666;
+       sprintf(header.name, "%s.paxheader", sha1_to_hex(sha1));
+       prepare_header(args, &header, mode, size);
+       write_blocked(&header, sizeof(header));
+       write_blocked(buffer, size);
+       return 0;
+}
+
 static int write_tar_entry(struct archiver_args *args,
                const unsigned char *sha1, const char *path, size_t pathlen,
                unsigned int mode, void *buffer, unsigned long size)
@@ -133,44 +170,34 @@ static int write_tar_entry(struct archiver_args *args,
 
        memset(&header, 0, sizeof(header));
 
-       if (!sha1) {
-               *header.typeflag = TYPEFLAG_GLOBAL_HEADER;
-               mode = 0100666;
-               strcpy(header.name, "pax_global_header");
-       } else if (!path) {
-               *header.typeflag = TYPEFLAG_EXT_HEADER;
-               mode = 0100666;
-               sprintf(header.name, "%s.paxheader", sha1_to_hex(sha1));
+       if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
+               *header.typeflag = TYPEFLAG_DIR;
+               mode = (mode | 0777) & ~tar_umask;
+       } else if (S_ISLNK(mode)) {
+               *header.typeflag = TYPEFLAG_LNK;
+               mode |= 0777;
+       } else if (S_ISREG(mode)) {
+               *header.typeflag = TYPEFLAG_REG;
+               mode = (mode | ((mode & 0100) ? 0777 : 0666)) & ~tar_umask;
        } else {
-               if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
-                       *header.typeflag = TYPEFLAG_DIR;
-                       mode = (mode | 0777) & ~tar_umask;
-               } else if (S_ISLNK(mode)) {
-                       *header.typeflag = TYPEFLAG_LNK;
-                       mode |= 0777;
-               } else if (S_ISREG(mode)) {
-                       *header.typeflag = TYPEFLAG_REG;
-                       mode = (mode | ((mode & 0100) ? 0777 : 0666)) & ~tar_umask;
+               return error("unsupported file mode: 0%o (SHA1: %s)",
+                            mode, sha1_to_hex(sha1));
+       }
+       if (pathlen > sizeof(header.name)) {
+               size_t plen = get_path_prefix(path, pathlen,
+                                             sizeof(header.prefix));
+               size_t rest = pathlen - plen - 1;
+               if (plen > 0 && rest <= sizeof(header.name)) {
+                       memcpy(header.prefix, path, plen);
+                               memcpy(header.name, path + plen + 1, rest);
                } else {
-                       return error("unsupported file mode: 0%o (SHA1: %s)",
-                                       mode, sha1_to_hex(sha1));
+                       sprintf(header.name, "%s.data",
+                               sha1_to_hex(sha1));
+                       strbuf_append_ext_header(&ext_header, "path",
+                                                path, pathlen);
                }
-               if (pathlen > sizeof(header.name)) {
-                       size_t plen = get_path_prefix(path, pathlen,
-                                       sizeof(header.prefix));
-                       size_t rest = pathlen - plen - 1;
-                       if (plen > 0 && rest <= sizeof(header.name)) {
-                               memcpy(header.prefix, path, plen);
-                               memcpy(header.name, path + plen + 1, rest);
-                       } else {
-                               sprintf(header.name, "%s.data",
-                                       sha1_to_hex(sha1));
-                               strbuf_append_ext_header(&ext_header, "path",
-                                               path, pathlen);
-                       }
-               } else
-                       memcpy(header.name, path, pathlen);
-       }
+       } else
+               memcpy(header.name, path, pathlen);
 
        if (S_ISLNK(mode) && buffer) {
                if (size > sizeof(header.linkname)) {
@@ -182,25 +209,11 @@ static int write_tar_entry(struct archiver_args *args,
                        memcpy(header.linkname, buffer, size);
        }
 
-       sprintf(header.mode, "%07o", mode & 07777);
-       sprintf(header.size, "%011lo", S_ISREG(mode) ? size : 0);
-       sprintf(header.mtime, "%011lo", (unsigned long) args->time);
-
-       sprintf(header.uid, "%07o", 0);
-       sprintf(header.gid, "%07o", 0);
-       strlcpy(header.uname, "root", sizeof(header.uname));
-       strlcpy(header.gname, "root", sizeof(header.gname));
-       sprintf(header.devmajor, "%07o", 0);
-       sprintf(header.devminor, "%07o", 0);
-
-       memcpy(header.magic, "ustar", 6);
-       memcpy(header.version, "00", 2);
-
-       sprintf(header.chksum, "%07o", ustar_header_chksum(&header));
+       prepare_header(args, &header, mode, size);
 
        if (ext_header.len > 0) {
-               err = write_tar_entry(args, sha1, NULL, 0, 0, ext_header.buf,
-                               ext_header.len);
+               err = write_extended_header(args, sha1, ext_header.buf,
+                                           ext_header.len);
                if (err)
                        return err;
        }
@@ -215,11 +228,18 @@ static int write_global_extended_header(struct archiver_args *args)
 {
        const unsigned char *sha1 = args->commit_sha1;
        struct strbuf ext_header = STRBUF_INIT;
-       int err;
+       struct ustar_header header;
+       unsigned int mode;
+       int err = 0;
 
        strbuf_append_ext_header(&ext_header, "comment", sha1_to_hex(sha1), 40);
-       err = write_tar_entry(args, NULL, NULL, 0, 0, ext_header.buf,
-                       ext_header.len);
+       memset(&header, 0, sizeof(header));
+       *header.typeflag = TYPEFLAG_GLOBAL_HEADER;
+       mode = 0100666;
+       strcpy(header.name, "pax_global_header");
+       prepare_header(args, &header, mode, ext_header.len);
+       write_blocked(&header, sizeof(header));
+       write_blocked(ext_header.buf, ext_header.len);
        strbuf_release(&ext_header);
        return err;
 }