Mercurial > mplayer.hg
changeset 23391:9bf57f60bf0a
new -menu-chroot option that prevent OSD file selection menu to go to an unwanted location (yeah, chroot ;-))
| author | ben |
|---|---|
| date | Tue, 29 May 2007 18:49:38 +0000 |
| parents | e80337bdc886 |
| children | 85c5ea3543ff |
| files | cfg-mplayer.h libmenu/menu_filesel.c |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-mplayer.h Tue May 29 16:14:52 2007 +0000 +++ b/cfg-mplayer.h Tue May 29 18:49:38 2007 +0000 @@ -71,6 +71,7 @@ #ifdef HAVE_MENU extern int menu_startup; extern int menu_keepdir; +extern char *menu_chroot; #ifdef USE_FRIBIDI extern char *menu_fribidi_charset; extern int menu_flip_hebrew; @@ -298,6 +299,7 @@ {"menu-cfg", &menu_cfg, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, {"menu-startup", &menu_startup, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"menu-keepdir", &menu_keepdir, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, + {"menu-chroot", &menu_chroot, CONF_TYPE_STRING, 0, 0, 0, NULL}, #ifdef USE_FRIBIDI {"menu-fribidi-charset", &menu_fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"menu-flip-hebrew", &menu_flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL},
--- a/libmenu/menu_filesel.c Tue May 29 16:14:52 2007 +0000 +++ b/libmenu/menu_filesel.c Tue May 29 18:49:38 2007 +0000 @@ -30,6 +30,7 @@ #define MENU_KEEP_PATH "/tmp/mp_current_path" int menu_keepdir = 0; +char *menu_chroot = NULL; struct list_entry_s { struct list_entry p; @@ -222,6 +223,12 @@ while ((dp = readdir(dirp)) != NULL) { if(dp->d_name[0] == '.' && strcmp(dp->d_name,"..") != 0) continue; + if (menu_chroot && !strcmp (dp->d_name,"..")) { + int len = strlen (menu_chroot); + if ((strlen (mpriv->dir) == len || strlen (mpriv->dir) == len + 1) + && !strncmp (mpriv->dir, menu_chroot, len)) + continue; + } mylstat(args,dp->d_name,&st); if (file_filter && extensions && !S_ISDIR(st.st_mode)) { if((ext = strrchr(dp->d_name,'.')) == NULL)