JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

restore C99 compatibility: do not use “restricted” as an identifier

Browse Source
This commit is contained in:
tg
2014-10-02 13:55:16 +00:00
parent 52461d70cc
commit 37de6e2d62
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main.c
View File

@ -34,7 +34,7 @@
#include <locale.h> #include <locale.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.282 2014/10/02 13:53:54 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/main.c,v 1.283 2014/10/02 13:55:16 tg Exp $");
extern char **environ; extern char **environ;
@ -184,7 +184,7 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
int argi, i; int argi, i;
Source *s = NULL; Source *s = NULL;
struct block *l; struct block *l;
unsigned char restricted, errexit, utf_flag; unsigned char restricted_shell, errexit, utf_flag;
char *cp; char *cp;
const char *ccp, **wp; const char *ccp, **wp;
struct tbl *vp; struct tbl *vp;
@ -573,7 +573,7 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
} }
/* Disable during .profile/ENV reading */ /* Disable during .profile/ENV reading */
restricted = Flag(FRESTRICTED); restricted_shell = Flag(FRESTRICTED);
Flag(FRESTRICTED) = 0; Flag(FRESTRICTED) = 0;
errexit = Flag(FERREXIT); errexit = Flag(FERREXIT);
Flag(FERREXIT) = 0; Flag(FERREXIT) = 0;
@ -603,7 +603,7 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
change_flag(FPRIVILEGED, OF_INTERNAL, false); change_flag(FPRIVILEGED, OF_INTERNAL, false);
} }
if (restricted) { if (restricted_shell) {
shcomexec(restr_com); shcomexec(restr_com);
/* After typeset command... */ /* After typeset command... */
Flag(FRESTRICTED) = 1; Flag(FRESTRICTED) = 1;