# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include "../libvlc.h"
-#include "vlc_keys.h"
+#include <vlc_keys.h>
+#include <vlc_charset.h>
#ifdef HAVE_GETOPT_LONG
# ifdef HAVE_GETOPT_H
{
int i_cmd, i_index, i_opts, i_shortopts, flag, i_verbose = 0;
module_t *p_parser;
- vlc_list_t *p_list;
struct option *p_longopts;
- int i_modules_index;
const char **argv_copy = NULL;
/* Short options */
module_config_t *pp_shortopts[256];
char *psz_shortopts;
-#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 */
- if ( (*pi_argc > 1) && (strncmp( ppsz_argv[ 1 ] , "-psn" , 4 ) == 0) )
- /* for example -psn_0_9306113 */
- {
- /* GDMF!... I can't do this or else the MacOSX window server will
- * not pick up the PSN and not register the app and we crash...
- * hence the following kludge otherwise we'll get confused w/ argv[1]
- * being an input file name.
- * As there won't be any more args to parse, just exit. */
- assert( *pi_argc == 2 );
- *pi_argc = 1;
- return 0;
- }
-#endif
-
/* List all modules */
- p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ module_t **list = module_list_get (NULL);
/*
* Generate the longopts and shortopts structures used by getopt_long
*/
i_opts = 0;
- for( i_modules_index = 0; i_modules_index < p_list->i_count;
- i_modules_index++ )
- {
- p_parser = (module_t *)p_list->p_values[i_modules_index].p_object ;
-
+ for (size_t i = 0; (p_parser = list[i]) != NULL; i++)
/* count the number of exported configuration options (to allocate
* longopts). We also need to allocate space for two options when
* dealing with boolean to allow for --foo and --no-foo */
- i_opts += p_parser->i_config_items
- + 2 * p_parser->i_bool_items;
- }
+ i_opts += p_parser->i_config_items + 2 * p_parser->i_bool_items;
p_longopts = malloc( sizeof(struct option) * (i_opts + 1) );
if( p_longopts == NULL )
{
- vlc_list_release( p_list );
+ module_list_free (list);
return -1;
}
if( psz_shortopts == NULL )
{
free( p_longopts );
- vlc_list_release( p_list );
+ module_list_free (list);
return -1;
}
{
free( psz_shortopts );
free( p_longopts );
- vlc_list_release( p_list );
+ module_list_free (list);
return -1;
}
memcpy( argv_copy, ppsz_argv, *pi_argc * sizeof(char *) );
/* Fill the p_longopts and psz_shortopts structures */
i_index = 0;
- for( i_modules_index = 0; i_modules_index < p_list->i_count;
- i_modules_index++ )
+ for (size_t i = 0; (p_parser = list[i]) != NULL; i++)
{
module_config_t *p_item, *p_end;
- p_parser = (module_t *)p_list->p_values[i_modules_index].p_object ;
if( !p_parser->i_config_items )
continue;
p_longopts[i_index].name = strdup( p_item->psz_name );
if( p_longopts[i_index].name == NULL ) continue;
p_longopts[i_index].has_arg =
- (p_item->i_type == CONFIG_ITEM_BOOL)?
- no_argument : required_argument;
+ (p_item->i_type == CONFIG_ITEM_BOOL) ? no_argument :
+#ifndef __APPLE__
+ required_argument;
+#else
+/* It seems that required_argument is broken on Darwin.
+ * Radar ticket #6113829 */
+ optional_argument;
+#endif
p_longopts[i_index].flag = &flag;
p_longopts[i_index].val = 0;
i_index++;
}
/* We don't need the module list anymore */
- vlc_list_release( p_list );
+ module_list_free( list );
/* Close the longopts and shortopts structures */
memset( &p_longopts[i_index], 0, sizeof(struct option) );
psz_name = p_conf->psz_name;
}
-
+#ifdef __APPLE__
+ if( p_conf->i_type != CONFIG_ITEM_BOOL && !optarg )
+ {
+ fprintf( stderr, "Warning: missing argument for option --%s\n", p_conf->psz_name );
+ fprintf( stderr, "Try specifying options as '--optionname=value' instead of '--optionname value'\n" );
+ continue;
+ }
+#endif
switch( p_conf->i_type )
{
case CONFIG_ITEM_STRING:
config_PutInt( p_this, psz_name, strtol(optarg, 0, 0));
break;
case CONFIG_ITEM_FLOAT:
- config_PutFloat( p_this, psz_name, (float)atof(optarg) );
+ config_PutFloat( p_this, psz_name, us_atof(optarg) );
break;
case CONFIG_ITEM_KEY:
config_PutInt( p_this, psz_name, ConfigStringToKey( optarg ) );
/* Internal error: unknown option */
if( !b_ignore_errors )
{
- fprintf( stderr, "%s: unknown option"
- " or missing mandatory argument ",
- p_this->p_libvlc->psz_object_name );
+ fputs( "vlc: unknown option"
+ " or missing mandatory argument ", stderr );
if( optopt )
{
fprintf( stderr, "`-%c'\n", optopt );
{
fprintf( stderr, "`%s'\n", ppsz_argv[optind-1] );
}
- fprintf( stderr, "Try `%s --help' for more information.\n",
- p_this->p_libvlc->psz_object_name );
+ fputs( "Try `vlc --help' for more information.\n", stderr );
for( i_index = 0; p_longopts[i_index].name; i_index++ )
free( (char *)p_longopts[i_index].name );
projects / vlc / blobdiff