Skip to content

Properly print arbitrary strings as valid JSON. #1362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Properly print arbitrary strings as valid JSON. #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,3 +193,18 @@ bool is_hex_color(const char *color)
}
return true;
}

void print_string_as_json(FILE *f, char *str)
{
fputc('"', f);
for (char *ptr = str; *ptr != '\0'; ++ptr) {
if (*ptr == '\x7f' || (*ptr >= '\x01' && *ptr <= '\x1f')) {
fprintf(f, "\\u%04x", *ptr);
continue;
}
if (*ptr == '"' || *ptr == '\\')
fputc('\\', f);
fputc(*ptr, f);
}
fputc('"', f);
}
1 change: 1 addition & 0 deletions src/helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,6 @@ char *mktempfifo(const char *template);
int asprintf(char **buf, const char *fmt, ...);
int vasprintf(char **buf, const char *fmt, va_list args);
bool is_hex_color(const char *color);
void print_string_as_json(FILE *f, char *str);

#endif
28 changes: 19 additions & 9 deletions src/query.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@
#include <string.h>
#include "bspwm.h"
#include "desktop.h"
#include "geometry.h"
#include "helpers.h"
#include "history.h"
#include "parse.h"
#include "monitor.h"
#include "window.h"
#include "tree.h"
#include "parse.h"
#include "query.h"
#include "geometry.h"
#include "tree.h"
#include "window.h"

void query_state(FILE *rsp)
{
Expand Down Expand Up @@ -69,7 +70,9 @@ void query_state(FILE *rsp)
void query_monitor(monitor_t *m, FILE *rsp)
{
fprintf(rsp, "{");
fprintf(rsp, "\"name\":\"%s\",", m->name);
fprintf(rsp, "\"name\":");
print_string_as_json(rsp, m->name);
fprintf(rsp, ",");
fprintf(rsp, "\"id\":%u,", m->id);
fprintf(rsp, "\"randrId\":%u,", m->randr_id);
fprintf(rsp, "\"wired\":%s,", BOOL_STR(m->wired));
Expand Down Expand Up @@ -98,7 +101,9 @@ void query_monitor(monitor_t *m, FILE *rsp)
void query_desktop(desktop_t *d, FILE *rsp)
{
fprintf(rsp, "{");
fprintf(rsp, "\"name\":\"%s\",", d->name);
fprintf(rsp, "\"name\":");
print_string_as_json(rsp, d->name);
fprintf(rsp, ",");
fprintf(rsp, "\"id\":%u,", d->id);
fprintf(rsp, "\"layout\":\"%s\",", LAYOUT_STR(d->layout));
fprintf(rsp, "\"userLayout\":\"%s\",", LAYOUT_STR(d->user_layout));
Expand Down Expand Up @@ -164,8 +169,12 @@ void query_client(client_t *c, FILE *rsp)
fprintf(rsp, "null");
} else {
fprintf(rsp, "{");
fprintf(rsp, "\"className\":\"%s\",", c->class_name);
fprintf(rsp, "\"instanceName\":\"%s\",", c->instance_name);
fprintf(rsp, "\"className\":");
print_string_as_json(rsp, c->class_name);
fprintf(rsp, ",");
fprintf(rsp, "\"instanceName\":");
print_string_as_json(rsp, c->instance_name);
fprintf(rsp, ",");
fprintf(rsp, "\"borderWidth\":%u,", c->border_width);
fprintf(rsp, "\"state\":\"%s\",", STATE_STR(c->state));
fprintf(rsp, "\"lastState\":\"%s\",", STATE_STR(c->last_state));
Expand Down Expand Up @@ -232,7 +241,8 @@ void query_subscribers(FILE *rsp)
for (subscriber_list_t *s = subscribe_head; s != NULL; s = s->next) {
fprintf(rsp, "{\"fileDescriptor\": %i", fileno(s->stream));
if (s->fifo_path != NULL) {
fprintf(rsp, ",\"fifoPath\":\"%s\"", s->fifo_path);
fprintf(rsp, ",\"fifoPath\":");
print_string_as_json(rsp, s->fifo_path);
}
fprintf(rsp, ",\"field\":%i,\"count\":%i}", s->field, s->count);
if (s->next != NULL) {
Expand Down