--- gcl/h/linux.h.orig 2021-01-18 20:07:36.072892806 -0700
+++ gcl/h/linux.h 2021-01-18 20:15:02.852982150 -0700
@@ -15,14 +15,14 @@
long offset = 0, endofelf; int j; \
ElfW(Ehdr) eheader; ElfW(Shdr) shdr; \
fseek(fp, 0, SEEK_SET); \
- massert(1==fread(&eheader, sizeof(eheader), 1, fp)); \
+ assert(1==fread(&eheader, sizeof(eheader), 1, fp)); \
/* in case the headers themselves come AFTER the actual sections */ \
endofelf=offset = eheader.e_shoff+ eheader.e_shentsize *eheader.e_shnum;\
fseek(fp, eheader.e_shoff, SEEK_SET); \
if ( eheader.e_shentsize != sizeof(ElfW(Shdr)) ) \
{ FEerror("Bad ELF section header size",0); } \
for ( j = 0; j < eheader.e_shnum; j++ ) \
- { massert(1==fread(&shdr,eheader.e_shentsize,1,fp)); \
+ { assert(1==fread(&shdr,eheader.e_shentsize,1,fp)); \
if ( (shdr.sh_offset > offset) && (shdr.sh_type != SHT_NOBITS) ) \
{ offset = shdr.sh_offset; endofelf = offset+shdr.sh_size; } \
} \
@@ -134,7 +134,7 @@ do { int c = 0; \
#include <sys/stat.h>
#define GET_FULL_PATH_SELF(a_) do { \
static char q[PATH_MAX]; \
- massert(which("/proc/self/exe",q) || which(argv[0],q)); \
+ assert(which("/proc/self/exe",q) || which(argv[0],q)); \
(a_)=q; \
} while(0)
--- gcl/o/main.c.orig 2021-01-18 20:10:11.918575121 -0700
+++ gcl/o/main.c 2021-01-18 20:10:32.816532533 -0700
@@ -469,7 +469,7 @@ mbin(const char *s,char *o) {
struct stat ss;
if (!stat(s,&ss) && (ss.st_mode&S_IFMT)==S_IFREG && !access(s,R_OK|X_OK)) {
- massert(realpath(s,o));
+ assert(realpath(s,o) != NULL);
return 1;
}
@@ -485,10 +485,10 @@ which(const char *n,char *o) {
if (strchr(n,'/'))
return mbin(n,o);
- massert(snprintf(FN1,sizeof(FN1),"%s",getenv("PATH"))>1);
+ assert(snprintf(FN1,sizeof(FN1),"%s",getenv("PATH"))>1);
for (s=NULL;(s=strtok(s ? NULL : FN1,":"));) {
- massert(snprintf(FN2,sizeof(FN2),"%s/%s",s,n));
+ assert(snprintf(FN2,sizeof(FN2),"%s/%s",s,n)>1);
if (mbin(FN2,o))
return 1;