andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XQuartz: added 'login_shell' option to defaults

Browse Source 
so the user can choose something other than /bin/sh
(cherry picked from commit b549cf18ce)
This commit is contained in:
Jeremy Huddleston 2008-01-12 11:35:48 -08:00
parent ec24a6b5aa
commit f72255639c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xquartz/X11Application.h
View File

@ -97,5 +97,6 @@ extern int quartzHasRoot, quartzEnableRootless;
#define PREFS_SWAP_ALT_META "swap_alt_meta" #define PREFS_SWAP_ALT_META "swap_alt_meta"
#define PREFS_XP_OPTIONS "xp_options" #define PREFS_XP_OPTIONS "xp_options"
#define PREFS_ENABLE_STEREO "enable_stereo" #define PREFS_ENABLE_STEREO "enable_stereo"
#define PREFS_LOGIN_SHELL "login_shell"
#endif /* X11APPLICATION_H */ #endif /* X11APPLICATION_H */

2
hw/xquartz/X11Controller.m
View File

@ -302,7 +302,7 @@
argv[0] = "/usr/bin/login"; argv[0] = "/usr/bin/login";
argv[1] = "-fp"; argv[1] = "-fp";
argv[2] = getlogin(); argv[2] = getlogin();
argv[3] = "/bin/sh"; argv[3] = [X11App prefs_get_string:@PREFS_FAKE_BUTTON2 default:"/bin/sh"];
argv[4] = "-c"; argv[4] = "-c";
argv[5] = command; argv[5] = command;
argv[6] = NULL; argv[6] = NULL;

2
hw/xquartz/bundle/Makefile.am
View File

@ -18,8 +18,6 @@ EXTRA_DIST = \
Info.plist \ Info.plist \
X11.icns \ X11.icns \
bundle-main.c \ bundle-main.c \
launcher-main.c \
server-main.c \
English.lproj/InfoPlist.strings \ English.lproj/InfoPlist.strings \
English.lproj/Localizable.strings \ English.lproj/Localizable.strings \
English.lproj/main.nib/classes.nib \ English.lproj/main.nib/classes.nib \

3
hw/xquartz/bundle/bundle-main.c
View File

@ -38,6 +38,7 @@
#define DEFAULT_CLIENT "/usr/X11/bin/xterm" #define DEFAULT_CLIENT "/usr/X11/bin/xterm"
#define DEFAULT_STARTX "/usr/X11/bin/startx" #define DEFAULT_STARTX "/usr/X11/bin/startx"
#define DEFAULT_SHELL "/bin/sh"
static int execute(const char *command); static int execute(const char *command);
static char *command_from_prefs(const char *key, const char *default_value); static char *command_from_prefs(const char *key, const char *default_value);
@ -82,7 +83,7 @@ static int execute(const char *command) {
newargv[0] = "/usr/bin/login"; newargv[0] = "/usr/bin/login";
newargv[1] = "-fp"; newargv[1] = "-fp";
newargv[2] = getlogin(); newargv[2] = getlogin();
newargv[3] = "/bin/sh"; newargv[3] = command_from_prefs("login_shell", DEFAULT_SHELL);
newargv[4] = "-c"; newargv[4] = "-c";
newargv[5] = command; newargv[5] = command;
newargv[6] = NULL; newargv[6] = NULL;