From 7530a392333c7084e52fc195669ad05de10f63f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 7 Feb 2010 18:00:26 +0200 Subject: [PATCH] Win32: strip ".libs" from libvlc path in any case That said, if someone really wants to support running vlc.exe from the build tree, this is far from sufficient. I would suggest setting data-path and plugin-path in static compilations of winvlc.c like we already do for vlc.c instead. --- src/win32/specific.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/win32/specific.c b/src/win32/specific.c index c3783965fc..1478ca870e 100644 --- a/src/win32/specific.c +++ b/src/win32/specific.c @@ -65,20 +65,17 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) else psz_path[0] = '\0'; } - if( (psz_vlc = strrchr( psz_path, '\\' )) ) *psz_vlc = '\0'; + psz_vlc = strrchr( psz_path, '\\' ); + if( psz_vlc ) + *psz_vlc = '\0'; -#ifndef HAVE_RELEASE { /* remove trailing \.libs from executable dir path if seen, we assume we are running vlc through libtool wrapper in build dir */ - int offset = strlen(psz_path)-sizeof("\\.libs")+1; - if( offset > 0 ) - { - psz_vlc = psz_path+offset; - if( ! strcmp(psz_vlc, "\\.libs") ) *psz_vlc = '\0'; - } + size_t len = strlen(psz_path); + if( len >= 5 && !stricmp(psz_path + len - 5, "\\.libs" ) ) + psz_path[len - 5] = '\0'; } -#endif psz_vlcpath = strdup( psz_path ); -- 2.39.2