/*****************************************************************************
* libc.c: Extra libc function for some systems.
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002-2006 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Samuel Hocevar <sam@zoy.org>
* Gildas Bazin <gbazin@videolan.org>
+ * Derk-Jan Hartman <hartman at videolan dot org>
+ * Christophe Massiot <massiot@via.ecp.fr>
+ * Rémi Denis-Courmont <rem à videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <string.h> /* strdup() */
-#include <stdlib.h>
+#include <vlc/vlc.h>
+
#include <ctype.h>
-#include <vlc/vlc.h>
#undef iconv_t
#undef iconv_open
# include <iconv.h>
#endif
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
+
+#ifdef HAVE_FORK
+# 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>
+#endif
+
+#if defined(WIN32) || defined(UNDER_CE)
+# undef _wopendir
+# undef _wreaddir
+# undef _wclosedir
+# undef rewinddir
+# undef seekdir
+# undef telldir
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+
+#ifdef UNDER_CE
+# define strcoll strcmp
+#endif
+
/*****************************************************************************
* getenv: just in case, but it should never be called
*****************************************************************************/
len = __MIN( len, n );
psz = (char*)malloc( len + 1 );
-
if( psz != NULL )
{
memcpy( (void*)psz, (const void*)string, len );
}
#endif
+/*****************************************************************************
+ * strnlen:
+ *****************************************************************************/
+#if !defined( HAVE_STRNLEN )
+size_t vlc_strnlen( const char *psz, size_t n )
+{
+ const char *psz_end = memchr( psz, 0, n );
+ return psz_end ? (size_t)( psz_end - psz ) : n;
+}
+#endif
+
/*****************************************************************************
* strcasecmp: compare two strings ignoring case
*****************************************************************************/
#if !defined( HAVE_STRCASECMP ) && !defined( HAVE_STRICMP )
int vlc_strcasecmp( const char *s1, const char *s2 )
{
- int i_delta = 0;
+ int c1, c2;
+ if( !s1 || !s2 ) return -1;
- while( !i_delta && *s1 && *s2 )
+ while( *s1 && *s2 )
{
- i_delta = *s1 - *s2;
-
- if( *s1 >= 'A' && *s1 <= 'Z' )
- {
- i_delta -= 'A' - 'a';
- }
-
- if( *s2 >= 'A' && *s2 <= 'Z' )
- {
- i_delta += 'A' - 'a';
- }
+ c1 = tolower(*s1);
+ c2 = tolower(*s2);
+ if( c1 != c2 ) return (c1 < c2 ? -1 : 1);
s1++; s2++;
}
- return i_delta;
+ if( !*s1 && !*s2 ) return 0;
+ else return (*s1 ? 1 : -1);
}
#endif
#if !defined( HAVE_STRNCASECMP ) && !defined( HAVE_STRNICMP )
int vlc_strncasecmp( const char *s1, const char *s2, size_t n )
{
- int i_delta = 0;
+ int c1, c2;
+ if( !s1 || !s2 ) return -1;
- while( n-- && !i_delta && *s1 )
+ while( n > 0 && *s1 && *s2 )
{
- i_delta = *s1 - *s2;
-
- if( *s1 >= 'A' && *s1 <= 'Z' )
- {
- i_delta -= 'A' - 'a';
- }
+ c1 = tolower(*s1);
+ c2 = tolower(*s2);
- if( *s2 >= 'A' && *s2 <= 'Z' )
- {
- i_delta += 'A' - 'a';
- }
-
- s1++; s2++;
+ if( c1 != c2 ) return (c1 < c2 ? -1 : 1);
+ s1++; s2++; n--;
}
- return i_delta;
+ if( !n || (!*s1 && !*s2) ) return 0;
+ else return (*s1 ? 1 : -1);
}
#endif
if( !psz_big || !psz_little || !*psz_little ) return p_pos;
- while( *p_pos )
+ while( *p_pos )
{
if( toupper( *p_pos ) == toupper( *psz_little ) )
{
/*****************************************************************************
* vasprintf:
*****************************************************************************/
-#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS)
+#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS)
int vlc_vasprintf(char **strp, const char *fmt, va_list ap)
{
/* Guess we need no more than 100 bytes. */
/*****************************************************************************
* asprintf:
*****************************************************************************/
-#if !defined(HAVE_ASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS)
+#if !defined(HAVE_ASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS)
int vlc_asprintf( char **strp, const char *fmt, ... )
{
va_list args;
double vlc_atof( const char *nptr )
{
double f_result;
- wchar_t *psz_tmp;
+ wchar_t *psz_tmp = NULL;
int i_len = strlen( nptr ) + 1;
psz_tmp = malloc( i_len * sizeof(wchar_t) );
+ if( !psz_tmp )
+ return NULL;
MultiByteToWideChar( CP_ACP, 0, nptr, -1, psz_tmp, i_len );
f_result = wcstod( psz_tmp, NULL );
free( psz_tmp );
#endif
/*****************************************************************************
- * lseek: reposition read/write file offset.
- *****************************************************************************
- * FIXME: this cast sucks!
+ * lldiv: returns quotient and remainder
*****************************************************************************/
-#if !defined( HAVE_LSEEK )
-off_t vlc_lseek( int fildes, off_t offset, int whence )
+#if defined(SYS_BEOS) \
+ || (defined (__FreeBSD__) && (__FreeBSD__ < 5))
+lldiv_t vlc_lldiv( long long numer, long long denom )
+{
+ lldiv_t d;
+ d.quot = numer / denom;
+ d.rem = numer % denom;
+ return d;
+}
+#endif
+
+
+/**
+ * Copy a string to a sized buffer. The result is always nul-terminated
+ * (contrary to strncpy()).
+ *
+ * @param dest destination buffer
+ * @param src string to be copied
+ * @param len maximum number of characters to be copied plus one for the
+ * terminating nul.
+ *
+ * @return strlen(src)
+ */
+#ifndef HAVE_STRLCPY
+extern size_t vlc_strlcpy (char *tgt, const char *src, size_t bufsize)
{
- return SetFilePointer( (HANDLE)fildes, (long)offset, NULL, whence );
+ size_t length;
+
+ for (length = 1; (length < bufsize) && *src; length++)
+ *tgt++ = *src++;
+
+ if (bufsize)
+ *tgt = '\0';
+
+ while (*src++)
+ length++;
+
+ return length - 1;
}
#endif
+/*****************************************************************************
+ * vlc_*dir_wrapper: wrapper under Windows to return the list of drive letters
+ * when called with an empty argument or just '\'
+ *****************************************************************************/
+#if defined(WIN32) && !defined(UNDER_CE)
+# include <assert.h>
+
+typedef struct vlc_DIR
+{
+ _WDIR *p_real_dir;
+ int i_drives;
+ struct _wdirent dd_dir;
+ vlc_bool_t b_insert_back;
+} vlc_DIR;
+
+void *vlc_wopendir( const wchar_t *wpath )
+{
+ vlc_DIR *p_dir = NULL;
+ _WDIR *p_real_dir = NULL;
+
+ if ( wpath == NULL || wpath[0] == '\0'
+ || (wcscmp (wpath, L"\\") == 0) )
+ {
+ /* Special mode to list drive letters */
+ p_dir = malloc( sizeof(vlc_DIR) );
+ if( !p_dir )
+ return NULL;
+ p_dir->p_real_dir = NULL;
+ p_dir->i_drives = GetLogicalDrives();
+ return (void *)p_dir;
+ }
+
+ p_real_dir = _wopendir( wpath );
+ if ( p_real_dir == NULL )
+ return NULL;
+
+ p_dir = malloc( sizeof(vlc_DIR) );
+ if( !p_dir )
+ {
+ _wclosedir( p_real_dir );
+ return NULL;
+ }
+ p_dir->p_real_dir = p_real_dir;
+
+ assert (wpath[0]); // wpath[1] is defined
+ p_dir->b_insert_back = !wcscmp (wpath + 1, L":\\");
+ return (void *)p_dir;
+}
+
+struct _wdirent *vlc_wreaddir( void *_p_dir )
+{
+ vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
+ unsigned int i;
+ DWORD i_drives;
+
+ if ( p_dir->p_real_dir != NULL )
+ {
+ if ( p_dir->b_insert_back )
+ {
+ /* Adds "..", gruik! */
+ p_dir->dd_dir.d_ino = 0;
+ p_dir->dd_dir.d_reclen = 0;
+ p_dir->dd_dir.d_namlen = 2;
+ wcscpy( p_dir->dd_dir.d_name, L".." );
+ p_dir->b_insert_back = VLC_FALSE;
+ return &p_dir->dd_dir;
+ }
+
+ return _wreaddir( p_dir->p_real_dir );
+ }
+
+ /* Drive letters mode */
+ i_drives = p_dir->i_drives;
+ if ( !i_drives )
+ return NULL; /* end */
+
+ for ( i = 0; i < sizeof(DWORD)*8; i++, i_drives >>= 1 )
+ if ( i_drives & 1 ) break;
+
+ if ( i >= 26 )
+ return NULL; /* this should not happen */
+
+ swprintf( p_dir->dd_dir.d_name, L"%c:\\", 'A' + i );
+ p_dir->dd_dir.d_namlen = wcslen(p_dir->dd_dir.d_name);
+ p_dir->i_drives &= ~(1UL << i);
+ return &p_dir->dd_dir;
+}
+
+int vlc_wclosedir( void *_p_dir )
+{
+ vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
+ int i_ret = 0;
+
+ if ( p_dir->p_real_dir != NULL )
+ i_ret = _wclosedir( p_dir->p_real_dir );
+
+ free( p_dir );
+ return i_ret;
+}
+
+void vlc_rewinddir( void *_p_dir )
+{
+ vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
+
+ if ( p_dir->p_real_dir != NULL )
+ _wrewinddir( p_dir->p_real_dir );
+}
+
+void vlc_seekdir( void *_p_dir, long loc)
+{
+ vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
+
+ if ( p_dir->p_real_dir != NULL )
+ _wseekdir( p_dir->p_real_dir, loc );
+}
+
+long vlc_telldir( void *_p_dir )
+{
+ vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
+
+ if ( p_dir->p_real_dir != NULL )
+ return _wtelldir( p_dir->p_real_dir );
+ return 0;
+}
+#endif
+
+/*****************************************************************************
+ * scandir: scan a directory alpha-sorted
+ *****************************************************************************/
+#if !defined( HAVE_SCANDIR )
+/* FIXME: I suspect this is dead code -> utf8_scandir */
+#ifdef WIN32
+# undef opendir
+# undef readdir
+# undef closedir
+#endif
+int vlc_alphasort( const struct dirent **a, const struct dirent **b )
+{
+ return strcoll( (*a)->d_name, (*b)->d_name );
+}
+
+int vlc_scandir( const char *name, struct dirent ***namelist,
+ int (*filter) ( const struct dirent * ),
+ int (*compar) ( const struct dirent **,
+ const struct dirent ** ) )
+{
+ DIR * p_dir;
+ struct dirent * p_content;
+ struct dirent ** pp_list;
+ int ret, size;
+
+ if( !namelist || !( p_dir = opendir( name ) ) ) return -1;
+
+ ret = 0;
+ pp_list = NULL;
+ while( ( p_content = readdir( p_dir ) ) )
+ {
+ if( filter && !filter( p_content ) )
+ {
+ continue;
+ }
+ pp_list = realloc( pp_list, ( ret + 1 ) * sizeof( struct dirent * ) );
+ size = sizeof( struct dirent ) + strlen( p_content->d_name ) + 1;
+ pp_list[ret] = malloc( size );
+ if( pp_list[ret] )
+ {
+ memcpy( pp_list[ret], p_content, size );
+ ret++;
+ }
+ else
+ {
+ /* Continuing is useless when no more memory can be allocted,
+ * so better return what we have found.
+ */
+ ret = -1;
+ break;
+ }
+ }
+
+ closedir( p_dir );
+
+ if( compar )
+ {
+ qsort( pp_list, ret, sizeof( struct dirent * ),
+ (int (*)(const void *, const void *)) compar );
+ }
+
+ *namelist = pp_list;
+ return ret;
+}
+#endif
+
+#ifdef WIN32
/*****************************************************************************
* dgettext: gettext for plugins.
*****************************************************************************/
return (char *)msgid;
#endif
}
+#endif
/*****************************************************************************
* count_utf8_string: returns the number of characters in the string.
* wraptext: inserts \n at convenient places to wrap the text.
* Returns the modified string in a new buffer.
*****************************************************************************/
-char *vlc_wraptext( const char *psz_text, int i_line, vlc_bool_t b_utf8 )
+char *vlc_wraptext( const char *psz_text, int i_line )
{
int i_len;
char *psz_line, *psz_new_text;
psz_line = psz_new_text = strdup( psz_text );
- if( b_utf8 )
- i_len = count_utf8_string( psz_text );
- else
- i_len = strlen( psz_text );
+ i_len = count_utf8_string( psz_text );
while( i_len > i_line )
{
int i_count = 0;
while( i_count <= i_line && *psz_parser != '\n' )
{
- if( b_utf8 )
- {
- while( *((unsigned char *)psz_parser) >= 0x80UL ) psz_parser++;
- }
+ while( *((unsigned char *)psz_parser) >= 0x80UL ) psz_parser++;
psz_parser++;
i_count++;
}
/* Find the furthest space. */
while( psz_parser > psz_line && *psz_parser != ' ' )
{
- if( b_utf8 )
- {
- while( *((unsigned char *)psz_parser) >= 0x80UL ) psz_parser--;
- }
+ while( *((unsigned char *)psz_parser) >= 0x80UL ) psz_parser--;
psz_parser--;
i_count--;
}
/* Wrapping has failed. Find the first space or newline */
while( i_count < i_len && *psz_parser != ' ' && *psz_parser != '\n' )
{
- if( b_utf8 )
- {
- while( *((unsigned char *)psz_parser) >= 0x80UL ) psz_parser++;
- }
+ while( *((unsigned char *)psz_parser) >= 0x80UL ) psz_parser++;
psz_parser++;
i_count++;
}
#endif
}
-size_t vlc_iconv( vlc_iconv_t cd, char **inbuf, size_t *inbytesleft,
+size_t vlc_iconv( vlc_iconv_t cd, const char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft )
{
#if defined(HAVE_ICONV)
- return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft );
+ return iconv( cd, (ICONV_CONST char **)inbuf, inbytesleft,
+ outbuf, outbytesleft );
#else
- int i_bytes = __MIN(*inbytesleft, *outbytesleft);
+ int i_bytes;
+
+ if (inbytesleft == NULL || outbytesleft == NULL)
+ {
+ return 0;
+ }
+
+ i_bytes = __MIN(*inbytesleft, *outbytesleft);
if( !inbuf || !outbuf || !i_bytes ) return (size_t)(-1);
memcpy( *outbuf, *inbuf, i_bytes );
inbuf += i_bytes;
* reduce a fraction
* (adapted from libavcodec, author Michael Niedermayer <michaelni@gmx.at>)
*****************************************************************************/
-vlc_bool_t vlc_reduce( int *pi_dst_nom, int *pi_dst_den,
- int64_t i_nom, int64_t i_den, int64_t i_max )
+vlc_bool_t vlc_ureduce( unsigned *pi_dst_nom, unsigned *pi_dst_den,
+ uint64_t i_nom, uint64_t i_den, uint64_t i_max )
{
- vlc_bool_t b_exact = 1, b_sign = 0;
- int64_t i_gcd;
+ vlc_bool_t b_exact = 1;
+ uint64_t i_gcd;
if( i_den == 0 )
{
return 1;
}
- if( i_den < 0 )
- {
- i_den = - i_den;
- i_nom = - i_nom;
- }
-
- if( i_nom < 0 )
- {
- i_nom = - i_nom;
- b_sign = 1;
- }
-
i_gcd = GCD( i_nom, i_den );
i_nom /= i_gcd;
i_den /= i_gcd;
if( i_nom > i_max || i_den > i_max )
{
- int i_a0_num = 0, i_a0_den = 1, i_a1_num = 1, i_a1_den = 0;
+ uint64_t i_a0_num = 0, i_a0_den = 1, i_a1_num = 1, i_a1_den = 0;
b_exact = 0;
for( ; ; )
{
- int64_t i_x = i_nom / i_den;
- int64_t i_a2n = i_x * i_a1_num + i_a0_num;
- int64_t i_a2d = i_x * i_a1_den + i_a0_den;
+ uint64_t i_x = i_nom / i_den;
+ uint64_t i_a2n = i_x * i_a1_num + i_a0_num;
+ uint64_t i_a2d = i_x * i_a1_den + i_a0_den;
if( i_a2n > i_max || i_a2d > i_max ) break;
i_den = i_a1_den;
}
- if( b_sign ) i_nom = - i_nom;
-
*pi_dst_nom = i_nom;
*pi_dst_den = i_den;
return b_exact;
}
+
+/*************************************************************************
+ * vlc_parse_cmdline: Command line parsing into elements.
+ *
+ * The command line is composed of space/tab separated arguments.
+ * Quotes can be used as argument delimiters and a backslash can be used to
+ * escape a quote.
+ *************************************************************************/
+static void find_end_quote( char **s, char **ppsz_parser, int i_quote )
+{
+ int i_bcount = 0;
+
+ while( **s )
+ {
+ if( **s == '\\' )
+ {
+ **ppsz_parser = **s;
+ (*ppsz_parser)++; (*s)++;
+ i_bcount++;
+ }
+ else if( **s == '"' || **s == '\'' )
+ {
+ /* Preceeded by a number of '\' which we erase. */
+ *ppsz_parser -= i_bcount / 2;
+ if( i_bcount & 1 )
+ {
+ /* '\\' followed by a '"' or '\'' */
+ *ppsz_parser -= 1;
+ **ppsz_parser = **s;
+ (*ppsz_parser)++; (*s)++;
+ i_bcount = 0;
+ continue;
+ }
+
+ if( **s == i_quote )
+ {
+ /* End */
+ return;
+ }
+ else
+ {
+ /* Different quoting */
+ int i_quote = **s;
+ **ppsz_parser = **s;
+ (*ppsz_parser)++; (*s)++;
+ find_end_quote( s, ppsz_parser, i_quote );
+ **ppsz_parser = **s;
+ (*ppsz_parser)++; (*s)++;
+ }
+
+ i_bcount = 0;
+ }
+ else
+ {
+ /* A regular character */
+ **ppsz_parser = **s;
+ (*ppsz_parser)++; (*s)++;
+ i_bcount = 0;
+ }
+ }
+}
+
+char **vlc_parse_cmdline( const char *psz_cmdline, int *i_args )
+{
+ int argc = 0;
+ char **argv = 0;
+ char *s, *psz_parser, *psz_arg, *psz_orig;
+ int i_bcount = 0;
+
+ if( !psz_cmdline ) return 0;
+ psz_orig = strdup( psz_cmdline );
+ psz_arg = psz_parser = s = psz_orig;
+
+ while( *s )
+ {
+ if( *s == '\t' || *s == ' ' )
+ {
+ /* We have a complete argument */
+ *psz_parser = 0;
+ TAB_APPEND( argc, argv, strdup(psz_arg) );
+
+ /* Skip trailing spaces/tabs */
+ do{ s++; } while( *s == '\t' || *s == ' ' );
+
+ /* New argument */
+ psz_arg = psz_parser = s;
+ i_bcount = 0;
+ }
+ else if( *s == '\\' )
+ {
+ *psz_parser++ = *s++;
+ i_bcount++;
+ }
+ else if( *s == '"' || *s == '\'' )
+ {
+ if( ( i_bcount & 1 ) == 0 )
+ {
+ /* Preceeded by an even number of '\', this is half that
+ * number of '\', plus a quote which we erase. */
+ int i_quote = *s;
+ psz_parser -= i_bcount / 2;
+ s++;
+ find_end_quote( &s, &psz_parser, i_quote );
+ s++;
+ }
+ else
+ {
+ /* Preceeded by an odd number of '\', this is half that
+ * number of '\' followed by a '"' */
+ psz_parser = psz_parser - i_bcount/2 - 1;
+ *psz_parser++ = '"';
+ s++;
+ }
+ i_bcount = 0;
+ }
+ else
+ {
+ /* A regular character */
+ *psz_parser++ = *s++;
+ i_bcount = 0;
+ }
+ }
+
+ /* Take care of the last arg */
+ if( *psz_arg )
+ {
+ *psz_parser = '\0';
+ TAB_APPEND( argc, argv, strdup(psz_arg) );
+ }
+
+ if( i_args ) *i_args = argc;
+ free( psz_orig );
+ return argv;
+}
+
+/*************************************************************************
+ * 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 )
+{
+ (void)i_argc; // <-- hmph
+#ifdef HAVE_FORK
+# define BUFSIZE 1024
+ int fds[2], i_status;
+
+ if (socketpair (AF_LOCAL, SOCK_STREAM, 0, fds))
+ return -1;
+
+ pid_t pid = -1;
+ if ((fds[0] > 2) && (fds[1] > 2))
+ pid = fork ();
+
+ switch (pid)
+ {
+ case -1:
+ msg_Err (p_object, "unable to fork (%s)", strerror (errno));
+ close (fds[0]);
+ close (fds[1]);
+ return -1;
+
+ case 0:
+ /* NOTE:
+ * Like it or not, close can fail (and not only with EBADF)
+ */
+ if ((close (0) == 0) && (close (1) == 0) && (close (2) == 0)
+ && (dup (fds[1]) == 0) && (dup (fds[1]) == 1)
+ && (open ("/dev/null", O_RDONLY) == 2)
+ && ((psz_cwd == NULL) || (chdir (psz_cwd) == 0)))
+ execve (ppsz_argv[0], ppsz_argv, ppsz_env);
+
+ exit (1);
+ }
+
+ close (fds[1]);
+
+ *pi_data = 0;
+ if (*pp_data)
+ free (*pp_data);
+ *pp_data = NULL;
+
+ if (i_in == 0)
+ shutdown (fds[0], SHUT_WR);
+
+ while (!p_object->b_die)
+ {
+ struct pollfd ufd[1];
+ memset (ufd, 0, sizeof (ufd));
+ ufd[0].fd = fds[0];
+ ufd[0].events = POLLIN;
+
+ if (i_in > 0)
+ ufd[0].events |= POLLOUT;
+
+ if (poll (ufd, 1, 10) <= 0)
+ continue;
+
+ if (ufd[0].revents & ~POLLOUT)
+ {
+ char *ptr = realloc (*pp_data, *pi_data + BUFSIZE + 1);
+ if (ptr == NULL)
+ break; /* safely abort */
+
+ *pp_data = ptr;
+
+ ssize_t val = read (fds[0], ptr + *pi_data, BUFSIZE);
+ switch (val)
+ {
+ case -1:
+ case 0:
+ shutdown (fds[0], SHUT_RD);
+ break;
+
+ default:
+ *pi_data += val;
+ }
+ }
+
+ if (ufd[0].revents & POLLOUT)
+ {
+ ssize_t val = write (fds[0], p_in, i_in);
+ switch (val)
+ {
+ case -1:
+ case 0:
+ i_in = 0;
+ shutdown (fds[0], SHUT_WR);
+ break;
+
+ default:
+ i_in -= val;
+ p_in += val;
+ }
+ }
+ }
+
+ close (fds[0]);
+
+ while (waitpid (pid, &i_status, 0) == -1);
+
+ if (WIFEXITED (i_status))
+ {
+ i_status = WEXITSTATUS (i_status);
+ if (i_status)
+ msg_Warn (p_object, "child %s (PID %d) exited with error code %d",
+ ppsz_argv[0], (int)pid, i_status);
+ }
+ else
+ if (WIFSIGNALED (i_status)) // <-- this should be redumdant a check
+ {
+ i_status = WTERMSIG (i_status);
+ msg_Warn (p_object, "child %s (PID %d) exited on signal %d (%s)",
+ ppsz_argv[0], (int)pid, i_status, strsignal (i_status));
+ }
+
+#elif defined( WIN32 ) && !defined( UNDER_CE )
+ SECURITY_ATTRIBUTES saAttr;
+ PROCESS_INFORMATION piProcInfo;
+ STARTUPINFO siStartInfo;
+ BOOL bFuncRetn = FALSE;
+ HANDLE hChildStdinRd, hChildStdinWr, hChildStdoutRd, hChildStdoutWr;
+ DWORD i_status;
+ char *psz_cmd = NULL, *p_env = NULL, *p = NULL;
+ char **ppsz_parser;
+ int i_size;
+
+ /* Set the bInheritHandle flag so pipe handles are inherited. */
+ saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
+ saAttr.bInheritHandle = TRUE;
+ saAttr.lpSecurityDescriptor = NULL;
+
+ /* Create a pipe for the child process's STDOUT. */
+ if ( !CreatePipe( &hChildStdoutRd, &hChildStdoutWr, &saAttr, 0 ) )
+ {
+ msg_Err( p_object, "stdout pipe creation failed" );
+ return -1;
+ }
+
+ /* Ensure the read handle to the pipe for STDOUT is not inherited. */
+ SetHandleInformation( hChildStdoutRd, HANDLE_FLAG_INHERIT, 0 );
+
+ /* Create a pipe for the child process's STDIN. */
+ if ( !CreatePipe( &hChildStdinRd, &hChildStdinWr, &saAttr, 0 ) )
+ {
+ msg_Err( p_object, "stdin pipe creation failed" );
+ return -1;
+ }
+
+ /* Ensure the write handle to the pipe for STDIN is not inherited. */
+ SetHandleInformation( hChildStdinWr, HANDLE_FLAG_INHERIT, 0 );
+
+ /* Set up members of the PROCESS_INFORMATION structure. */
+ ZeroMemory( &piProcInfo, sizeof(PROCESS_INFORMATION) );
+
+ /* Set up members of the STARTUPINFO structure. */
+ ZeroMemory( &siStartInfo, sizeof(STARTUPINFO) );
+ siStartInfo.cb = sizeof(STARTUPINFO);
+ siStartInfo.hStdError = hChildStdoutWr;
+ siStartInfo.hStdOutput = hChildStdoutWr;
+ siStartInfo.hStdInput = hChildStdinRd;
+ siStartInfo.wShowWindow = SW_HIDE;
+ siStartInfo.dwFlags |= STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
+
+ /* Set up the command line. */
+ psz_cmd = malloc(32768);
+ if( !psz_cmd )
+ return -1;
+ psz_cmd[0] = '\0';
+ i_size = 32768;
+ ppsz_parser = &ppsz_argv[0];
+ while ( ppsz_parser[0] != NULL && i_size > 0 )
+ {
+ /* Protect the last argument with quotes ; the other arguments
+ * are supposed to be already protected because they have been
+ * passed as a command-line option. */
+ if ( ppsz_parser[1] == NULL )
+ {
+ strncat( psz_cmd, "\"", i_size );
+ i_size--;
+ }
+ strncat( psz_cmd, *ppsz_parser, i_size );
+ i_size -= strlen( *ppsz_parser );
+ if ( ppsz_parser[1] == NULL )
+ {
+ strncat( psz_cmd, "\"", i_size );
+ i_size--;
+ }
+ strncat( psz_cmd, " ", i_size );
+ i_size--;
+ ppsz_parser++;
+ }
+
+ /* Set up the environment. */
+ p = p_env = malloc(32768);
+ if( !p )
+ {
+ free( psz_cmd );
+ return -1;
+ }
+
+ i_size = 32768;
+ ppsz_parser = &ppsz_env[0];
+ while ( *ppsz_parser != NULL && i_size > 0 )
+ {
+ memcpy( p, *ppsz_parser,
+ __MIN((int)(strlen(*ppsz_parser) + 1), i_size) );
+ p += strlen(*ppsz_parser) + 1;
+ i_size -= strlen(*ppsz_parser) + 1;
+ ppsz_parser++;
+ }
+ *p = '\0';
+
+ /* Create the child process. */
+ bFuncRetn = CreateProcess( NULL,
+ psz_cmd, // command line
+ NULL, // process security attributes
+ NULL, // primary thread security attributes
+ TRUE, // handles are inherited
+ 0, // creation flags
+ p_env,
+ psz_cwd,
+ &siStartInfo, // STARTUPINFO pointer
+ &piProcInfo ); // receives PROCESS_INFORMATION
+
+ free( psz_cmd );
+ free( p_env );
+
+ if ( bFuncRetn == 0 )
+ {
+ msg_Err( p_object, "child creation failed" );
+ return -1;
+ }
+
+ /* Read from a file and write its contents to a pipe. */
+ while ( i_in > 0 && !p_object->b_die )
+ {
+ DWORD i_written;
+ if ( !WriteFile( hChildStdinWr, p_in, i_in, &i_written, NULL ) )
+ break;
+ i_in -= i_written;
+ p_in += i_written;
+ }
+
+ /* Close the pipe handle so the child process stops reading. */
+ CloseHandle(hChildStdinWr);
+
+ /* Close the write end of the pipe before reading from the
+ * read end of the pipe. */
+ CloseHandle(hChildStdoutWr);
+
+ /* Read output from the child process. */
+ *pi_data = 0;
+ if( *pp_data )
+ free( pp_data );
+ *pp_data = NULL;
+ *pp_data = malloc( 1025 ); /* +1 for \0 */
+
+ while ( !p_object->b_die )
+ {
+ DWORD i_read;
+ if ( !ReadFile( hChildStdoutRd, &(*pp_data)[*pi_data], 1024, &i_read,
+ NULL )
+ || i_read == 0 )
+ break;
+ *pi_data += i_read;
+ *pp_data = realloc( *pp_data, *pi_data + 1025 );
+ }
+
+ while ( !p_object->b_die
+ && !GetExitCodeProcess( piProcInfo.hProcess, &i_status )
+ && i_status != STILL_ACTIVE )
+ msleep( 10000 );
+
+ CloseHandle(piProcInfo.hProcess);
+ CloseHandle(piProcInfo.hThread);
+
+ if ( i_status )
+ msg_Warn( p_object,
+ "child %s returned with error code %ld",
+ ppsz_argv[0], i_status );
+
+#else
+ msg_Err( p_object, "vlc_execve called but no implementation is available" );
+ return -1;
+
+#endif
+
+ if (*pp_data == NULL)
+ return -1;
+
+ (*pp_data)[*pi_data] = '\0';
+ return 0;
+}
projects / vlc / blobdiff