/*****************************************************************************
* variables.c: routines for object variables handling
*****************************************************************************
- * Copyright (C) 2002-2009 the VideoLAN team
+ * Copyright (C) 2002-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.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.
*****************************************************************************/
/*****************************************************************************
#include <vlc_charset.h>
#include "variables.h"
+#ifdef HAVE_SEARCH_H
+# include <search.h>
+#endif
+
#include "libvlc.h"
+#include "config/configuration.h"
-#include <search.h>
#include <assert.h>
#include <math.h>
#include <limits.h>
+#ifdef __GLIBC__
+# include <dlfcn.h>
+#endif
/*****************************************************************************
* Private types
static void FreeDummy( vlc_value_t *p_val ) { (void)p_val; /* unused */ }
static void FreeString( vlc_value_t *p_val ) { free( p_val->psz_string ); }
-static void FreeMutex( vlc_value_t *p_val ) { vlc_mutex_destroy( (vlc_mutex_t*)p_val->p_address ); free( p_val->p_address ); }
static void FreeList( vlc_value_t *p_val )
{
case VLC_VAR_STRING:
FreeString( &p_val->p_list->p_values[i] );
break;
- case VLC_VAR_MUTEX:
- FreeMutex( &p_val->p_list->p_values[i] );
- break;
default:
break;
}
bool_ops = { CmpBool, DupDummy, FreeDummy, },
float_ops = { CmpFloat, DupDummy, FreeDummy, },
int_ops = { CmpInt, DupDummy, FreeDummy, },
-mutex_ops = { CmpAddress, DupDummy, FreeMutex, },
string_ops = { CmpString, DupString, FreeString, },
time_ops = { CmpTime, DupDummy, FreeDummy, },
coords_ops = { NULL, DupDummy, FreeDummy, };
free( p_var->choices.p_values );
free( p_var->choices_text.p_values );
}
+#if 0 // ndef NDEBUG
+ for (int i = 0; i < p_var->i_entries; i++)
+ {
+ const char *file = "?", *symbol = "?";
+ const void *addr = p_var->p_entries[i].pf_callback;
+# ifdef __GLIBC__
+ Dl_info info;
+
+ if (dladdr (addr, &info))
+ {
+ if (info.dli_fname) file = info.dli_fname;
+ if (info.dli_sname) symbol = info.dli_sname;
+ }
+# endif
+ fprintf (stderr, "Error: callback on \"%s\" dangling %s(%s)[%p]\n",
+ p_var->psz_name, file, symbol, addr);
+ }
+#endif
+
free( p_var->psz_name );
free( p_var->psz_text );
free( p_var->p_entries );
p_var->ops = &addr_ops;
p_var->val.p_address = NULL;
break;
- case VLC_VAR_MUTEX:
- p_var->ops = &mutex_ops;
- p_var->val.p_address = malloc( sizeof(vlc_mutex_t) );
- vlc_mutex_init( (vlc_mutex_t*)p_var->val.p_address );
- break;
default:
p_var->ops = &void_ops;
#ifndef NDEBUG
vlc_object_internals_t *priv = vlc_internals( obj );
tdestroy( priv->var_root, CleanupVar );
+ priv->var_root = NULL;
}
#undef var_Change
int var_Change( vlc_object_t *p_this, const char *psz_name,
int i_action, vlc_value_t *p_val, vlc_value_t *p_val2 )
{
- int i;
+ int ret = VLC_SUCCESS;
variable_t *p_var;
vlc_value_t oldval;
vlc_value_t newval;
break;
case VLC_VAR_GETMIN:
if( p_var->i_type & VLC_VAR_HASMIN )
- {
*p_val = p_var->min;
- }
+ else
+ ret = VLC_EGENERIC;
break;
case VLC_VAR_SETMAX:
if( p_var->i_type & VLC_VAR_HASMAX )
break;
case VLC_VAR_GETMAX:
if( p_var->i_type & VLC_VAR_HASMAX )
- {
*p_val = p_var->max;
- }
+ else
+ ret = VLC_EGENERIC;
break;
case VLC_VAR_SETSTEP:
if( p_var->i_type & VLC_VAR_HASSTEP )
break;
case VLC_VAR_GETSTEP:
if( p_var->i_type & VLC_VAR_HASSTEP )
- {
*p_val = p_var->step;
- }
+ else
+ ret = VLC_EGENERIC;
break;
case VLC_VAR_ADDCHOICE:
- i = p_var->choices.i_count;
+ {
+ int i = p_var->choices.i_count;
INSERT_ELEM( p_var->choices.p_values, p_var->choices.i_count,
i, *p_val );
CheckValue( p_var, &p_var->val );
break;
+ }
case VLC_VAR_DELCHOICE:
+ {
+ int i;
+
for( i = 0 ; i < p_var->choices.i_count ; i++ )
- {
if( p_var->ops->pf_cmp( p_var->choices.p_values[i], *p_val ) == 0 )
- {
break;
- }
- }
if( i == p_var->choices.i_count )
{
}
if( p_var->i_default > i )
- {
p_var->i_default--;
- }
else if( p_var->i_default == i )
- {
p_var->i_default = -1;
- }
p_var->ops->pf_free( &p_var->choices.p_values[i] );
free( p_var->choices_text.p_values[i].psz_string );
CheckValue( p_var, &p_var->val );
break;
+ }
case VLC_VAR_CHOICESCOUNT:
p_val->i_int = p_var->choices.i_count;
break;
case VLC_VAR_CLEARCHOICES:
- for( i = 0 ; i < p_var->choices.i_count ; i++ )
- {
+ for( int i = 0 ; i < p_var->choices.i_count ; i++ )
p_var->ops->pf_free( &p_var->choices.p_values[i] );
- }
- for( i = 0 ; i < p_var->choices_text.i_count ; i++ )
+ for( int i = 0 ; i < p_var->choices_text.i_count ; i++ )
free( p_var->choices_text.p_values[i].psz_string );
if( p_var->choices.i_count ) free( p_var->choices.p_values );
p_var->i_default = -1;
break;
case VLC_VAR_SETDEFAULT:
+ {
+ int i;
/* FIXME: the list is sorted, dude. Use something cleverer. */
for( i = 0 ; i < p_var->choices.i_count ; i++ )
- {
if( p_var->ops->pf_cmp( p_var->choices.p_values[i], *p_val ) == 0 )
- {
break;
- }
- }
if( i == p_var->choices.i_count )
- {
/* Not found */
break;
- }
p_var->i_default = i;
CheckValue( p_var, &p_var->val );
break;
+ }
case VLC_VAR_SETVALUE:
/* Duplicate data if needed */
newval = *p_val;
}
p_val->p_list->i_count = p_var->choices.i_count;
if( p_val2 ) p_val2->p_list->i_count = p_var->choices.i_count;
- for( i = 0 ; i < p_var->choices.i_count ; i++ )
+ for( int i = 0 ; i < p_var->choices.i_count ; i++ )
{
p_val->p_list->p_values[i] = p_var->choices.p_values[i];
p_val->p_list->pi_types[i] = p_var->i_type;
vlc_mutex_unlock( &p_priv->var_lock );
- return VLC_SUCCESS;
+ return ret;
}
#undef var_GetAndSet
( !psz_value || !*psz_value ) ) goto cleanup; /* Invalid value */
/* check if option is unsafe */
- if( !trusted )
+ if( !trusted && !config_IsSafe( psz_name ) )
{
- module_config_t *p_config = config_FindConfig( p_obj, psz_name );
- if( !p_config || !p_config->b_safe )
- {
- msg_Err( p_obj, "unsafe option \"%s\" has been ignored for "
- "security reasons", psz_name );
- free( psz_name );
- return;
- }
+ msg_Err( p_obj, "unsafe option \"%s\" has been ignored for "
+ "security reasons", psz_name );
+ free( psz_name );
+ return;
}
/* Create the variable in the input object.
break;
case VLC_VAR_STRING:
- case VLC_VAR_MODULE:
- case VLC_VAR_FILE:
- case VLC_VAR_DIRECTORY:
val.psz_string = psz_value;
break;
free( psz_name );
}
+#undef var_LocationParse
+/**
+ * Parses a set of colon-separated or semicolon-separated
+ * <variable name>=<value> pairs.
+ * Some access (or access_demux) plugins uses this scheme
+ * in media resource location.
+ * @note Only trusted/safe variables are allowed. This is intended.
+ *
+ * @warning Only use this for plugins implementing VLC-specific resource
+ * location schemes. This would not make any sense for standardized ones.
+ *
+ * @param obj VLC object on which to set variables (and emit error messages)
+ * @param mrl string to parse
+ * @param pref prefix to prepend to option names in the string
+ *
+ * @return VLC_ENOMEM on error, VLC_SUCCESS on success.
+ */
+int var_LocationParse (vlc_object_t *obj, const char *mrl, const char *pref)
+{
+ int ret = VLC_SUCCESS;
+ size_t preflen = strlen (pref) + 1;
-/* Following functions are local */
+ assert(mrl != NULL);
+ while (*mrl != '\0')
+ {
+ mrl += strspn (mrl, ":;"); /* skip leading colon(s) */
+
+ size_t len = strcspn (mrl, ":;");
+ char *buf = malloc (preflen + len);
+
+ if (likely(buf != NULL))
+ {
+ /* NOTE: this does not support the "no-<varname>" bool syntax. */
+ /* DO NOT use asprintf() here; it won't work! Think again. */
+ snprintf (buf, preflen + len, "%s%s", pref, mrl);
+ var_OptionParse (obj, buf, false);
+ free (buf);
+ }
+ else
+ ret = VLC_ENOMEM;
+ mrl += len;
+ }
+
+ return ret;
+}
/**
* Waits until the variable is inactive (i.e. not executing a callback)
const char *psz_cmd, const char *psz_arg, char **psz_msg )
{
vlc_object_t *p_obj = vlc_object_find_name( p_this->p_libvlc,
- psz_name, FIND_CHILD );
+ psz_name );
int i_type, i_ret;
if( !p_obj )
projects / vlc / blobdiff