Skip to content
Snippets Groups Projects
Commit 4af683f0 authored by rswindell's avatar rswindell
Browse files

Convert from legacy brace style (sorry, IHA).

parent 19583499
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 220 additions and 110 deletions
src/sbbs3/scfg/scfg.c
+ 220
− 110
View file @ 4af683f0
......@@ -672,25 +672,29 @@ void txt_cfg()
uifc.helpbuf=invalid_code;
uifc.msg("Invalid Code");
uifc.helpbuf=0;
continue; }
continue;
}
if((cfg.txtsec=(txtsec_t **)realloc(cfg.txtsec
,sizeof(txtsec_t *)*(cfg.total_txtsecs+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_txtsecs+1);
cfg.total_txtsecs=0;
bail(1);
continue; }
continue;
}
if(cfg.total_txtsecs)
for(u=cfg.total_txtsecs;u>i;u--)
cfg.txtsec[u]=cfg.txtsec[u-1];
if((cfg.txtsec[i]=(txtsec_t *)malloc(sizeof(txtsec_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(txtsec_t));
continue; }
continue;
}
memset((txtsec_t *)cfg.txtsec[i],0,sizeof(txtsec_t));
strcpy(cfg.txtsec[i]->name,str);
strcpy(cfg.txtsec[i]->code,code);
cfg.total_txtsecs++;
uifc.changes=1;
continue; }
continue;
}
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
free(cfg.txtsec[i]);
......@@ -698,16 +702,19 @@ void txt_cfg()
for(j=i;j<cfg.total_txtsecs;j++)
cfg.txtsec[j]=cfg.txtsec[j+1];
uifc.changes=1;
continue; }
continue;
}
if((i&MSK_ON)==MSK_GET) {
i&=MSK_OFF;
savtxtsec=*cfg.txtsec[i];
continue; }
continue;
}
if((i&MSK_ON)==MSK_PUT) {
i&=MSK_OFF;
*cfg.txtsec[i]=savtxtsec;
uifc.changes=1;
continue; }
continue;
}
i=txt_dflt;
j=0;
done=0;
......@@ -755,7 +762,8 @@ void txt_cfg()
else {
uifc.helpbuf=invalid_code;
uifc.msg("Invalid Code");
uifc.helpbuf=0; }
uifc.helpbuf=0;
}
break;
}
}
......@@ -838,25 +846,29 @@ void shell_cfg()
uifc.helpbuf=invalid_code;
uifc.msg("Invalid Code");
uifc.helpbuf=0;
continue; }
continue;
}
if((cfg.shell=(shell_t **)realloc(cfg.shell
,sizeof(shell_t *)*(cfg.total_shells+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_shells+1);
cfg.total_shells=0;
bail(1);
continue; }
continue;
}
if(cfg.total_shells)
for(u=cfg.total_shells;u>i;u--)
cfg.shell[u]=cfg.shell[u-1];
if((cfg.shell[i]=(shell_t *)malloc(sizeof(shell_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(shell_t));
continue; }
continue;
}
memset((shell_t *)cfg.shell[i],0,sizeof(shell_t));
strcpy(cfg.shell[i]->name,str);
strcpy(cfg.shell[i]->code,code);
cfg.total_shells++;
uifc.changes=1;
continue; }
continue;
}
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
free(cfg.shell[i]);
......@@ -864,16 +876,19 @@ void shell_cfg()
for(j=i;j<cfg.total_shells;j++)
cfg.shell[j]=cfg.shell[j+1];
uifc.changes=1;
continue; }
continue;
}
if((i&MSK_ON)==MSK_GET) {
i&=MSK_OFF;
savshell=*cfg.shell[i];
continue; }
continue;
}
if((i&MSK_ON)==MSK_PUT) {
i&=MSK_OFF;
*cfg.shell[i]=savshell;
uifc.changes=1;
continue; }
continue;
}
i=shell_dflt;
j=0;
done=0;
......@@ -938,7 +953,8 @@ void shell_cfg()
else {
uifc.helpbuf=invalid_code;
uifc.msg("Invalid Code");
uifc.helpbuf=0; }
uifc.helpbuf=0;
}
break;
}
}
......@@ -1011,26 +1027,34 @@ void getar(char *desc, char *inar)
for(i=0;i<n;i++) { /* Shorten operators */
if(!strncmp(ar+i,"AND",3)) {
strcat(str,"&");
i+=2; }
i+=2;
}
else if(!strncmp(ar+i,"NOT",3)) {
strcat(str,"!");
i+=2; }
i+=2;
}
else if(!strncmp(ar+i,"EQUAL",5)) {
strcat(str,"=");
i+=4; }
i+=4;
}
else if(!strncmp(ar+i,"EQUALS",6)) {
strcat(str,"=");
i+=5; }
i+=5;
}
else if(!strncmp(ar+i,"EQUAL TO",8)) {
strcat(str,"=");
i+=7; }
i+=7;
}
else if(!strncmp(ar+i,"OR",2)) {
strcat(str,"|");
i+=1; }
i+=1;
}
else
strncat(str,ar+i,1); }
strncat(str,ar+i,1);
}
strcpy(ar,str);
len=strlen(ar); }
len=strlen(ar);
}
if(len>=30) {
str[0]=0;
......@@ -1038,17 +1062,22 @@ void getar(char *desc, char *inar)
for(i=0;i<n;i++) { /* Remove spaces from ! and = */
if(!strncmp(ar+i," ! ",3)) {
strcat(str,"!");
i+=2; }
i+=2;
}
else if(!strncmp(ar+i,"= ",2)) {
strcat(str,"=");
i++; }
i++;
}
else if(!strncmp(ar+i," = ",3)) {
strcat(str,"=");
i+=2; }
i+=2;
}
else
strncat(str,ar+i,1); }
strncat(str,ar+i,1);
}
strcpy(ar,str);
len=strlen(ar); }
len=strlen(ar);
}
if(len>=30) {
str[0]=0;
......@@ -1056,14 +1085,18 @@ void getar(char *desc, char *inar)
for(i=0;i<n;i++) { /* Remove spaces from & and | */
if(!strncmp(ar+i," & ",3)) {
strcat(str," ");
i+=2; }
i+=2;
}
else if(!strncmp(ar+i," | ",3)) {
strcat(str,"|");
i+=2; }
i+=2;
}
else
strncat(str,ar+i,1); }
strncat(str,ar+i,1);
}
strcpy(ar,str);
len=strlen(ar); }
len=strlen(ar);
}
if(len>=30) { /* change week days to numbers */
str[0]=0;
......@@ -1073,11 +1106,14 @@ void getar(char *desc, char *inar)
if(!strnicmp(ar+i,wday[j],3)) {
strcat(str,ultoa(j,tmp,10));
i+=2;
break; }
break;
}
if(j==7)
strncat(str,ar+i,1); }
strncat(str,ar+i,1);
}
strcpy(ar,str);
len=strlen(ar); }
len=strlen(ar);
}
if(len>=30) { /* Shorten parameters */
str[0]=0;
......@@ -1085,85 +1121,113 @@ void getar(char *desc, char *inar)
for(i=0;i<n;i++) {
if(!strncmp(ar+i,"AGE",3)) {
strcat(str,"$A");
i+=2; }
i+=2;
}
else if(!strncmp(ar+i,"BPS",3)) {
strcat(str,"$B");
i+=2; }
i+=2;
}
else if(!strncmp(ar+i,"PCR",3)) {
strcat(str,"$P");
i+=2; }
i+=2;
}
else if(!strncmp(ar+i,"RIP",3)) {
strcat(str,"$*");
i+=2; }
i+=2;
}
else if(!strncmp(ar+i,"SEX",3)) {
strcat(str,"$S");
i+=2; }
i+=2;
}
else if(!strncmp(ar+i,"UDR",3)) {
strcat(str,"$K");
i+=2; }
i+=2;
}
else if(!strncmp(ar+i,"DAY",3)) {
strcat(str,"$W");
i+=2; }
i+=2;
}
else if(!strncmp(ar+i,"ANSI",4)) {
strcat(str,"$[");
i+=3; }
i+=3;
}
else if(!strncmp(ar+i,"UDFR",4)) {
strcat(str,"$D");
i+=3; }
i+=3;
}
else if(!strncmp(ar+i,"FLAG",4)) {
strcat(str,"$F");
i+=3; }
i+=3;
}
else if(!strncmp(ar+i,"NODE",4)) {
strcat(str,"$N");
i+=3; }
i+=3;
}
else if(!strncmp(ar+i,"NULL",4)) {
strcat(str,"$0");
i+=3; }
i+=3;
}
else if(!strncmp(ar+i,"TIME",4)) {
strcat(str,"$T");
i+=3; }
i+=3;
}
else if(!strncmp(ar+i,"USER",4)) {
strcat(str,"$U");
i+=3; }
i+=3;
}
else if(!strncmp(ar+i,"REST",4)) {
strcat(str,"$Z");
i+=3; }
i+=3;
}
else if(!strncmp(ar+i,"LOCAL",5)) {
strcat(str,"$G");
i+=4; }
i+=4;
}
else if(!strncmp(ar+i,"LEVEL",5)) {
strcat(str,"$L");
i+=4; }
i+=4;
}
else if(!strncmp(ar+i,"TLEFT",5)) {
strcat(str,"$R");
i+=4; }
i+=4;
}
else if(!strncmp(ar+i,"TUSED",5)) {
strcat(str,"$O");
i+=4; }
i+=4;
}
else if(!strncmp(ar+i,"EXPIRE",6)) {
strcat(str,"$E");
i+=5; }
i+=5;
}
else if(!strncmp(ar+i,"CREDIT",6)) {
strcat(str,"$C");
i+=5; }
i+=5;
}
else if(!strncmp(ar+i,"EXEMPT",6)) {
strcat(str,"$X");
i+=5; }
i+=5;
}
else if(!strncmp(ar+i,"RANDOM",6)) {
strcat(str,"$Q");
i+=5; }
i+=5;
}
else if(!strncmp(ar+i,"LASTON",6)) {
strcat(str,"$Y");
i+=5; }
i+=5;
}
else if(!strncmp(ar+i,"LOGONS",6)) {
strcat(str,"$V");
i+=5; }
i+=5;
}
else if(!strncmp(ar+i,":00",3)) {
i+=2; }
i+=2;
}
else
strncat(str,ar+i,1); }
strncat(str,ar+i,1);
}
strcpy(ar,str);
len=strlen(ar); }
len=strlen(ar);
}
if(len>=30) { /* Remove all spaces and &s */
str[0]=0;
n=strlen(ar);
......@@ -1171,7 +1235,8 @@ void getar(char *desc, char *inar)
if(ar[i]!=' ' && ar[i]!='&')
strncat(str,ar+i,1);
strcpy(ar,str);
len=strlen(ar); }
len=strlen(ar);
}
i=0;
sprintf(opt[i++],"Requirement String (%s)",ar);
strcpy(opt[i++],"Clear Requirements");
......@@ -1241,12 +1306,14 @@ void getar(char *desc, char *inar)
i=uifc.list(WIN_MID|WIN_SAV,0,0,0,&i,0,"Are You Sure",opt);
if(!i) {
ar[0]=0;
uifc.changes=1; }
uifc.changes=1;
}
break;
case 2:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
i=whichlogic();
if(i==-1)
break;
......@@ -1267,7 +1334,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"LEVEL ");
switch(i) {
case 1:
......@@ -1278,13 +1346,15 @@ void getar(char *desc, char *inar)
break;
case 3:
strcat(ar,"NOT ");
break; }
break;
}
strcat(ar,str);
break;
case 3:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
for(i=0;i<4;i++)
sprintf(opt[i],"Flag Set #%d",i+1);
......@@ -1311,7 +1381,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"FLAG ");
if(i)
strcat(ar,ultoa(i+1,tmp,10));
......@@ -1320,7 +1391,8 @@ void getar(char *desc, char *inar)
case 4:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
i=whichlogic();
if(i==-1)
break;
......@@ -1341,7 +1413,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"AGE ");
switch(i) {
case 1:
......@@ -1352,13 +1425,15 @@ void getar(char *desc, char *inar)
break;
case 3:
strcat(ar,"NOT ");
break; }
break;
}
strcat(ar,str);
break;
case 5:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
str[0]=0;
uifc.helpbuf=
"`Required Sex:`\n"
......@@ -1378,14 +1453,16 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"SEX ");
strcat(ar,str);
break;
case 6:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
i=whichlogic();
if(i==-1)
break;
......@@ -1402,7 +1479,8 @@ void getar(char *desc, char *inar)
j=atoi(str);
if(j>=300 && j<30000) {
j/=100;
sprintf(str,"%d",j); }
sprintf(str,"%d",j);
}
if(ar[0]) {
j=whichcond();
if(j==-1)
......@@ -1410,7 +1488,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"BPS ");
switch(i) {
case 1:
......@@ -1421,13 +1500,15 @@ void getar(char *desc, char *inar)
break;
case 3:
strcat(ar,"NOT ");
break; }
break;
}
strcat(ar,str);
break;
case 7:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
i=whichlogic();
if(i==-1)
break;
......@@ -1449,7 +1530,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"PCR ");
switch(i) {
case 1:
......@@ -1460,13 +1542,15 @@ void getar(char *desc, char *inar)
break;
case 3:
strcat(ar,"NOT ");
break; }
break;
}
strcat(ar,str);
break;
case 8:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
i=whichlogic();
if(i==-1)
break;
......@@ -1488,7 +1572,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"CREDIT ");
switch(i) {
case 1:
......@@ -1499,13 +1584,15 @@ void getar(char *desc, char *inar)
break;
case 3:
strcat(ar,"NOT ");
break; }
break;
}
strcat(ar,str);
break;
case 9:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
i=whichlogic();
if(i==-1)
break;
......@@ -1529,7 +1616,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"UDR ");
switch(i) {
case 1:
......@@ -1540,13 +1628,15 @@ void getar(char *desc, char *inar)
break;
case 3:
strcat(ar,"NOT ");
break; }
break;
}
strcat(ar,str);
break;
case 10:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
i=whichlogic();
if(i==-1)
break;
......@@ -1571,7 +1661,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"UDFR ");
switch(i) {
case 1:
......@@ -1582,13 +1673,15 @@ void getar(char *desc, char *inar)
break;
case 3:
strcat(ar,"NOT ");
break; }
break;
}
strcat(ar,str);
break;
case 11:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
i=0;
strcpy(opt[0],"Before");
strcpy(opt[1],"After");
......@@ -1614,7 +1707,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"TIME ");
if(!i)
strcat(ar,"NOT ");
......@@ -1623,7 +1717,8 @@ void getar(char *desc, char *inar)
case 12:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
i=whichlogic();
if(i==-1)
break;
......@@ -1649,7 +1744,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"DAY ");
switch(i) {
case 1:
......@@ -1660,13 +1756,15 @@ void getar(char *desc, char *inar)
break;
case 3:
strcat(ar,"NOT ");
break; }
break;
}
strcat(ar,str);
break;
case 13:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
i=whichlogic();
if(i==-1)
break;
......@@ -1687,7 +1785,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"NODE ");
switch(i) {
case 1:
......@@ -1698,13 +1797,15 @@ void getar(char *desc, char *inar)
break;
case 3:
strcat(ar,"NOT ");
break; }
break;
}
strcat(ar,str);
break;
case 14:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
i=whichlogic();
if(i==-1)
break;
......@@ -1725,7 +1826,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"USER ");
switch(i) {
case 1:
......@@ -1736,14 +1838,16 @@ void getar(char *desc, char *inar)
break;
case 3:
strcat(ar,"NOT ");
break; }
break;
}
strcat(ar,str);
break;
case 15:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
i=whichlogic();
if(i==-1)
break;
......@@ -1765,7 +1869,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"TLEFT ");
switch(i) {
case 1:
......@@ -1776,14 +1881,16 @@ void getar(char *desc, char *inar)
break;
case 3:
strcat(ar,"NOT ");
break; }
break;
}
strcat(ar,str);
break;
case 16:
if(strlen(ar)>=30) {
uifc.msg("Maximum string length reached");
break; }
break;
}
i=whichlogic();
if(i==-1)
break;
......@@ -1805,7 +1912,8 @@ void getar(char *desc, char *inar)
if(!j)
strcat(ar," AND ");
else
strcat(ar," OR "); }
strcat(ar," OR ");
}
strcat(ar,"EXPIRE ");
switch(i) {
case 1:
......@@ -1816,7 +1924,8 @@ void getar(char *desc, char *inar)
break;
case 3:
strcat(ar,"NOT ");
break; }
break;
}
strcat(ar,str);
break;
......@@ -1871,7 +1980,8 @@ void bail(int code)
write_msgs_cfg(&cfg,backup_level);
write_file_cfg(&cfg,backup_level);
write_chat_cfg(&cfg,backup_level);
write_xtrn_cfg(&cfg,backup_level); }
write_xtrn_cfg(&cfg,backup_level);
}
uifc.bail();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment