diff options
| author |   espie <espie@openbsd.org> | 2008-06-09 12:00:48 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2008-06-09 12:00:48 +0000 |
| commit | 19bafd843f5335d04c740e51c63c3ee7152cd5b7 (patch) | |
| tree | 3a95cafff9e01b00553665eed6569fcd13c0fa54 | |
| parent | constify arguments in wrapper functions; the lower level functions (diff) | |
| download | wireguard-openbsd-19bafd843f5335d04c740e51c63c3ee7152cd5b7.tar.xz wireguard-openbsd-19bafd843f5335d04c740e51c63c3ee7152cd5b7.zip | |
allow direct copy of fh to another
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Subst.pm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Subst.pm b/usr.sbin/pkg_add/OpenBSD/Subst.pm index 6ad52df3b3a..d64f794019d 100644 --- a/usr.sbin/pkg_add/OpenBSD/Subst.pm +++ b/usr.sbin/pkg_add/OpenBSD/Subst.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Subst.pm,v 1.5 2008/04/07 17:56:43 espie Exp $ +# $OpenBSD: Subst.pm,v 1.6 2008/06/09 12:00:48 espie Exp $ # # Copyright (c) 2008 Marc Espie <espie@openbsd.org> # @@ -70,16 +70,22 @@ sub do return $_; } -sub copy_fh +sub copy_fh2 { - my ($self, $srcname, $dest) = @_; - open my $src, '<', $srcname or die "can't open $srcname"; + my ($self, $src, $dest) = @_; local $_; while (<$src>) { print $dest $self->do($_); } } +sub copy_fh +{ + my ($self, $srcname, $dest) = @_; + open my $src, '<', $srcname or die "can't open $srcname"; + $self->copy_fh2($src, $dest); +} + sub copy { my ($self, $srcname, $destname) = @_; |