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

Merge tag 'mksh-R52c'

Browse Source
This commit is contained in:
KO Myung-Hun
2016-03-05 14:59:34 +09:00
parent e9364a4318 10d43a1622
commit 68f6e899ef
20 changed files with 387 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main.c
View File

@ -34,7 +34,7 @@
#include <locale.h>
#endif
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.308 2016/02/24 01:44:46 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.310 2016/02/26 21:53:36 tg Exp $");
extern char **environ;
@ -110,13 +110,13 @@ rndsetup(void)
} *bufptr;
char *cp;
cp = alloc(sizeof(*bufptr) - ALLOC_SIZE, APERM);
cp = alloc(sizeof(*bufptr) - sizeof(ALLOC_ITEM), APERM);
#ifdef DEBUG
/* clear the allocated space, for valgrind */
memset(cp, 0, sizeof(*bufptr) - ALLOC_SIZE);
memset(cp, 0, sizeof(*bufptr) - sizeof(ALLOC_ITEM));
#endif
/* undo what alloc() did to the malloc result address */
bufptr = (void *)(cp - ALLOC_SIZE);
bufptr = (void *)(cp - sizeof(ALLOC_ITEM));
/* PIE or something similar provides us with deltas here */
bufptr->dataptr = &rndsetupstate;
/* ASLR in at least Windows, Linux, some BSDs */
@ -208,6 +208,8 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
/* initialise permanent Area */
ainit(&aperm);
/* max. name length: -2147483648 = 11 (+ NUL) */
vtemp = alloc(offsetof(struct tbl, name[0]) + 12, APERM);
/* set up base environment */
env.type = E_NONE;
@ -933,9 +935,9 @@ newenv(int type)
* struct env includes ALLOC_ITEM for alignment constraints
* so first get the actually used memory, then assign it
*/
cp = alloc(sizeof(struct env) - ALLOC_SIZE, ATEMP);
cp = alloc(sizeof(struct env) - sizeof(ALLOC_ITEM), ATEMP);
/* undo what alloc() did to the malloc result address */
ep = (void *)(cp - ALLOC_SIZE);
ep = (void *)(cp - sizeof(ALLOC_ITEM));
/* initialise public members of struct env (not the ALLOC_ITEM) */
ainit(&ep->area);
ep->oenv = e;
@ -1031,7 +1033,7 @@ quitenv(struct shf *shf)
/* free the struct env - tricky due to the ALLOC_ITEM inside */
cp = (void *)ep;
afree(cp + ALLOC_SIZE, ATEMP);
afree(cp + sizeof(ALLOC_ITEM), ATEMP);
}
/* Called after a fork to cleanup stuff left over from parents environment */