mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-12-04 15:26:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

vlc: fix regression with command line arguments

Browse Source
This commit is contained in:
Rémi Denis-Courmont 2012-03-20 17:56:43 +02:00
parent 34add54858
commit b542d45898
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/vlc.c
View File

@ -33,6 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
#include <locale.h>
#include <signal.h>
#ifdef HAVE_PTHREAD_H
@ -40,10 +41,6 @@
#endif
#include <unistd.h>
#ifdef __APPLE__
#include <string.h>
#endif
#ifdef __OS2__
# define pthread_t int
# define pthread_self() _gettid()
@ -178,6 +175,17 @@ int main( int i_argc, const char *ppsz_argv[] )
#ifdef TOP_SRCDIR
argv[argc++] = "--data-path="TOP_SRCDIR"/share";
#endif
ppsz_argv++; i_argc--; /* skip executable path */
#ifdef __APPLE__
/* When VLC.app is run by double clicking in Mac OS X, the 2nd arg
* is the PSN - process serial number (a unique PID-ish thingie)
* still ok for real Darwin & when run from command line
* for example -psn_0_9306113 */
if (i_argc >= 1 && !strncmp (*ppsz_argv, "-psn" , 4))
ppsz_argv++, i_argc--;
#endif
memcpy (argv + argc, ppsz_argv, i_argc * sizeof (*argv));
argc += i_argc;
argv[argc] = NULL;
vlc_enable_override ();