Truncate error source from start, not end, if it's too long to fit

It's more helpful to see "...bar/baz.json" instead of "/long/path/to".
This commit is contained in:
Petri Lehtinen 2011-02-22 13:24:15 +02:00
parent 5df7b79397
commit 50dc64a7af

View File

@ -5,13 +5,21 @@ void jsonp_error_init(json_error_t *error, const char *source)
{ {
if(error) if(error)
{ {
size_t length;
error->text[0] = '\0'; error->text[0] = '\0';
error->line = -1; error->line = -1;
error->column = -1; error->column = -1;
error->position = 0; error->position = 0;
strncpy(error->source, source, JSON_ERROR_SOURCE_LENGTH); length = strlen(source);
error->source[JSON_ERROR_SOURCE_LENGTH - 1] = '\0'; if(length < JSON_ERROR_SOURCE_LENGTH)
strcpy(error->source, source);
else {
size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
strcpy(error->source, "...");
strcpy(error->source + 3, source + extra);
}
} }
} }