mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-11-01 06:20:55 +01:00
Code Releases Activity

53085: support for BSDs in $ZSH_EXEPATH implementation

Browse source
This commit is contained in:
Oliver Kiddle 2024-09-14 19:38:23 +02:00
parent 0cd2c953b4
commit 701fad5021
3 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2024-09-14 Oliver Kiddle <opk@zsh.org>
* 53085: configure.ac, Src/init.c: support for BSDs in
$ZSH_EXEPATH implementation
* 53084: configure.ac: yet another approach to the /dev/fd
autoconf test because of shells emulating /dev/fd

34
Src/init.c
View file

@ -36,6 +36,10 @@
#include "version.h"
#ifdef HAVE_SYS_SYSCTL_H
#include <sys/sysctl.h>
#endif
/**/
int noexitct = 0;
@ -913,12 +917,6 @@ getmypath(const char *name, const char *cwd)
char *buf;
int namelen;
if (!name)
return NULL;
if (*name == '-')
++name;
if ((namelen = strlen(name)) == 0)
return NULL;
#if defined(__APPLE__)
{
uint32_t n = PATH_MAX;
@ -934,6 +932,19 @@ getmypath(const char *name, const char *cwd)
else
free(buf);
}
#elif defined(KERN_PROC_PATHNAME)
{
#ifdef __NetBSD__
int mib[4] = { CTL_KERN, KERN_PROC_ARGS, getpid(), KERN_PROC_PATHNAME };
#else
int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
#endif
size_t len = PATH_MAX;
buf = (char *) zalloc(PATH_MAX);
if (!sysctl(mib, 4, buf, &len, NULL, 0) && len > 1)
return buf;
free(buf);
}
#elif defined(PROC_SELF_EXE)
{
ssize_t n;
@ -947,6 +958,13 @@ getmypath(const char *name, const char *cwd)
free(buf);
}
#endif
if (!name)
return NULL;
if (*name == '-')
++name;
if ((namelen = strlen(name)) == 0)
return NULL;
/* guess the absolute pathname of 'name' */
if (name[namelen-1] == '/') /* name should not end with '/' */
return NULL;
@ -964,7 +982,7 @@ getmypath(const char *name, const char *cwd)
}
#ifdef HAVE_REALPATH
else {
/* search each dir in PARH */
/* search each dir in PATH */
const char *path, *sep;
char *real, *try;
int pathlen, dirlen;
@ -978,7 +996,7 @@ getmypath(const char *name, const char *cwd)
do {
sep = strchr(path, ':');
dirlen = sep ? sep - path : strlen(path);
strncpy(try, path, dirlen);
memcpy(try, path, dirlen);
try[dirlen] = '/';
try[dirlen+1] = '\0';
strcat(try, name);

2
configure.ac
View file

@ -636,7 +636,7 @@ fi
AC_CHECK_HEADERS(sys/time.h sys/times.h sys/select.h termcap.h termio.h \
termios.h sys/param.h sys/filio.h string.h memory.h \
limits.h fcntl.h libc.h sys/utsname.h sys/resource.h \
sys/random.h \
sys/sysctl.h sys/random.h \
locale.h errno.h stdio.h stdarg.h varargs.h stdlib.h \
unistd.h sys/capability.h \
utmp.h utmpx.h sys/types.h pwd.h grp.h poll.h sys/mman.h \