rred.cc 18 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731
  1. // Copyright (c) 2014 Anthony Towns
  2. //
  3. // This program is free software; you can redistribute it and/or modify
  4. // it under the terms of the GNU General Public License as published by
  5. // the Free Software Foundation; either version 2 of the License, or
  6. // (at your option) any later version.
  7. #include <config.h>
  8. #include <apt-pkg/fileutl.h>
  9. #include <apt-pkg/error.h>
  10. #include <apt-pkg/acquire-method.h>
  11. #include <apt-pkg/strutl.h>
  12. #include <apt-pkg/hashes.h>
  13. #include <apt-pkg/configuration.h>
  14. #include "aptmethod.h"
  15. #include <stddef.h>
  16. #include <iostream>
  17. #include <string>
  18. #include <list>
  19. #include <vector>
  20. #include <assert.h>
  21. #include <errno.h>
  22. #include <stdio.h>
  23. #include <stdlib.h>
  24. #include <string.h>
  25. #include <sys/stat.h>
  26. #include <sys/time.h>
  27. #include <apti18n.h>
  28. #define BLOCK_SIZE (512*1024)
  29. class MemBlock {
  30. char *start;
  31. size_t size;
  32. char *free;
  33. MemBlock *next;
  34. explicit MemBlock(size_t size) : size(size), next(NULL)
  35. {
  36. free = start = new char[size];
  37. }
  38. size_t avail(void) { return size - (free - start); }
  39. public:
  40. MemBlock(void) {
  41. free = start = new char[BLOCK_SIZE];
  42. size = BLOCK_SIZE;
  43. next = NULL;
  44. }
  45. ~MemBlock() {
  46. delete [] start;
  47. delete next;
  48. }
  49. void clear(void) {
  50. free = start;
  51. if (next)
  52. next->clear();
  53. }
  54. char *add_easy(char *src, size_t len, char *last)
  55. {
  56. if (last) {
  57. for (MemBlock *k = this; k; k = k->next) {
  58. if (k->free == last) {
  59. if (len <= k->avail()) {
  60. char *n = k->add(src, len);
  61. assert(last == n);
  62. if (last == n)
  63. return NULL;
  64. return n;
  65. } else {
  66. break;
  67. }
  68. } else if (last >= start && last < free) {
  69. break;
  70. }
  71. }
  72. }
  73. return add(src, len);
  74. }
  75. char *add(char *src, size_t len) {
  76. if (len > avail()) {
  77. if (!next) {
  78. if (len > BLOCK_SIZE) {
  79. next = new MemBlock(len);
  80. } else {
  81. next = new MemBlock;
  82. }
  83. }
  84. return next->add(src, len);
  85. }
  86. char *dst = free;
  87. free += len;
  88. memcpy(dst, src, len);
  89. return dst;
  90. }
  91. };
  92. struct Change {
  93. /* Ordering:
  94. *
  95. * 1. write out <offset> lines unchanged
  96. * 2. skip <del_cnt> lines from source
  97. * 3. write out <add_cnt> lines (<add>/<add_len>)
  98. */
  99. size_t offset;
  100. size_t del_cnt;
  101. size_t add_cnt; /* lines */
  102. size_t add_len; /* bytes */
  103. char *add;
  104. explicit Change(size_t off)
  105. {
  106. offset = off;
  107. del_cnt = add_cnt = add_len = 0;
  108. add = NULL;
  109. }
  110. /* actually, don't write <lines> lines from <add> */
  111. void skip_lines(size_t lines)
  112. {
  113. while (lines > 0) {
  114. char *s = (char*) memchr(add, '\n', add_len);
  115. assert(s != NULL);
  116. s++;
  117. add_len -= (s - add);
  118. add_cnt--;
  119. lines--;
  120. if (add_len == 0) {
  121. add = NULL;
  122. assert(add_cnt == 0);
  123. assert(lines == 0);
  124. } else {
  125. add = s;
  126. assert(add_cnt > 0);
  127. }
  128. }
  129. }
  130. };
  131. class FileChanges {
  132. std::list<struct Change> changes;
  133. std::list<struct Change>::iterator where;
  134. size_t pos; // line number is as far left of iterator as possible
  135. bool pos_is_okay(void) const
  136. {
  137. #ifdef POSDEBUG
  138. size_t cpos = 0;
  139. std::list<struct Change>::const_iterator x;
  140. for (x = changes.begin(); x != where; ++x) {
  141. assert(x != changes.end());
  142. cpos += x->offset + x->add_cnt;
  143. }
  144. return cpos == pos;
  145. #else
  146. return true;
  147. #endif
  148. }
  149. public:
  150. FileChanges() {
  151. where = changes.end();
  152. pos = 0;
  153. }
  154. std::list<struct Change>::iterator begin(void) { return changes.begin(); }
  155. std::list<struct Change>::iterator end(void) { return changes.end(); }
  156. std::list<struct Change>::reverse_iterator rbegin(void) { return changes.rbegin(); }
  157. std::list<struct Change>::reverse_iterator rend(void) { return changes.rend(); }
  158. void add_change(Change c) {
  159. assert(pos_is_okay());
  160. go_to_change_for(c.offset);
  161. assert(pos + where->offset == c.offset);
  162. if (c.del_cnt > 0)
  163. delete_lines(c.del_cnt);
  164. assert(pos + where->offset == c.offset);
  165. if (c.add_len > 0) {
  166. assert(pos_is_okay());
  167. if (where->add_len > 0)
  168. new_change();
  169. assert(where->add_len == 0 && where->add_cnt == 0);
  170. where->add_len = c.add_len;
  171. where->add_cnt = c.add_cnt;
  172. where->add = c.add;
  173. }
  174. assert(pos_is_okay());
  175. merge();
  176. assert(pos_is_okay());
  177. }
  178. private:
  179. void merge(void)
  180. {
  181. while (where->offset == 0 && where != changes.begin()) {
  182. left();
  183. }
  184. std::list<struct Change>::iterator next = where;
  185. ++next;
  186. while (next != changes.end() && next->offset == 0) {
  187. where->del_cnt += next->del_cnt;
  188. next->del_cnt = 0;
  189. if (next->add == NULL) {
  190. next = changes.erase(next);
  191. } else if (where->add == NULL) {
  192. where->add = next->add;
  193. where->add_len = next->add_len;
  194. where->add_cnt = next->add_cnt;
  195. next = changes.erase(next);
  196. } else {
  197. ++next;
  198. }
  199. }
  200. }
  201. void go_to_change_for(size_t line)
  202. {
  203. while(where != changes.end()) {
  204. if (line < pos) {
  205. left();
  206. continue;
  207. }
  208. if (pos + where->offset + where->add_cnt <= line) {
  209. right();
  210. continue;
  211. }
  212. // line is somewhere in this slot
  213. if (line < pos + where->offset) {
  214. break;
  215. } else if (line == pos + where->offset) {
  216. return;
  217. } else {
  218. split(line - pos);
  219. right();
  220. return;
  221. }
  222. }
  223. /* it goes before this patch */
  224. insert(line-pos);
  225. }
  226. void new_change(void) { insert(where->offset); }
  227. void insert(size_t offset)
  228. {
  229. assert(pos_is_okay());
  230. assert(where == changes.end() || offset <= where->offset);
  231. if (where != changes.end())
  232. where->offset -= offset;
  233. changes.insert(where, Change(offset));
  234. --where;
  235. assert(pos_is_okay());
  236. }
  237. void split(size_t offset)
  238. {
  239. assert(pos_is_okay());
  240. assert(where->offset < offset);
  241. assert(offset < where->offset + where->add_cnt);
  242. size_t keep_lines = offset - where->offset;
  243. Change before(*where);
  244. where->del_cnt = 0;
  245. where->offset = 0;
  246. where->skip_lines(keep_lines);
  247. before.add_cnt = keep_lines;
  248. before.add_len -= where->add_len;
  249. changes.insert(where, before);
  250. --where;
  251. assert(pos_is_okay());
  252. }
  253. void delete_lines(size_t cnt)
  254. {
  255. std::list<struct Change>::iterator x = where;
  256. assert(pos_is_okay());
  257. while (cnt > 0)
  258. {
  259. size_t del;
  260. del = x->add_cnt;
  261. if (del > cnt)
  262. del = cnt;
  263. x->skip_lines(del);
  264. cnt -= del;
  265. ++x;
  266. if (x == changes.end()) {
  267. del = cnt;
  268. } else {
  269. del = x->offset;
  270. if (del > cnt)
  271. del = cnt;
  272. x->offset -= del;
  273. }
  274. where->del_cnt += del;
  275. cnt -= del;
  276. }
  277. assert(pos_is_okay());
  278. }
  279. void left(void) {
  280. assert(pos_is_okay());
  281. --where;
  282. pos -= where->offset + where->add_cnt;
  283. assert(pos_is_okay());
  284. }
  285. void right(void) {
  286. assert(pos_is_okay());
  287. pos += where->offset + where->add_cnt;
  288. ++where;
  289. assert(pos_is_okay());
  290. }
  291. };
  292. class Patch {
  293. FileChanges filechanges;
  294. MemBlock add_text;
  295. static bool retry_fwrite(char *b, size_t l, FileFd &f, Hashes *hash)
  296. {
  297. if (f.Write(b, l) == false)
  298. return false;
  299. if (hash)
  300. hash->Add((unsigned char*)b, l);
  301. return true;
  302. }
  303. static void dump_rest(FileFd &o, FileFd &i, Hashes *hash)
  304. {
  305. char buffer[BLOCK_SIZE];
  306. unsigned long long l = 0;
  307. while (i.Read(buffer, sizeof(buffer), &l)) {
  308. if (l ==0 || !retry_fwrite(buffer, l, o, hash))
  309. break;
  310. }
  311. }
  312. static void dump_lines(FileFd &o, FileFd &i, size_t n, Hashes *hash)
  313. {
  314. char buffer[BLOCK_SIZE];
  315. while (n > 0) {
  316. if (i.ReadLine(buffer, sizeof(buffer)) == NULL)
  317. buffer[0] = '\0';
  318. size_t const l = strlen(buffer);
  319. if (l == 0 || buffer[l-1] == '\n')
  320. n--;
  321. retry_fwrite(buffer, l, o, hash);
  322. }
  323. }
  324. static void skip_lines(FileFd &i, int n)
  325. {
  326. char buffer[BLOCK_SIZE];
  327. while (n > 0) {
  328. if (i.ReadLine(buffer, sizeof(buffer)) == NULL)
  329. buffer[0] = '\0';
  330. size_t const l = strlen(buffer);
  331. if (l == 0 || buffer[l-1] == '\n')
  332. n--;
  333. }
  334. }
  335. static void dump_mem(FileFd &o, char *p, size_t s, Hashes *hash) {
  336. retry_fwrite(p, s, o, hash);
  337. }
  338. public:
  339. bool read_diff(FileFd &f, Hashes * const h)
  340. {
  341. char buffer[BLOCK_SIZE];
  342. bool cmdwanted = true;
  343. Change ch(std::numeric_limits<size_t>::max());
  344. if (f.ReadLine(buffer, sizeof(buffer)) == NULL)
  345. return _error->Error("Reading first line of patchfile %s failed", f.Name().c_str());
  346. do {
  347. if (h != NULL)
  348. h->Add(buffer);
  349. if (cmdwanted) {
  350. char *m, *c;
  351. size_t s, e;
  352. errno = 0;
  353. s = strtoul(buffer, &m, 10);
  354. if (unlikely(m == buffer || s == std::numeric_limits<unsigned long>::max() || errno != 0))
  355. return _error->Error("Parsing patchfile %s failed: Expected an effected line start", f.Name().c_str());
  356. else if (*m == ',') {
  357. ++m;
  358. e = strtol(m, &c, 10);
  359. if (unlikely(m == c || e == std::numeric_limits<unsigned long>::max() || errno != 0))
  360. return _error->Error("Parsing patchfile %s failed: Expected an effected line end", f.Name().c_str());
  361. if (unlikely(e < s))
  362. return _error->Error("Parsing patchfile %s failed: Effected lines end %lu is before start %lu", f.Name().c_str(), e, s);
  363. } else {
  364. e = s;
  365. c = m;
  366. }
  367. if (s > ch.offset)
  368. return _error->Error("Parsing patchfile %s failed: Effected line is after previous effected line", f.Name().c_str());
  369. switch(*c) {
  370. case 'a':
  371. cmdwanted = false;
  372. ch.add = NULL;
  373. ch.add_cnt = 0;
  374. ch.add_len = 0;
  375. ch.offset = s;
  376. ch.del_cnt = 0;
  377. break;
  378. case 'c':
  379. if (unlikely(s == 0))
  380. return _error->Error("Parsing patchfile %s failed: Change command can't effect line zero", f.Name().c_str());
  381. cmdwanted = false;
  382. ch.add = NULL;
  383. ch.add_cnt = 0;
  384. ch.add_len = 0;
  385. ch.offset = s - 1;
  386. ch.del_cnt = e - s + 1;
  387. break;
  388. case 'd':
  389. if (unlikely(s == 0))
  390. return _error->Error("Parsing patchfile %s failed: Delete command can't effect line zero", f.Name().c_str());
  391. ch.offset = s - 1;
  392. ch.del_cnt = e - s + 1;
  393. ch.add = NULL;
  394. ch.add_cnt = 0;
  395. ch.add_len = 0;
  396. filechanges.add_change(ch);
  397. break;
  398. default:
  399. return _error->Error("Parsing patchfile %s failed: Unknown command", f.Name().c_str());
  400. }
  401. } else { /* !cmdwanted */
  402. if (strcmp(buffer, ".\n") == 0) {
  403. cmdwanted = true;
  404. filechanges.add_change(ch);
  405. } else {
  406. char *last = NULL;
  407. char *add;
  408. size_t l;
  409. if (ch.add)
  410. last = ch.add + ch.add_len;
  411. l = strlen(buffer);
  412. add = add_text.add_easy(buffer, l, last);
  413. if (!add) {
  414. ch.add_len += l;
  415. ch.add_cnt++;
  416. } else {
  417. if (ch.add) {
  418. filechanges.add_change(ch);
  419. ch.del_cnt = 0;
  420. }
  421. ch.offset += ch.add_cnt;
  422. ch.add = add;
  423. ch.add_len = l;
  424. ch.add_cnt = 1;
  425. }
  426. }
  427. }
  428. } while(f.ReadLine(buffer, sizeof(buffer)));
  429. return true;
  430. }
  431. void write_diff(FileFd &f)
  432. {
  433. unsigned long long line = 0;
  434. std::list<struct Change>::reverse_iterator ch;
  435. for (ch = filechanges.rbegin(); ch != filechanges.rend(); ++ch) {
  436. line += ch->offset + ch->del_cnt;
  437. }
  438. for (ch = filechanges.rbegin(); ch != filechanges.rend(); ++ch) {
  439. std::list<struct Change>::reverse_iterator mg_i, mg_e = ch;
  440. while (ch->del_cnt == 0 && ch->offset == 0)
  441. ++ch;
  442. line -= ch->del_cnt;
  443. std::string buf;
  444. if (ch->add_cnt > 0) {
  445. if (ch->del_cnt == 0) {
  446. strprintf(buf, "%llua\n", line);
  447. } else if (ch->del_cnt == 1) {
  448. strprintf(buf, "%lluc\n", line+1);
  449. } else {
  450. strprintf(buf, "%llu,%lluc\n", line+1, line+ch->del_cnt);
  451. }
  452. f.Write(buf.c_str(), buf.length());
  453. mg_i = ch;
  454. do {
  455. dump_mem(f, mg_i->add, mg_i->add_len, NULL);
  456. } while (mg_i-- != mg_e);
  457. buf = ".\n";
  458. f.Write(buf.c_str(), buf.length());
  459. } else if (ch->del_cnt == 1) {
  460. strprintf(buf, "%llud\n", line+1);
  461. f.Write(buf.c_str(), buf.length());
  462. } else if (ch->del_cnt > 1) {
  463. strprintf(buf, "%llu,%llud\n", line+1, line+ch->del_cnt);
  464. f.Write(buf.c_str(), buf.length());
  465. }
  466. line -= ch->offset;
  467. }
  468. }
  469. void apply_against_file(FileFd &out, FileFd &in, Hashes *hash = NULL)
  470. {
  471. std::list<struct Change>::iterator ch;
  472. for (ch = filechanges.begin(); ch != filechanges.end(); ++ch) {
  473. dump_lines(out, in, ch->offset, hash);
  474. skip_lines(in, ch->del_cnt);
  475. dump_mem(out, ch->add, ch->add_len, hash);
  476. }
  477. dump_rest(out, in, hash);
  478. }
  479. };
  480. class RredMethod : public aptMethod {
  481. private:
  482. bool Debug;
  483. struct PDiffFile {
  484. std::string FileName;
  485. HashStringList ExpectedHashes;
  486. PDiffFile(std::string const &FileName, HashStringList const &ExpectedHashes) :
  487. FileName(FileName), ExpectedHashes(ExpectedHashes) {}
  488. };
  489. HashStringList ReadExpectedHashesForPatch(unsigned int const patch, std::string const &Message)
  490. {
  491. HashStringList ExpectedHashes;
  492. for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
  493. {
  494. std::string tagname;
  495. strprintf(tagname, "Patch-%d-%s-Hash", patch, *type);
  496. std::string const hashsum = LookupTag(Message, tagname.c_str());
  497. if (hashsum.empty() == false)
  498. ExpectedHashes.push_back(HashString(*type, hashsum));
  499. }
  500. return ExpectedHashes;
  501. }
  502. protected:
  503. virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE {
  504. Debug = _config->FindB("Debug::pkgAcquire::RRed", false);
  505. URI Get = Itm->Uri;
  506. std::string Path = Get.Host + Get.Path; // rred:/path - no host
  507. FetchResult Res;
  508. Res.Filename = Itm->DestFile;
  509. if (Itm->Uri.empty())
  510. {
  511. Path = Itm->DestFile;
  512. Itm->DestFile.append(".result");
  513. } else
  514. URIStart(Res);
  515. std::vector<PDiffFile> patchfiles;
  516. Patch patch;
  517. if (FileExists(Path + ".ed") == true)
  518. {
  519. HashStringList const ExpectedHashes = ReadExpectedHashesForPatch(0, Message);
  520. std::string const FileName = Path + ".ed";
  521. if (ExpectedHashes.usable() == false)
  522. return _error->Error("No hashes found for uncompressed patch: %s", FileName.c_str());
  523. patchfiles.push_back(PDiffFile(FileName, ExpectedHashes));
  524. }
  525. else
  526. {
  527. _error->PushToStack();
  528. std::vector<std::string> patches = GetListOfFilesInDir(flNotFile(Path), "gz", true, false);
  529. _error->RevertToStack();
  530. std::string const baseName = Path + ".ed.";
  531. unsigned int seen_patches = 0;
  532. for (std::vector<std::string>::const_iterator p = patches.begin();
  533. p != patches.end(); ++p)
  534. {
  535. if (p->compare(0, baseName.length(), baseName) == 0)
  536. {
  537. HashStringList const ExpectedHashes = ReadExpectedHashesForPatch(seen_patches, Message);
  538. if (ExpectedHashes.usable() == false)
  539. return _error->Error("No hashes found for uncompressed patch %d: %s", seen_patches, p->c_str());
  540. patchfiles.push_back(PDiffFile(*p, ExpectedHashes));
  541. ++seen_patches;
  542. }
  543. }
  544. }
  545. std::string patch_name;
  546. for (std::vector<PDiffFile>::iterator I = patchfiles.begin();
  547. I != patchfiles.end();
  548. ++I)
  549. {
  550. patch_name = I->FileName;
  551. if (Debug == true)
  552. std::clog << "Patching " << Path << " with " << patch_name
  553. << std::endl;
  554. FileFd p;
  555. Hashes patch_hash(I->ExpectedHashes);
  556. // all patches are compressed, even if the name doesn't reflect it
  557. if (p.Open(patch_name, FileFd::ReadOnly, FileFd::Gzip) == false ||
  558. patch.read_diff(p, &patch_hash) == false)
  559. {
  560. _error->DumpErrors(std::cerr, GlobalError::DEBUG, false);
  561. return false;
  562. }
  563. p.Close();
  564. HashStringList const hsl = patch_hash.GetHashStringList();
  565. if (hsl != I->ExpectedHashes)
  566. return _error->Error("Hash Sum mismatch for uncompressed patch %s", patch_name.c_str());
  567. }
  568. if (Debug == true)
  569. std::clog << "Applying patches against " << Path
  570. << " and writing results to " << Itm->DestFile
  571. << std::endl;
  572. FileFd inp, out;
  573. if (inp.Open(Path, FileFd::ReadOnly, FileFd::Extension) == false)
  574. {
  575. std::cerr << "FAILED to open inp " << Path << std::endl;
  576. return _error->Error("Failed to open inp %s", Path.c_str());
  577. }
  578. if (out.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create, FileFd::Extension) == false)
  579. {
  580. std::cerr << "FAILED to open out " << Itm->DestFile << std::endl;
  581. return _error->Error("Failed to open out %s", Itm->DestFile.c_str());
  582. }
  583. Hashes hash(Itm->ExpectedHashes);
  584. patch.apply_against_file(out, inp, &hash);
  585. out.Close();
  586. inp.Close();
  587. if (Debug == true) {
  588. std::clog << "rred: finished file patching of " << Path << "." << std::endl;
  589. }
  590. struct stat bufbase, bufpatch;
  591. if (stat(Path.c_str(), &bufbase) != 0 ||
  592. stat(patch_name.c_str(), &bufpatch) != 0)
  593. return _error->Errno("stat", _("Failed to stat"));
  594. struct timeval times[2];
  595. times[0].tv_sec = bufbase.st_atime;
  596. times[1].tv_sec = bufpatch.st_mtime;
  597. times[0].tv_usec = times[1].tv_usec = 0;
  598. if (utimes(Itm->DestFile.c_str(), times) != 0)
  599. return _error->Errno("utimes",_("Failed to set modification time"));
  600. if (stat(Itm->DestFile.c_str(), &bufbase) != 0)
  601. return _error->Errno("stat", _("Failed to stat"));
  602. Res.LastModified = bufbase.st_mtime;
  603. Res.Size = bufbase.st_size;
  604. Res.TakeHashes(hash);
  605. URIDone(Res);
  606. return true;
  607. }
  608. public:
  609. RredMethod() : aptMethod("rred", "2.0",SingleInstance | SendConfig), Debug(false) {}
  610. };
  611. int main(int argc, char **argv)
  612. {
  613. int i;
  614. bool just_diff = true;
  615. Patch patch;
  616. if (argc <= 1) {
  617. RredMethod Mth;
  618. return Mth.Run();
  619. }
  620. if (argc > 1 && strcmp(argv[1], "-f") == 0) {
  621. just_diff = false;
  622. i = 2;
  623. } else {
  624. i = 1;
  625. }
  626. for (; i < argc; i++) {
  627. FileFd p;
  628. if (p.Open(argv[i], FileFd::ReadOnly) == false) {
  629. _error->DumpErrors(std::cerr);
  630. exit(1);
  631. }
  632. if (patch.read_diff(p, NULL) == false)
  633. {
  634. _error->DumpErrors(std::cerr);
  635. exit(2);
  636. }
  637. }
  638. if (just_diff) {
  639. FileFd out;
  640. out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::Create);
  641. patch.write_diff(out);
  642. } else {
  643. FileFd out, inp;
  644. out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::Create);
  645. inp.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly);
  646. patch.apply_against_file(out, inp);
  647. }
  648. return 0;
  649. }