From b7a47b3f58e6fa05d56577ea6425d353a41ddb86 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Thu, 17 Feb 2011 09:27:08 -0700 Subject: fix 'print' on stdin --- src/io.c | 7 ++++++- src/uzbl-core.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/io.c b/src/io.c index 1e85237..b84780e 100644 --- a/src/io.c +++ b/src/io.c @@ -123,9 +123,14 @@ control_stdin(GIOChannel *gio, GIOCondition condition) { if ( (ret == G_IO_STATUS_ERROR) || (ret == G_IO_STATUS_EOF) ) return FALSE; - parse_cmd_line(ctl_line, NULL); + GString *result = g_string_new(""); + + parse_cmd_line(ctl_line, result); g_free(ctl_line); + puts(result->str); + g_string_free(result, TRUE); + return TRUE; } diff --git a/src/uzbl-core.c b/src/uzbl-core.c index a4d43af..936dbdc 100644 --- a/src/uzbl-core.c +++ b/src/uzbl-core.c @@ -622,6 +622,9 @@ print(WebKitWebView *page, GArray *argv, GString *result) { (void) page; (void) result; gchar* buf; + if(!result) + return; + buf = expand(argv_idx(argv, 0), 0); g_string_assign(result, buf); g_free(buf); -- cgit v1.2.3