summaryrefslogtreecommitdiffstats
path: root/osdep/glob.h
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossymiles@gmail.com>2014-02-13 18:18:58 +1100
committerwm4 <wm4@nowhere>2014-04-21 02:57:16 +0200
commit0cef033d4897a0b5878c4213556ba0937bd1ff91 (patch)
tree67a2edd039775840d60cd143efe48d8328d702e4 /osdep/glob.h
parentff9ac834191aca42ac16007ac136ab0495e02a18 (diff)
downloadmpv-0cef033d4897a0b5878c4213556ba0937bd1ff91.tar.bz2
mpv-0cef033d4897a0b5878c4213556ba0937bd1ff91.tar.xz
glob-win: support Unicode
glob-win.c wasn't big, so it was easier to rewrite it. The new version supports Unicode, handles directories properly, sorts the output and puts all its allocations in the same talloc context to simplify the implementation of globfree. Notably, the old glob had error checking code, but didn't do anything with the errors since the error reporting code was commented out. The new glob doesn't copy this behaviour. It just treats errors as if there were no more matching files, which shouldn't matter for mpv, since it ignores glob errors too. To match the other Windows I/O helper functions, the definition is moved to osdep/io.h.
Diffstat (limited to 'osdep/glob.h')
-rw-r--r--osdep/glob.h34
1 files changed, 0 insertions, 34 deletions
diff --git a/osdep/glob.h b/osdep/glob.h
deleted file mode 100644
index f117725d63..0000000000
--- a/osdep/glob.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer 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
- * (at your option) any later version.
- *
- * MPlayer 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.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_GLOB_H
-#define MPLAYER_GLOB_H
-
-#include <sys/types.h>
-
-typedef struct {
- size_t gl_pathc;
- char **gl_pathv;
- size_t gl_offs;
-} glob_t;
-
-void globfree(glob_t *pglob);
-
-int glob(const char *pattern, int flags, int (*errfunc)(const char *epath, int eerrno), glob_t *pglob);
-
-#endif /* MPLAYER_GLOB_H */