Commit 1c5705e4 authored by Gildas Bazin's avatar Gildas Bazin

* src/libvlc.c: win32 fixes for the help output when used with a cygwin shell.

parent 57470f44
...@@ -99,6 +99,7 @@ static void Version ( void ); ...@@ -99,6 +99,7 @@ static void Version ( void );
#ifdef WIN32 #ifdef WIN32
static void ShowConsole ( void ); static void ShowConsole ( void );
static void PauseConsole ( void );
#endif #endif
static int ConsoleWidth ( void ); static int ConsoleWidth ( void );
...@@ -526,8 +527,8 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) ...@@ -526,8 +527,8 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
ShowConsole(); ShowConsole();
/* Pause the console because it's destroyed when we exit */ /* Pause the console because it's destroyed when we exit */
fprintf( stderr, "The command line options couldn't be loaded, check " fprintf( stderr, "The command line options couldn't be loaded, check "
"that they are valid.\nPress the RETURN key to continue..." ); "that they are valid.\n" );
getchar(); PauseConsole();
#endif #endif
vlc_object_detach( p_help_module ); vlc_object_detach( p_help_module );
config_Free( p_help_module ); config_Free( p_help_module );
...@@ -2073,8 +2074,7 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) ...@@ -2073,8 +2074,7 @@ static void Usage( vlc_t *p_this, char const *psz_module_name )
vlc_list_release( p_list ); vlc_list_release( p_list );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */ #ifdef WIN32 /* Pause the console because it's destroyed when we exit */
fprintf( stdout, _("\nPress the RETURN key to continue...\n") ); PauseConsole();
getchar();
#endif #endif
} }
...@@ -2128,8 +2128,7 @@ static void ListModules( vlc_t *p_this ) ...@@ -2128,8 +2128,7 @@ static void ListModules( vlc_t *p_this )
vlc_list_release( p_list ); vlc_list_release( p_list );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */ #ifdef WIN32 /* Pause the console because it's destroyed when we exit */
fprintf( stdout, _("\nPress the RETURN key to continue...\n") ); PauseConsole();
getchar();
#endif #endif
} }
...@@ -2152,8 +2151,7 @@ static void Version( void ) ...@@ -2152,8 +2151,7 @@ static void Version( void )
"Written by the VideoLAN team; see the AUTHORS file.\n") ); "Written by the VideoLAN team; see the AUTHORS file.\n") );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */ #ifdef WIN32 /* Pause the console because it's destroyed when we exit */
fprintf( stdout, _("\nPress the RETURN key to continue...\n") ); PauseConsole();
getchar();
#endif #endif
} }
...@@ -2173,9 +2171,26 @@ static void ShowConsole( void ) ...@@ -2173,9 +2171,26 @@ static void ShowConsole( void )
freopen( "CONOUT$", "w", stdout ); freopen( "CONOUT$", "w", stdout );
freopen( "CONOUT$", "w", stderr ); freopen( "CONOUT$", "w", stderr );
freopen( "CONIN$", "r", stdin ); freopen( "CONIN$", "r", stdin );
# endif # endif
}
#endif
/*****************************************************************************
* PauseConsole: On Win32, wait for a key press before closing the console
*****************************************************************************
* This function is useful only on Win32.
*****************************************************************************/
#ifdef WIN32 /* */
static void PauseConsole( void )
{
# ifndef UNDER_CE
return; if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
getchar();
# endif
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment