diff options
| author | cboesch <cboesch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-11-16 21:06:52 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-12-16 03:59:37 +0200 |
| commit | e8757fb88311329a35d874b43ff1aaf095ed4147 (patch) | |
| tree | d8818a6042537bcc393f368349a2303c6fdcca52 /libmenu | |
| parent | 970d02c79189ce1c0037fac80bde93f0fa0cb693 (diff) | |
| download | mpv-e8757fb88311329a35d874b43ff1aaf095ed4147.tar.bz2 mpv-e8757fb88311329a35d874b43ff1aaf095ed4147.tar.xz | |
path.c: add function for mp_basename, remove duplicated macros
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32630 b3059339-0415-0410-9bf9-f77b7e298cf2
Fix crash on path without directories.
Regression introduced in r32630. Patch by Yuriy Kaminskiy yumkam at mail ru.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32631 b3059339-0415-0410-9bf9-f77b7e298cf2
Handle correctly paths with mixed '/' and '\' in it.
Patch by Yuriy Kaminskiy (yumkam at mail ru)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32632 b3059339-0415-0410-9bf9-f77b7e298cf2
Handle ':' on systems with DOS paths: it allows paths like C:foo.avi.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32642 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmenu')
| -rw-r--r-- | libmenu/menu_pt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmenu/menu_pt.c b/libmenu/menu_pt.c index 7008db2896..985066ba7c 100644 --- a/libmenu/menu_pt.c +++ b/libmenu/menu_pt.c @@ -23,6 +23,7 @@ #include "config.h" #include "mp_msg.h" +#include "path.h" #include "libmpcodecs/img_format.h" #include "libmpcodecs/mp_image.h" @@ -37,8 +38,6 @@ #include "input/input.h" #include "access_mpcontext.h" -#define mp_basename(s) (strrchr((s),'/')==NULL?(char*)(s):(strrchr((s),'/')+1)) - struct list_entry_s { struct list_entry p; play_tree_t* pt; @@ -155,7 +154,7 @@ static int op(menu_t* menu, char* args) { for( ; i != NULL ; i = i->next ) { e = calloc(1,sizeof(list_entry_t)); if(i->files) - e->p.txt = mp_basename(i->files[0]); + e->p.txt = (char *)mp_basename(i->files[0]); else e->p.txt = "Group ..."; e->pt = i; |