projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svn import: skip initial revisions
[git.git]
/
tar-tree.c
diff --git
a/tar-tree.c
b/tar-tree.c
index
d313c80
..
970c4bb
100644
(file)
--- a/
tar-tree.c
+++ b/
tar-tree.c
@@
-17,7
+17,7
@@
#define EXT_HEADER_PATH 1
#define EXT_HEADER_LINKPATH 2
#define EXT_HEADER_PATH 1
#define EXT_HEADER_LINKPATH 2
-static const char
*tar_tree_usage = "
tar-tree <key> [basedir]";
+static const char
tar_tree_usage[] = "git-
tar-tree <key> [basedir]";
static char block[BLOCKSIZE];
static unsigned long offset;
static char block[BLOCKSIZE];
static unsigned long offset;
@@
-40,9
+40,9
@@
static void reliable_write(void *buf, unsigned long size)
continue;
if (errno == EPIPE)
exit(0);
continue;
if (errno == EPIPE)
exit(0);
- die("tar-tree: %s", strerror(errno));
+ die("
git-
tar-tree: %s", strerror(errno));
} else if (!ret) {
} else if (!ret) {
- die("tar-tree: disk full?");
+ die("
git-
tar-tree: disk full?");
}
size -= ret;
buf += ret;
}
size -= ret;
buf += ret;
@@
-73,16
+73,13
@@
static char *get_record(void)
*/
static void write_trailer(void)
{
*/
static void write_trailer(void)
{
- memset(block + offset, 0, RECORDSIZE);
- offset += RECORDSIZE;
+ get_record();
write_if_needed();
write_if_needed();
- memset(block + offset, 0, RECORDSIZE);
- offset += RECORDSIZE;
+ get_record();
write_if_needed();
write_if_needed();
- if (offset) {
- memset(block + offset, 0, BLOCKSIZE - offset);
- reliable_write(block, BLOCKSIZE);
- offset = 0;
+ while (offset) {
+ get_record();
+ write_if_needed();
}
}
}
}
@@
-205,7
+202,7
@@
static void append_extended_header(char **p, const char *keyword,
append_char(p, '\n');
}
append_char(p, '\n');
}
-static void write_header(const char *, char, const char *, struct path_prefix *,
+static void write_header(const
unsigned
char *, char, const char *, struct path_prefix *,
const char *, unsigned int, void *, unsigned long);
/* stores a pax extended header directly in the block buffer */
const char *, unsigned int, void *, unsigned long);
/* stores a pax extended header directly in the block buffer */
@@
-238,7
+235,7
@@
static void write_extended_header(const char *headerfilename, int is_dir,
free(buffer);
}
free(buffer);
}
-static void write_global_extended_header(const char *sha1)
+static void write_global_extended_header(const
unsigned
char *sha1)
{
char *p;
unsigned int size;
{
char *p;
unsigned int size;
@@
-253,7
+250,7
@@
static void write_global_extended_header(const char *sha1)
}
/* stores a ustar header directly in the block buffer */
}
/* stores a ustar header directly in the block buffer */
-static void write_header(const char *sha1, char typeflag, const char *basepath,
+static void write_header(const
unsigned
char *sha1, char typeflag, const char *basepath,
struct path_prefix *prefix, const char *path,
unsigned int mode, void *buffer, unsigned long size)
{
struct path_prefix *prefix, const char *path,
unsigned int mode, void *buffer, unsigned long size)
{
@@
-328,8
+325,8
@@
static void write_header(const char *sha1, char typeflag, const char *basepath,
memcpy(&header[257], "ustar", 6);
memcpy(&header[263], "00", 2);
memcpy(&header[257], "ustar", 6);
memcpy(&header[263], "00", 2);
-
printf(&header[329], "%07o", 0);
/* devmajor */
-
printf(&header[337], "%07o", 0);
/* devminor */
+
sprintf(&header[329], "%07o", 0);
/* devmajor */
+
sprintf(&header[337], "%07o", 0);
/* devminor */
memset(&header[148], ' ', 8);
for (i = 0; i < RECORDSIZE; i++)
memset(&header[148], ' ', 8);
for (i = 0; i < RECORDSIZE; i++)
@@
-356,6
+353,8
@@
static void traverse_tree(void *buffer, unsigned long size,
if (size < namelen + 20 || sscanf(buffer, "%o", &mode) != 1)
die("corrupt 'tree' file");
if (size < namelen + 20 || sscanf(buffer, "%o", &mode) != 1)
die("corrupt 'tree' file");
+ if (S_ISDIR(mode) || S_ISREG(mode))
+ mode |= (mode & 0100) ? 0777 : 0666;
buffer = sha1 + 20;
size -= namelen + 20;
buffer = sha1 + 20;
size -= namelen + 20;
@@
-375,7
+374,7
@@
static void traverse_tree(void *buffer, unsigned long size,
}
/* get commit time from committer line of commit object */
}
/* get commit time from committer line of commit object */
-time_t commit_time(void * buffer, unsigned long size)
+
static
time_t commit_time(void * buffer, unsigned long size)
{
time_t result = 0;
char *p = buffer;
{
time_t result = 0;
char *p = buffer;
@@
-433,8
+432,8
@@
int main(int argc, char **argv)
if (!archive_time)
archive_time = time(NULL);
if (basedir)
if (!archive_time)
archive_time = time(NULL);
if (basedir)
- write_header(
"0", TYPEFLAG_DIR, NULL, NULL, basedir, 040755
,
-
NULL, 0);
+ write_header(
(unsigned char *)"0", TYPEFLAG_DIR, NULL, NULL
,
+
basedir, 040755,
NULL, 0);
traverse_tree(buffer, size, NULL);
free(buffer);
write_trailer();
traverse_tree(buffer, size, NULL);
free(buffer);
write_trailer();