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

rm obsolete /usr/5bin paths (Solaris patch 130-CR7019368)

This change is pulled from here:
https://github.com/oracle/solaris-userland/blob/master/components/ksh93/patches/130-CR7019368.patch
This commit is contained in:
Martijn Dekker 2021-01-08 11:47:05 +00:00
parent bae02c39b6
commit 744e68e7be
4 changed files with 4 additions and 4 deletions

View file

@ -1379,7 +1379,7 @@ esac
export COLUMNS=80
SOURCE=$PWD
PATH=$SOURCE:${PATH#?(.):}
PATH=${PATH%%:?(.)}:/usr/5bin:/bin:/usr/bin
PATH=${PATH%%:?(.)}:/bin:/usr/bin
UNIT=$1
shift
if [[ -f $UNIT && ! -x $UNIT ]]

View file

@ -39,7 +39,7 @@ mkdir(const char* path, mode_t mode)
register int n;
char* av[3];
static char* cmd[] = { "/bin/mkdir", "/usr/5bin/mkdir", 0 };
static char* cmd[] = { "/bin/mkdir", 0 };
n = errno;

View file

@ -39,7 +39,7 @@ rmdir(const char* path)
struct stat st;
char* av[3];
static char* cmd[] = { "/bin/rmdir", "/usr/5bin/rmdir", 0 };
static char* cmd[] = { "/bin/rmdir", 0 };
if (stat(path, &st) < 0) return(-1);
if (!S_ISDIR(st.st_mode))

View file

@ -569,7 +569,7 @@ initialize(register Feature_t* fp, const char* path, const char* command, const
}
if (fp->op == OP_universe)
{
if (strneq(p, "xpg", 3) || strneq(p, "5bin", 4))
if (strneq(p, "xpg", 3))
{
ok = 1;
break;