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
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
|
#include <apt-pkg/fileutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/hashes.h>
#include <sys/stat.h>
#include <unistd.h>
#include <utime.h>
#include <stdio.h>
#include <errno.h>
#include <apti18n.h>
/* this method implements a patch functionality similar to "patch --ed" that is
* used by the "tiffany" incremental packages download stuff. it differs from
* "ed" insofar that it is way more restricted (and therefore secure). in the
* moment only the "c", "a" and "d" commands of ed are implemented (diff
* doesn't output any other). additionally the records must be reverse sorted
* by line number and may not overlap (diff *seems* to produce this kind of
* output).
* */
const char *Prog;
class RredMethod : public pkgAcqMethod
{
bool Debug;
// the size of this doesn't really matter (except for performance)
const static int BUF_SIZE = 1024;
// the ed commands
enum Mode {MODE_CHANGED, MODE_DELETED, MODE_ADDED};
// return values
enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE};
// this applies a single hunk, it uses a tail recursion to
// reverse the hunks in the file
int ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line,
char *buffer, unsigned int bufsize, Hashes *hash);
// apply a patch file
int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash);
protected:
// the methods main method
virtual bool Fetch(FetchItem *Itm);
public:
RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
};
int RredMethod::ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line,
char *buffer, unsigned int bufsize, Hashes *hash) {
int pos;
int startline;
int stopline;
int mode;
int written;
char *idx;
/* get the current command and parse it*/
if (fgets(buffer, bufsize, ed_cmds) == NULL) {
return line;
}
startline = strtol(buffer, &idx, 10);
if (startline < line) {
return ED_ORDERING;
}
if (*idx == ',') {
idx++;
stopline = strtol(idx, &idx, 10);
}
else {
stopline = startline;
}
if (*idx == 'c') {
mode = MODE_CHANGED;
if (Debug == true) {
std::clog << "changing from line " << startline
<< " to " << stopline << std::endl;
}
}
else if (*idx == 'a') {
mode = MODE_ADDED;
if (Debug == true) {
std::clog << "adding after line " << startline << std::endl;
}
}
else if (*idx == 'd') {
mode = MODE_DELETED;
if (Debug == true) {
std::clog << "deleting from line " << startline
<< " to " << stopline << std::endl;
}
}
else {
return ED_PARSER;
}
/* get the current position */
pos = ftell(ed_cmds);
/* if this is add or change then go to the next full stop */
if ((mode == MODE_CHANGED) || (mode == MODE_ADDED)) {
do {
fgets(buffer, bufsize, ed_cmds);
while ((strlen(buffer) == (bufsize - 1))
&& (buffer[bufsize - 2] != '\n')) {
fgets(buffer, bufsize, ed_cmds);
buffer[0] = ' ';
}
} while (strncmp(buffer, ".", 1) != 0);
}
/* do the recursive call */
line = ed_rec(ed_cmds, in_file, out_file, line, buffer, bufsize,
hash);
/* pass on errors */
if (line < 0) {
return line;
}
/* apply our hunk */
fseek(ed_cmds, pos, SEEK_SET);
/* first wind to the current position */
if (mode != MODE_ADDED) {
startline -= 1;
}
while (line < startline) {
fgets(buffer, bufsize, in_file);
written = fwrite(buffer, 1, strlen(buffer), out_file);
hash->Add((unsigned char*)buffer, written);
while ((strlen(buffer) == (bufsize - 1))
&& (buffer[bufsize - 2] != '\n')) {
fgets(buffer, bufsize, in_file);
written = fwrite(buffer, 1, strlen(buffer), out_file);
hash->Add((unsigned char*)buffer, written);
}
line++;
}
/* include from ed script */
if ((mode == MODE_ADDED) || (mode == MODE_CHANGED)) {
do {
fgets(buffer, bufsize, ed_cmds);
if (strncmp(buffer, ".", 1) != 0) {
written = fwrite(buffer, 1, strlen(buffer), out_file);
hash->Add((unsigned char*)buffer, written);
while ((strlen(buffer) == (bufsize - 1))
&& (buffer[bufsize - 2] != '\n')) {
fgets(buffer, bufsize, ed_cmds);
written = fwrite(buffer, 1, strlen(buffer), out_file);
hash->Add((unsigned char*)buffer, written);
}
}
else {
break;
}
} while (1);
}
/* ignore the corresponding number of lines from input */
if ((mode == MODE_DELETED) || (mode == MODE_CHANGED)) {
while (line < stopline) {
fgets(buffer, bufsize, in_file);
while ((strlen(buffer) == (bufsize - 1))
&& (buffer[bufsize - 2] != '\n')) {
fgets(buffer, bufsize, in_file);
}
line++;
}
}
return line;
}
int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file,
Hashes *hash) {
char buffer[BUF_SIZE];
int result;
int written;
/* we do a tail recursion to read the commands in the right order */
result = ed_rec(ed_cmds, in_file, out_file, 0, buffer, BUF_SIZE,
hash);
/* read the rest from infile */
if (result >= 0) {
while (fgets(buffer, BUF_SIZE, in_file) != NULL) {
written = fwrite(buffer, 1, strlen(buffer), out_file);
hash->Add((unsigned char*)buffer, written);
}
}
else {
return ED_FAILURE;
}
return ED_OK;
}
bool RredMethod::Fetch(FetchItem *Itm)
{
Debug = _config->FindB("Debug::pkgAcquire::RRed", false);
URI Get = Itm->Uri;
string Path = Get.Host + Get.Path; // To account for relative paths
FetchResult Res;
Res.Filename = Itm->DestFile;
if (Itm->Uri.empty() == true) {
Path = Itm->DestFile;
Itm->DestFile.append(".result");
} else
URIStart(Res);
if (Debug == true)
std::clog << "Patching " << Path << " with " << Path
<< ".ed and putting result into " << Itm->DestFile << std::endl;
// Open the source and destination files (the d'tor of FileFd will do
// the cleanup/closing of the fds)
FileFd From(Path,FileFd::ReadOnly);
FileFd Patch(Path+".ed",FileFd::ReadOnly);
FileFd To(Itm->DestFile,FileFd::WriteEmpty);
To.EraseOnFailure();
if (_error->PendingError() == true)
return false;
Hashes Hash;
FILE* fFrom = fdopen(From.Fd(), "r");
FILE* fPatch = fdopen(Patch.Fd(), "r");
FILE* fTo = fdopen(To.Fd(), "w");
// now do the actual patching
if (ed_file(fPatch, fFrom, fTo, &Hash) != ED_OK) {
_error->Errno("rred", _("Could not patch file"));
return false;
}
// write out the result
fflush(fFrom);
fflush(fPatch);
fflush(fTo);
From.Close();
Patch.Close();
To.Close();
// Transfer the modification times
struct stat Buf;
if (stat(Path.c_str(),&Buf) != 0)
return _error->Errno("stat",_("Failed to stat"));
struct utimbuf TimeBuf;
TimeBuf.actime = Buf.st_atime;
TimeBuf.modtime = Buf.st_mtime;
if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
return _error->Errno("utime",_("Failed to set modification time"));
if (stat(Itm->DestFile.c_str(),&Buf) != 0)
return _error->Errno("stat",_("Failed to stat"));
// return done
if (Itm->Uri.empty() == true) {
Res.LastModified = Buf.st_mtime;
Res.Size = Buf.st_size;
Res.TakeHashes(Hash);
URIDone(Res);
}
return true;
}
/**
* \brief Wrapper class for testing rred
*/
class TestRredMethod : public RredMethod {
public:
/** \brief Run rred in debug test mode
*
* This method can be used to run the rred method outside
* of the "normal" acquire environment for easier testing.
*
* \param base basename of all files involved in this rred test
*/
bool Run(char const *base) {
_config->CndSet("Debug::pkgAcquire::RRed", "true");
FetchItem *test = new FetchItem;
test->DestFile = base;
return Fetch(test);
}
};
/**
* \brief Starter for the rred method (or its test method)
*
* Used without parameters is the normal behavior for methods for
* the APT acquire system. While this works great for the acquire system
* it is very hard to test the method and therefore the method also
* accepts one parameter which will switch it directly to debug test mode:
* The test mode expects that if "Testfile" is given as parameter
* the file "Testfile" should be ed-style patched with "Testfile.ed"
* and will write the result to "Testfile.result".
*/
int main(int argc, char *argv[]) {
Prog = strrchr(argv[0],'/');
Prog++;
if (argc == 0) {
RredMethod Mth;
return Mth.Run();
} else {
TestRredMethod Mth;
bool result = Mth.Run(argv[1]);
_error->DumpErrors();
return result;
}
}
|