diff options
| author |  Andreas Krennmair <ak@synflood.at>
| 2008-03-16 14:42:08 +0000 |
|---|---|---|
| committer | Andreas Krennmair <ak@synflood.at>
| 2008-03-16 14:42:08 +0000 |
| commit | b4f39162ccfd0183f77d186938f793932c280e4a (patch) | |
| tree | fe0e277e76148afecc6f65c5dc58e25f71eafeed /src/controller.cpp | |
| parent | ae462380dab3a8f1b916704f6e6572f35de9f389 (diff) | |
| download | newsboat-b4f39162ccfd0183f77d186938f793932c280e4a.tar.gz newsboat-b4f39162ccfd0183f77d186938f793932c280e4a.tar.zst newsboat-b4f39162ccfd0183f77d186938f793932c280e4a.zip | |
Andreas Krennmair:
merged changes from trunk.
updated ChangeLog and program version in config.h.
Diffstat (limited to 'src/controller.cpp')
| -rw-r--r-- | src/controller.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<char *>("/bin/sh"); + my_argv[1] = const_cast<char *>("-c"); // wow. what an abuse. std::string cmdline = bookmark_cmd + " " + stfl::quote(url) + " " + stfl::quote(title) + " " + stfl::quote(description); |