AIR/parson
1
0
Fork 0
mirror of https://github.com/kgabis/parson.git synced 2024-11-24 06:05:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better handling of CRLF line breaks.

Browse Source
This commit is contained in:
Krzysztof Gabis 2018-02-06 20:32:02 +01:00
parent c147744b72
commit 387c5665f6
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
parson.c
View File

@ -262,7 +262,8 @@ static int is_decimal(const char *string, size_t length) {
static char * read_file(const char * filename) {
FILE *fp = fopen(filename, "r");
size_t file_size;
size_t size_to_read = 0;
size_t size_read = 0;
long pos;
char *file_contents;
if (!fp) {
@ -274,22 +275,21 @@ static char * read_file(const char * filename) {
fclose(fp);
return NULL;
}
file_size = pos;
size_to_read = pos;
rewind(fp);
file_contents = (char*)parson_malloc(sizeof(char) * (file_size + 1));
file_contents = (char*)parson_malloc(sizeof(char) * (size_to_read + 1));
if (!file_contents) {
fclose(fp);
return NULL;
}
if (fread(file_contents, file_size, 1, fp) < 1) {
if (ferror(fp)) {
fclose(fp);
parson_free(file_contents);
return NULL;
}
size_read = fread(file_contents, 1, size_to_read, fp);
if (size_read == 0 || ferror(fp)) {
fclose(fp);
parson_free(file_contents);
return NULL;
}
fclose(fp);
file_contents[file_size] = '\0';
file_contents[size_read] = '\0';
return file_contents;
}
@ -1441,7 +1441,7 @@ JSON_Status json_serialize_to_file(const JSON_Value *value, const char *filename
if (serialized_string == NULL) {
return JSONFailure;
}
fp = fopen (filename, "w");
fp = fopen(filename, "w");
if (fp == NULL) {
json_free_serialized_string(serialized_string);
return JSONFailure;
@ -1501,7 +1501,7 @@ JSON_Status json_serialize_to_file_pretty(const JSON_Value *value, const char *f
if (serialized_string == NULL) {
return JSONFailure;
}
fp = fopen (filename, "w");
fp = fopen(filename, "w");
if (fp == NULL) {
json_free_serialized_string(serialized_string);
return JSONFailure;

23
tests.c
View File

@ -614,33 +614,34 @@ void serialization_example(void) {
static char * read_file(const char * filename) {
FILE *fp = fopen(filename, "r");
size_t file_size;
size_t size_to_read = 0;
size_t size_read = 0;
long pos;
char *file_contents;
if (!fp)
if (!fp) {
return NULL;
}
fseek(fp, 0L, SEEK_END);
pos = ftell(fp);
if (pos < 0) {
fclose(fp);
return NULL;
}
file_size = pos;
size_to_read = pos;
rewind(fp);
file_contents = (char*)malloc(sizeof(char) * (file_size + 1));
file_contents = (char*)malloc(sizeof(char) * (size_to_read + 1));
if (!file_contents) {
fclose(fp);
return NULL;
}
if (fread(file_contents, file_size, 1, fp) < 1) {
if (ferror(fp)) {
fclose(fp);
free(file_contents);
return NULL;
}
size_read = fread(file_contents, 1, size_to_read, fp);
if (size_read == 0 || ferror(fp)) {
fclose(fp);
free(file_contents);
return NULL;
}
fclose(fp);
file_contents[file_size] = '\0';
file_contents[size_read] = '\0';
return file_contents;
}