Win32 Crashreport: use FTP passive mode

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index 75a97a1379bcfed64342e621cbb7a1cca9df4576..6969a1b5b440468c0a094e090b370eaf198f7b93 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -67,9 +67,14 @@ static bool signal_ignored (int signum)
 
 static void vlc_kill (void *data)
 {
+#ifndef __OS2__
     pthread_t *ps = data;
 
     pthread_kill (*ps, SIGTERM);
+#else
+    // send a signal to the main thread
+    kill (getpid(), SIGTERM);
+#endif
 }
 
 static void exit_timeout (int signum)
@@ -121,11 +126,11 @@ int main( int i_argc, const char *ppsz_argv[] )
 
     setlocale (LC_ALL, "");
 
-#ifndef __APPLE__
-    /* This clutters OSX GUI error logs */
-    fprintf( stderr, "VLC media player %s (revision %s)\n",
-             libvlc_get_version(), libvlc_get_changeset() );
-#endif
+    if (isatty (STDERR_FILENO))
+        /* This message clutters error logs. It is printed only on a TTY.
+         * Fortunately, LibVLC prints version info with -vv anyway. */
+        fprintf (stderr, "VLC media player %s (revision %s)\n",
+                 libvlc_get_version(), libvlc_get_changeset());
 
     sigset_t set;
 
@@ -208,7 +213,7 @@ int main( int i_argc, const char *ppsz_argv[] )
 
     libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION);
 
-#if !defined (HAVE_MAEMO) && !defined __APPLE__
+#if !defined (HAVE_MAEMO) && !defined __APPLE__ && !defined (__OS2__)
     libvlc_add_intf (vlc, "globalhotkeys,none");
 #endif
     if (libvlc_add_intf (vlc, NULL))
@@ -247,7 +252,7 @@ int main( int i_argc, const char *ppsz_argv[] )
 out:
     if (vlc != NULL)
         libvlc_release (vlc);
-    for (int i = 1; i < argc; i++)
+    for (int i = 2; i < argc; i++)
         LocaleFree (argv[i]);
 
     return 0;