Truncate error source from start, not end, if it's too long to fit
authorPetri Lehtinen <petri@digip.org>
Tue, 22 Feb 2011 11:24:15 +0000 (13:24 +0200)
committerPetri Lehtinen <petri@digip.org>
Tue, 22 Feb 2011 11:34:37 +0000 (13:34 +0200)
It's more helpful to see "...bar/baz.json" instead of "/long/path/to".

src/error.c

index b950c2c..d113b8f 100644 (file)
@@ -5,13 +5,21 @@ void jsonp_error_init(json_error_t *error, const char *source)
 {
     if(error)
     {
+        size_t length;
+
         error->text[0] = '\0';
         error->line = -1;
         error->column = -1;
         error->position = 0;
 
-        strncpy(error->source, source, JSON_ERROR_SOURCE_LENGTH);
-        error->source[JSON_ERROR_SOURCE_LENGTH - 1] = '\0';
+        length = strlen(source);
+        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);
+        }
     }
 }