Merge pull request #49 from ConradIrwin/master

yajl_gen_escape_solidus is unsettable

2 files changed, 5 insertions, 0 deletions

diff --git a/reformatter/json_reformat.c b/reformatter/json_reformat.c
index c5b88f0..ce77c11 100644
--- a/reformatter/json_reformat.c
+++ b/reformatter/json_reformat.c
@@ -99,6 +99,7 @@ usage(const char * progname)
             "usage:  json_reformat [options]\n"
             "    -m minimize json rather than beautify (default)\n"
             "    -u allow invalid UTF8 inside strings during parsing\n",
+            "    -e escape any forward slashes (for embedding in HTML)\n",
             progname);
     exit(1);
 
@@ -136,6 +137,9 @@ main(int argc, char ** argv)
                 case 'u':
                     yajl_config(hand, yajl_dont_validate_strings, 1);
                     break;
+                case 'e':
+                    yajl_gen_config(g, yajl_gen_escape_solidus, 1);
+                    break;
                 default:
                     fprintf(stderr, "unrecognized option: '%c'\n\n",
                             argv[a][i]);
diff --git a/src/yajl_gen.c b/src/yajl_gen.c
index 2bb6ad2..f36da2a 100644
--- a/src/yajl_gen.c
+++ b/src/yajl_gen.c
@@ -57,6 +57,7 @@ yajl_gen_config(yajl_gen g, yajl_gen_option opt, ...)
     switch(opt) {
         case yajl_gen_beautify:
         case yajl_gen_validate_utf8:
+        case yajl_gen_escape_solidus:
             if (va_arg(ap, int)) g->flags |= opt;
             else g->flags &= ~opt;
             break;