#include <stdbool.h>
#include <ctype.h>
#include <getopt.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <inttypes.h>
#include "list.h"
#include "avl.h"
{
char *type;
- if (!obj)
- return -1;
-
switch (json_object_get_type(obj)) {
case json_type_object:
type = "object";
case json_type_double:
type = "double";
break;
+ case json_type_null:
+ type = "null";
+ break;
default:
return -1;
}
fprintf(stdout, "' %d;\n", json_object_get_boolean(obj));
break;
case json_type_int:
- fprintf(stdout, "' %d;\n", json_object_get_int(obj));
+ fprintf(stdout, "' %"PRId64";\n", json_object_get_int64(obj));
break;
case json_type_double:
fprintf(stdout, "' %lf;\n", json_object_get_double(obj));
break;
+ case json_type_null:
+ fprintf(stdout, "';\n");
+ break;
default:
return -1;
}
} else if (!strcmp(type, "string")) {
new = json_object_new_string(var);
} else if (!strcmp(type, "int")) {
- new = json_object_new_int(atoi(var));
+ new = json_object_new_int64(atoll(var));
} else if (!strcmp(type, "double")) {
new = json_object_new_double(strtod(var, NULL));
} else if (!strcmp(type, "boolean")) {
new = json_object_new_boolean(!!atoi(var));
+ } else if (!strcmp(type, "null")) {
+ new = NULL;
} else {
return;
}
static int usage(const char *progname)
{
- fprintf(stderr, "Usage: %s [-n] [-i] -r <message>|-w\n", progname);
+ fprintf(stderr, "Usage: %s [-n] [-i] -r <message>|-R <file>|-w\n", progname);
return 2;
}
struct env_var *vars;
int i;
int ch;
+ int fd;
+ struct stat sb;
+ char *fbuf;
+ int ret;
avl_init(&env_vars, avl_strcmp_var, false, NULL);
for (i = 0; environ[i]; i++);
vars = calloc(i, sizeof(*vars));
+ if (!vars) {
+ fprintf(stderr, "%m\n");
+ return -1;
+ }
for (i = 0; environ[i]; i++) {
char *c;
avl_insert(&env_vars, &vars[i].avl);
}
- while ((ch = getopt(argc, argv, "p:nir:w")) != -1) {
+ while ((ch = getopt(argc, argv, "p:nir:R:w")) != -1) {
switch(ch) {
case 'p':
var_prefix = optarg;
break;
case 'r':
return jshn_parse(optarg);
+ case 'R':
+ if ((fd = open(optarg, O_RDONLY)) == -1) {
+ fprintf(stderr, "Error opening %s\n", optarg);
+ return 3;
+ }
+ if (fstat(fd, &sb) == -1) {
+ fprintf(stderr, "Error getting size of %s\n", optarg);
+ close(fd);
+ return 3;
+ }
+ if (!(fbuf = malloc(sb.st_size))) {
+ fprintf(stderr, "Error allocating memory for %s\n", optarg);
+ close(fd);
+ return 3;
+ }
+ if (read(fd, fbuf, sb.st_size) != sb.st_size) {
+ fprintf(stderr, "Error reading %s\n", optarg);
+ free(fbuf);
+ close(fd);
+ return 3;
+ }
+ ret = jshn_parse(fbuf);
+ free(fbuf);
+ close(fd);
+ return ret;
case 'w':
return jshn_format(no_newline, indent);
case 'n':