From b4f39162ccfd0183f77d186938f793932c280e4a Mon Sep 17 00:00:00 2001 From: Andreas Krennmair Date: Sun, 16 Mar 2008 14:42:08 +0000 Subject: Andreas Krennmair: merged changes from trunk. updated ChangeLog and program version in config.h. --- src/controller.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/controller.cpp') diff --git a/src/controller.cpp b/src/controller.cpp index 49543e40..06f415a7 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -52,7 +52,7 @@ void ignore_signal(int sig) { void omg_a_child_died(int /* sig */) { pid_t pid; int stat; - while ((pid = waitpid(-1,&stat,WNOHANG)) > 0); + while ((pid = waitpid(-1,&stat,WNOHANG)) > 0) { } } controller::controller() : v(0), rsscache(0), url_file("urls"), cache_file("cache.db"), config_file("config"), queue_file("queue"), refresh_on_start(false), cfg(0) { @@ -820,8 +820,8 @@ std::string controller::bookmark(const std::string& url, const std::string& titl std::string bookmark_cmd = cfg->get_configvalue("bookmark-cmd"); if (bookmark_cmd.length() > 0) { char * my_argv[4]; - my_argv[0] = "/bin/sh"; - my_argv[1] = "-c"; + my_argv[0] = const_cast("/bin/sh"); + my_argv[1] = const_cast("-c"); // wow. what an abuse. std::string cmdline = bookmark_cmd + " " + stfl::quote(url) + " " + stfl::quote(title) + " " + stfl::quote(description); -- cgit v1.2.3