components/ksh93/patches/130-CR7019368.patch
changeset 4196 d697072a92f5
parent 805 23c55a2f8a8e
equal deleted inserted replaced
4195:d88c5d15a4af 4196:d697072a92f5
       
     1 diff -rupN INIT.2011-02-08/src/cmd/INIT/regress.sh INIT.2011-02-08.clean/src/cmd/INIT/regress.sh
       
     2 --- INIT.2011-02-08/src/cmd/INIT/regress.sh	2010-06-13 16:38:43.000000000 +0100
       
     3 +++ INIT.2011-02-08.clean/src/cmd/INIT/regress.sh	2012-05-07 15:27:52.975530153 +0100
       
     4 @@ -1351,7 +1351,7 @@ esac
       
     5  export COLUMNS=80
       
     6  SOURCE=$PWD
       
     7  PATH=$SOURCE:${PATH#?(.):}
       
     8 -PATH=${PATH%%:?(.)}:/usr/5bin:/bin:/usr/bin
       
     9 +PATH=${PATH%%:?(.)}:/bin:/usr/bin
       
    10  UNIT=$1
       
    11  shift
       
    12  if	[[ -f $UNIT && ! -x $UNIT ]]
       
    13 diff -rupN INIT.2011-02-08/src/lib/libast/comp/mkdir.c INIT.2011-02-08.clean/src/lib/libast/comp/mkdir.c
       
    14 --- INIT.2011-02-08/src/lib/libast/comp/mkdir.c	2012-05-07 15:23:37.437905060 +0100
       
    15 +++ INIT.2011-02-08.clean/src/lib/libast/comp/mkdir.c	2012-05-07 15:25:03.856907633 +0100
       
    16 @@ -39,7 +39,7 @@ mkdir(const char* path, mode_t mode)
       
    17  	register int	n;
       
    18  	char*		av[3];
       
    19  
       
    20 -	static char*	cmd[] = { "/bin/mkdir", "/usr/5bin/mkdir", 0 };
       
    21 +	static char*	cmd[] = { "/bin/mkdir", 0 };
       
    22  
       
    23  
       
    24  	n = errno;
       
    25 diff -rupN INIT.2011-02-08/src/lib/libast/comp/rmdir.c INIT.2011-02-08.clean/src/lib/libast/comp/rmdir.c
       
    26 --- INIT.2011-02-08/src/lib/libast/comp/rmdir.c	2012-05-07 15:23:37.439623862 +0100
       
    27 +++ INIT.2011-02-08.clean/src/lib/libast/comp/rmdir.c	2012-05-07 15:25:25.119862860 +0100
       
    28 @@ -39,7 +39,7 @@ rmdir(const char* path)
       
    29  	struct stat	st;
       
    30  	char*		av[3];
       
    31  
       
    32 -	static char*	cmd[] = { "/bin/rmdir", "/usr/5bin/rmdir", 0 };
       
    33 +	static char*	cmd[] = { "/bin/rmdir", 0 };
       
    34  
       
    35  	if (stat(path, &st) < 0) return(-1);
       
    36  	if (!S_ISDIR(st.st_mode))
       
    37 diff -rupN INIT.2011-02-08/src/lib/libast/port/astconf.c INIT.2011-02-08.clean/src/lib/libast/port/astconf.c
       
    38 --- INIT.2011-02-08/src/lib/libast/port/astconf.c	2012-05-07 15:23:37.452538787 +0100
       
    39 +++ INIT.2011-02-08.clean/src/lib/libast/port/astconf.c	2012-05-07 15:27:12.365726756 +0100
       
    40 @@ -565,7 +565,7 @@ initialize(register Feature_t* fp, const
       
    41  						}
       
    42  						if (fp->op == OP_universe)
       
    43  						{
       
    44 -							if (strneq(p, "xpg", 3) || strneq(p, "5bin", 4))
       
    45 +							if (strneq(p, "xpg", 3))
       
    46  							{
       
    47  								ok = 1;
       
    48  								break;