d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For scripts that are called in non-login environments (in particular

Browse Source 
mail filters), the /usr/bin/perl dummy fails since it assumes that the
installed package could be reached via the existing $PATH.  Also,
since we are obviously looking for a perl installed by a package, we
should make sure that at least the default package bindir is being
searched.
This commit is contained in:
joerg 2002-08-21 20:54:45 +00:00
parent c99effb6f5
commit d0dc6152ac
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
usr.bin/perl/pathnames.h Normal file
View File

@ -0,0 +1,31 @@
/*-
* Copyright (c) 2002 Joerg Wunsch
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer
* in this position and unchanged.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD$
*/
#define PATH_PKG_BINDIR "/usr/local/bin"

22
usr.bin/perl/perl.c
View File

@ -30,6 +30,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/sysctl.h>
#include <err.h>
#include <errno.h>
@ -38,12 +39,14 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
#include "pathnames.h"
extern char **environ;
int
main(int argc __unused, char *argv[])
{
char path[PATH_MAX];
char path[PATH_MAX], *cp;
const char *cmd, *p, *q, *self;
size_t len;
@ -52,6 +55,23 @@ main(int argc __unused, char *argv[])
cmd = self;
else
cmd++;
/* If null path (e. g. in mailfilter scripts), use default path. */
if ((p = getenv("PATH")) == NULL) {
if (sysctlbyname("user.cs_path", (void *)NULL, &len,
(void *)NULL, 0) == -1)
err(1, "sysctlbyname(\"user.cs_path\")");
if ((cp = malloc(len + 1)) == NULL)
err(1, "malloc() failed");
if (sysctlbyname("user.cs_path", cp, &len, (void *)NULL, 0) == -1)
err(1, "sysctlbyname(\"user.cs_path\")");
setenv("PATH", cp, 1);
}
/* If default package bindir not there, append it. */
p = getenv("PATH");
if (strstr(p, PATH_PKG_BINDIR) == NULL) {
snprintf(path, sizeof path, "%s:%s", p, PATH_PKG_BINDIR);
setenv("PATH", path, 1);
}
argv[0] = path;
for (p = q = getenv("PATH"); p && *p && *q; p = q + 1) {
for (q = p; *q && *q != ':'; ++q)