Mercurial > mplayer.hg

diff command.c @ 32588:aa82dfc7bd49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make use of mp_basename in a few places.
author cboesch
date Sat, 04 Dec 2010 10:24:42 +0000
parents 17bb5a38ae2e
children 0c5bb45690ea
line wrap: on
line diff
--- a/command.c	Sat Dec 04 01:55:18 2010 +0000
+++ b/command.c	Sat Dec 04 10:24:42 2010 +0000
@@ -284,9 +284,8 @@
     char *f;
     if (!filename)
         return M_PROPERTY_UNAVAILABLE;
-    if (((f = strrchr(filename, '/')) || (f = strrchr(filename, '\\'))) && f[1])
-        f++;
-    else
+    f = (char *)mp_basename(filename);
+    if (!*f)
         f = filename;
     return m_property_string_ro(prop, action, arg, f);
 }
@@ -1467,10 +1466,7 @@
             sub_name = ass_track->name;
 #endif
         if (sub_name) {
-            char *tmp, *tmp2;
-            tmp = sub_name;
-            if ((tmp2 = strrchr(tmp, '/')))
-                tmp = tmp2 + 1;
+            const char *tmp = mp_basename(sub_name);
 
             snprintf(*(char **) arg, 63, "(%d) %s%s",
                      mpctx->set_of_sub_pos + 1,