1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
--- ccache.h.orig Wed Sep 8 21:30:40 2004
+++ ccache.h Wed Sep 8 21:31:53 2004
@@ -65,14 +65,14 @@
typedef unsigned uint32;
-#include "mdfour.h"
+#include <md4.h>
void hash_start(void);
void hash_string(const char *s);
void hash_int(int x);
void hash_file(const char *fname);
char *hash_result(void);
-void hash_buffer(const char *s, int len);
+void hash_buffer(const unsigned char *s, unsigned int len);
void cc_log(const char *format, ...);
void fatal(const char *msg);
--- hash.c.orig Wed Sep 8 21:36:22 2004
+++ hash.c Wed Sep 8 21:36:25 2004
@@ -20,17 +20,22 @@
*/
#include "ccache.h"
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
-static struct mdfour md;
+static MD4_CTX md;
+static off_t totalN;
-void hash_buffer(const char *s, int len)
+void hash_buffer(const unsigned char *s, unsigned int len)
{
- mdfour_update(&md, (unsigned char *)s, len);
+ totalN += len;
+ MD4Update(&md, s, len);
}
void hash_start(void)
{
- mdfour_begin(&md);
+ MD4Init(&md);
}
void hash_string(const char *s)
@@ -46,35 +51,40 @@
/* add contents of a file to the hash */
void hash_file(const char *fname)
{
- char buf[1024];
- int fd, n;
+ char *buf;
+ int fd;
+ struct stat stats;
fd = open(fname, O_RDONLY|O_BINARY);
if (fd == -1) {
cc_log("Failed to open %s\n", fname);
- fatal("hash_file");
+ fatal(__FUNCTION__);
}
- while ((n = read(fd, buf, sizeof(buf))) > 0) {
- hash_buffer(buf, n);
- }
+ if (fstat(fd, &stats) != 0) {
+ cc_log("Failed to fstat the opened %s (descriptor %d)\n",
+ fname, fd);
+ close(fd);
+ fatal(__FUNCTION__);
+ }
+ buf = mmap(NULL, stats.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+ if (buf == MAP_FAILED) {
+ cc_log("Failed to mmap %s\n", fname);
+ close(fd);
+ fatal(__FUNCTION__);
+ }
+
+ hash_buffer(buf, stats.st_size);
close(fd);
}
/* return the hash result as a static string */
char *hash_result(void)
{
- unsigned char sum[16];
static char ret[53];
- int i;
- hash_buffer(NULL, 0);
- mdfour_result(&md, sum);
+ MD4End(&md, ret);
- for (i=0;i<16;i++) {
- sprintf(&ret[i*2], "%02x", (unsigned)sum[i]);
- }
- sprintf(&ret[i*2], "-%u", (unsigned)md.totalN);
-
+ snprintf(ret + 32, sizeof ret - 32, "-%lu", (unsigned long)totalN);
return ret;
}
--- unify.c.orig Wed Sep 8 21:36:41 2004
+++ unify.c Wed Sep 8 21:37:20 2004
@@ -104,13 +104,12 @@
hash_buffer((char *)buf, len);
len = 0;
}
- hash_buffer(NULL, 0);
return;
}
buf[len++] = c;
- if (len == 64) {
- hash_buffer((char *)buf, len);
+ if (len == sizeof buf) {
+ hash_buffer((char *)buf, sizeof buf);
len = 0;
}
}
--- Makefile.in.orig Mon Sep 6 09:04:22 2004
+++ Makefile.in Wed Sep 8 21:41:00 2004
@@ -11,16 +11,16 @@
CFLAGS=@CFLAGS@ -I.
EXEEXT=@EXEEXT@
-OBJS= ccache.o mdfour.o hash.o execute.o util.o args.o stats.o \
+OBJS= ccache.o hash.o execute.o util.o args.o stats.o \
cleanup.o snprintf.o unify.o
-HEADERS = ccache.h mdfour.h
+HEADERS = ccache.h
all: ccache$(EXEEXT)
docs: ccache.1 web/ccache-man.html
ccache$(EXEEXT): $(OBJS) $(HEADERS)
- $(CC) $(CFLAGS) -o $@ $(OBJS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) -lmd
ccache.1: ccache.yo
-yodl2man -o ccache.1 ccache.yo
|
