cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quote filenames when handing them off to a shell.

Browse Source 
This fixes errors like "sh: syntax error: `(' unexpected" in make-plist.
ok espie@, jasper@
This commit is contained in:
naddy 2009-04-09 14:48:45 +00:00
parent 10d3197794
commit 6c08a3cb68
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infrastructure/install/FS.pm
View File

@ -1,4 +1,4 @@
# $OpenBSD: FS.pm,v 1.6 2008/12/27 09:16:43 espie Exp $ # $OpenBSD: FS.pm,v 1.7 2009/04/09 14:48:45 naddy Exp $
# Copyright (c) 2008 Marc Espie <espie@openbsd.org> # Copyright (c) 2008 Marc Espie <espie@openbsd.org>
# #
# Permission to use, copy, modify, and distribute this software for any # Permission to use, copy, modify, and distribute this software for any
@ -107,7 +107,7 @@ sub is_shared_object
{ {
my $filename = shift; my $filename = shift;
$filename = resolve_link($filename); $filename = resolve_link($filename);
my $check=`/usr/bin/file $filename`; my $check=`/usr/bin/file \Q$filename\E`;
chomp $check; chomp $check;
if ($check =~m/\: ELF (32|64)-bit (MSB|LSB) shared object\,/ || if ($check =~m/\: ELF (32|64)-bit (MSB|LSB) shared object\,/ ||
$check =~m/OpenBSD\/.* demand paged shared library/) { $check =~m/OpenBSD\/.* demand paged shared library/) {
@ -129,7 +129,7 @@ sub is_binary
{ {
my $filename = shift; my $filename = shift;
return 0 if -l $filename or ! -x $filename; return 0 if -l $filename or ! -x $filename;
my $check=`/usr/bin/file $filename`; my $check=`/usr/bin/file \Q$filename\E`;
chomp $check; chomp $check;
if ($check =~m/\: ELF (32|64)-bit (MSB|LSB) executable\,.+ for OpenBSD\,/) { if ($check =~m/\: ELF (32|64)-bit (MSB|LSB) executable\,.+ for OpenBSD\,/) {
return 1; return 1;