#include <vlc_common.h>
-#include <ctype.h>
-
+#include <errno.h>
#undef iconv_t
#undef iconv_open
# include <iconv.h>
#endif
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
-
#ifdef HAVE_FORK
# include <signal.h>
-# include <sys/time.h>
# include <unistd.h>
-# include <errno.h>
# include <sys/wait.h>
-# include <fcntl.h>
# include <sys/socket.h>
# include <sys/poll.h>
# ifndef PF_LOCAL
#endif
#if defined(WIN32) || defined(UNDER_CE)
-# undef _wopendir
-# undef _wreaddir
-# undef _wclosedir
-# undef rewinddir
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
+# include <dirent.h>
#endif
/*****************************************************************************
if ( p_dir->p_real_dir != NULL )
_wrewinddir( p_dir->p_real_dir );
}
-#endif
/* This one is in the libvlccore exported symbol list */
int vlc_wclosedir( void *_p_dir )
{
-#if defined(WIN32)
vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
int i_ret = 0;
free( p_dir );
return i_ret;
-#else
- return closedir( _p_dir );
-#endif
}
+#endif
+
#ifdef ENABLE_NLS
# include <libintl.h>
char *vlc_gettext( const char *msgid )
{
#ifdef ENABLE_NLS
+ if( unlikely(!*msgid))
+ return (char *)"";
return dgettext( PACKAGE_NAME, msgid );
#else
return (char *)msgid;
return b_exact;
}
+#undef vlc_execve
/*************************************************************************
* vlc_execve: Execute an external program with a given environment,
* wait until it finishes and return its standard output
*************************************************************************/
-int __vlc_execve( vlc_object_t *p_object, int i_argc, char *const *ppsz_argv,
- char *const *ppsz_env, const char *psz_cwd,
- const char *p_in, size_t i_in,
- char **pp_data, size_t *pi_data )
+int vlc_execve( vlc_object_t *p_object, int i_argc, char *const *ppsz_argv,
+ char *const *ppsz_env, const char *psz_cwd,
+ const char *p_in, size_t i_in,
+ char **pp_data, size_t *pi_data )
{
(void)i_argc; // <-- hmph
#ifdef HAVE_FORK
&& ((psz_cwd == NULL) || (chdir (psz_cwd) == 0)))
execve (ppsz_argv[0], ppsz_argv, ppsz_env);
- exit (EXIT_FAILURE);
+ _exit (EXIT_FAILURE);
}
}