X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/b4d4f2b856cd0d5e24f777a088b9d4462567dac0..2ff195aaa4238105a6a426e927efb8f81e94b9c5:/src/modules/module-cli.c?ds=sidebyside

diff --git a/src/modules/module-cli.c b/src/modules/module-cli.c
index 60a9d460..4e893d1a 100644
--- a/src/modules/module-cli.c
+++ b/src/modules/module-cli.c
@@ -36,14 +36,13 @@
 #include <pulsecore/modargs.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/core-util.h>
-#include <pulsecore/core-error.h>
 
 #include "module-cli-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering");
 PA_MODULE_DESCRIPTION("Command line interface");
 PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(TRUE);
+PA_MODULE_LOAD_ONCE(true);
 PA_MODULE_USAGE("exit_on_eof=<exit daemon after EOF?>");
 
 static const char* const valid_modargs[] = {
@@ -57,7 +56,7 @@ static void eof_and_unload_cb(pa_cli*c, void *userdata) {
     pa_assert(c);
     pa_assert(m);
 
-    pa_module_unload_request(m, TRUE);
+    pa_module_unload_request(m, true);
 }
 
 static void eof_and_exit_cb(pa_cli*c, void *userdata) {
@@ -66,14 +65,16 @@ static void eof_and_exit_cb(pa_cli*c, void *userdata) {
     pa_assert(c);
     pa_assert(m);
 
-    pa_core_exit(m->core, FALSE, 0);
+    pa_core_exit(m->core, false, 0);
 }
 
 int pa__init(pa_module*m) {
     pa_iochannel *io;
     pa_modargs *ma;
-    pa_bool_t exit_on_eof = FALSE;
+    bool exit_on_eof = false;
+#ifndef OS_IS_WIN32
     int fd;
+#endif
 
     pa_assert(m);
 
@@ -93,7 +94,7 @@ int pa__init(pa_module*m) {
     }
 
     if (pa_stdio_acquire() < 0) {
-        pa_log("STDIN/STDUSE already in use.");
+        pa_log("STDIN/STDOUT already in use.");
         goto fail;
     }
 
@@ -105,12 +106,16 @@ int pa__init(pa_module*m) {
      * of log messages, particularly because if stdout and stderr are
      * dup'ed they share the same O_NDELAY, too. */
 
-    if ((fd = open("/dev/tty", O_RDWR|O_CLOEXEC|O_NONBLOCK)) >= 0) {
+#ifndef OS_IS_WIN32
+    if ((fd = pa_open_cloexec("/dev/tty", O_RDWR|O_NONBLOCK, 0)) >= 0) {
         io = pa_iochannel_new(m->core->mainloop, fd, fd);
         pa_log_debug("Managed to open /dev/tty.");
-    } else {
+    }
+    else
+#endif
+    {
         io = pa_iochannel_new(m->core->mainloop, STDIN_FILENO, STDOUT_FILENO);
-        pa_iochannel_set_noclose(io, TRUE);
+        pa_iochannel_set_noclose(io, true);
         pa_log_debug("Failed to open /dev/tty, using stdin/stdout fds instead.");
     }
 
@@ -132,7 +137,7 @@ fail:
 void pa__done(pa_module*m) {
     pa_assert(m);
 
-    if (m->core->running_as_daemon == 0) {
+    if (m->userdata) {
         pa_cli_free(m->userdata);
         pa_stdio_release();
     }