From b740cc3090ce8e07b7633201d8a20818df3278b8 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Sun, 30 May 2004 06:56:06 +0000
Subject: [PATCH] Kill the SP macro in preperation for xcurses support
---
src/sbbs3/scfg/scfg.c | 6 ++---
src/sbbs3/scfg/scfgchat.c | 4 ++--
src/sbbs3/scfg/scfgmdm.c | 46 +++++++++++++++++++--------------------
src/sbbs3/scfg/scfgmsg.c | 4 ++--
src/sbbs3/scfg/scfgsub.c | 2 +-
src/sbbs3/scfg/scfgsys.c | 6 ++---
src/sbbs3/scfg/scfgxfr2.c | 18 +++++++--------
src/sbbs3/scfg/scfgxtrn.c | 6 ++---
8 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/src/sbbs3/scfg/scfg.c b/src/sbbs3/scfg/scfg.c
index c03c839532..559c7dd683 100644
--- a/src/sbbs3/scfg/scfg.c
+++ b/src/sbbs3/scfg/scfg.c
@@ -659,7 +659,7 @@ This is the name of this text section.
,K_EDIT)<1)
continue;
sprintf(code,"%.8s",str);
- p=strchr(code,SP);
+ p=strchr(code,' ');
if(p) *p=0;
strupr(code);
SETHELP(WHERE);
@@ -825,7 +825,7 @@ This is the descriptive name of this command shell.
,K_EDIT)<1)
continue;
sprintf(code,"%.8s",str);
- p=strchr(code,SP);
+ p=strchr(code,' ');
if(p) *p=0;
strupr(code);
SETHELP(WHERE);
@@ -1187,7 +1187,7 @@ while(!done) {
str[0]=0;
n=strlen(ar);
for(i=0;i<n;i++)
- if(ar[i]!=SP && ar[i]!='&')
+ if(ar[i]!=' ' && ar[i]!='&')
strncat(str,ar+i,1);
strcpy(ar,str);
len=strlen(ar); }
diff --git a/src/sbbs3/scfg/scfgchat.c b/src/sbbs3/scfg/scfgchat.c
index 4ff7f52b1a..219eba7b8f 100644
--- a/src/sbbs3/scfg/scfgchat.c
+++ b/src/sbbs3/scfg/scfgchat.c
@@ -222,7 +222,7 @@ This is the name or description of the chat channel.
,K_EDIT)<1)
continue;
sprintf(code,"%.8s",str);
- p=strchr(code,SP);
+ p=strchr(code,' ');
if(p) *p=0;
strupr(code);
SETHELP(WHERE);
@@ -620,7 +620,7 @@ This is the name of the selected Guru.
,0)<1)
continue;
sprintf(code,"%.8s",str);
- p=strchr(code,SP);
+ p=strchr(code,' ');
if(p) *p=0;
strupr(code);
SETHELP(WHERE);
diff --git a/src/sbbs3/scfg/scfgmdm.c b/src/sbbs3/scfg/scfgmdm.c
index 19f7fc737e..d603585cb9 100644
--- a/src/sbbs3/scfg/scfgmdm.c
+++ b/src/sbbs3/scfg/scfgmdm.c
@@ -71,7 +71,7 @@ void cvttab(char *str)
for(i=0;str[i];i++)
if(str[i]==TAB)
- str[i]=SP;
+ str[i]=' ';
}
int export_mdm(char *fname)
@@ -134,7 +134,7 @@ while(!feof(stream)) {
cvttab(str);
truncsp(str);
p=str;
- while(*p && *p<=SP) /* look for beginning of command */
+ while(*p && *p<=' ') /* look for beginning of command */
p++;
if(!*p)
continue;
@@ -143,55 +143,55 @@ while(!feof(stream)) {
if(!strnicmp(p,"COM_RATE",8)) {
p+=8;
- while(*p==SP) p++;
+ while(*p==' ') p++;
cfg.com_rate=atol(p);
continue; }
if(!strnicmp(p,"INIT_STR",8)) {
p+=8;
- while(*p==SP) p++;
+ while(*p==' ') p++;
sprintf(cfg.mdm_init,"%.63s",p);
continue; }
if(!strnicmp(p,"DIAL_STR",8)) {
p+=8;
- while(*p==SP) p++;
+ while(*p==' ') p++;
sprintf(cfg.mdm_dial,"%.63s",p);
continue; }
if(!strnicmp(p,"HANGUP_STR",10)) {
p+=10;
- while(*p==SP) p++;
+ while(*p==' ') p++;
sprintf(cfg.mdm_hang,"%.63s",p);
continue; }
if(!strnicmp(p,"ANSWER_STR",10)) {
p+=10;
- while(*p==SP) p++;
+ while(*p==' ') p++;
sprintf(cfg.mdm_answ,"%.63s",p);
continue; }
if(!strnicmp(p,"OFFHOOK_STR",11)) {
p+=11;
- while(*p==SP) p++;
+ while(*p==' ') p++;
sprintf(cfg.mdm_offh,"%.63s",p);
continue; }
if(!strnicmp(p,"SPEC_INIT",9)) {
p+=9;
- while(*p==SP) p++;
+ while(*p==' ') p++;
sprintf(cfg.mdm_spec,"%.63s",p);
continue; }
if(!strnicmp(p,"TERM_INIT",9)) {
p+=9;
- while(*p==SP) p++;
+ while(*p==' ') p++;
sprintf(cfg.mdm_term,"%.63s",p);
continue; }
if(!strnicmp(p,"LOCKED_RATE",11)) {
p+=11;
- while(*p==SP) p++;
+ while(*p==' ') p++;
if(!stricmp(p,"OFF") || !stricmp(p,"NO"))
cfg.mdm_misc&=~MDM_STAYHIGH;
else
@@ -200,7 +200,7 @@ while(!feof(stream)) {
if(!strnicmp(p,"CALLER_ID",9)) {
p+=9;
- while(*p==SP) p++;
+ while(*p==' ') p++;
if(!stricmp(p,"YES") || !stricmp(p,"ON"))
cfg.mdm_misc|=MDM_CALLERID;
else
@@ -209,7 +209,7 @@ while(!feof(stream)) {
if(!strnicmp(p,"VERBAL_RESULTS",14)) {
p+=14;
- while(*p==SP) p++;
+ while(*p==' ') p++;
if(!stricmp(p,"YES") || !stricmp(p,"ON"))
cfg.mdm_misc|=MDM_VERBAL;
else
@@ -218,7 +218,7 @@ while(!feof(stream)) {
if(!strnicmp(p,"DROP_DTR",8)) {
p+=8;
- while(*p==SP) p++;
+ while(*p==' ') p++;
if(!stricmp(p,"OFF") || !stricmp(p,"NO"))
cfg.mdm_misc|=MDM_NODTR;
else
@@ -227,7 +227,7 @@ while(!feof(stream)) {
if(!strnicmp(p,"FLOW_CONTROL",12)) {
p+=12;
- while(*p==SP) p++;
+ while(*p==' ') p++;
cfg.mdm_misc&=~(MDM_RTS|MDM_CTS);
strupr(p);
if(strstr(p,"RTS") || strstr(p,"RECEIVE") || strstr(p,"RECV")
@@ -240,7 +240,7 @@ while(!feof(stream)) {
if(!strnicmp(p,"RESULT ",7)) {
p+=7;
- while(*p==SP) p++;
+ while(*p==' ') p++;
i=atoi(p);
for(j=0;j<cfg.mdm_results;j++)
if(cfg.mdm_result[j].code==i)
@@ -255,20 +255,20 @@ while(!feof(stream)) {
continue; }
cfg.mdm_results++; }
cfg.mdm_result[j].code=i;
- while(*p!=SP) p++;
- while(*p==SP) p++;
+ while(*p!=' ') p++;
+ while(*p==' ') p++;
cfg.mdm_result[j].cps=atoi(p);
- while(*p!=SP) p++;
- while(*p==SP) p++;
+ while(*p!=' ') p++;
+ while(*p==' ') p++;
cfg.mdm_result[j].rate=atoi(p);
- while(*p!=SP) p++;
- while(*p==SP) p++;
+ while(*p!=' ') p++;
+ while(*p==' ') p++;
sprintf(cfg.mdm_result[j].str,"%.*s",LEN_MODEM,p);
continue; }
if(!strnicmp(p,"INCLUDE ",8)) {
p+=8;
- while(*p==SP) p++;
+ while(*p==' ') p++;
exec_mdm(p);
continue; }
diff --git a/src/sbbs3/scfg/scfgmsg.c b/src/sbbs3/scfg/scfgmsg.c
index 7c64c7c656..05e7c494f3 100644
--- a/src/sbbs3/scfg/scfgmsg.c
+++ b/src/sbbs3/scfg/scfgmsg.c
@@ -55,7 +55,7 @@ char *stou(char *str)
int i;
for(i=0;str[i];i++)
- if(str[i]==SP)
+ if(str[i]==' ')
out[i]='_';
else
out[i]=str[i];
@@ -547,7 +547,7 @@ import into the current message group.
continue;
if(k) {
p=str;
- while(*p && *p<=SP) p++;
+ while(*p && *p<=' ') p++;
if(!*p || *p==';')
continue;
memset(&tmpsub,0,sizeof(sub_t));
diff --git a/src/sbbs3/scfg/scfgsub.c b/src/sbbs3/scfg/scfgsub.c
index 93574ff929..9f3269c25d 100644
--- a/src/sbbs3/scfg/scfgsub.c
+++ b/src/sbbs3/scfg/scfgsub.c
@@ -120,7 +120,7 @@ This is the name of the sub-board used for QWK off-line readers.
continue;
#endif
sprintf(code,"%.8s",str2);
- p=strchr(code,SP);
+ p=strchr(code,' ');
if(p) *p=0;
strupr(code);
SETHELP(WHERE);
diff --git a/src/sbbs3/scfg/scfgsys.c b/src/sbbs3/scfg/scfgsys.c
index 7d3a4aeb06..19508425e5 100644
--- a/src/sbbs3/scfg/scfgsys.c
+++ b/src/sbbs3/scfg/scfgsys.c
@@ -683,7 +683,7 @@ to Yes.
,cfg.new_xedit);
sprintf(opt[i++],"%-27.27s%s","Command Shell"
,cfg.shell[cfg.new_shell]->code);
- if(cfg.new_prot!=SP)
+ if(cfg.new_prot!=' ')
sprintf(str,"%c",cfg.new_prot);
else
strcpy(str,"None");
@@ -882,8 +882,8 @@ This option allows you to set the default download protocol of new users
,"Default Download Protocol (SPACE=Disabled)"
,str,1,K_EDIT|K_UPPER);
cfg.new_prot=str[0];
- if(cfg.new_prot<SP)
- cfg.new_prot=SP;
+ if(cfg.new_prot<' ')
+ cfg.new_prot=' ';
break;
case 13:
SETHELP(WHERE);
diff --git a/src/sbbs3/scfg/scfgxfr2.c b/src/sbbs3/scfg/scfgxfr2.c
index 787e4969b9..9c6045537e 100644
--- a/src/sbbs3/scfg/scfgxfr2.c
+++ b/src/sbbs3/scfg/scfgxfr2.c
@@ -457,7 +457,7 @@ command: DIR /ON /AD /B > DIRS.RAW
tmpdir.dn_pct=cfg.cdt_dn_pct;
p=str;
- while(*p && *p<=SP) p++;
+ while(*p && *p<=' ') p++;
if(k==2) { /* raw */
SAFECOPY(tmp_code,p);
@@ -470,14 +470,14 @@ command: DIR /ON /AD /B > DIRS.RAW
if(strnicmp(p,"AREA ",5))
continue;
p+=5;
- while(*p && *p<=SP) p++;
+ while(*p && *p<=' ') p++;
SAFECOPY(tmp_code,p);
- while(*p>SP) p++; /* Skip areaname */
- while(*p && *p<=SP) p++; /* Skip space */
- while(*p>SP) p++; /* Skip level */
- while(*p && *p<=SP) p++; /* Skip space */
- while(*p>SP) p++; /* Skip flags */
- while(*p && *p<=SP) p++; /* Skip space */
+ while(*p>' ') p++; /* Skip areaname */
+ while(*p && *p<=' ') p++; /* Skip space */
+ while(*p>' ') p++; /* Skip level */
+ while(*p && *p<=' ') p++; /* Skip space */
+ while(*p>' ') p++; /* Skip flags */
+ while(*p && *p<=' ') p++; /* Skip space */
SAFECOPY(tmpdir.sname,p);
SAFECOPY(tmpdir.lname,p);
ported++;
@@ -666,7 +666,7 @@ the file transfer prompt.
,K_EDIT)<1)
continue;
sprintf(code,"%.8s",str2);
- p=strchr(code,SP);
+ p=strchr(code,' ');
if(p) *p=0;
strupr(code);
SETHELP(WHERE);
diff --git a/src/sbbs3/scfg/scfgxtrn.c b/src/sbbs3/scfg/scfgxtrn.c
index 7695291b74..7b75d942ff 100644
--- a/src/sbbs3/scfg/scfgxtrn.c
+++ b/src/sbbs3/scfg/scfgxtrn.c
@@ -799,7 +799,7 @@ This is the name or description of the online program (door).
,0)<1)
continue;
sprintf(code,"%.8s",str);
- p=strchr(code,SP);
+ p=strchr(code,' ');
if(p) *p=0;
strupr(code);
SETHELP(WHERE);
@@ -1489,7 +1489,7 @@ This is the name or description of the external editor.
,0)<1)
continue;
sprintf(code,"%.8s",str);
- p=strchr(code,SP);
+ p=strchr(code,' ');
if(p) *p=0;
strupr(code);
SETHELP(WHERE);
@@ -2008,7 +2008,7 @@ This is the name of this section.
,0)<1)
continue;
sprintf(code,"%.8s",str);
- p=strchr(code,SP);
+ p=strchr(code,' ');
if(p) *p=0;
strupr(code);
SETHELP(WHERE);
--
GitLab