1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

rm redundant hardcoded default paths (re: aa4669ad)

As of aa4669ad, astconf("PATH") is implemented as a hardcoded AST
configuration variable that always has a value, instead of one that
falls back on the OS. Its value is now obtained from the OS (with a
fallback) at configure time and not at runtime. This means that any
fallback for astconf("PATH") is now never used.

src/cmd/ksh93/data/msg.c,
src/cmd/ksh93/include/shell.h:
- Remove e_defpath[]. (The path "/bin:/usr/bin:" made no sense as a
  default path anyway, as the final empty element is wrong: default
  utilities should never be sought in the current working dir.)

src/cmd/ksh93/sh/path.c,
src/lib/libast/path/pathbin.c:
- abort() if astconf("PATH") returns null.

src/lib/libast/comp/conf.tab: PATH:
- If no 'getconf' utility can be found, use a fallback path that
  finds more utilities by also searching in 'sbin' directories.
  On some systems, this is needed to find chown(1).

src/cmd/ksh93/sh.1:
- Update doc re default path.
This commit is contained in:
Martijn Dekker 2020-08-11 14:12:48 +01:00
parent 34d145bb88
commit f485fe0f8d
6 changed files with 6 additions and 14 deletions

View file

@ -375,7 +375,7 @@ PATH AST CS 1 MU sh{
*) CONF_path=`"$CONF_getconf" PATH` ;;
esac
case $CONF_path in
'') echo '"/bin:/usr/bin"' ;;
'') echo '"/bin:/usr/bin:/sbin:/usr/sbin"' ;;
*) echo "\\"$CONF_path\\"" ;;
esac
}

View file

@ -39,7 +39,7 @@ pathbin(void)
if ((!(bin = getenv("PATH")) || !*bin) && !(bin = val))
{
if (!*(bin = astconf("PATH", NiL, NiL)) || !(bin = strdup(bin)))
bin = "/bin:/usr/bin:/usr/local/bin";
abort();
val = bin;
}
return bin;