# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <ctype.h>
# include <dirent.h>
#endif
-#ifdef HAVE_SIGNAL_H
-# include <signal.h>
-#endif
+#include <signal.h>
#ifdef HAVE_FORK
# include <sys/time.h>
# include <windows.h>
#endif
-#ifdef UNDER_CE
-# define strcoll strcmp
-#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;
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.
*****************************************************************************/
-#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++;
}
return i_value * sign;
-}
#endif
+}
/**
* Copy a string to a sized buffer. The result is always nul-terminated
*
* @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++)
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 <assert.h>
typedef struct vlc_DIR
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;
}
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 )
/* 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 */
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;
}
#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 ** ) )
+/* This one is in the libvlccore exported symbol list */
+int vlc_wclosedir( void *_p_dir )
{
- 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 defined(WIN32)
+ vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
+ int i_ret = 0;
- if( compar )
- {
- qsort( pp_list, ret, sizeof( struct dirent * ),
- (int (*)(const void *, const void *)) compar );
- }
+ if ( p_dir->p_real_dir != NULL )
+ i_ret = _wclosedir( p_dir->p_real_dir );
- *namelist = pp_list;
- return ret;
-}
+ free( p_dir );
+ return i_ret;
+#else
+ return closedir( _p_dir );
#endif
-
-#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 );
}
-#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
}
/*****************************************************************************
#if defined(HAVE_ICONV)
return iconv_open( tocode, fromcode );
#else
- return NULL;
+ return (vlc_iconv_t)(-1);
#endif
}
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
}
#if defined(HAVE_ICONV)
return iconv_close( cd );
#else
- return 0;
+ abort ();
#endif
}
projects / vlc / blobdiff