Removes trailing spaces. Removes tabs.

[vlc] / src / misc / darwin_specific.c

diff --git a/src/misc/darwin_specific.c b/src/misc/darwin_specific.c
index 69695c8e143d92b8c19aa38acea81408fd687ae8..f14d54b8ce8d575eddc85d2fc7eff0a6f1700f2f 100644 (file)
--- a/src/misc/darwin_specific.c
+++ b/src/misc/darwin_specific.c
@@ -49,7 +49,7 @@ static CFArrayRef copy_all_locale_indentifiers(void)
     while ( (file = readdir(dir)) )
     {
         /* we should probably filter out garbage */
-        /* we can't use CFStringCreateWithFileSystemRepresentation as it is 
+        /* we can't use CFStringCreateWithFileSystemRepresentation as it is
          * supported only on post-10.4 (and this function is only for pre-10.4) */
         CFStringRef locale = CFStringCreateWithCString( kCFAllocatorDefault, file->d_name, kCFStringEncodingUTF8 );
         CFArrayAppendValue( available_locales, (void*)locale );
@@ -66,10 +66,27 @@ static CFArrayRef copy_all_locale_indentifiers(void)
 void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
 {
     char i_dummy;
-    char *p_char, *p_oldchar = &i_dummy;
+    char *p_char = NULL;
+    char *p_oldchar = &i_dummy;
+    int i;
 
     /* Get the full program path and name */
-    p_char = vlc_global()->psz_vlcpath = strdup( ppsz_argv[ 0 ] );
+
+    /* First try to see if we are linked to the framework */
+    for (i = 0; i < _dyld_image_count(); i++)
+    {
+        char * psz_img_name = _dyld_get_image_name(i);
+        if( strstr( psz_img_name, "VLC.framework/Version/Current/VLC" ) )
+            p_char = strdup( psz_img_name );
+    }
+
+    if( !p_char )
+    {
+        /* We are not linked to the VLC.framework, return the executable path */
+        p_char = strdup( ppsz_argv[ 0 ] );
+    }
+
+    vlc_global()->psz_vlcpath = p_char;
 
     /* Remove trailing program name */
     for( ; *p_char ; )
@@ -90,7 +107,7 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
         /*
            Retrieve the preferred language as chosen in  System Preferences.app
            (note that CFLocaleCopyCurrent() is not used because it returns the
-            prefered locale not language) 
+            prefered locale not language)
         */
         CFArrayRef all_locales, preferred_locales;
         char psz_locale[50];