diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2012-06-19 18:56:08 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2012-06-19 18:56:08 +0000 |
| commit | d36e5b4141b98f99787db4e76b04ecf579bb9e3d (patch) | |
| tree | a33a23916c25daecec7a9b4a71bcb4e7b5df1a93 | |
| parent | 0bceec318f7f0fafdb46cc4f9798bc8d4d1835b8 (diff) | |
avoid shell code errors
unneeded eval
okay jasper@
| -rw-r--r-- | usr.bin/libtool/LT/Library.pm | 4 | ||||
| -rwxr-xr-x | usr.bin/libtool/libtool | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/libtool/LT/Library.pm b/usr.bin/libtool/LT/Library.pm index 5f1e7eca9ac..672092e575f 100644 --- a/usr.bin/libtool/LT/Library.pm +++ b/usr.bin/libtool/LT/Library.pm @@ -1,4 +1,4 @@ -# $OpenBSD: Library.pm,v 1.1 2012/06/19 09:30:44 espie Exp $ +# $OpenBSD: Library.pm,v 1.2 2012/06/19 18:56:07 espie Exp $ # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org> # @@ -139,7 +139,7 @@ sub inspect return; } LT::Trace::debug {"inspecting $filename for library dependencies...\n"}; - open(my $fh, '-|', "objdump -p $filename"); + open(my $fh, '-|', "objdump", "-p", "--", $filename); while (<$fh>) { if (m/\s+NEEDED\s+(\S+)\s*$/) { push @deps, $1; diff --git a/usr.bin/libtool/libtool b/usr.bin/libtool/libtool index 74d2dcc77f8..a536dceb85c 100755 --- a/usr.bin/libtool/libtool +++ b/usr.bin/libtool/libtool @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $OpenBSD: libtool,v 1.1 2012/06/19 09:30:44 espie Exp $ +# $OpenBSD: libtool,v 1.2 2012/06/19 18:56:07 espie Exp $ # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org> # @@ -704,6 +704,6 @@ sub is_wrapper my $program = shift; open(my $pw, '<', $program) or die "Cannot open $program: $!\n"; - return eval(grep { m/wrapper\sfor/ } <$pw>); + return grep { m/wrapper\sfor/ } <$pw>; } |