navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-30 10:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #157 from nicowilliams/argfile-fixes

Browse Source 
Argfile fixes
This commit is contained in:
Stephen Dolan committed 2013-06-21 09:40:32 -07:00
2 parents 824ce76cec 3216d7683a
commit dc2fe63e42
2 files changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

jv_file.c
+4 -1
View File
@@ -28,12 +28,15 @@ jv jv_load_file(const char* filename, int raw) {
if (raw) { if (raw) {
data = jv_string_concat(data, jv_string_sized(buf, (int)n)); data = jv_string_concat(data, jv_string_sized(buf, (int)n));
} else { } else {
jv_parser_set_buf(&parser, buf, strlen(buf), !feof(file)); jv_parser_set_buf(&parser, buf, n, !feof(file));
jv value; jv value;
while (jv_is_valid((value = jv_parser_next(&parser)))) while (jv_is_valid((value = jv_parser_next(&parser))))
data = jv_array_append(data, value); data = jv_array_append(data, value);
jv_free(value);
} }
} }
if (!raw)
jv_parser_free(&parser);
int badread = ferror(file); int badread = ferror(file);
fclose(file); fclose(file);
if (badread) { if (badread) {
main.c
+1 -1
View File
@@ -202,7 +202,7 @@ int main(int argc, char* argv[]) {
jv_free(data); jv_free(data);
return 1; return 1;
} }
if (jv_array_length(data) == 1) if (jv_get_kind(data) == JV_KIND_ARRAY && jv_array_length(jv_copy(data)) == 1)
data = jv_array_get(data, 0); data = jv_array_get(data, 0);
arg = jv_object_set(arg, jv_string("value"), data); arg = jv_object_set(arg, jv_string("value"), data);
program_arguments = jv_array_append(program_arguments, arg); program_arguments = jv_array_append(program_arguments, arg);