X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fextras%2Flibc.c;h=f20b8a31d5b4e0385d15a72f11c55d708e4814f5;hb=e2123909a9be46a704bc922ae9cf0a0a50040cc8;hp=f2b9019917ea4880f959b9dbacdc805d02ef0cb0;hpb=c80de559fa80947d00a98561ab1f506bcf910d0c;p=vlc diff --git a/src/extras/libc.c b/src/extras/libc.c index f2b9019917..f20b8a31d5 100644 --- a/src/extras/libc.c +++ b/src/extras/libc.c @@ -29,7 +29,7 @@ # include "config.h" #endif -#include +#include #include @@ -74,9 +74,11 @@ * 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; @@ -98,71 +100,8 @@ 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 /***************************************************************************** * strtoll: convert a string to a 64 bits int. @@ -249,9 +188,11 @@ long long vlc_strtoll( const char *nptr, char **endptr, int base ) * * @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++) @@ -264,8 +205,30 @@ extern size_t vlc_strlcpy (char *tgt, const char *src, size_t bufsize) length++; return length - 1; -} #endif +} + +/** + * Extract a token from string. + * It is a replacement for strsep if not present. + */ +char *vlc_strsep( char **ppsz_string, const char *psz_delimiters ) +{ + char *psz_string = *ppsz_string; + if( !psz_string ) + return NULL; + + char *p = strpbrk( psz_string, psz_delimiters ); + if( !p ) + { + *ppsz_string = NULL; + return psz_string; + } + *p++ = '\0'; + + *ppsz_string = p; + return psz_string; +} /***************************************************************************** * vlc_*dir_wrapper: wrapper under Windows to return the list of drive letters @@ -355,44 +318,42 @@ struct _wdirent *vlc_wreaddir( void *_p_dir ) return &p_dir->dd_dir; } -int vlc_wclosedir( void *_p_dir ) +void vlc_rewinddir( 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; + _wrewinddir( p_dir->p_real_dir ); } +#endif -void vlc_rewinddir( void *_p_dir ) +/* This one is in the libvlccore exported symbol list */ +int vlc_wclosedir( void *_p_dir ) { +#if defined(WIN32) && !defined(UNDER_CE) vlc_DIR *p_dir = (vlc_DIR *)_p_dir; + int i_ret = 0; if ( p_dir->p_real_dir != NULL ) - _wrewinddir( p_dir->p_real_dir ); -} -#endif + i_ret = _wclosedir( p_dir->p_real_dir ); -#if defined (WIN32) -/** - * gettext callbacks for plugins. - * LibVLC links libintl statically on Windows. - */ -char *vlc_dgettext( const char *package, const char *msgid ) -{ - return dgettext( package, msgid ); -} + free( p_dir ); + return i_ret; +#else + return closedir( _p_dir ); #endif +} /** * In-tree plugins share their gettext domain with LibVLC. */ char *vlc_gettext( const char *msgid ) { +#ifdef ENABLE_NLS return dgettext( PACKAGE_NAME, msgid ); +#else + return (char *)msgid; +#endif } /***************************************************************************** @@ -478,7 +439,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 } @@ -489,21 +450,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 } @@ -512,7 +459,7 @@ int vlc_iconv_close( vlc_iconv_t cd ) #if defined(HAVE_ICONV) return iconv_close( cd ); #else - return 0; + abort (); #endif }