external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Disable fixargs() on Solaris (re: 159fb9ee, cefe087d)

Browse source 
It doesn't work on Solaris either.
This commit is contained in:
Martijn Dekker 2021-01-10 18:47:12 +00:00
parent 159fb9ee27
commit 9b7c392a7c
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/ksh93/sh/main.c
View file

@ -52,7 +52,7 @@
/* These routines are referenced by this module */ /* These routines are referenced by this module */
static void exfile(Shell_t*, Sfio_t*,int); static void exfile(Shell_t*, Sfio_t*,int);
static void chkmail(Shell_t *shp, char*); static void chkmail(Shell_t *shp, char*);
#if defined(_lib_fork) && !defined(_NEXT_SOURCE) && !defined(__FreeBSD__) #if defined(_lib_fork) && !defined(_NEXT_SOURCE) && !defined(__FreeBSD__) && !defined(__sun)
static void fixargs(char**,int); static void fixargs(char**,int);
#else #else
# define fixargs(a,b) # define fixargs(a,b)
@ -697,7 +697,7 @@ static void chkmail(Shell_t *shp, char *files)
# define PSTAT 1 # define PSTAT 1
#endif #endif
#if defined(_lib_fork) && !defined(_NEXT_SOURCE) && !defined(__FreeBSD__) #if defined(_lib_fork) && !defined(_NEXT_SOURCE) && !defined(__FreeBSD__) && !defined(__sun)
/* /*
* fix up command line for ps command * fix up command line for ps command
* *

2
src/cmd/ksh93/tests/basic.sh
View file

@ -708,7 +708,7 @@ getPsOutput() {
while [[ $actual == [[:space:]]* ]]; do actual=${actual#?}; done while [[ $actual == [[:space:]]* ]]; do actual=${actual#?}; done
while [[ $actual == *[[:space:]] ]]; do actual=${actual%?}; done while [[ $actual == *[[:space:]] ]]; do actual=${actual%?}; done
} }
if [[ $(uname -s) != FreeBSD ]] && if [[ ! $(uname -s) =~ ^(FreeBSD|SunOS)$ ]] &&
getPsOutput "$$" && getPsOutput "$$" &&
[[ "$SHELL $0" == "$actual"* ]] # "$SHELL $0" is how shtests invokes this script [[ "$SHELL $0" == "$actual"* ]] # "$SHELL $0" is how shtests invokes this script
then expect='./atest 1 2' then expect='./atest 1 2'