bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Diesel coding and decoding for strings

Browse Source
This commit is contained in:
Michiel Broek 2007-02-13 14:28:43 +00:00
parent 92f2b4e3b2
commit 424bb3d4e4
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -3,7 +3,9 @@ $Id$
v0.91.3 11-Feb-2007 v0.91.3 11-Feb-2007
mbselib: mbselib:
Extra logging activated in MacroVars. Added coding and decoding to strings that are processed by the
diesel macroprocessor. EXPERIMENTAL IS UNDER TEST !!!
Fixed a compile warning in the diesel code.
mbuser: mbuser:
Set default editor on erased records. Set default editor on erased records.

4
lib/clcomm.c
View File

@ -4,7 +4,7 @@
* Purpose ...............: Client/Server communications * Purpose ...............: Client/Server communications
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2006 * Copyright (C) 1997-2007
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -530,7 +530,7 @@ char *clencode(char *s)
return s; return s;
} }
for (p = s, q = buf; *p != '\0';) { for (p = s, q = buf; *p != '\0';) {
if ((! isascii(*p)) || (*p == ',') || (*p == ';')) { if ((! isascii(*p)) || (*p == ',') || (*p == ';') || (*p == '"')) {
*q++ = '\\'; *q++ = '\\';
*q++ = Base16Code[(*p >> 4) & 0x0f]; *q++ = Base16Code[(*p >> 4) & 0x0f];
*q++ = Base16Code[*p & 0x0f]; *q++ = Base16Code[*p & 0x0f];

18
lib/mbdiesel.c
View File

@ -4,7 +4,7 @@
* Purpose ...............: MBSE BBS functions for TURBODIESEL * Purpose ...............: MBSE BBS functions for TURBODIESEL
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2005 * Copyright (C) 1997-2007
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -52,7 +52,7 @@ void MacroVars( const char *codes, const char *fmt, ...)
switch (fmt[j]) { switch (fmt[j]) {
case 's': /* string */ case 's': /* string */
vs = va_arg(ap, char *); vs = va_arg(ap, char *);
snprintf(tmp1, MAXSTR -1, "@(setvar,%c,\"%s\")",codes[j],vs); snprintf(tmp1, MAXSTR -1, "@(setvar,%c,\"%s\")",codes[j], clencode(vs));
break; break;
case 'd': /* int */ case 'd': /* int */
vd = va_arg(ap, int); vd = va_arg(ap, int);
@ -62,18 +62,15 @@ void MacroVars( const char *codes, const char *fmt, ...)
vc = va_arg(ap, int); vc = va_arg(ap, int);
snprintf(tmp1, MAXSTR -1, "@(setvar,%c,%c)",codes[j],vc); snprintf(tmp1, MAXSTR -1, "@(setvar,%c,%c)",codes[j],vc);
break; break;
case 'f': /* char */ case 'f': /* float */
vf = va_arg(ap, double); vf = va_arg(ap, double);
snprintf(tmp1, MAXSTR -1, "@(setvar,%c,%f)",codes[j],vf); snprintf(tmp1, MAXSTR -1, "@(setvar,%c,%f)",codes[j],vf);
break; break;
} }
dieselrc = diesel(tmp1,tmp2); dieselrc = diesel(tmp1,tmp2);
if (dieselrc || (fmt[j] == 's')) { if (dieselrc) {
Syslog('!', "MacroVars error %d argument %d, macro %c type %c", dieselrc, j, codes[j], fmt[j]); Syslog('!', "MacroVars error %d argument %d, macro %c type %c", dieselrc, j, codes[j], fmt[j]);
// if (fmt[j] == 's')
// Syslogp('!', printable(va_arg(ap, char *), 0));
Syslogp('!', printable(tmp1, 0)); Syslogp('!', printable(tmp1, 0));
Syslogp('!', printable(tmp2, 0));
} }
} }
va_end(ap); va_end(ap);
@ -101,7 +98,8 @@ void MacroClear(void)
char *ParseMacro( const char *line, int *dieselrc) char *ParseMacro( const char *line, int *dieselrc)
{ {
static char res[MAXSTR]; static char res[MAXSTR];
char *tmp1, *tmp2, *tmp3, *i; const char *i;
char *tmp1, *tmp2, *tmp3;
int j, l; int j, l;
char code; char code;
@ -117,7 +115,7 @@ char *ParseMacro( const char *line, int *dieselrc)
tmp1[0]='\0'; tmp1[0]='\0';
for ( i=line ; i[0] != '\0'; i++){ for (i = line; i[0] != '\0'; i++) {
if ( (i[0] == '@') && isalpha(i[1]) ){ if ( (i[0] == '@') && isalpha(i[1]) ){
l=2; l=2;
i++; i++;
@ -180,6 +178,8 @@ char *ParseMacro( const char *line, int *dieselrc)
} }
if ((res[0] == '@') && (res[1] =='!' )) if ((res[0] == '@') && (res[1] =='!' ))
res[0]='\0'; res[0]='\0';
cldecode(res);
return res; return res;
} }