Skip to content

Commit a44c9a5

Browse files
author
Linus Torvalds
committed
Simplify "write_sha1_file()" interfaces
The write function now adds the header to the file by itself, so there is no reason to duplicate it among all the users any more.
1 parent e6948b6 commit a44c9a5

File tree

5 files changed

+38
-100
lines changed

5 files changed

+38
-100
lines changed

‎cache.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ extern int write_sha1_buffer(const unsigned char *sha1, void *buf, unsigned int
121121
extern void * map_sha1_file(const unsigned char *sha1, unsigned long *size);
122122
extern void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned long *size);
123123
extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size);
124-
extern int write_sha1_file(char *buf, unsigned len, unsigned char *return_sha1);
124+
extern int write_sha1_file(char *buf, unsigned len, const char *type, unsigned char *return_sha1);
125125

126126
extern int check_sha1_signature(unsigned char *sha1, void *buf, unsigned long size, const char *type);
127127

‎commit-tree.c‎

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,14 @@
1212
#include <time.h>
1313

1414
#define BLOCKING (1ul << 14)
15-
#define ORIG_OFFSET (40)
1615

1716
/*
18-
* Leave space at the beginning to insert the tag
19-
* once we know how big things are.
20-
*
2117
* FIXME! Share the code with "write-tree.c"
2218
*/
2319
static void init_buffer(char **bufp, unsigned int *sizep)
2420
{
2521
char *buf = malloc(BLOCKING);
26-
memset(buf, 0, ORIG_OFFSET);
27-
*sizep = ORIG_OFFSET;
22+
*sizep = 0;
2823
*bufp = buf;
2924
}
3025

@@ -52,34 +47,6 @@ static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
5247
memcpy(buf + size, one_line, len);
5348
}
5449

55-
static int prepend_integer(char *buffer, unsigned val, int i)
56-
{
57-
buffer[--i] = '\0';
58-
do {
59-
buffer[--i] = '0' + (val % 10);
60-
val /= 10;
61-
} while (val);
62-
return i;
63-
}
64-
65-
static void finish_buffer(char *tag, char **bufp, unsigned int *sizep)
66-
{
67-
int taglen;
68-
int offset;
69-
char *buf = *bufp;
70-
unsigned int size = *sizep;
71-
72-
offset = prepend_integer(buf, size - ORIG_OFFSET, ORIG_OFFSET);
73-
taglen = strlen(tag);
74-
offset -= taglen;
75-
buf += offset;
76-
size -= offset;
77-
memcpy(buf, tag, taglen);
78-
79-
*bufp = buf;
80-
*sizep = size;
81-
}
82-
8350
static void remove_special(char *p)
8451
{
8552
char c;
@@ -355,9 +322,7 @@ int main(int argc, char **argv)
355322
while (fgets(comment, sizeof(comment), stdin) != NULL)
356323
add_buffer(&buffer, &size, "%s", comment);
357324

358-
finish_buffer("commit ", &buffer, &size);
359-
360-
write_sha1_file(buffer, size, commit_sha1);
325+
write_sha1_file(buffer, size, "commit", commit_sha1);
361326
printf("%s\n", sha1_to_hex(commit_sha1));
362327
return 0;
363328
}

‎convert-cache.c‎

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -66,25 +66,11 @@ static void convert_ascii_sha1(void *buffer)
6666
memcpy(buffer, sha1_to_hex(entry->new_sha1), 40);
6767
}
6868

69-
#define ORIG_OFFSET (40)
70-
71-
static int prepend_integer(char *buffer, unsigned val, int i)
72-
{
73-
buffer[--i] = '\0';
74-
do {
75-
buffer[--i] = '0' + (val % 10);
76-
val /= 10;
77-
} while (val);
78-
return i;
79-
}
80-
81-
8269
static int write_subdirectory(void *buffer, unsigned long size, const char *base, int baselen, unsigned char *result_sha1)
8370
{
84-
char *new = malloc(size + ORIG_OFFSET);
85-
unsigned long newlen = ORIG_OFFSET;
71+
char *new = malloc(size);
72+
unsigned long newlen = 0;
8673
unsigned long used;
87-
int i;
8874

8975
used = 0;
9076
while (size) {
@@ -126,11 +112,7 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
126112
buffer += len;
127113
}
128114

129-
i = prepend_integer(new, newlen - ORIG_OFFSET, ORIG_OFFSET);
130-
i -= 5;
131-
memcpy(new + i, "tree ", 5);
132-
133-
write_sha1_file(new + i, newlen - i, result_sha1);
115+
write_sha1_file(new, newlen, "tree", result_sha1);
134116
free(new);
135117
return used;
136118
}
@@ -244,9 +226,8 @@ static int convert_date_line(char *dst, void **buf, unsigned long *sp)
244226

245227
static void convert_date(void *buffer, unsigned long size, unsigned char *result_sha1)
246228
{
247-
char *new = malloc(size + ORIG_OFFSET + 100);
248-
unsigned long newlen = ORIG_OFFSET;
249-
int i;
229+
char *new = malloc(size + 100);
230+
unsigned long newlen = 0;
250231

251232
// "tree <sha1>\n"
252233
memcpy(new + newlen, buffer, 46);
@@ -271,11 +252,7 @@ static void convert_date(void *buffer, unsigned long size, unsigned char *result
271252
memcpy(new + newlen, buffer, size);
272253
newlen += size;
273254

274-
i = prepend_integer(new, newlen - ORIG_OFFSET, ORIG_OFFSET);
275-
i -= 7;
276-
memcpy(new + i, "commit ", 7);
277-
278-
write_sha1_file(new + i, newlen - i, result_sha1);
255+
write_sha1_file(new, newlen, "commit", result_sha1);
279256
free(new);
280257
}
281258

@@ -298,24 +275,23 @@ static struct entry * convert_entry(unsigned char *sha1)
298275
struct entry *entry = lookup_entry(sha1);
299276
char type[20];
300277
void *buffer, *data;
301-
unsigned long size, offset;
278+
unsigned long size;
302279

303280
if (entry->converted)
304281
return entry;
305282
data = read_sha1_file(sha1, type, &size);
306283
if (!data)
307284
die("unable to read object %s", sha1_to_hex(sha1));
308285

309-
buffer = malloc(size + 100);
310-
offset = sprintf(buffer, "%s %lu", type, size)+1;
311-
memcpy(buffer + offset, data, size);
286+
buffer = malloc(size);
287+
memcpy(buffer, data, size);
312288

313289
if (!strcmp(type, "blob")) {
314-
write_sha1_file(buffer, size + offset, entry->new_sha1);
290+
write_sha1_file(buffer, size, "blob", entry->new_sha1);
315291
} else if (!strcmp(type, "tree"))
316-
convert_tree(buffer + offset, size, entry->new_sha1);
292+
convert_tree(buffer, size, entry->new_sha1);
317293
else if (!strcmp(type, "commit"))
318-
convert_commit(buffer + offset, size, entry->new_sha1);
294+
convert_commit(buffer, size, entry->new_sha1);
319295
else
320296
die("unknown object type '%s' in %s", type, sha1_to_hex(sha1));
321297
entry->converted = 1;

‎sha1_file.c‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned l
155155

156156
inflateInit(&stream);
157157
ret = inflate(&stream, 0);
158-
if (ret < Z_OK)
159-
return NULL;
158+
if (ret < Z_OK)
159+
return NULL;
160160
if (sscanf(buffer, "%10s %lu", type, size) != 2)
161161
return NULL;
162162

@@ -231,18 +231,23 @@ void *read_tree_with_tree_or_commit_sha1(const unsigned char *sha1,
231231
return buffer;
232232
}
233233

234-
int write_sha1_file(char *buf, unsigned len, unsigned char *returnsha1)
234+
int write_sha1_file(char *buf, unsigned len, const char *type, unsigned char *returnsha1)
235235
{
236236
int size;
237237
char *compressed;
238238
z_stream stream;
239239
unsigned char sha1[20];
240240
SHA_CTX c;
241241
char *filename;
242-
int fd;
242+
char hdr[50];
243+
int fd, hdrlen;
244+
245+
/* Generate the header */
246+
hdrlen = sprintf(hdr, "%s %d", type, len)+1;
243247

244248
/* Sha1.. */
245249
SHA1_Init(&c);
250+
SHA1_Update(&c, hdr, hdrlen);
246251
SHA1_Update(&c, buf, len);
247252
SHA1_Final(sha1, &c);
248253

@@ -265,14 +270,22 @@ int write_sha1_file(char *buf, unsigned len, unsigned char *returnsha1)
265270
/* Set it up */
266271
memset(&stream, 0, sizeof(stream));
267272
deflateInit(&stream, Z_BEST_COMPRESSION);
268-
size = deflateBound(&stream, len);
273+
size = deflateBound(&stream, len+hdrlen);
269274
compressed = malloc(size);
270275

271276
/* Compress it */
272-
stream.next_in = buf;
273-
stream.avail_in = len;
274277
stream.next_out = compressed;
275278
stream.avail_out = size;
279+
280+
/* First header.. */
281+
stream.next_in = hdr;
282+
stream.avail_in = hdrlen;
283+
while (deflate(&stream, 0) == Z_OK)
284+
/* nothing */
285+
286+
/* Then the data itself.. */
287+
stream.next_in = buf;
288+
stream.avail_in = len;
276289
while (deflate(&stream, Z_FINISH) == Z_OK)
277290
/* nothing */;
278291
deflateEnd(&stream);

‎write-tree.c‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,17 @@ static int check_valid_sha1(unsigned char *sha1)
1717
return ret;
1818
}
1919

20-
static int prepend_integer(char *buffer, unsigned val, int i)
21-
{
22-
buffer[--i] = '\0';
23-
do {
24-
buffer[--i] = '0' + (val % 10);
25-
val /= 10;
26-
} while (val);
27-
return i;
28-
}
29-
30-
#define ORIG_OFFSET (40) /* Enough space to add the header of "tree <size>\0" */
31-
3220
static int write_tree(struct cache_entry **cachep, int maxentries, const char *base, int baselen, unsigned char *returnsha1)
3321
{
3422
unsigned char subdir_sha1[20];
3523
unsigned long size, offset;
3624
char *buffer;
37-
int i, nr;
25+
int nr;
3826

3927
/* Guess at some random initial size */
4028
size = 8192;
4129
buffer = malloc(size);
42-
offset = ORIG_OFFSET;
30+
offset = 0;
4331

4432
nr = 0;
4533
do {
@@ -89,11 +77,7 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
8977
nr++;
9078
} while (nr < maxentries);
9179

92-
i = prepend_integer(buffer, offset - ORIG_OFFSET, ORIG_OFFSET);
93-
i -= 5;
94-
memcpy(buffer+i, "tree ", 5);
95-
96-
write_sha1_file(buffer + i, offset - i, returnsha1);
80+
write_sha1_file(buffer, offset, "tree", returnsha1);
9781
free(buffer);
9882
return nr;
9983
}

0 commit comments

Comments
 (0)