debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use KORNSHELL variable instead of /bin/ksh

Browse Source 
This patch removes instances of hardcoded
invocation of /bin/ksh and allows to
replace it with, for, example,
/usr/local/bin/ksh93

Also "ksh93" is accepted whenever "ksh" is.

Tested using the following /bin/ksh:

----8<----
WHAT=`ps -o command= -p $PPID`
msg="Something tried to call /bin/ksh: $PPID: $WHAT"
print -u2 "$msg"
logger user.warn "$msg"
exit 99
----8<----
(Warning: first two lines are FreeBSD specific)

Scripts from Makefiles should now be executed either
with

$(KORNSHELL) korn-shell-script

or

$(SHELL) bourne-shell-script

therefore #!/bin/ksh has not been changed everywhere.

/usr/dt/bin/ scripts have been converted (e.g. Xsession)

Whenever possible Imake and CPP facilities have been used.

For C and C++ programs KORNSHELL needs to be defined to
"/path/to/your/ksh" (with quotes) so that it can make
a valid C constant.

Therefore, when adding KORNSHELL to Imakefile for C files,
you have to add

CXXEXTRA_DEFINES = -DKORNSHELL=\"$(KORNSHELL)\"

or similar (for example, see programs/dtprintinfo)

But for simple shell script substitution we usually change

 LOCAL_CPP_DEFINES = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
                     -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
                     -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP)

to:

 LOCAL_CPP_DEFINES = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
                     -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
                     -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
                     -DKORNSHELL=$(KORNSHELL) \
                     -DXPROJECTROOT=X11ProjectRoot

since we don't want quotes for shell scripts.
This commit is contained in:
Marcin Cieslak
2012-08-23 17:49:26 +02:00
committed by Jon Trulson
parent 98b17d3551
commit 17a33f0430
32 changed files with 63 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/dtprintinfo/libUI/MotifUI/Imakefile
View File

@@ -16,6 +16,8 @@ INCLUDES = -I. -I..
EXTRA_DEFINES = -DHAS_EXCEPTIONS
#endif
CXXEXTRA_DEFINES = -DKORNSHELL=\"$(KORNSHELL)\"
SRCS = Application.C Button.C ComboBoxObj.C \
Container.C Debug.c Dialog.C \
DtDND.C Group.C HelpSystem.C \

2
cde/programs/dtprintinfo/libUI/MotifUI/MotifThread.C
View File

@@ -93,7 +93,7 @@ void MotifThread::CreateThread(MotifUI *_obj, const char *cmd, int _pid,
dup(m_stdout[1]);
close(m_stdout[1]);
execlp("/bin/ksh", "ksh", "-c", cmd, NULL);
execlp(KORNSHELL, "ksh", "-c", cmd, NULL);
char *msg = strerror(errno);
write(1, msg, strlen(msg));