/*****************************************************************************
* cmdline.c: command line parsing
*****************************************************************************
- * Copyright (C) 2001-2007 the VideoLAN team
+ * Copyright (C) 2001-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
#include "../libvlc.h"
#include <vlc_keys.h>
#include <vlc_charset.h>
+#include <vlc_modules.h>
#include "vlc_getopt.h"
p_item++ )
{
/* Ignore hints */
- if( p_item->i_type & CONFIG_HINT )
+ if( !CONFIG_ITEM(p_item->i_type) )
continue;
/* Add item to long options */
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);
p_longopts[i_index].flag = &flag;
p_longopts[i_index].val = 0;
- i_index++;
- /* When dealing with bools we also need to add the --no-foo
- * option */
- if( p_item->i_type == CONFIG_ITEM_BOOL )
+ if( CONFIG_CLASS(p_item->i_type) != CONFIG_ITEM_BOOL )
+ p_longopts[i_index].has_arg = true;
+ else
+ /* Booleans also need --no-foo and --nofoo options */
{
- char *psz_name = malloc( strlen(p_item->psz_name) + 3 );
- if( psz_name == NULL ) continue;
- strcpy( psz_name, "no" );
- strcat( psz_name, p_item->psz_name );
+ char *psz_name;
+
+ p_longopts[i_index].has_arg = false;
+ i_index++;
+ if( asprintf( &psz_name, "no%s", p_item->psz_name ) == -1 )
+ continue;
p_longopts[i_index].name = psz_name;
p_longopts[i_index].has_arg = false;
p_longopts[i_index].flag = &flag;
p_longopts[i_index].val = 1;
i_index++;
- psz_name = malloc( strlen(p_item->psz_name) + 4 );
- if( psz_name == NULL ) continue;
- strcpy( psz_name, "no-" );
- strcat( psz_name, p_item->psz_name );
-
+ if( asprintf( &psz_name, "no-%s", p_item->psz_name ) == -1 )
+ continue;
p_longopts[i_index].name = psz_name;
p_longopts[i_index].has_arg = false;
p_longopts[i_index].flag = &flag;
p_longopts[i_index].val = 1;
- i_index++;
}
+ i_index++;
/* If item also has a short option, add it */
if( p_item->i_short )
* Parse the command line options
*/
vlc_getopt_t state;
- state.optind = 0 ; /* set to 0 to tell GNU getopt to reinitialize */
+ 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 )
continue;
}
- if( p_conf->psz_oldname
- && !strcmp( p_conf->psz_oldname, psz_name) )
- {
- if( !b_ignore_errors )
- {
- 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;
- }
-
- switch( p_conf->i_type )
+ switch( CONFIG_CLASS(p_conf->i_type) )
{
case CONFIG_ITEM_STRING:
- case CONFIG_ITEM_PASSWORD:
- case CONFIG_ITEM_FILE:
- case CONFIG_ITEM_DIRECTORY:
- case CONFIG_ITEM_MODULE:
- case CONFIG_ITEM_MODULE_LIST:
- 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, state.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(state.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(state.optarg) );
- break;
- case CONFIG_ITEM_KEY:
- var_Create( p_this, psz_name, VLC_VAR_INTEGER );
- var_SetInteger( p_this, psz_name,
- ConfigStringToKey( state.optarg ) );
+ var_SetFloat( p_this, psz_name, us_atof(state.arg) );
break;
case CONFIG_ITEM_BOOL:
var_Create( p_this, psz_name, VLC_VAR_BOOL );
if( pp_shortopts[i_cmd] != NULL )
{
const char *name = pp_shortopts[i_cmd]->psz_name;
- switch( pp_shortopts[i_cmd]->i_type )
+ switch( CONFIG_CLASS(pp_shortopts[i_cmd]->i_type) )
{
case CONFIG_ITEM_STRING:
- case CONFIG_ITEM_PASSWORD:
- case CONFIG_ITEM_FILE:
- case CONFIG_ITEM_DIRECTORY:
- case CONFIG_ITEM_MODULE:
- case CONFIG_ITEM_MODULE_CAT:
- case CONFIG_ITEM_MODULE_LIST:
- case CONFIG_ITEM_MODULE_LIST_CAT:
var_Create( p_this, name, VLC_VAR_STRING );
- var_SetString( p_this, name, state.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(state.optarg, NULL, 0) );
+ strtoll(state.arg, NULL, 0) );
}
break;
case CONFIG_ITEM_BOOL:
{
fputs( "vlc: unknown option"
" or missing mandatory argument ", stderr );
- if( state.optopt )
+ if( state.opt )
{
- fprintf( stderr, "`-%c'\n", state.optopt );
+ fprintf( stderr, "`-%c'\n", state.opt );
}
else
{
- fprintf( stderr, "`%s'\n", ppsz_argv[state.optind-1] );
+ fprintf( stderr, "`%s'\n", ppsz_argv[state.ind-1] );
}
fputs( "Try `vlc --help' for more information.\n", stderr );
goto out;
ret = 0;
if( pindex != NULL )
- *pindex = state.optind;
+ *pindex = state.ind;
out:
/* Free allocated resources */
for( i_index = 0; p_longopts[i_index].name; i_index++ )
projects / vlc / blobdiff