empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(valstr, nstr_exec, nstr_comp_val, nstr_exec_val, xdprval): Support

Browse source 
strings with length limit instead of zero termination.
(ship_ca, land_ca): New selectors rflags, rpath.  The latter is such a
string.
This commit is contained in:
Markus Armbruster 2004-09-11 08:45:17 +00:00
parent 66eaa28f92
commit 630e8e105a
4 changed files with 40 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/lib/commands/xdump.c
View file

@ -294,7 +294,7 @@ xdeval(struct valstr *val, nsc_type type, void *ptr, ptrdiff_t off, int idx)
static char *
xdprval(struct valstr *val, char *sep)
{
unsigned char *s, *e;
unsigned char *s, *e, *l;
switch (val->val_type) {
case NSC_TYPEID:
@ -305,14 +305,17 @@ xdprval(struct valstr *val, char *sep)
pr("%s%#g", sep, val->val_as.dbl);
break;
case NSC_STRING:
s = (unsigned char *)val->val_as.str;
s = (unsigned char *)val->val_as.str.base;
if (s) {
pr("%s\"", sep);
while (*s) {
for (e = s; *e != '"' && *e != '\\' && isgraph(*e); ++e) ;
l = s + val->val_as.str.maxsz;
for (;;) {
for (e=s; e<l && *e != '"' && *e != '\\' && isgraph(*e); ++e) ;
pr("%.*s", (int)(e-s), s);
if (*e)
if (e < l && *e)
pr("\\%03o", *e++);
else
break;
s = e;
}
prnf("\"");
@ -455,7 +458,7 @@ xdchr(int chridx)
val.val_as.sym.off = cm->ca[0].ca_off;
val.val_as.sym.idx = 0;
nstr_exec_val(&val, player->cnum, p, NSC_STRING);
if (!val.val_as.str || !*val.val_as.str)
if (!val.val_as.str.base || !*val.val_as.str.base)
break;
++n;
xdflds(cm->ca, p);