Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

http://eressea.upb.de/mantis/view.php?id=1437

Browse source 
"Zeilenumbruch im Einheitennamen"
- apply fixes to existing data.
This commit is contained in:
Enno Rehling 2008-06-03 07:42:06 +00:00
parent e26700c8b1
commit 09478956c8
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/common/kernel/binarystore.c
View file

@ -151,6 +151,7 @@ bin_w_str(struct storage * store, const char * tok)
return result; return result;
} }
#define FIX_INVALID_CHARS
static char * static char *
bin_r_str(struct storage * store) bin_r_str(struct storage * store)
{ {
@ -162,6 +163,16 @@ bin_r_str(struct storage * store)
fread(result, sizeof(char), len, file(store)); fread(result, sizeof(char), len, file(store));
result[len] = 0; result[len] = 0;
#ifdef FIX_INVALID_CHARS
{
char * p = strpbrk(result, "\n\r");
while (p) {
log_error(("Invalid character %d in input string \"%s\".\n", *p, result));
strcpy(p, p+1);
p = strpbrk(p, "\n\r");
}
}
#endif
return result; return result;
} }
return NULL; return NULL;
@ -187,6 +198,16 @@ bin_r_str_buf(struct storage * store, char * result, size_t size)
} else { } else {
result[len] = 0; result[len] = 0;
} }
#ifdef FIX_INVALID_CHARS
{
char * p = strpbrk(result, "\n\r");
while (p) {
log_error(("Invalid character %d in input string \"%s\".\n", *p, result));
strcpy(p, p+1);
p = strpbrk(p, "\n\r");
}
}
#endif
} }
} }