X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fconfig%2Fcmdline.c;h=4d7514d9d190860ed6ec7aa90c89e50ed933cd3c;hb=b355bd884b2c1a9c2aaadcb8acd842b5fbff3c1f;hp=cfca4f2475fcdc27196e5639b934bc7a41a8ae8c;hpb=6edb2da8f463a74490a6a16ddaef86ea6ddb4417;p=vlc diff --git a/src/config/cmdline.c b/src/config/cmdline.c index cfca4f2475..4d7514d9d1 100644 --- a/src/config/cmdline.c +++ b/src/config/cmdline.c @@ -29,6 +29,7 @@ #include "../libvlc.h" #include #include +#include #include "vlc_getopt.h" @@ -47,22 +48,20 @@ * 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. - * FIXME: this still breaks if getopt() is used outside of LibVLC. */ -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 option *p_longopts; + struct vlc_option *p_longopts; const char **argv_copy = NULL; +#define b_ignore_errors (pindex == NULL) /* Short options */ module_config_t *pp_shortopts[256]; @@ -82,14 +81,14 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, * dealing with boolean to allow for --foo and --no-foo */ i_opts += p_parser->i_config_items + 2 * p_parser->i_bool_items; - p_longopts = malloc( sizeof(struct option) * (i_opts + 1) ); + p_longopts = malloc( sizeof(*p_longopts) * (i_opts + 1) ); if( p_longopts == NULL ) { module_list_free (list); return -1; } - psz_shortopts = malloc( sizeof( char ) * (2 * i_opts + 1) ); + psz_shortopts = malloc( 2 * i_opts + 1 ); if( psz_shortopts == NULL ) { free( p_longopts ); @@ -102,7 +101,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, * 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 ); @@ -110,7 +109,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, 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; } @@ -141,14 +140,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, 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 : -#ifndef __APPLE__ - required_argument; -#else -/* It seems that required_argument is broken on Darwin. - * Radar ticket #6113829 */ - optional_argument; -#endif + (p_item->i_type != CONFIG_ITEM_BOOL); p_longopts[i_index].flag = &flag; p_longopts[i_index].val = 0; i_index++; @@ -163,7 +155,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, strcat( psz_name, p_item->psz_name ); p_longopts[i_index].name = psz_name; - p_longopts[i_index].has_arg = no_argument; + p_longopts[i_index].has_arg = false; p_longopts[i_index].flag = &flag; p_longopts[i_index].val = 1; i_index++; @@ -174,7 +166,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, strcat( psz_name, p_item->psz_name ); p_longopts[i_index].name = psz_name; - p_longopts[i_index].has_arg = no_argument; + p_longopts[i_index].has_arg = false; p_longopts[i_index].flag = &flag; p_longopts[i_index].val = 1; i_index++; @@ -186,16 +178,11 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, pp_shortopts[(int)p_item->i_short] = p_item; psz_shortopts[i_shortopts] = p_item->i_short; i_shortopts++; - if( p_item->i_type != CONFIG_ITEM_BOOL ) + if( p_item->i_type != CONFIG_ITEM_BOOL + && p_item->i_short != 'v' ) { psz_shortopts[i_shortopts] = ':'; i_shortopts++; - - if( p_item->i_short == 'v' ) - { - psz_shortopts[i_shortopts] = ':'; - i_shortopts++; - } } } } @@ -205,15 +192,19 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, module_list_free( list ); /* Close the longopts and shortopts structures */ - memset( &p_longopts[i_index], 0, sizeof(struct option) ); + memset( &p_longopts[i_index], 0, sizeof(*p_longopts) ); psz_shortopts[i_shortopts] = '\0'; + int ret = -1; + /* * Parse the command line options */ - optind = 0; /* set to 0 to tell GNU getopt to reinitialize */ - while( ( i_cmd = vlc_getopt_long( *pi_argc, (char **)ppsz_argv, psz_shortopts, - p_longopts, &i_index ) ) != -1 ) + 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, &state ) ) != -1 ) { /* A long option has been recognized */ if( i_cmd == 0 ) @@ -240,31 +231,17 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, 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; } -#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: @@ -276,21 +253,21 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, 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, 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(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(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( optarg ) ); + ConfigStringToKey( state.arg ) ); break; case CONFIG_ITEM_BOOL: var_Create( p_this, psz_name, VLC_VAR_BOOL ); @@ -316,38 +293,19 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, case CONFIG_ITEM_MODULE_LIST: case CONFIG_ITEM_MODULE_LIST_CAT: var_Create( p_this, name, VLC_VAR_STRING ); - var_SetString( p_this, name, optarg ); + var_SetString( p_this, name, state.arg ); break; case CONFIG_ITEM_INTEGER: var_Create( p_this, name, VLC_VAR_INTEGER ); if( i_cmd == 'v' ) { - if( optarg ) - { - if( *optarg == 'v' ) /* eg. -vvv */ - { - i_verbose++; - while( *optarg == 'v' ) - { - i_verbose++; - optarg++; - } - } - else - { - i_verbose += atoi( optarg ); /* eg. -v2 */ - } - } - else - { - i_verbose++; /* -v */ - } + i_verbose++; /* -v */ var_SetInteger( p_this, name, i_verbose ); } else { var_SetInteger( p_this, name, - strtol(optarg, NULL, 0) ); + strtoll(state.arg, NULL, 0) ); } break; case CONFIG_ITEM_BOOL: @@ -364,31 +322,29 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, { fputs( "vlc: unknown option" " or missing mandatory argument ", stderr ); - if( optopt ) + if( state.opt ) { - fprintf( stderr, "`-%c'\n", optopt ); + fprintf( stderr, "`-%c'\n", state.opt ); } else { - fprintf( stderr, "`%s'\n", ppsz_argv[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; }