X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fextras%2Flibc.c;h=acd0924027a8d833a52e12e8af9e330cbaaa9370;hb=06edede5c6157d8222d6d0c37fe9b7cbf2053f14;hp=ec6ee2e309c261ccbb8ce49e9ae7628e3ac82210;hpb=c6b6537f4d82d799bb4ee6d4c8c1dc6b87c0542c;p=vlc diff --git a/src/extras/libc.c b/src/extras/libc.c index ec6ee2e309..acd0924027 100644 --- a/src/extras/libc.c +++ b/src/extras/libc.c @@ -25,7 +25,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include @@ -43,6 +47,8 @@ # include #endif +#include + #ifdef HAVE_FORK # include # include @@ -58,122 +64,19 @@ # undef _wreaddir # undef _wclosedir # undef rewinddir -# undef seekdir -# undef telldir # define WIN32_LEAN_AND_MEAN # include #endif -#ifdef UNDER_CE -# define strcoll strcmp -#endif - -/***************************************************************************** - * getenv: just in case, but it should never be called - *****************************************************************************/ -#if !defined( HAVE_GETENV ) -char *vlc_getenv( const char *name ) -{ - return NULL; -} -#endif - -/***************************************************************************** - * strdup: returns a malloc'd copy of a string - *****************************************************************************/ -#if !defined( HAVE_STRDUP ) -char *vlc_strdup( const char *string ) -{ - return strndup( string, strlen( string ) ); -} -#endif - -/***************************************************************************** - * strndup: returns a malloc'd copy of at most n bytes of string - * Does anyone know whether or not it will be present in Jaguar? - *****************************************************************************/ -#if !defined( HAVE_STRNDUP ) -char *vlc_strndup( const char *string, size_t n ) -{ - char *psz; - size_t len = strlen( string ); - - len = __MIN( len, n ); - psz = (char*)malloc( len + 1 ); - if( psz != NULL ) - { - memcpy( (void*)psz, (const void*)string, len ); - psz[ len ] = 0; - } - - return psz; -} -#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 c1, c2; - if( !s1 || !s2 ) return -1; - - while( *s1 && *s2 ) - { - c1 = tolower(*s1); - c2 = tolower(*s2); - - if( c1 != c2 ) return (c1 < c2 ? -1 : 1); - s1++; s2++; - } - - if( !*s1 && !*s2 ) return 0; - else return (*s1 ? 1 : -1); -} -#endif - -/***************************************************************************** - * strncasecmp: compare n chars from two strings ignoring case - *****************************************************************************/ -#if !defined( HAVE_STRNCASECMP ) && !defined( HAVE_STRNICMP ) -int vlc_strncasecmp( const char *s1, const char *s2, size_t n ) -{ - int c1, c2; - if( !s1 || !s2 ) return -1; - - while( n > 0 && *s1 && *s2 ) - { - c1 = tolower(*s1); - c2 = tolower(*s2); - - if( c1 != c2 ) return (c1 < c2 ? -1 : 1); - s1++; s2++; n--; - } - - if( !n || (!*s1 && !*s2) ) return 0; - else return (*s1 ? 1 : -1); -} -#endif - /****************************************************************************** * strcasestr: find a substring (little) in another substring (big) * Case sensitive. Return NULL if not found, return big if little == null *****************************************************************************/ -#if !defined( HAVE_STRCASESTR ) && !defined( HAVE_STRISTR ) char * vlc_strcasestr( const char *psz_big, const char *psz_little ) { +#if defined (HAVE_STRCASESTR) || defined (HAVE_STRISTR) + return strcasestr (psz_big, psz_little); +#else char *p_pos = (char *)psz_big; if( !psz_big || !psz_little || !*psz_little ) return p_pos; @@ -195,100 +98,18 @@ char * vlc_strcasestr( const char *psz_big, const char *psz_little ) p_pos++; } return NULL; -} #endif - -/***************************************************************************** - * vasprintf: - *****************************************************************************/ -#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. */ - int i_size = 100; - char *p = malloc( i_size ); - int n; - - if( p == NULL ) - { - *strp = NULL; - return -1; - } - - for( ;; ) - { - /* Try to print in the allocated space. */ - n = vsnprintf( p, i_size, fmt, ap ); - - /* If that worked, return the string. */ - if (n > -1 && n < i_size) - { - *strp = p; - return strlen( p ); - } - /* Else try again with more space. */ - if (n > -1) /* glibc 2.1 */ - { - i_size = n+1; /* precisely what is needed */ - } - else /* glibc 2.0 */ - { - i_size *= 2; /* twice the old size */ - } - if( (p = realloc( p, i_size ) ) == NULL) - { - *strp = NULL; - return -1; - } - } } -#endif - -/***************************************************************************** - * asprintf: - *****************************************************************************/ -#if !defined(HAVE_ASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS) -int vlc_asprintf( char **strp, const char *fmt, ... ) -{ - va_list args; - int i_ret; - - va_start( args, fmt ); - i_ret = vasprintf( strp, fmt, args ); - va_end( args ); - - return i_ret; -} -#endif - -/***************************************************************************** - * atof: convert a string to a double. - *****************************************************************************/ -#if !defined( HAVE_ATOF ) -double vlc_atof( const char *nptr ) -{ - double f_result; - 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 ); - - return f_result; -} -#endif /***************************************************************************** * strtoll: convert a string to a 64 bits int. *****************************************************************************/ -#if !defined( HAVE_STRTOLL ) -int64_t vlc_strtoll( const char *nptr, char **endptr, int base ) +long long vlc_strtoll( const char *nptr, char **endptr, int base ) { - int64_t i_value = 0; +#if defined( HAVE_STRTOLL ) + return strtoll( nptr, endptr, base ); +#else + long long i_value = 0; int sign = 1, newbase = base ? base : 10; while( isspace(*nptr) ) nptr++; @@ -351,33 +172,8 @@ int64_t vlc_strtoll( const char *nptr, char **endptr, int base ) } return i_value * sign; -} #endif - -/***************************************************************************** - * atoll: convert a string to a 64 bits int. - *****************************************************************************/ -#if !defined( HAVE_ATOLL ) -int64_t vlc_atoll( const char *nptr ) -{ - return strtoll( nptr, (char **)NULL, 10 ); -} -#endif - -/***************************************************************************** - * lldiv: returns quotient and remainder - *****************************************************************************/ -#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 @@ -390,9 +186,11 @@ lldiv_t vlc_lldiv( long long numer, long long denom ) * * @return strlen(src) */ -#ifndef HAVE_STRLCPY extern size_t vlc_strlcpy (char *tgt, const char *src, size_t bufsize) { +#ifdef HAVE_STRLCPY + return strlcpy (tgt, src, bufsize); +#else size_t length; for (length = 1; (length < bufsize) && *src; length++) @@ -405,14 +203,14 @@ extern size_t vlc_strlcpy (char *tgt, const char *src, size_t bufsize) 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) +#if defined(WIN32) # include typedef struct vlc_DIR @@ -420,7 +218,7 @@ typedef struct vlc_DIR _WDIR *p_real_dir; int i_drives; struct _wdirent dd_dir; - vlc_bool_t b_insert_back; + bool b_insert_back; } vlc_DIR; void *vlc_wopendir( const wchar_t *wpath ) @@ -436,7 +234,11 @@ void *vlc_wopendir( const wchar_t *wpath ) if( !p_dir ) return NULL; p_dir->p_real_dir = NULL; +#if defined(UNDER_CE) + p_dir->i_drives = NULL; +#else p_dir->i_drives = GetLogicalDrives(); +#endif return (void *)p_dir; } @@ -460,7 +262,6 @@ void *vlc_wopendir( const wchar_t *wpath ) 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 ) @@ -472,7 +273,7 @@ struct _wdirent *vlc_wreaddir( void *_p_dir ) 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; + p_dir->b_insert_back = false; return &p_dir->dd_dir; } @@ -481,6 +282,11 @@ struct _wdirent *vlc_wreaddir( void *_p_dir ) /* Drive letters mode */ i_drives = p_dir->i_drives; +#ifdef UNDER_CE + swprintf( p_dir->dd_dir.d_name, L"\\"); + p_dir->dd_dir.d_namlen = wcslen(p_dir->dd_dir.d_name); +#else + unsigned int i; if ( !i_drives ) return NULL; /* end */ @@ -493,21 +299,10 @@ struct _wdirent *vlc_wreaddir( void *_p_dir ) 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); +#endif 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; @@ -515,105 +310,36 @@ void vlc_rewinddir( void *_p_dir ) if ( p_dir->p_real_dir != NULL ) _wrewinddir( p_dir->p_real_dir ); } +#endif -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 ) +/* 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; if ( p_dir->p_real_dir != NULL ) - return _wtelldir( p_dir->p_real_dir ); - return 0; -} -#endif + i_ret = _wclosedir( p_dir->p_real_dir ); -/***************************************************************************** - * 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 + free( p_dir ); + return i_ret; +#else + return closedir( _p_dir ); #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. - *****************************************************************************/ -char *vlc_dgettext( const char *package, const char *msgid ) +/** + * In-tree plugins share their gettext domain with LibVLC. + */ +char *vlc_gettext( const char *msgid ) { -#if defined( ENABLE_NLS ) \ - && ( defined(HAVE_GETTEXT) || defined(HAVE_INCLUDED_GETTEXT) ) - return dgettext( package, msgid ); +#ifdef ENABLE_NLS + return dgettext( PACKAGE_NAME, msgid ); #else return (char *)msgid; #endif } -#endif /***************************************************************************** * count_utf8_string: returns the number of characters in the string. @@ -698,7 +424,7 @@ vlc_iconv_t vlc_iconv_open( const char *tocode, const char *fromcode ) #if defined(HAVE_ICONV) return iconv_open( tocode, fromcode ); #else - return NULL; + return (vlc_iconv_t)(-1); #endif } @@ -709,21 +435,7 @@ size_t vlc_iconv( vlc_iconv_t cd, const char **inbuf, size_t *inbytesleft, return iconv( cd, (ICONV_CONST char **)inbuf, inbytesleft, outbuf, outbytesleft ); #else - 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; - outbuf += i_bytes; - inbytesleft -= i_bytes; - outbytesleft -= i_bytes; - return i_bytes; + abort (); #endif } @@ -732,7 +444,7 @@ int vlc_iconv_close( vlc_iconv_t cd ) #if defined(HAVE_ICONV) return iconv_close( cd ); #else - return 0; + abort (); #endif } @@ -740,10 +452,10 @@ int vlc_iconv_close( vlc_iconv_t cd ) * reduce a fraction * (adapted from libavcodec, author Michael Niedermayer ) *****************************************************************************/ -vlc_bool_t vlc_ureduce( unsigned *pi_dst_nom, unsigned *pi_dst_den, +bool 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; + bool b_exact = 1; uint64_t i_gcd; if( i_den == 0 ) @@ -757,7 +469,7 @@ vlc_bool_t vlc_ureduce( unsigned *pi_dst_nom, unsigned *pi_dst_den, i_nom /= i_gcd; i_den /= i_gcd; - if( i_max == 0 ) i_max = I64C(0xFFFFFFFF); + if( i_max == 0 ) i_max = INT64_C(0xFFFFFFFF); if( i_nom > i_max || i_den > i_max ) { @@ -789,140 +501,6 @@ vlc_bool_t vlc_ureduce( unsigned *pi_dst_nom, unsigned *pi_dst_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