Fix pretty much all of the warnings (except for the hard ones).

I've likely broken something though, so if you see weird behaviour with
extended ASCII, let me know please.

src/conio/bitmap_con.c

@@ -299,7 +299,6 @@ int bitmap_movetext(int x, int y, int ex, int ey, int tox, int toy)
 {
 	int	direction=1;
 	int	cy;
-	int	sy;
 	int	destoffset;
 	int	sourcepos;
 	int width=ex-x+1;

src/conio/ciolib.c

@@ -99,8 +99,8 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_textcolor(int colour);
 CIOLIBEXPORT void CIOLIBCALL ciolib_highvideo(void);
 CIOLIBEXPORT void CIOLIBCALL ciolib_lowvideo(void);
 CIOLIBEXPORT void CIOLIBCALL ciolib_normvideo(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_puttext(int a,int b,int c,int d,unsigned char *e);
-CIOLIBEXPORT int CIOLIBCALL ciolib_gettext(int a,int b,int c,int d,unsigned char *e);
+CIOLIBEXPORT int CIOLIBCALL ciolib_puttext(int a,int b,int c,int d,void *e);
+CIOLIBEXPORT int CIOLIBCALL ciolib_gettext(int a,int b,int c,int d,void *e);
 CIOLIBEXPORT void CIOLIBCALL ciolib_textattr(int a);
 CIOLIBEXPORT void CIOLIBCALL ciolib_delay(long a);
 CIOLIBEXPORT int CIOLIBCALL ciolib_putch(int a);
@@ -1016,7 +1016,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_normvideo(void)
 }
 
 /* **MUST** be implemented */
-CIOLIBEXPORT int CIOLIBCALL ciolib_puttext(int a,int b,int c,int d,unsigned char *e)
+CIOLIBEXPORT int CIOLIBCALL ciolib_puttext(int a,int b,int c,int d,void *e)
 {
 	CIOLIB_INIT();
 	
@@ -1024,7 +1024,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_puttext(int a,int b,int c,int d,unsigned char
 }
 
 /* **MUST** be implemented */
-CIOLIBEXPORT int CIOLIBCALL ciolib_gettext(int a,int b,int c,int d,unsigned char *e)
+CIOLIBEXPORT int CIOLIBCALL ciolib_gettext(int a,int b,int c,int d,void *e)
 {
 	CIOLIB_INIT();
 	

src/conio/ciolib.h

@@ -313,8 +313,8 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_textcolor(int colour);
 CIOLIBEXPORT void CIOLIBCALL ciolib_highvideo(void);
 CIOLIBEXPORT void CIOLIBCALL ciolib_lowvideo(void);
 CIOLIBEXPORT void CIOLIBCALL ciolib_normvideo(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_puttext(int a,int b,int c,int d,unsigned char *e);
-CIOLIBEXPORT int CIOLIBCALL ciolib_gettext(int a,int b,int c,int d,unsigned char *e);
+CIOLIBEXPORT int CIOLIBCALL ciolib_puttext(int a,int b,int c,int d,void *e);
+CIOLIBEXPORT int CIOLIBCALL ciolib_gettext(int a,int b,int c,int d,void *e);
 CIOLIBEXPORT void CIOLIBCALL ciolib_textattr(int a);
 CIOLIBEXPORT void CIOLIBCALL ciolib_delay(long a);
 CIOLIBEXPORT int CIOLIBCALL ciolib_putch(int a);

src/conio/cterm.c

@@ -2009,34 +2009,34 @@ char *cterm_write(struct cterminal * cterm, const unsigned char *buf, int buflen
 					cterm->fontbuf[cterm->font_read++]=ch[0];
 					if(cterm->font_read == cterm->font_size) {
 #ifndef CTERM_WITHOUT_CONIO
-						char *buf;
+						char *buf2;
 
-						if((buf=(char *)malloc(cterm->font_size))!=NULL) {
-							memcpy(buf,cterm->fontbuf,cterm->font_size);
+						if((buf2=(char *)malloc(cterm->font_size))!=NULL) {
+							memcpy(buf2,cterm->fontbuf,cterm->font_size);
 							if(cterm->font_slot >= CONIO_FIRST_FREE_FONT) {
 								switch(cterm->font_size) {
 									case 4096:
 										FREE_AND_NULL(conio_fontdata[cterm->font_slot].eight_by_sixteen);
-										conio_fontdata[cterm->font_slot].eight_by_sixteen=buf;
+										conio_fontdata[cterm->font_slot].eight_by_sixteen=buf2;
 										FREE_AND_NULL(conio_fontdata[cterm->font_slot].desc);
 										conio_fontdata[cterm->font_slot].desc=strdup("Remote Defined Font");
 										break;
 									case 3586:
 										FREE_AND_NULL(conio_fontdata[cterm->font_slot].eight_by_fourteen);
-										conio_fontdata[cterm->font_slot].eight_by_fourteen=buf;
+										conio_fontdata[cterm->font_slot].eight_by_fourteen=buf2;
 										FREE_AND_NULL(conio_fontdata[cterm->font_slot].desc);
 										conio_fontdata[cterm->font_slot].desc=strdup("Remote Defined Font");
 										break;
 									case 2048:
 										FREE_AND_NULL(conio_fontdata[cterm->font_slot].eight_by_eight);
-										conio_fontdata[cterm->font_slot].eight_by_eight=buf;
+										conio_fontdata[cterm->font_slot].eight_by_eight=buf2;
 										FREE_AND_NULL(conio_fontdata[cterm->font_slot].desc);
 										conio_fontdata[cterm->font_slot].desc=strdup("Remote Defined Font");
 										break;
 								}
 							}
 							else
-								FREE_AND_NULL(buf);
+								FREE_AND_NULL(buf2);
 						}
 #endif
 						cterm->font_size=0;

src/conio/cterm.h

@@ -81,7 +81,7 @@ struct cterminal {
 	int					height;			// Height of the terminal buffer
 	int					width;			// Width of the terminal buffer
 	int					quiet;			// No sounds are made
-	char				*scrollback;
+	unsigned char				*scrollback;
 	int					backlines;		// Number of lines in scrollback
 	char				DA[1024];		// Device Attributes
 	bool				autowrap;
@@ -125,14 +125,14 @@ struct cterminal {
 	int					font_size;		// Bytes
 	int					doorway_mode;
 	int					doorway_char;	// Indicates next char is a "doorway" mode char
-	int					cursor;			// Current cursor mode (Normal or None)
+	int					cursor;			// Current cursor mode (Normal or None)z
 
 	/* conio function pointers */
 #ifdef CTERM_WITHOUT_CONIO
 	void	(*ciolib_gotoxy)		(struct cterminal *,int,int);
 	int		(*ciolib_wherex)		(struct cterminal *);
 	int		(*ciolib_wherey)		(struct cterminal *);
-	int		(*ciolib_gettext)		(struct cterminal *,int,int,int,int,unsigned char *);
+	int		(*ciolib_gettext)		(struct cterminal *,int,int,int,int,void *);
 	void	(*ciolib_gettextinfo)	(struct cterminal *,struct text_info *);
 	void	(*ciolib_textattr)		(struct cterminal *,int);
 	void	(*ciolib_setcursortype)	(struct cterminal *,int);
@@ -142,7 +142,7 @@ struct cterminal {
 	void	(*ciolib_setvideoflags)	(struct cterminal *,int flags);
 	int		(*ciolib_getvideoflags)	(struct cterminal *);
 	int		(*ciolib_putch)			(struct cterminal *,int);
-	int		(*ciolib_puttext)		(struct cterminal *,int,int,int,int,unsigned char *);
+	int		(*ciolib_puttext)		(struct cterminal *,int,int,int,int,void *);
 	void	(*ciolib_window)		(struct cterminal *,int,int,int,int);
 	int		(*ciolib_cputs)			(struct cterminal *,char *);
 	int		(*ciolib_setfont)		(struct cterminal *,int font, int force, int font_num);
@@ -150,7 +150,7 @@ struct cterminal {
 	void	CIOLIBCALL (*ciolib_gotoxy)		(int,int);
 	int		CIOLIBCALL (*ciolib_wherex)		(void);
 	int		CIOLIBCALL (*ciolib_wherey)		(void);
-	int		CIOLIBCALL (*ciolib_gettext)		(int,int,int,int,unsigned char *);
+	int		CIOLIBCALL (*ciolib_gettext)		(int,int,int,int,void *);
 	void	CIOLIBCALL (*ciolib_gettextinfo)	(struct text_info *);
 	void	CIOLIBCALL (*ciolib_textattr)		(int);
 	void	CIOLIBCALL (*ciolib_setcursortype)	(int);
@@ -160,7 +160,7 @@ struct cterminal {
 	void	CIOLIBCALL (*ciolib_setvideoflags)	(int flags);
 	int		CIOLIBCALL (*ciolib_getvideoflags)	(void);
 	int		CIOLIBCALL (*ciolib_putch)			(int);
-	int		CIOLIBCALL (*ciolib_puttext)		(int,int,int,int,unsigned char *);
+	int		CIOLIBCALL (*ciolib_puttext)		(int,int,int,int,void *);
 	void	CIOLIBCALL (*ciolib_window)		(int,int,int,int);
 	int		CIOLIBCALL (*ciolib_cputs)			(char *);
 	int		CIOLIBCALL (*ciolib_setfont)		(int font, int force, int font_num);

src/conio/x_events.c

@@ -410,7 +410,6 @@ static void handle_resize_event(int width, int height)
 {
 	int newFSH=1;
 	int newFSW=1;
-	int oldscaling=vstat.scaling;
 
 	// No change
 	if((width == vstat.charwidth * vstat.cols * vstat.scaling)

src/sbbs3/addfiles.c

@@ -80,7 +80,7 @@ int lprintf(int level, const char *fmat, ...)
 	return(chcount);
 }
 
-void prep_desc(uchar *str)
+void prep_desc(char *str)
 {
 	char tmp[1024];
 	int i,j;
@@ -88,11 +88,11 @@ void prep_desc(uchar *str)
 	for(i=j=0;str[i] && j < sizeof(tmp)-1;i++) {
 		if(j && str[i]==' ' && tmp[j-1]==' ' && (mode&KEEP_SPACE))
 			tmp[j++]=str[i];
-		else if(j && str[i]<=' ' && tmp[j-1]==' ')
+		else if(j && str[i]<=' ' && str[i] > 0&& tmp[j-1]==' ')
 			continue;
-		else if(i && !isalnum(str[i]) && str[i]==str[i-1])
+		else if(i && !isalnum((uchar)str[i]) && str[i]==str[i-1])
 			continue;
-		else if(str[i]>=' ')
+		else if(str[i]>=' ' || str[i]<0)
 			tmp[j++]=str[i];
 		else if(str[i]==TAB || (str[i]==CR && str[i+1]==LF))
 			tmp[j++]=' ';
@@ -212,7 +212,7 @@ void addlist(char *inpath, file_t f, uint dskip, uint sskip)
 	char filepath[MAX_PATH+1];
 	char curline[256],nextline[256];
 	char *p;
-	uchar ext[1024],tmpext[513];
+	char ext[1024],tmpext[513];
 	int i,file;
 	long l;
 	BOOL exist;
@@ -282,7 +282,7 @@ void addlist(char *inpath, file_t f, uint dskip, uint sskip)
 						memset(ext,0,513);
 						read(file,ext,512);
 						for(i=512;i;i--)
-							if(ext[i-1]>' ')
+							if(ext[i-1]>' ' || ext[i-1]<0)
 								break;
 						ext[i]=0;
 						if(mode&ASCII_ONLY)
@@ -291,10 +291,10 @@ void addlist(char *inpath, file_t f, uint dskip, uint sskip)
 							sprintf(tmpext,"%.256s",ext);
 							prep_desc(tmpext);
 							for(i=0;tmpext[i];i++)
-								if(isalpha(tmpext[i]))
+								if(isalpha((uchar)tmpext[i]))
 									break;
 							sprintf(f.desc,"%.*s",LEN_FDESC,tmpext+i);
-							for(i=0;f.desc[i]>=' ' && i<LEN_FDESC;i++)
+							for(i=0;(f.desc[i]>=' ' || f.desc[i]<0) && i<LEN_FDESC;i++)
 								;
 							f.desc[i]=0; }
 						close(file);
@@ -428,7 +428,7 @@ void addlist(char *inpath, file_t f, uint dskip, uint sskip)
 			if(nextline[0]==' ') {
 				strcpy(str,nextline);				   /* tack on to end of desc */
 				p=str+dskip;
-				while(*p && *p<=' ') p++;
+				while(*p>0 && *p<=' ') p++;
 				i=LEN_FDESC-strlen(f.desc);
 				if(i>1) {
 					p[i-1]=0;
@@ -485,7 +485,7 @@ void addlist(char *inpath, file_t f, uint dskip, uint sskip)
 					memset(ext,0,513);
 					read(file,ext,512);
 					for(i=512;i;i--)
-						if(ext[i-1]>' ')
+						if(ext[i-1]>' ' || ext[i-1]<0)
 							break;
 					ext[i]=0;
 					if(mode&ASCII_ONLY)
@@ -494,10 +494,10 @@ void addlist(char *inpath, file_t f, uint dskip, uint sskip)
 						sprintf(tmpext,"%.256s",ext);
 						prep_desc(tmpext);
 						for(i=0;tmpext[i];i++)
-							if(isalpha(tmpext[i]))
+							if(isalpha((uchar)tmpext[i]))
 								break;
 						sprintf(f.desc,"%.*s",LEN_FDESC,tmpext+i);
-						for(i=0;f.desc[i]>=' ' && i<LEN_FDESC;i++)
+						for(i=0;(f.desc[i]>=' ' || f.desc[i]<0) && i<LEN_FDESC;i++)
 							;
 						f.desc[i]=0; 
 					}
@@ -539,11 +539,11 @@ void addlist(char *inpath, file_t f, uint dskip, uint sskip)
 
 void synclist(char *inpath, int dirnum)
 {
-	uchar	str[1024];
+	char	str[1024];
 	char	fname[MAX_PATH+1];
 	char	listpath[MAX_PATH+1];
 	uchar*	ixbbuf;
-	uchar*	p;
+	char*	p;
 	int		i,file,found;
 	long	l,m,length;
 	FILE*	stream;
@@ -668,7 +668,8 @@ int main(int argc, char **argv)
 	char revision[16];
 	char str[MAX_PATH+1];
 	char tmp[MAX_PATH+1];
-	uchar *p,exist,listgiven=0,namegiven=0,ext[513]
+	char *p;
+	char exist,listgiven=0,namegiven=0,ext[513]
 		,auto_name[MAX_PATH+1]="FILES.BBS";
 	int i,j,file;
 	uint desc_offset=0, size_offset=0;
@@ -721,7 +722,7 @@ int main(int argc, char **argv)
 		mode|=AUTO_ADD;
 		i=0; 
 	} else {
-		if(!isalnum(argv[1][0]) && argc==2) {
+		if(!isalnum((uchar)argv[1][0]) && argc==2) {
 			printf(usage);
 			return(1); 
 		}
@@ -814,7 +815,7 @@ int main(int argc, char **argv)
 						return(1); 
 			} 
 		}
-		else if(isdigit(argv[j][0])) {
+		else if(isdigit((uchar)argv[j][0])) {
 			if(desc_offset==0)
 				desc_offset=atoi(argv[j]);
 			else
@@ -824,9 +825,9 @@ int main(int argc, char **argv)
 		else if(argv[j][0]=='+') {      /* filelist - FILES.BBS */
 			listgiven=1;
 			if(argc > j+1
-				&& isdigit(argv[j+1][0])) { /* skip x characters before description */
+				&& isdigit((uchar)argv[j+1][0])) { /* skip x characters before description */
 				if(argc > j+2
-					&& isdigit(argv[j+2][0])) { /* skip x characters before size */
+					&& isdigit((uchar)argv[j+2][0])) { /* skip x characters before size */
 					addlist(argv[j]+1,f,atoi(argv[j+1]),atoi(argv[j+2]));
 					j+=2; 
 				}
@@ -908,7 +909,7 @@ int main(int argc, char **argv)
 						read(file,ext,512);
 						if(!(mode&KEEP_DESC)) {
 							sprintf(f.desc,"%.*s",LEN_FDESC,ext);
-							for(i=0;f.desc[i]>=' ' && i<LEN_FDESC;i++)
+							for(i=0;(f.desc[i]>=' ' || f.desc[i]<0) && i<LEN_FDESC;i++)
 								;
 							f.desc[i]=0; 
 						}

src/sbbs3/baja.c

@@ -151,7 +151,7 @@ int32_t val(char *src, char *p)
 	static int inside;
 	int32_t l;
 
-	if(isdigit(*p) || *p=='-')      /* Dec, Hex, or Oct */
+	if(isdigit((uchar)*p) || *p=='-')      /* Dec, Hex, or Oct */
 		l=strtol(p,&p,0);
 	else if(*p=='\'') {  /* Char */
 		p++;
@@ -219,7 +219,7 @@ int32_t val(char *src, char *p)
 }
 
 
-void writecstr(uchar *p)
+void writecstr(char *p)
 {
 	char str[1024];
 	int j=0,inquotes=0;
@@ -233,11 +233,11 @@ void writecstr(uchar *p)
 			continue; }
 		if(*p=='\\')    { /* escape */
 			p++;
-			if(isdigit(*p)) {
+			if(isdigit((uchar)*p)) {
 				sprintf(tmp,"%.3s",p);
 				str[j]=atoi(tmp); 		/* decimal, NOT octal */
-				if(isdigit(*(++p))) 	/* skip up to 3 digits */
-					if(isdigit(*(++p)))
+				if(isdigit((uchar)*(++p))) 	/* skip up to 3 digits */
+					if(isdigit((uchar)*(++p)))
 						p++;
 				j++;
 				continue; }
@@ -245,7 +245,7 @@ void writecstr(uchar *p)
 				case 'x':
 					tmp[0]=*(p++);
 					tmp[1]=0;
-					if(isxdigit(*p)) {	/* if another hex digit, skip too */
+					if(isxdigit((uchar)*p)) {	/* if another hex digit, skip too */
 						tmp[1]=*(p++);
 						tmp[2]=0; }
 					str[j]=(char)ahtoul(tmp);
@@ -284,7 +284,7 @@ void writecstr(uchar *p)
 	fwrite(str,1,j+1,out);
 }
 
-void writestr(uchar *p)
+void writestr(char *p)
 {
 	char str[1024];
 	int j=0;
@@ -309,12 +309,12 @@ void cvttab(char *str)
 			str[i]=' ';
 }
 
-void newvar(uchar* src, uchar *in)
+void newvar(char* src, char *in)
 {
-	uchar name[128];
+	char name[128];
 	int32_t i,l;
 
-	if(isdigit(*in)) {
+	if(isdigit((uchar)*in)) {
 		printf("!SYNTAX ERROR (illegal variable name):\n");
 		printf(linestr,src,line,(char*)in);
 		bail(1); 
@@ -342,10 +342,10 @@ void newvar(uchar* src, uchar *in)
 	vars++;
 }
 
-void writecrc(uchar *src, uchar *in)
+void writecrc(char *src, char *in)
 {
-	uchar	name[128];
-	uchar*	p;
+	char	name[128];
+	char*	p;
 	int32_t	l;
 	int		i;
 
@@ -375,12 +375,12 @@ void writecrc(uchar *src, uchar *in)
 	fwrite(&l,4,1,out);
 }
 
-int32_t isvar(uchar *arg)
+int32_t isvar(char *arg)
 {
-	uchar name[128],*p;
+	char name[128],*p;
 	int32_t i,l;
 
-	if(!arg || !(*arg) || isdigit(*arg))
+	if(!arg || !(*arg) || isdigit((uchar)*arg))
 		return(0);
 
 	sprintf(name,"%.80s",arg);
@@ -407,9 +407,9 @@ int str_cmp(char *s1, char *s2)
 	return(stricmp(s1,s2));
 }
 
-void expdefs(uchar *line)
+void expdefs(char *line)
 {
-	uchar str[512],*p,*sp,sav[2]={0};
+	char str[512],*p,*sp,sav[2]={0};
 	int i;
 
 	str[0]=0;
@@ -429,7 +429,7 @@ void expdefs(uchar *line)
 			continue; }
 
 		for(sp=p;*sp;sp++)
-			if(!isalnum(*sp) && *sp!='_')
+			if(!isalnum((uchar)*sp) && *sp!='_')
 				break;
 		sav[0]=*sp; 		/* Save delimiter */
 		sav[1]=0;
@@ -450,10 +450,12 @@ void expdefs(uchar *line)
 }
 
 
+#define SKIPCTRLSP(p) while(*(p)<=' ' && *(p)>0) (p)++
 
 void compile(char *src)
 {
-	uchar *str,*save,*p,*sp,*tp,*arg,*arg2,*arg3,*arg4,*ar,ch;
+	char *str,*save,*p,*sp,*tp,*arg,*arg2,*arg3,*arg4,ch;
+	uchar *ar;
 	char path[MAX_PATH+1];
 	uint16_t i;
     uint16_t j;
@@ -484,8 +486,7 @@ void compile(char *src)
 		line++;
 		strcpy(save,str);
 		p=str;
-		while(*p && *p<=' ')   /* look for beginning of command */
-			p++;
+		SKIPCTRLSP(p);   /* look for beginning of command */
 		if((*p)==0)
 			continue;
 		if(*p=='#')             /* remarks start with # */
@@ -498,19 +499,23 @@ void compile(char *src)
 		if(sp) {
 			*sp=0;
 			arg=sp+1;
-			while(*arg && *arg<=' ') arg++;
+			SKIPCTRLSP(arg);
 			sp=strchr(arg,' ');
 			if(sp) {
 				arg2=sp+1;
-				while(*arg2 && *arg2<=' ') arg2++;
+				SKIPCTRLSP(arg2);
 				sp=strchr(arg2,' ');
 				if(sp) {
 					arg3=sp+1;
-					while(*arg3 && *arg3<=' ') arg3++; 
+					SKIPCTRLSP(arg3);
 					sp=strchr(arg3,' ');
 					if(sp) {
 						arg4=sp+1;
-						while(*arg4 && *arg4<=' ') arg4++; } } } }
+						SKIPCTRLSP(arg4);
+					}
+				}
+			}
+		}
 
 		if(!stricmp(p,"!INCLUDE")) {
 			savline=line;
@@ -563,15 +568,15 @@ void compile(char *src)
 				if(!sp)
 					break;
 				p=sp+1;
-				while(*p && *p<=' ')
-					p++; }
+				SKIPCTRLSP(p);
+			}
 			continue; }
 
 		if(!stricmp(p,"PATCH")) {
 			if(!(*arg)) break;
 			p=arg;
 			while(*p) {
-				while(*p && *p<=' ') p++;
+				SKIPCTRLSP(p);
 				tmp[0]=*p++;
 				tmp[1]=*p++;
 				tmp[2]=0;
@@ -832,7 +837,7 @@ void compile(char *src)
 				ch=toupper(*arg);
 			if(ch=='/')
 				ch=*(arg+1)|0x80;   /* high bit indicates slash required */
-			else if(ch=='^' && *(arg+1)>=0x40)
+			else if(ch=='^' && (*(arg+1)>=0x40))
 				ch=*(arg+1)-0x40;   /* ctrl char */
 			else if(ch=='\\')
 				ch=cesc(*(arg+1));
@@ -869,8 +874,8 @@ void compile(char *src)
 				if(!sp)
 					break;
 				p=sp+1;
-				while(*p && *p<=' ')
-					p++; }
+				SKIPCTRLSP(p);
+			}
 			continue; }
 		if(!stricmp(p,"DEFINE_INT_VAR") || !stricmp(p,"INT")) {
 			if(!(*arg)) break;
@@ -884,8 +889,8 @@ void compile(char *src)
 				if(!sp)
 					break;
 				p=sp+1;
-				while(*p && *p<=' ')
-					p++; }
+				SKIPCTRLSP(p);
+			}
 			continue; }
 		if(!stricmp(p,"DEFINE_GLOBAL_STR_VAR") || !stricmp(p,"GLOBAL_STR")) {
 			if(!(*arg)) break;
@@ -899,8 +904,8 @@ void compile(char *src)
 				if(!sp)
 					break;
 				p=sp+1;
-				while(*p && *p<=' ')
-					p++; }
+				SKIPCTRLSP(p);
+			}
 			continue; }
 		if(!stricmp(p,"DEFINE_GLOBAL_INT_VAR") || !stricmp(p,"GLOBAL_INT")) {
 			if(!(*arg)) break;
@@ -914,8 +919,8 @@ void compile(char *src)
 				if(!sp)
 					break;
 				p=sp+1;
-				while(*p && *p<=' ')
-					p++; }
+				SKIPCTRLSP(p);
+			}
 			continue; }
 
 		if(!stricmp(p,"LOGIN")) {
@@ -1017,14 +1022,14 @@ void compile(char *src)
 			*p=0;
 			writecrc(src,arg);					/* Write destination variable */
 			p++;
-			while(*p && *p<=' ') p++;
+			SKIPCTRLSP(p);
 			arg=p;
 			p=strrchr(arg,'"');
 			if(!p)
 				break;
 			*p=0;
 			p++;
-			while(*p && *p<=' ') p++;
+			SKIPCTRLSP(p);
 			writecstr(arg);                 /* Write string */
 			l=ftell(out);
 			fputc(0,out);                   /* Write total number of args */
@@ -1052,7 +1057,7 @@ void compile(char *src)
 			*p=0;
 			writecrc(src,arg);					/* Write destination variable */
 			p++;
-			while(*p && *p<=' ') p++;
+			SKIPCTRLSP(p);
 			arg=p;
 			p=strrchr(arg,'"');
 			if(!p)
@@ -1060,7 +1065,7 @@ void compile(char *src)
 			*p=0;
 			writecstr(arg);                 /* Write string */
 			p++;
-			while(*p && *p<=' ') p++;
+			SKIPCTRLSP(p);
 			writecrc(src,p);
 			continue; }
 
@@ -1147,7 +1152,7 @@ void compile(char *src)
 				break;
 			*p=0;
 			p++;
-			while(*p && *p<=' ') p++;
+			SKIPCTRLSP(p);
 			writecrc(src,arg2);
 			writecstr(p);
 			continue; }
@@ -1173,14 +1178,14 @@ void compile(char *src)
 				break;
 			*p=0;
 			p++;
-			while(*p && *p<=' ') p++;
+			SKIPCTRLSP(p);
 			writecrc(src,arg2);
 			writecrc(src,p);
 			continue; }
 
 		if(!stricmp(p,"COMPARE_INT_VAR") ||
 			(!stricmp(p,"COMPARE")
-				&& (isdigit(*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) {
+				&& (isdigit((uchar)*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) {
 			if(!(*arg)) break;
 
 			fputc(CS_VAR_INSTRUCTION,out);
@@ -1285,7 +1290,7 @@ void compile(char *src)
 
 		if(!stricmp(p,"ADD_INT_VAR")
 			|| (!stricmp(p,"ADD")
-				&& (isdigit(*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) {
+				&& (isdigit((uchar)*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) {
 			if(!(*arg)) break;
 			fputc(CS_VAR_INSTRUCTION,out);
 			fputc(ADD_INT_VAR,out);
@@ -1313,7 +1318,7 @@ void compile(char *src)