more file leaks fixed
Ryan Niebur
14 years ago
| 518 | 518 | Debian::Utils.gunzip(ctz) {|ct| |
| 519 | 519 | Debian::Utils.tar(ct, op, *pat) {|fp| |
| 520 | 520 | if block_given? |
| 521 | return yield(fp) | |
| 521 | ct.close | |
| 522 | retval = yield(fp) | |
| 523 | fp.close | |
| 524 | return retval | |
| 522 | 525 | else |
| 526 | ct.close | |
| 523 | 527 | return fp |
| 524 | 528 | end |
| 525 | 529 | } |
| 530 | 534 | def control_fp(op, *pat) |
| 531 | 535 | deb_fp("control.tar.gz", op, *pat) {|fp| |
| 532 | 536 | if block_given? |
| 533 | return yield(fp) | |
| 537 | yield(fp) | |
| 534 | 538 | else |
| 535 | return fp | |
| 539 | fp | |
| 536 | 540 | end |
| 537 | 541 | } |
| 538 | 542 | end |
| 539 | 543 | def data_fp(op, *pat) |
| 540 | 544 | deb_fp("data.tar.gz", op, *pat) {|fp| |
| 541 | 545 | if block_given? |
| 542 | return yield(fp) | |
| 546 | yield(fp) | |
| 543 | 547 | else |
| 544 | return fp | |
| 548 | fp | |
| 545 | 549 | end |
| 546 | 550 | } |
| 547 | 551 | end |
| 574 | 578 | end |
| 575 | 579 | control_fp(Debian::Utils::TAR_EXTRACT, "*/#{cfile}") {|fp| |
| 576 | 580 | if block_given? |
| 577 | return yield(fp) | |
| 581 | yield(fp) | |
| 578 | 582 | else |
| 579 | return fp | |
| 583 | fp | |
| 580 | 584 | end |
| 581 | 585 | } |
| 582 | 586 | end |
| 583 | 587 | def controlData(cfile = "control") |
| 584 | controlFile(cfile) {|fp| return fp.readlines.join("") } | |
| 588 | controlFile(cfile) {|fp| fp.readlines.join("") } | |
| 585 | 589 | end |
| 586 | 590 | def dataFile(fname) |
| 587 | 591 | if /^\.\// =~ fname |
| 592 | 596 | end |
| 593 | 597 | data_fp(Debian::Utils::TAR_EXTRACT, pat) {|fp| |
| 594 | 598 | if block_given? |
| 595 | return yield(fp) | |
| 599 | yield(fp) | |
| 596 | 600 | else |
| 597 | return fp | |
| 601 | fp | |
| 598 | 602 | end |
| 599 | 603 | } |
| 600 | 604 | end |
| 601 | 605 | def dataData(fname) |
| 602 | dataFile(fname) {|fp| return fp.readlines.join("") } | |
| 606 | dataFile(fname) {|fp| fp.readlines.join("") } | |
| 603 | 607 | end |
| 604 | 608 | def sys_tarfile |
| 605 | 609 | unless @filename || @artab |
| 608 | 612 | @artab.open("data.tar.gz") {|dtz| |
| 609 | 613 | Debian::Utils.gunzip(dtz) {|dt| |
| 610 | 614 | if block_given? |
| 611 | return yield(dt) | |
| 615 | yield(dt) | |
| 612 | 616 | else |
| 613 | return dt | |
| 617 | dt | |
| 614 | 618 | end |
| 615 | 619 | } |
| 616 | 620 | } |