Put a quick bandaid on internal citrus locking.

The code is not quite right still, but it programs from deadlocking
on themselves if one enables new citrus code by mistake.
This commit is contained in:
kan 2011-06-19 13:35:46 +00:00
parent 13e3e9fd02
commit 92d2909328
2 changed files with 3 additions and 1 deletions

View File

@ -337,7 +337,9 @@ _citrus_mapper_open(struct _citrus_mapper_area *__restrict ma,
goto quit;
/* open mapper */
UNLOCK;
ret = mapper_open(ma, &cm, module, variable);
WLOCK;
if (ret)
goto quit;
cm->cm_key = strdup(mapname);

View File

@ -85,7 +85,7 @@ _iconv_open(const char *out, const char *in, struct _citrus_iconv *prealloc)
errno = ENOMEM;
return ((iconv_t)-1);
}
p = out_truncated;
while (*p != 0) {
if (p[0] == '/' && p[1] == '/') {