Skip to content

Commit 744e68e

Browse files
committed
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
1 parent bae02c3 commit 744e68e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/cmd/INIT/regress.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1379,7 +1379,7 @@ esac
13791379
export COLUMNS=80
13801380
SOURCE=$PWD
13811381
PATH=$SOURCE:${PATH#?(.):}
1382-
PATH=${PATH%%:?(.)}:/usr/5bin:/bin:/usr/bin
1382+
PATH=${PATH%%:?(.)}:/bin:/usr/bin
13831383
UNIT=$1
13841384
shift
13851385
if [[ -f $UNIT && ! -x $UNIT ]]

src/lib/libast/comp/mkdir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ mkdir(const char* path, mode_t mode)
3939
register int n;
4040
char* av[3];
4141

42-
static char* cmd[] = { "/bin/mkdir", "/usr/5bin/mkdir", 0 };
42+
static char* cmd[] = { "/bin/mkdir", 0 };
4343

4444

4545
n = errno;

src/lib/libast/comp/rmdir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ rmdir(const char* path)
3939
struct stat st;
4040
char* av[3];
4141

42-
static char* cmd[] = { "/bin/rmdir", "/usr/5bin/rmdir", 0 };
42+
static char* cmd[] = { "/bin/rmdir", 0 };
4343

4444
if (stat(path, &st) < 0) return(-1);
4545
if (!S_ISDIR(st.st_mode))

src/lib/libast/port/astconf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ initialize(register Feature_t* fp, const char* path, const char* command, const
569569
}
570570
if (fp->op == OP_universe)
571571
{
572-
if (strneq(p, "xpg", 3) || strneq(p, "5bin", 4))
572+
if (strneq(p, "xpg", 3))
573573
{
574574
ok = 1;
575575
break;

0 commit comments

Comments
 (0)