#include "../libvlc.h"
#include <vlc_keys.h>
#include <vlc_charset.h>
+#include <vlc_modules.h>
#include "vlc_getopt.h"
* options used (ie. exported) by each module.
*
* @param p_this object to write command line options as variables to
- * @param pi_argc number of command line arguments [IN/OUT]
+ * @param i_argc number of command line arguments
* @param ppsz_args commandl ine arguments [IN/OUT]
- * @param b_ignore_errors whether to ignore parsing errors
+ * @param pindex NULL to ignore unknown options,
+ * otherwise index of the first non-option argument [OUT]
* @return 0 on success, -1 on error.
- *
- * @warning This function is not re-entrant (because of getopt_long()).
- * It must be called with the module bank initialization global lock held.
*/
-int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
- const char *ppsz_argv[], bool b_ignore_errors )
+int config_LoadCmdLine( vlc_object_t *p_this, int i_argc,
+ const char *ppsz_argv[], int *pindex )
{
int i_cmd, i_index, i_opts, i_shortopts, flag, i_verbose = 0;
module_t *p_parser;
struct vlc_option *p_longopts;
const char **argv_copy = NULL;
+#define b_ignore_errors (pindex == NULL)
/* Short options */
module_config_t *pp_shortopts[256];
* us, ignoring the arity of the options */
if( b_ignore_errors )
{
- argv_copy = (const char**)malloc( *pi_argc * sizeof(char *) );
+ argv_copy = (const char**)malloc( i_argc * sizeof(char *) );
if( argv_copy == NULL )
{
free( psz_shortopts );
module_list_free (list);
return -1;
}
- memcpy( argv_copy, ppsz_argv, *pi_argc * sizeof(char *) );
+ memcpy( argv_copy, ppsz_argv, i_argc * sizeof(char *) );
ppsz_argv = argv_copy;
}
memset( &p_longopts[i_index], 0, sizeof(*p_longopts) );
psz_shortopts[i_shortopts] = '\0';
+ int ret = -1;
+
/*
* Parse the command line options
*/
- vlc_optind = 0; /* set to 0 to tell GNU getopt to reinitialize */
- while( ( i_cmd = vlc_getopt_long( *pi_argc, (char **)ppsz_argv,
+ vlc_getopt_t state;
+ state.ind = 0 ; /* set to 0 to tell GNU getopt to reinitialize */
+ while( ( i_cmd = vlc_getopt_long( i_argc, (char **)ppsz_argv,
psz_shortopts,
- p_longopts, &i_index ) ) != -1 )
+ p_longopts, &i_index, &state ) ) != -1 )
{
/* A long option has been recognized */
if( i_cmd == 0 )
if( p_conf->psz_oldname
&& !strcmp( p_conf->psz_oldname, psz_name) )
{
- fprintf( stderr,
- "%s: option --%s is deprecated. Use --%s instead.\n",
- b_ignore_errors ? "Warning" : "Error",
- psz_name, p_conf->psz_name );
if( !b_ignore_errors )
{
- /*free */
- for( i_index = 0; p_longopts[i_index].name; i_index++ )
- free( (char *)p_longopts[i_index].name );
-
- free( p_longopts );
- free( psz_shortopts );
- return -1;
+ fprintf( stderr, "Error: option --%s is deprecated. "
+ "Use --%s instead.\n",
+ psz_name, p_conf->psz_name );
+ goto out;
}
psz_name = p_conf->psz_name;
case CONFIG_ITEM_MODULE_LIST_CAT:
case CONFIG_ITEM_MODULE_CAT:
var_Create( p_this, psz_name, VLC_VAR_STRING );
- var_SetString( p_this, psz_name, vlc_optarg );
+ var_SetString( p_this, psz_name, state.arg );
break;
case CONFIG_ITEM_INTEGER:
var_Create( p_this, psz_name, VLC_VAR_INTEGER );
var_SetInteger( p_this, psz_name,
- strtol(vlc_optarg, NULL, 0));
+ strtoll(state.arg, NULL, 0));
break;
case CONFIG_ITEM_FLOAT:
var_Create( p_this, psz_name, VLC_VAR_FLOAT );
- var_SetFloat( p_this, psz_name, us_atof(vlc_optarg) );
+ var_SetFloat( p_this, psz_name, us_atof(state.arg) );
break;
case CONFIG_ITEM_KEY:
var_Create( p_this, psz_name, VLC_VAR_INTEGER );
var_SetInteger( p_this, psz_name,
- ConfigStringToKey( vlc_optarg ) );
+ ConfigStringToKey( state.arg ) );
break;
case CONFIG_ITEM_BOOL:
var_Create( p_this, psz_name, VLC_VAR_BOOL );
case CONFIG_ITEM_MODULE_LIST:
case CONFIG_ITEM_MODULE_LIST_CAT:
var_Create( p_this, name, VLC_VAR_STRING );
- var_SetString( p_this, name, vlc_optarg );
+ var_SetString( p_this, name, state.arg );
break;
case CONFIG_ITEM_INTEGER:
var_Create( p_this, name, VLC_VAR_INTEGER );
else
{
var_SetInteger( p_this, name,
- strtol(vlc_optarg, NULL, 0) );
+ strtoll(state.arg, NULL, 0) );
}
break;
case CONFIG_ITEM_BOOL:
{
fputs( "vlc: unknown option"
" or missing mandatory argument ", stderr );
- if( vlc_optopt )
+ if( state.opt )
{
- fprintf( stderr, "`-%c'\n", vlc_optopt );
+ fprintf( stderr, "`-%c'\n", state.opt );
}
else
{
- fprintf( stderr, "`%s'\n", ppsz_argv[vlc_optind-1] );
+ fprintf( stderr, "`%s'\n", ppsz_argv[state.ind-1] );
}
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 );
- free( p_longopts );
- free( psz_shortopts );
- return -1;
+ goto out;
}
}
+ ret = 0;
+ if( pindex != NULL )
+ *pindex = state.ind;
+out:
/* Free allocated resources */
for( i_index = 0; p_longopts[i_index].name; i_index++ )
free( (char *)p_longopts[i_index].name );
free( p_longopts );
free( psz_shortopts );
free( argv_copy );
-
- return 0;
+ return ret;
}
projects / vlc / blobdiff