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

fix first batch of compile warnings, enable aalloc for mirbsd

Browse Source
This commit is contained in:
tg 2008-11-12 04:59:42 +00:00
parent 3c1e46ee4d
commit d15671f6f6
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,11 +1,11 @@
# $MirOS: src/bin/mksh/Makefile,v 1.65 2008/11/02 22:42:37 tg Exp $ # $MirOS: src/bin/mksh/Makefile,v 1.66 2008/11/12 04:59:42 tg Exp $
#- #-
# use CPPFLAGS=-DDEBUG __CRAZY=Yes to check for certain more stuff # use CPPFLAGS=-DDEBUG __CRAZY=Yes to check for certain more stuff
.include <bsd.own.mk> .include <bsd.own.mk>
PROG= mksh PROG= mksh
SRCS= alloc.c edit.c eval.c exec.c expr.c funcs.c histrap.c \ SRCS= aalloc.c edit.c eval.c exec.c expr.c funcs.c histrap.c \
jobs.c lex.c main.c misc.c shf.c syn.c tree.c var.c jobs.c lex.c main.c misc.c shf.c syn.c tree.c var.c
.if !make(test-build) .if !make(test-build)
. if ${DEBUGLIBS:L} == "yes" . if ${DEBUGLIBS:L} == "yes"

26
aalloc.c
View File

@ -1,6 +1,6 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/aalloc.c,v 1.1 2008/11/12 04:55:17 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/aalloc.c,v 1.2 2008/11/12 04:59:42 tg Exp $");
/* mksh integration of aalloc */ /* mksh integration of aalloc */
@ -102,7 +102,7 @@ static size_t pagesz;
if (((dest) = realloc((dest), (len))) == NULL) \ if (((dest) = realloc((dest), (len))) == NULL) \
AALLOC_ABORT("unable to allocate %zu bytes: %s", \ AALLOC_ABORT("unable to allocate %zu bytes: %s", \
(len), strerror(errno)); \ (len), strerror(errno)); \
if ((dest) & PVMASK) \ if ((ptrdiff_t)(dest) & PVMASK) \
AALLOC_ABORT("unaligned malloc result: %p", (dest)); \ AALLOC_ABORT("unaligned malloc result: %p", (dest)); \
} while (/* CONSTCOND */ 0) } while (/* CONSTCOND */ 0)
@ -164,7 +164,7 @@ anew(void)
} }
ap = NULL; safe_realloc(ap, sizeof (struct TArea)); ap = NULL; safe_realloc(ap, sizeof (struct TArea));
bp = NULL; safe_realloc(bp, AALLOC_INITSZ); bp = NULL; safe_realloc(bp, (size_t)AALLOC_INITSZ);
/* ensure unaligned cookie */ /* ensure unaligned cookie */
do { do {
bp->cookie = AALLOC_RANDOM(); bp->cookie = AALLOC_RANDOM();
@ -202,28 +202,28 @@ check_bp(PArea ap, const char *funcname, TCookie ocookie)
return (NULL); return (NULL);
} }
p.iv = ap->bp.iv ^ gcookie; p.iv = ap->bp.iv ^ gcookie;
if ((bp = p.pv) & PVMASK) { if ((ptrdiff_t)(bp = p.pv) & PVMASK) {
AALLOC_WARN("%s: area %p block pointer destroyed: %08X", AALLOC_WARN("%s: area %p block pointer destroyed: %08tX",
funcname, ap, p.iv); funcname, ap, p.iv);
return (NULL); return (NULL);
} }
AALLOC_PEEK(bp); AALLOC_PEEK(bp);
if (ocookie && bp->cookie != ocookie) { if (ocookie && bp->cookie != ocookie) {
AALLOC_WARN("%s: block %p cookie destroyed: %08X, %08X", AALLOC_WARN("%s: block %p cookie destroyed: %08tX, %08tX",
funcname, bp, ocookie, bp->cookie); funcname, bp, ocookie, bp->cookie);
return (NULL); return (NULL);
} }
if ((bp->endp & PVMASK) || (bp->last & PVMASK)) { if (((ptrdiff_t)bp->endp & PVMASK) || ((ptrdiff_t)bp->last & PVMASK)) {
AALLOC_WARN("%s: block %p data structure destroyed: %p, %p", AALLOC_WARN("%s: block %p data structure destroyed: %p, %p",
funcname, bp, bp->endp, bp->last); funcname, bp, bp->endp, bp->last);
return (NULL); return (NULL);
} }
if (bp->endp < bp) { if (bp->endp < (void *)bp) {
AALLOC_WARN("%s: block %p end pointer out of bounds: %p", AALLOC_WARN("%s: block %p end pointer out of bounds: %p",
funcname, bp, bp->endp); funcname, bp, bp->endp);
return (NULL); return (NULL);
} }
if ((bp->last < &bp->storage) || (bp->last >= bp->endp)) { if ((bp->last < (void *)&bp->storage) || (bp->last >= bp->endp)) {
AALLOC_WARN("%s: block %p last pointer out of bounds: " AALLOC_WARN("%s: block %p last pointer out of bounds: "
"%p < %p < %p", funcname, bp, &bp->storage, bp->last, "%p < %p < %p", funcname, bp, &bp->storage, bp->last,
bp->endp); bp->endp);
@ -346,8 +346,8 @@ alloc(size_t nmemb, size_t size, PArea ap)
size_t bsz; size_t bsz;
/* make room for more forward ptrs in the block allocation */ /* make room for more forward ptrs in the block allocation */
bsz = bp->endp - bp; bsz = bp->endp - (void *)bp;
safe_muladd(2, bsz, 0); safe_muladd((size_t)2, bsz, 0);
safe_realloc(bp, bsz); safe_realloc(bp, bsz);
/* “bp” has possibly changed, enter its new value into ap */ /* “bp” has possibly changed, enter its new value into ap */
@ -403,7 +403,7 @@ check_ptr(void *vp, PArea ap, PBlock *bpp, const char *what, const char *extra)
PBlock bp; PBlock bp;
TPtr *ptr; TPtr *ptr;
if (vp & PVMASK) { if ((ptrdiff_t)vp & PVMASK) {
AALLOC_WARN("trying to %s rogue unaligned pointer %p from " AALLOC_WARN("trying to %s rogue unaligned pointer %p from "
"area %p%s", what + 1, vp, ap, extra); "area %p%s", what + 1, vp, ap, extra);
return (NULL); return (NULL);
@ -419,7 +419,7 @@ check_ptr(void *vp, PArea ap, PBlock *bpp, const char *what, const char *extra)
if ((bp = check_bp(ap, what, 0)) == NULL) if ((bp = check_bp(ap, what, 0)) == NULL)
AALLOC_ABORT("cannot continue"); AALLOC_ABORT("cannot continue");
ptr->iv ^= bp->cookie; ptr->iv ^= bp->cookie;
if (ptr->pv < &bp->storage || ptr->pv >= bp->last) { if (ptr->pv < (void *)&bp->storage || ptr->pv >= bp->last) {
AALLOC_WARN("trying to %s rogue pointer %p from area %p " AALLOC_WARN("trying to %s rogue pointer %p from area %p "
"(block %p..%p), backpointer %p out of bounds%s", "(block %p..%p), backpointer %p out of bounds%s",
what + 1, vp, ap, bp, bp->last, ptr->pv, extra); what + 1, vp, ap, bp, bp->last, ptr->pv, extra);