summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/Makefile.am13
-rw-r--r--gtk/xdgmime/ChangeLog437
-rw-r--r--gtk/xdgmime/Makefile.am27
-rw-r--r--gtk/xdgmime/test-mime.c142
-rw-r--r--gtk/xdgmime/xdgmime.c855
-rw-r--r--gtk/xdgmime/xdgmime.h118
-rw-r--r--gtk/xdgmime/xdgmimealias.c184
-rw-r--r--gtk/xdgmime/xdgmimealias.h51
-rw-r--r--gtk/xdgmime/xdgmimecache.c920
-rw-r--r--gtk/xdgmime/xdgmimecache.h76
-rw-r--r--gtk/xdgmime/xdgmimeglob.c547
-rw-r--r--gtk/xdgmime/xdgmimeglob.h67
-rw-r--r--gtk/xdgmime/xdgmimeint.c154
-rw-r--r--gtk/xdgmime/xdgmimeint.h73
-rw-r--r--gtk/xdgmime/xdgmimemagic.c813
-rw-r--r--gtk/xdgmime/xdgmimemagic.h57
-rw-r--r--gtk/xdgmime/xdgmimeparent.c219
-rw-r--r--gtk/xdgmime/xdgmimeparent.h51
18 files changed, 2 insertions, 4802 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 9af44121c..714badfed 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,19 +1,14 @@
# Makefile.am for gtk+/gtk
include $(top_srcdir)/Makefile.decl
-xdgmimedir =
-
-if OS_UNIX
-xdgmimedir += xdgmime
if USE_QUARTZ
GTK_PRINT_PREVIEW_COMMAND="open -a /Applications/Preview.app %f"
else
GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
endif
-endif
-SUBDIRS = theme-bits $(xdgmimedir) . tests
-DIST_SUBDIRS=theme-bits xdgmime tests
+SUBDIRS = theme-bits . tests
+DIST_SUBDIRS=theme-bits tests
if HAVE_CUPS
GTK_PRINT_BACKENDS=file,cups
@@ -116,10 +111,6 @@ libadd = \
$(GTK_DEP_LIBS)
deps =
-if OS_UNIX
-libadd += xdgmime/libxdgmime.la
-endif
-
# libtool stuff: set version and export symbols for resolving
# since automake doesn't support conditionalized libsomething_la_LDFLAGS
# we use the general approach here
diff --git a/gtk/xdgmime/ChangeLog b/gtk/xdgmime/ChangeLog
deleted file mode 100644
index f3c32fcd3..000000000
--- a/gtk/xdgmime/ChangeLog
+++ /dev/null
@@ -1,437 +0,0 @@
-2008-06-03 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.13.2 ===
-
-2008-05-29 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.13.1 ===
-
-2008-04-16 Matthias Clasen <mclasen@redhat.com>
-
- * Sync xdgmime to the copy in gio.
-
-2008-04-16 Matthias Clasen <mclasen@redhat.com>
-
- Partically revert the last commit after realizing that
- xdg_mime_media_type_equal doesn't have to init at all.
-
- * xdgmime.h:
- * xdgmime.c: Get rid of _xdg_mime_media_type_equal
-
- * xdgmimecache.c: Use xdg_mime_media_type_equal
-
-2008-04-16 Matthias Clasen <mclasen@redhat.com>
-
- Avoid possible memory corruption in xdgmime, fd.o bug 12512,
- reported by Joe Shaw and Federico Mena Quintero.
-
- * xdgmime.c(_xdg_mime_media_type_equal): Implement.
- (xdg_mime_media_type_equal): Turn into a wrapper around the
- _-prefixed version.
-
- * xdgmimecache.c: Use the _-prefixed versions of
- comparison functions throughout.
-
-2008-02-16 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.13.0 ===
-
-2007-10-16 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.12.1 ===
-
-2007-09-13 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.12.0 ===
-
-2007-07-25 Alexander Larsson <alexl@redhat.com>
-
- * xdgmimealias.h:
- * xdgmimecache.h:
- * xdgmimeparent.h:
- Mark more internal symbols for prefixing
-
-2007-07-21 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.11.6 ===
-
-2007-07-02 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.11.5 ===
-
-2007-06-19 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.11.4 ===
-
-2007-06-15 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.11.3 ===
-
-2007-06-06 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.11.2 ===
-
-2007-06-04 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.11.1 ===
-
-2007-05-24 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.11.0 ===
-
-2007-04-09 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimeglob.c (_xdg_glob_hash_insert_text): Duplicate the
- mime_type when storing it in a hash node, to avoid leaks.
- Update all callers.
-
-2007-01-07 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimecache.c (cache_glob_node_lookup_suffix): Don't return ""
- as match. (fd.o #9544, Yevgen Muntyan)
-
-2007-01-07 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimecache.c (_xdg_mime_cache_list_mime_parents): Fix
- several problems with this function. (fd.o #9560, Yevgen Muntyan)
-
-2006-08-17 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.10.2 ===
-
-2006-07-23 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.10.1 ===
-
-2006-07-20 Matthias Clasen <mclasen@redhat.com>
-
- Fix a thinko that leads to constantly reloading
- the mime data if a mime.cache is present. Patch
- by Yevgen Muntyan, bugs.freedesktop.org #7495
-
- * xdgmime.c (xdg_check_dir): Look for mime.cache first.
- (xdg_check_file): Report existance of the file separately.
-
-2006-07-20 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmime.c (xdg_mime_shutdown): Unref the caches.
- Patch by Yevgen Muntyan, bugs.freedesktop.org #7496
-
- * xdgmimemagic.c:
- * xdgmime.c:
- * xdgmime.h: Add xdg_init-free versions of some
- functions and use them internally, so that we don't
- reload caches and clobber data structures in the
- middle of an operation. Patch by Joe Shaw,
- bugs.freedesktop.org #6824
-
-2006-07-19 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimeglob.c (_xdg_glob_hash_node_lookup_file_name):
- Don't return NULL as a mimetype, ever, patch
- by Yevgen Muntyan, bugs.freedesktop.org #5241
-
-2006-07-02 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.10.0 ===
-
-2006-06-21 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.9.4 ===
-
-2006-06-12 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.9.3 ===
-
-2006-06-05 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.9.2 ===
-
-2006-05-16 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.9.1 ====
-
-2006-05-04 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.9.0 ===
-
-2006-04-03 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmime.[hc]: Move xdg_mime_type_unknown to .rodata.
-
-2006-03-06 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimemagic.c: Remove superfluous extern errno
- declaration. (#333605, Tommi Komulainen)
-
-2006-02-27 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmime.h (xdg_mime_dump): Don't export xdg_mime_dump.
-
-2005-12-01 Matthias Clasen <mclasen@redhat.com>
-
- * Merge upstream changes to handle duplicate glob
- patterns.
-
-2005-11-04 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmime.c (xdg_mime_list_mime_parents): Prevent
- a segfault.
-
-2005-10-18 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimecache.c: Make magic comparisons work correctly
- in the cache.
-
-2005-10-17 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmime.c (xdg_mime_get_mime_type_for_file): Remove
- a debugging printf.
-
-2005-09-01 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmime.h:
- * xdgmime.c (xdg_mime_get_mime_type_for_file): Take
- a struct statbuf * as argument.
-
- * test-mime.c (main): Adjust.
-
-2005-08-24 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.8.2 ===
-
- * === Released 2.8.1 ===
-
-2005-08-13 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.8.0 ===
-
-2005-08-07 Matthias Clasen <mclasen@redhat.com>
-
- * Rename caches to _caches, so it doesn't
- get exported. Also don't export n_caches.
-
-2005-08-02 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.7.5 ===
-
-2005-07-22 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.7.4 ===
-
-2005-07-15 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.7.3 ===
-
-2005-07-08 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.7.2 ===
-
-2005-07-01 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.7.1 ===
-
-2005-06-20 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimecache.c: Handle missing MAP_FAILED. (#308449, Georg
- Schwarz)
-
-2005-06-20 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.7.0 ===
-
-2005-06-10 Federico Mena Quintero <federico@ximian.com>
-
- * xdgmime.c (xdg_mime_init_from_directory): Pass the correct size
- to realloc(). Fixes https://bugs.freedesktop.org/show_bug.cgi?id=3506.
-
-2005-06-09 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimemagic.c: Don't declare errno, including errno.h
- is enough. (#304164, Joerg Sonnenberger)
-
-2005-05-20 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimecache.c (GET_UINT32): Don't rely on C99
- types. (#304924, John Ehresman)
-
-2005-04-29 Matthias Clasen <mclasen@redhat.com>
-
- * Sync to upstream.
-
-2005-04-08 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimecache.c (cache_magic_matchlet_compare_to_data)
- (cache_magic_matchlet_compare): Use cache->buffer, not
- cache.
-
-Tue Apr 5 16:00:04 2005 Manish Singh <yosh@gimp.org>
-
- * Makefile.am: add xdgmimecache.[ch].
-
-2005-03-28 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimeglob.c: Sync to latest upstream,
- including fixes for matching against multiple
- extensions (eg .tar.gz) and for suffix
- patterns which don't start with a dot.
-
-Sat Mar 19 23:52:33 2005 Manish Singh <yosh@gimp.org>
-
- * xdgmimeglob.c (_xdg_glob_hash_insert_text): cast away the constness
- in the call to free().
-
-2005-03-20 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimeglob.c (_xdg_glob_hash_insert_text): Don't
- leak node->mime_type if we are reusing an existing
- node. (#170774, Kjartan Maraas)
-
-2005-01-08 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.6.1 ===
-
-2004-12-16 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.6.0 ===
-
-2004-12-13 Marco Pesenti Gritti <marco@gnome.org>
-
- * xdgmimeglob.c: (_xdg_glob_hash_lookup_file_name):
-
- Resync with upstream again
-
-Fri Dec 10 13:58:38 2004 Manish Singh <yosh@gimp.org>
-
- * xdgmime.h: wrap new API in XDG_ENTRY().
-
-2004-12-09 Marco Pesenti Gritti <marco@gnome.org>
-
- * xdgmime.c: (xdg_mime_unalias_mime_type),
- (xdg_mime_mime_type_equal), (xdg_mime_mime_type_subclass),
- (xdg_mime_get_mime_parents):
- * xdgmime.h:
- * xdgmimealias.c: (_xdg_mime_alias_list_lookup):
- * xdgmimeglob.c: (_xdg_glob_hash_node_lookup_file_name):
- * xdgmimeint.c: (_xdg_ucs4_to_lower):
- * xdgmimeint.h:
- * xdgmimemagic.c: (_xdg_mime_magic_read_from_file):
- * xdgmimeparent.c: (_xdg_mime_parent_list_lookup):
-
- Resync with upstream
-
-2004-12-09 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimealias.c (_xdg_mime_alias_read_from_file):
- * xdgmimeparent.c (_xdg_mime_parent_read_from_file): Make
- repeated calls accumulate the results, don't call qsort()
- on empty arrays. (#160838, Mariano Suárez-Alvarez)
-
-2004-12-02 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.5.6 ===
-
-2004-11-29 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimeparent.c (_xdg_mime_parent_list_lookup):
- * xdgmimealias.c (_xdg_mime_alias_list_lookup): Protect
- against stupid bsearch() implementations. (#159737,
- Morten Welinder)
-
-2004-11-24 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmimeparent.c (_xdg_mime_parent_read_from_file):
- Initialize the parent field of the newly allocate list
- entry. (#159330, Alex Larsson)
-
-Fri Nov 19 15:10:32 2004 Manish Singh <yosh@gimp.org>
-
- * xdgmime.c: Don't put /* within a comment.
-
-2004-11-09 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmime.h: Prefix all symbols.
-
-2004-11-08 Matthias Clasen <mclasen@redhat.com>
-
- * xdgmime.c (xdg_mime_mime_type_subclass): Enable matching
- of supertypes as text/*.
-
- * Sync from upstream
-
-2004-10-27 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.5.4 ===
-
-2004-09-19 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.5.3 ===
-
-2004-08-25 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.5.2 ===
-
-Wed Aug 11 20:44:35 2004 Matthias Clasen <maclas@gmx.de>
-
- * xdgmime.h (xdg_mime_shutdown): Add the XDG_PREFIX to
- this function as well.
-
-2004-08-01 Matthias Clasen <mclasen@redhat.com>
-
- * === Released 2.5.1 ===
-
-Tue Jul 20 22:24:35 2004 Matthias Clasen <maclas@gmx.de>
-
- * xdgmimeglob.h: Remove trailing commas from
- enumerations. (#148035)
-
-Sun Jul 18 20:17:41 2004 Soeren Sandmann <sandmann@daimi.au.dk>
-
- * === Released 2.5.0 ==
-
-Thu May 27 15:23:17 2004 Jonathan Blandford <jrb@gnome.org>
-
- * Sync from upstream
-
-Fri Apr 30 00:19:11 2004 Matthias Clasen <maclas@gmx.de>
-
- * xdgmimemagic.c (_xdg_mime_magic_read_a_number): Make sure
- the static string is long enough. (#136323, Morten Welinder)
-
-2004-03-12 Morten Welinder <terra@gnome.org>
-
- * *.c: Make sure to include <config.h> (#137001)
-
-Wed Mar 10 22:48:15 2004 Jonathan Blandford <jrb@gnome.org>
-
- * Sync from upstream
-
-Sun Feb 8 19:05:16 2004 Manish Singh <yosh@gimp.org>
-
- * xdgmimeint.h: declare _xdg_utf8_skip as extern to prevent multiple
- definitions.
-
-Wed Jan 21 09:33:13 2004 Jonathan Blandford <jrb@gnome.org>
-
- * libgnomevfs/xdgmimeglob.c:
- * libgnomevfs/xdgmimemagic.c: Sync from upstream
-
-Tue Jan 20 13:07:04 2004 Jonathan Blandford <jrb@gnome.org>
-
- * xdgmime.c: resync with upstream sources.
-
-Fri Oct 24 16:54:57 2003 Owen Taylor <otaylor@redhat.com>
-
- * Makefile.am (libxdgmime_la_SOURCES): Add .h files to
- SOURCES.
-
-Fri Oct 24 16:02:32 2003 Owen Taylor <otaylor@redhat.com>
-
- * *.[ch]: Relicense to be dual AFL/LGPL (and thus also
- GPL) rather than AFL/GPL. Also update AFL version to 1.2.
-
-Tue Jul 22 15:37:45 2003 Jonathan Blandford <jrb@gnome.org>
-
- * xdgmime/xdgmime.c (xdg_mime_init): use XDG_DATA_HOME instead of
- XDG_CONFIG_HOME.
-
diff --git a/gtk/xdgmime/Makefile.am b/gtk/xdgmime/Makefile.am
deleted file mode 100644
index c153a12d3..000000000
--- a/gtk/xdgmime/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-INCLUDES = -DXDG_PREFIX=_gtk_xdg
-
-noinst_LTLIBRARIES = libxdgmime.la
-
-libxdgmime_la_SOURCES = \
- xdgmime.c \
- xdgmime.h \
- xdgmimealias.c \
- xdgmimealias.h \
- xdgmimecache.c \
- xdgmimecache.h \
- xdgmimeglob.c \
- xdgmimeglob.h \
- xdgmimeint.c \
- xdgmimeint.h \
- xdgmimemagic.c \
- xdgmimemagic.h \
- xdgmimeparent.c \
- xdgmimeparent.h
-
-noinst_PROGRAMS = test-mime
-
-test_mime_LDADD = libxdgmime.la
-test_mime_SOURCES = test-mime.c
-
diff --git a/gtk/xdgmime/test-mime.c b/gtk/xdgmime/test-mime.c
deleted file mode 100644
index 7cff59b49..000000000
--- a/gtk/xdgmime/test-mime.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2003,2004 Red Hat, Inc.
- * Copyright (C) 2003,2004 Jonathan Blandford <jrb@alum.mit.edu>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#include "xdgmime.h"
-#include "xdgmimeglob.h"
-#include <string.h>
-#include <stdio.h>
-
-
-static void
-test_individual_glob (const char *glob,
- XdgGlobType expected_type)
-{
- XdgGlobType test_type;
-
- test_type = _xdg_glob_determine_type (glob);
- if (test_type != expected_type)
- {
- printf ("Test Failed: %s is of type %s, but %s is expected\n",
- glob,
- ((test_type == XDG_GLOB_LITERAL)?"XDG_GLOB_LITERAL":
- ((test_type == XDG_GLOB_SIMPLE)?"XDG_GLOB_SIMPLE":"XDG_GLOB_FULL")),
- ((expected_type == XDG_GLOB_LITERAL)?"XDG_GLOB_LITERAL":
- ((expected_type == XDG_GLOB_SIMPLE)?"XDG_GLOB_SIMPLE":"XDG_GLOB_COMPLEX")));
- }
-}
-
-static void
-test_glob_type (void)
-{
- test_individual_glob ("*.gif", XDG_GLOB_SIMPLE);
- test_individual_glob ("Foo*.gif", XDG_GLOB_FULL);
- test_individual_glob ("*[4].gif", XDG_GLOB_FULL);
- test_individual_glob ("Makefile", XDG_GLOB_LITERAL);
- test_individual_glob ("sldkfjvlsdf\\\\slkdjf", XDG_GLOB_FULL);
- test_individual_glob ("tree.[ch]", XDG_GLOB_FULL);
-}
-
-static void
-test_alias (const char *mime_a,
- const char *mime_b,
- int expected)
-{
- int actual;
-
- actual = xdg_mime_mime_type_equal (mime_a, mime_b);
-
- if (actual != expected)
- {
- printf ("Test Failed: %s is %s to %s\n",
- mime_a, actual ? "equal" : "not equal", mime_b);
- }
-}
-
-static void
-test_aliasing (void)
-{
- test_alias ("application/wordperfect", "application/vnd.wordperfect", 1);
- test_alias ("application/x-gnome-app-info", "application/x-desktop", 1);
- test_alias ("application/x-wordperfect", "application/vnd.wordperfect", 1);
- test_alias ("application/x-wordperfect", "audio/x-midi", 0);
- test_alias ("/", "vnd/vnd", 0);
- test_alias ("application/octet-stream", "text/plain", 0);
- test_alias ("text/plain", "text/*", 0);
-}
-
-static void
-test_subclass (const char *mime_a,
- const char *mime_b,
- int expected)
-{
- int actual;
-
- actual = xdg_mime_mime_type_subclass (mime_a, mime_b);
-
- if (actual != expected)
- {
- printf ("Test Failed: %s is %s of %s\n",
- mime_a, actual ? "subclass" : "not subclass", mime_b);
- }
-}
-
-static void
-test_subclassing (void)
-{
- test_subclass ("application/rtf", "text/plain", 1);
- test_subclass ("message/news", "text/plain", 1);
- test_subclass ("message/news", "message/*", 1);
- test_subclass ("message/news", "text/*", 1);
- test_subclass ("message/news", "application/octet-stream", 1);
- test_subclass ("application/rtf", "application/octet-stream", 1);
- test_subclass ("application/x-gnome-app-info", "text/plain", 1);
- test_subclass ("image/x-djvu", "image/vnd.djvu", 1);
- test_subclass ("image/vnd.djvu", "image/x-djvu", 1);
- test_subclass ("image/vnd.djvu", "text/plain", 0);
- test_subclass ("image/vnd.djvu", "text/*", 0);
- test_subclass ("text/*", "text/plain", 0);
-}
-
-int
-main (int argc, char *argv[])
-{
- const char *result;
- const char *file_name;
- int i;
-
- test_glob_type ();
- test_aliasing ();
- test_subclassing ();
-
- for (i = 1; i < argc; i++)
- {
- file_name = argv[i];
- result = xdg_mime_get_mime_type_for_file (file_name, NULL);
- printf ("File \"%s\" has a mime-type of %s\n", file_name, result);
- }
-
-#if 0
- xdg_mime_dump ();
-#endif
- return 0;
-}
-
diff --git a/gtk/xdgmime/xdgmime.c b/gtk/xdgmime/xdgmime.c
deleted file mode 100644
index 332c16537..000000000
--- a/gtk/xdgmime/xdgmime.c
+++ /dev/null
@@ -1,855 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmime.c: XDG Mime Spec mime resolver. Based on version 0.11 of the spec.
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2003,2004 Red Hat, Inc.
- * Copyright (C) 2003,2004 Jonathan Blandford <jrb@alum.mit.edu>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "xdgmime.h"
-#include "xdgmimeint.h"
-#include "xdgmimeglob.h"
-#include "xdgmimemagic.h"
-#include "xdgmimealias.h"
-#include "xdgmimeparent.h"
-#include "xdgmimecache.h"
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <assert.h>
-
-typedef struct XdgDirTimeList XdgDirTimeList;
-typedef struct XdgCallbackList XdgCallbackList;
-
-static int need_reread = TRUE;
-static time_t last_stat_time = 0;
-
-static XdgGlobHash *global_hash = NULL;
-static XdgMimeMagic *global_magic = NULL;
-static XdgAliasList *alias_list = NULL;
-static XdgParentList *parent_list = NULL;
-static XdgDirTimeList *dir_time_list = NULL;
-static XdgCallbackList *callback_list = NULL;
-
-XdgMimeCache **_caches = NULL;
-static int n_caches = 0;
-
-const char xdg_mime_type_unknown[] = "application/octet-stream";
-
-
-enum
-{
- XDG_CHECKED_UNCHECKED,
- XDG_CHECKED_VALID,
- XDG_CHECKED_INVALID
-};
-
-struct XdgDirTimeList
-{
- time_t mtime;
- char *directory_name;
- int checked;
- XdgDirTimeList *next;
-};
-
-struct XdgCallbackList
-{
- XdgCallbackList *next;
- XdgCallbackList *prev;
- int callback_id;
- XdgMimeCallback callback;
- void *data;
- XdgMimeDestroy destroy;
-};
-
-/* Function called by xdg_run_command_on_dirs. If it returns TRUE, further
- * directories aren't looked at */
-typedef int (*XdgDirectoryFunc) (const char *directory,
- void *user_data);
-
-static void
-xdg_dir_time_list_add (char *file_name,
- time_t mtime)
-{
- XdgDirTimeList *list;
-
- for (list = dir_time_list; list; list = list->next)
- {
- if (strcmp (list->directory_name, file_name) == 0)
- return;
- }
-
- list = calloc (1, sizeof (XdgDirTimeList));
- list->checked = XDG_CHECKED_UNCHECKED;
- list->directory_name = file_name;
- list->mtime = mtime;
- list->next = dir_time_list;
- dir_time_list = list;
-}
-
-static void
-xdg_dir_time_list_free (XdgDirTimeList *list)
-{
- XdgDirTimeList *next;
-
- while (list)
- {
- next = list->next;
- free (list->directory_name);
- free (list);
- list = next;
- }
-}
-
-static int
-xdg_mime_init_from_directory (const char *directory)
-{
- char *file_name;
- struct stat st;
-
- assert (directory != NULL);
-
- file_name = malloc (strlen (directory) + strlen ("/mime/mime.cache") + 1);
- strcpy (file_name, directory); strcat (file_name, "/mime/mime.cache");
- if (stat (file_name, &st) == 0)
- {
- XdgMimeCache *cache = _xdg_mime_cache_new_from_file (file_name);
-
- if (cache != NULL)
- {
- xdg_dir_time_list_add (file_name, st.st_mtime);
-
- _caches = realloc (_caches, sizeof (XdgMimeCache *) * (n_caches + 2));
- _caches[n_caches] = cache;
- _caches[n_caches + 1] = NULL;
- n_caches++;
-
- return FALSE;
- }
- }
- free (file_name);
-
- file_name = malloc (strlen (directory) + strlen ("/mime/globs") + 1);
- strcpy (file_name, directory); strcat (file_name, "/mime/globs");
- if (stat (file_name, &st) == 0)
- {
- _xdg_mime_glob_read_from_file (global_hash, file_name);
- xdg_dir_time_list_add (file_name, st.st_mtime);
- }
- else
- {
- free (file_name);
- }
-
- file_name = malloc (strlen (directory) + strlen ("/mime/magic") + 1);
- strcpy (file_name, directory); strcat (file_name, "/mime/magic");
- if (stat (file_name, &st) == 0)
- {
- _xdg_mime_magic_read_from_file (global_magic, file_name);
- xdg_dir_time_list_add (file_name, st.st_mtime);
- }
- else
- {
- free (file_name);
- }
-
- file_name = malloc (strlen (directory) + strlen ("/mime/aliases") + 1);
- strcpy (file_name, directory); strcat (file_name, "/mime/aliases");
- _xdg_mime_alias_read_from_file (alias_list, file_name);
- free (file_name);
-
- file_name = malloc (strlen (directory) + strlen ("/mime/subclasses") + 1);
- strcpy (file_name, directory); strcat (file_name, "/mime/subclasses");
- _xdg_mime_parent_read_from_file (parent_list, file_name);
- free (file_name);
-
- return FALSE; /* Keep processing */
-}
-
-/* Runs a command on all the directories in the search path */
-static void
-xdg_run_command_on_dirs (XdgDirectoryFunc func,
- void *user_data)
-{
- const char *xdg_data_home;
- const char *xdg_data_dirs;
- const char *ptr;
-
- xdg_data_home = getenv ("XDG_DATA_HOME");
- if (xdg_data_home)
- {
- if ((func) (xdg_data_home, user_data))
- return;
- }
- else
- {
- const char *home;
-
- home = getenv ("HOME");
- if (home != NULL)
- {
- char *guessed_xdg_home;
- int stop_processing;
-
- guessed_xdg_home = malloc (strlen (home) + strlen ("/.local/share/") + 1);
- strcpy (guessed_xdg_home, home);
- strcat (guessed_xdg_home, "/.local/share/");
- stop_processing = (func) (guessed_xdg_home, user_data);
- free (guessed_xdg_home);
-
- if (stop_processing)
- return;
- }
- }
-
- xdg_data_dirs = getenv ("XDG_DATA_DIRS");
- if (xdg_data_dirs == NULL)
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
-
- ptr = xdg_data_dirs;
-
- while (*ptr != '\000')
- {
- const char *end_ptr;
- char *dir;
- int len;
- int stop_processing;
-
- end_ptr = ptr;
- while (*end_ptr != ':' && *end_ptr != '\000')
- end_ptr ++;
-
- if (end_ptr == ptr)
- {
- ptr++;
- continue;
- }
-
- if (*end_ptr == ':')
- len = end_ptr - ptr;
- else
- len = end_ptr - ptr + 1;
- dir = malloc (len + 1);
- strncpy (dir, ptr, len);
- dir[len] = '\0';
- stop_processing = (func) (dir, user_data);
- free (dir);
-
- if (stop_processing)
- return;
-
- ptr = end_ptr;
- }
-}
-
-/* Checks file_path to make sure it has the same mtime as last time it was
- * checked. If it has a different mtime, or if the file doesn't exist, it
- * returns FALSE.
- *
- * FIXME: This doesn't protect against permission changes.
- */
-static int
-xdg_check_file (const char *file_path,
- int *exists)
-{
- struct stat st;
-
- /* If the file exists */
- if (stat (file_path, &st) == 0)
- {
- XdgDirTimeList *list;
-
- if (exists)
- *exists = TRUE;
-
- for (list = dir_time_list; list; list = list->next)
- {
- if (! strcmp (list->directory_name, file_path))
- {
- if (st.st_mtime == list->mtime)
- list->checked = XDG_CHECKED_VALID;
- else
- list->checked = XDG_CHECKED_INVALID;
-
- return (list->checked != XDG_CHECKED_VALID);
- }
- }
- return TRUE;
- }
-
- if (exists)
- *exists = FALSE;
-
- return FALSE;
-}
-
-static int
-xdg_check_dir (const char *directory,
- int *invalid_dir_list)
-{
- int invalid, exists;
- char *file_name;
-
- assert (directory != NULL);
-
- /* Check the mime.cache file */
- file_name = malloc (strlen (directory) + strlen ("/mime/mime.cache") + 1);
- strcpy (file_name, directory); strcat (file_name, "/mime/mime.cache");
- invalid = xdg_check_file (file_name, &exists);
- free (file_name);
- if (invalid)
- {
- *invalid_dir_list = TRUE;
- return TRUE;
- }
- else if (exists)
- {
- return FALSE;
- }
-
- /* Check the globs file */
- file_name = malloc (strlen (directory) + strlen ("/mime/globs") + 1);
- strcpy (file_name, directory); strcat (file_name, "/mime/globs");
- invalid = xdg_check_file (file_name, NULL);
- free (file_name);
- if (invalid)
- {
- *invalid_dir_list = TRUE;
- return TRUE;
- }
-
- /* Check the magic file */
- file_name = malloc (strlen (directory) + strlen ("/mime/magic") + 1);
- strcpy (file_name, directory); strcat (file_name, "/mime/magic");
- invalid = xdg_check_file (file_name, NULL);
- free (file_name);
- if (invalid)
- {
- *invalid_dir_list = TRUE;
- return TRUE;
- }
-
- return FALSE; /* Keep processing */
-}
-
-/* Walks through all the mime files stat()ing them to see if they've changed.
- * Returns TRUE if they have. */
-static int
-xdg_check_dirs (void)
-{
- XdgDirTimeList *list;
- int invalid_dir_list = FALSE;
-
- for (list = dir_time_list; list; list = list->next)
- list->checked = XDG_CHECKED_UNCHECKED;
-
- xdg_run_command_on_dirs ((XdgDirectoryFunc) xdg_check_dir,
- &invalid_dir_list);
-
- if (invalid_dir_list)
- return TRUE;
-
- for (list = dir_time_list; list; list = list->next)
- {
- if (list->checked != XDG_CHECKED_VALID)
- return TRUE;
- }
-
- return FALSE;
-}
-
-/* We want to avoid stat()ing on every single mime call, so we only look for
- * newer files every 5 seconds. This will return TRUE if we need to reread the
- * mime data from disk.
- */
-static int
-xdg_check_time_and_dirs (void)
-{
- struct timeval tv;
- time_t current_time;
- int retval = FALSE;
-
- gettimeofday (&tv, NULL);
- current_time = tv.tv_sec;
-
- if (current_time >= last_stat_time + 5)
- {
- retval = xdg_check_dirs ();
- last_stat_time = current_time;
- }
-
- return retval;
-}
-
-/* Called in every public function. It reloads the hash function if need be.
- */
-static void
-xdg_mime_init (void)
-{
- if (xdg_check_time_and_dirs ())
- {
- xdg_mime_shutdown ();
- }
-
- if (need_reread)
- {
- global_hash = _xdg_glob_hash_new ();
- global_magic = _xdg_mime_magic_new ();
- alias_list = _xdg_mime_alias_list_new ();
- parent_list = _xdg_mime_parent_list_new ();
-
- xdg_run_command_on_dirs ((XdgDirectoryFunc) xdg_mime_init_from_directory,
- NULL);
-
- need_reread = FALSE;
- }
-}
-
-const char *
-xdg_mime_get_mime_type_for_data (const void *data,
- size_t len,
- int *result_prio)
-{
- const char *mime_type;
-
- xdg_mime_init ();
-
- if (_caches)
- return _xdg_mime_cache_get_mime_type_for_data (data, len, result_prio);
-
- mime_type = _xdg_mime_magic_lookup_data (global_magic, data, len, result_prio, NULL, 0);
-
- if (mime_type)
- return mime_type;
-
- return XDG_MIME_TYPE_UNKNOWN;
-}
-
-const char *
-xdg_mime_get_mime_type_for_file (const char *file_name,
- struct stat *statbuf)
-{
- const char *mime_type;
- /* currently, only a few globs occur twice, and none
- * more often, so 5 seems plenty.
- */
- const char *mime_types[5];
- FILE *file;
- unsigned char *data;
- int max_extent;
- int bytes_read;
- struct stat buf;
- const char *base_name;
- int n;
-
- if (file_name == NULL)
- return NULL;
- if (! _xdg_utf8_validate (file_name))
- return NULL;
-
- xdg_mime_init ();
-
- if (_caches)
- return _xdg_mime_cache_get_mime_type_for_file (file_name, statbuf);
-
- base_name = _xdg_get_base_name (file_name);
- n = _xdg_glob_hash_lookup_file_name (global_hash, base_name, mime_types, 5);
-
- if (n == 1)
- return mime_types[0];
-
- if (!statbuf)
- {
- if (stat (file_name, &buf) != 0)
- return XDG_MIME_TYPE_UNKNOWN;
-
- statbuf = &buf;
- }
-
- if (!S_ISREG (statbuf->st_mode))
- return XDG_MIME_TYPE_UNKNOWN;
-
- /* FIXME: Need to make sure that max_extent isn't totally broken. This could
- * be large and need getting from a stream instead of just reading it all
- * in. */
- max_extent = _xdg_mime_magic_get_buffer_extents (global_magic);
- data = malloc (max_extent);
- if (data == NULL)
- return XDG_MIME_TYPE_UNKNOWN;
-
- file = fopen (file_name, "r");
- if (file == NULL)
- {
- free (data);
- return XDG_MIME_TYPE_UNKNOWN;
- }
-
- bytes_read = fread (data, 1, max_extent, file);
- if (ferror (file))
- {
- free (data);
- fclose (file);
- return XDG_MIME_TYPE_UNKNOWN;
- }
-
- mime_type = _xdg_mime_magic_lookup_data (global_magic, data, bytes_read, NULL,
- mime_types, n);
-
- free (data);
- fclose (file);
-
- if (mime_type)
- return mime_type;
-
- return XDG_MIME_TYPE_UNKNOWN;
-}
-
-const char *
-xdg_mime_get_mime_type_from_file_name (const char *file_name)
-{
- const char *mime_type;
-
- xdg_mime_init ();
-
- if (_caches)
- return _xdg_mime_cache_get_mime_type_from_file_name (file_name);
-
- if (_xdg_glob_hash_lookup_file_name (global_hash, file_name, &mime_type, 1))
- return mime_type;
- else
- return XDG_MIME_TYPE_UNKNOWN;
-}
-
-int
-xdg_mime_get_mime_types_from_file_name (const char *file_name,
- const char *mime_types[],
- int n_mime_types)
-{
- xdg_mime_init ();
-
- if (_caches)
- return _xdg_mime_cache_get_mime_types_from_file_name (file_name, mime_types, n_mime_types);
-
- return _xdg_glob_hash_lookup_file_name (global_hash, file_name, mime_types, n_mime_types);
-}
-
-int
-xdg_mime_is_valid_mime_type (const char *mime_type)
-{
- /* FIXME: We should make this a better test
- */
- return _xdg_utf8_validate (mime_type);
-}
-
-void
-xdg_mime_shutdown (void)
-{
- XdgCallbackList *list;
-
- /* FIXME: Need to make this (and the whole library) thread safe */
- if (dir_time_list)
- {
- xdg_dir_time_list_free (dir_time_list);
- dir_time_list = NULL;
- }
-
- if (global_hash)
- {
- _xdg_glob_hash_free (global_hash);
- global_hash = NULL;
- }
- if (global_magic)
- {
- _xdg_mime_magic_free (global_magic);
- global_magic = NULL;
- }
-
- if (alias_list)
- {
- _xdg_mime_alias_list_free (alias_list);
- alias_list = NULL;
- }
-
- if (parent_list)
- {
- _xdg_mime_parent_list_free (parent_list);
- parent_list = NULL;
- }
-
- if (_caches)
- {
- int i;
-
- for (i = 0; i < n_caches; i++)
- _xdg_mime_cache_unref (_caches[i]);
- free (_caches);
- _caches = NULL;
- n_caches = 0;
- }
-
- for (list = callback_list; list; list = list->next)
- (list->callback) (list->data);
-
- need_reread = TRUE;
-}
-
-int
-xdg_mime_get_max_buffer_extents (void)
-{
- xdg_mime_init ();
-
- if (_caches)
- return _xdg_mime_cache_get_max_buffer_extents ();
-
- return _xdg_mime_magic_get_buffer_extents (global_magic);
-}
-
-const char *
-_xdg_mime_unalias_mime_type (const char *mime_type)
-{
- const char *lookup;
-
- if (_caches)
- return _xdg_mime_cache_unalias_mime_type (mime_type);
-
- if ((lookup = _xdg_mime_alias_list_lookup (alias_list, mime_type)) != NULL)
- return lookup;
-
- return mime_type;
-}
-
-const char *
-xdg_mime_unalias_mime_type (const char *mime_type)
-{
- xdg_mime_init ();
-
- return _xdg_mime_unalias_mime_type (mime_type);
-}
-
-int
-_xdg_mime_mime_type_equal (const char *mime_a,
- const char *mime_b)
-{
- const char *unalias_a, *unalias_b;
-
- unalias_a = _xdg_mime_unalias_mime_type (mime_a);
- unalias_b = _xdg_mime_unalias_mime_type (mime_b);
-
- if (strcmp (unalias_a, unalias_b) == 0)
- return 1;
-
- return 0;
-}
-
-int
-xdg_mime_mime_type_equal (const char *mime_a,
- const char *mime_b)
-{
- xdg_mime_init ();
-
- return _xdg_mime_mime_type_equal (mime_a, mime_b);
-}
-
-int
-xdg_mime_media_type_equal (const char *mime_a,
- const char *mime_b)
-{
- char *sep;
-
- sep = strchr (mime_a, '/');
-
- if (sep && strncmp (mime_a, mime_b, sep - mime_a + 1) == 0)
- return 1;
-
- return 0;
-}
-
-#if 1
-static int
-xdg_mime_is_super_type (const char *mime)
-{
- int length;
- const char *type;
-
- length = strlen (mime);
- type = &(mime[length - 2]);
-
- if (strcmp (type, "/*") == 0)
- return 1;
-
- return 0;
-}
-#endif
-
-int
-_xdg_mime_mime_type_subclass (const char *mime,
- const char *base)
-{
- const char *umime, *ubase;
- const char **parents;
-
- if (_caches)
- return _xdg_mime_cache_mime_type_subclass (mime, base);
-
- umime = _xdg_mime_unalias_mime_type (mime);
- ubase = _xdg_mime_unalias_mime_type (base);
-
- if (strcmp (umime, ubase) == 0)
- return 1;
-
-#if 1
- /* Handle supertypes */
- if (xdg_mime_is_super_type (ubase) &&
- xdg_mime_media_type_equal (umime, ubase))
- return 1;
-#endif
-
- /* Handle special cases text/plain and application/octet-stream */
- if (strcmp (ubase, "text/plain") == 0 &&
- strncmp (umime, "text/", 5) == 0)
- return 1;
-
- if (strcmp (ubase, "application/octet-stream") == 0)
- return 1;
-
- parents = _xdg_mime_parent_list_lookup (parent_list, umime);
- for (; parents && *parents; parents++)
- {
- if (_xdg_mime_mime_type_subclass (*parents, ubase))
- return 1;
- }
-
- return 0;
-}
-
-int
-xdg_mime_mime_type_subclass (const char *mime,
- const char *base)
-{
- xdg_mime_init ();
-
- return _xdg_mime_mime_type_subclass (mime, base);
-}
-
-char **
-xdg_mime_list_mime_parents (const char *mime)
-{
- const char **parents;
- char **result;
- int i, n;
-
- if (_caches)
- return _xdg_mime_cache_list_mime_parents (mime);
-
- parents = xdg_mime_get_mime_parents (mime);
-
- if (!parents)
- return NULL;
-
- for (i = 0; parents[i]; i++) ;
-
- n = (i + 1) * sizeof (char *);
- result = (char **) malloc (n);
- memcpy (result, parents, n);
-
- return result;
-}
-
-const char **
-xdg_mime_get_mime_parents (const char *mime)
-{
- const char *umime;
-
- xdg_mime_init ();
-
- umime = _xdg_mime_unalias_mime_type (mime);
-
- return _xdg_mime_parent_list_lookup (parent_list, umime);
-}
-
-void
-xdg_mime_dump (void)
-{
- printf ("*** ALIASES ***\n\n");
- _xdg_mime_alias_list_dump (alias_list);
- printf ("\n*** PARENTS ***\n\n");
- _xdg_mime_parent_list_dump (parent_list);
-}
-
-
-/* Registers a function to be called every time the mime database reloads its files
- */
-int
-xdg_mime_register_reload_callback (XdgMimeCallback callback,
- void *data,
- XdgMimeDestroy destroy)
-{
- XdgCallbackList *list_el;
- static int callback_id = 1;
-
- /* Make a new list element */
- list_el = calloc (1, sizeof (XdgCallbackList));
- list_el->callback_id = callback_id;
- list_el->callback = callback;
- list_el->data = data;
- list_el->destroy = destroy;
- list_el->next = callback_list;
- if (list_el->next)
- list_el->next->prev = list_el;
-
- callback_list = list_el;
- callback_id ++;
-
- return callback_id - 1;
-}
-
-void
-xdg_mime_remove_callback (int callback_id)
-{
- XdgCallbackList *list;
-
- for (list = callback_list; list; list = list->next)
- {
- if (list->callback_id == callback_id)
- {
- if (list->next)
- list->next = list->prev;
-
- if (list->prev)
- list->prev->next = list->next;
- else
- callback_list = list->next;
-
- /* invoke the destroy handler */
- (list->destroy) (list->data);
- free (list);
- return;
- }
- }
-}
diff --git a/gtk/xdgmime/xdgmime.h b/gtk/xdgmime/xdgmime.h
deleted file mode 100644
index fde7cfe16..000000000
--- a/gtk/xdgmime/xdgmime.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmime.h: XDG Mime Spec mime resolver. Based on version 0.11 of the spec.
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2003 Red Hat, Inc.
- * Copyright (C) 2003 Jonathan Blandford <jrb@alum.mit.edu>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __XDG_MIME_H__
-#define __XDG_MIME_H__
-
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#ifdef XDG_PREFIX
-#define XDG_ENTRY(func) _XDG_ENTRY2(XDG_PREFIX,func)
-#define _XDG_ENTRY2(prefix,func) _XDG_ENTRY3(prefix,func)
-#define _XDG_ENTRY3(prefix,func) prefix##_##func
-#endif
-
-typedef void (*XdgMimeCallback) (void *user_data);
-typedef void (*XdgMimeDestroy) (void *user_data);
-
-
-#ifdef XDG_PREFIX
-#define xdg_mime_get_mime_type_for_data XDG_ENTRY(get_mime_type_for_data)
-#define xdg_mime_get_mime_type_for_file XDG_ENTRY(get_mime_type_for_file)
-#define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name)
-#define xdg_mime_get_mime_types_from_file_name XDG_ENTRY(get_mime_types_from_file_name)
-#define xdg_mime_is_valid_mime_type XDG_ENTRY(is_valid_mime_type)
-#define xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal)
-#define _xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal_p)
-#define xdg_mime_media_type_equal XDG_ENTRY(media_type_equal)
-#define xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass)
-#define _xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass_p)
-#define xdg_mime_get_mime_parents XDG_ENTRY(get_mime_parents)
-#define xdg_mime_list_mime_parents XDG_ENTRY(list_mime_parents)
-#define xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type)
-#define _xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type_p)
-#define xdg_mime_get_max_buffer_extents XDG_ENTRY(get_max_buffer_extents)
-#define xdg_mime_shutdown XDG_ENTRY(shutdown)
-#define xdg_mime_dump XDG_ENTRY(dump)
-#define xdg_mime_register_reload_callback XDG_ENTRY(register_reload_callback)
-#define xdg_mime_remove_callback XDG_ENTRY(remove_callback)
-#define xdg_mime_type_unknown XDG_ENTRY(type_unknown)
-#endif
-
-extern const char xdg_mime_type_unknown[];
-#define XDG_MIME_TYPE_UNKNOWN xdg_mime_type_unknown
-
-const char *xdg_mime_get_mime_type_for_data (const void *data,
- size_t len,
- int *result_prio);
-const char *xdg_mime_get_mime_type_for_file (const char *file_name,
- struct stat *statbuf);
-const char *xdg_mime_get_mime_type_from_file_name (const char *file_name);
-int xdg_mime_get_mime_types_from_file_name(const char *file_name,
- const char *mime_types[],
- int n_mime_types);
-int xdg_mime_is_valid_mime_type (const char *mime_type);
-int xdg_mime_mime_type_equal (const char *mime_a,
- const char *mime_b);
-int xdg_mime_media_type_equal (const char *mime_a,
- const char *mime_b);
-int xdg_mime_mime_type_subclass (const char *mime_a,
- const char *mime_b);
- /* xdg_mime_get_mime_parents() is deprecated since it does
- * not work correctly with caches. Use xdg_mime_list_parents()
- * instead, but notice that that function expects you to free
- * the array it returns.
- */
-const char **xdg_mime_get_mime_parents (const char *mime);
-char ** xdg_mime_list_mime_parents (const char *mime);
-const char *xdg_mime_unalias_mime_type (const char *mime);
-int xdg_mime_get_max_buffer_extents (void);
-void xdg_mime_shutdown (void);
-void xdg_mime_dump (void);
-int xdg_mime_register_reload_callback (XdgMimeCallback callback,
- void *data,
- XdgMimeDestroy destroy);
-void xdg_mime_remove_callback (int callback_id);
-
- /* Private versions of functions that don't call xdg_mime_init () */
-int _xdg_mime_mime_type_equal (const char *mime_a,
- const char *mime_b);
-int _xdg_mime_mime_type_subclass (const char *mime,
- const char *base);
-const char *_xdg_mime_unalias_mime_type (const char *mime);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __XDG_MIME_H__ */
diff --git a/gtk/xdgmime/xdgmimealias.c b/gtk/xdgmime/xdgmimealias.c
deleted file mode 100644
index 07d89eb32..000000000
--- a/gtk/xdgmime/xdgmimealias.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmimealias.c: Private file. Datastructure for storing the aliases.
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2004 Red Hat, Inc.
- * Copyright (C) 2004 Matthias Clasen <mclasen@redhat.com>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "xdgmimealias.h"
-#include "xdgmimeint.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include <fnmatch.h>
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#ifndef TRUE
-#define TRUE (!FALSE)
-#endif
-
-typedef struct XdgAlias XdgAlias;
-
-struct XdgAlias
-{
- char *alias;
- char *mime_type;
-};
-
-struct XdgAliasList
-{
- struct XdgAlias *aliases;
- int n_aliases;
-};
-
-XdgAliasList *
-_xdg_mime_alias_list_new (void)
-{
- XdgAliasList *list;
-
- list = malloc (sizeof (XdgAliasList));
-
- list->aliases = NULL;
- list->n_aliases = 0;
-
- return list;
-}
-
-void
-_xdg_mime_alias_list_free (XdgAliasList *list)
-{
- int i;
-
- if (list->aliases)
- {
- for (i = 0; i < list->n_aliases; i++)
- {
- free (list->aliases[i].alias);
- free (list->aliases[i].mime_type);
- }
- free (list->aliases);
- }
- free (list);
-}
-
-static int
-alias_entry_cmp (const void *v1, const void *v2)
-{
- return strcmp (((XdgAlias *)v1)->alias, ((XdgAlias *)v2)->alias);
-}
-
-const char *
-_xdg_mime_alias_list_lookup (XdgAliasList *list,
- const char *alias)
-{
- XdgAlias *entry;
- XdgAlias key;
-
- if (list->n_aliases > 0)
- {
- key.alias = (char *)alias;
- key.mime_type = NULL;
-
- entry = bsearch (&key, list->aliases, list->n_aliases,
- sizeof (XdgAlias), alias_entry_cmp);
- if (entry)
- return entry->mime_type;
- }
-
- return NULL;
-}
-
-void
-_xdg_mime_alias_read_from_file (XdgAliasList *list,
- const char *file_name)
-{
- FILE *file;
- char line[255];
- int alloc;
-
- file = fopen (file_name, "r");
-
- if (file == NULL)
- return;
-
- /* FIXME: Not UTF-8 safe. Doesn't work if lines are greater than 255 chars.
- * Blah */
- alloc = list->n_aliases + 16;
- list->aliases = realloc (list->aliases, alloc * sizeof (XdgAlias));
- while (fgets (line, 255, file) != NULL)
- {
- char *sep;
- if (line[0] == '#')
- continue;
-
- sep = strchr (line, ' ');
- if (sep == NULL)
- continue;
- *(sep++) = '\000';
- sep[strlen (sep) -1] = '\000';
- if (list->n_aliases == alloc)
- {
- alloc <<= 1;
- list->aliases = realloc (list->aliases,
- alloc * sizeof (XdgAlias));
- }
- list->aliases[list->n_aliases].alias = strdup (line);
- list->aliases[list->n_aliases].mime_type = strdup (sep);
- list->n_aliases++;
- }
- list->aliases = realloc (list->aliases,
- list->n_aliases * sizeof (XdgAlias));
-
- fclose (file);
-
- if (list->n_aliases > 1)
- qsort (list->aliases, list->n_aliases,
- sizeof (XdgAlias), alias_entry_cmp);
-}
-
-
-void
-_xdg_mime_alias_list_dump (XdgAliasList *list)
-{
- int i;
-
- if (list->aliases)
- {
- for (i = 0; i < list->n_aliases; i++)
- {
- printf ("%s %s\n",
- list->aliases[i].alias,
- list->aliases[i].mime_type);
- }
- }
-}
-
-
diff --git a/gtk/xdgmime/xdgmimealias.h b/gtk/xdgmime/xdgmimealias.h
deleted file mode 100644
index d0aaed052..000000000
--- a/gtk/xdgmime/xdgmimealias.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmimealias.h: Private file. Datastructure for storing the aliases.
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2004 Red Hat, Inc.
- * Copyright (C) 200 Matthias Clasen <mclasen@redhat.com>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __XDG_MIME_ALIAS_H__
-#define __XDG_MIME_ALIAS_H__
-
-#include "xdgmime.h"
-
-typedef struct XdgAliasList XdgAliasList;
-
-#ifdef XDG_PREFIX
-#define _xdg_mime_alias_read_from_file XDG_ENTRY(alias_read_from_file)
-#define _xdg_mime_alias_list_new XDG_ENTRY(alias_list_new)
-#define _xdg_mime_alias_list_free XDG_ENTRY(alias_list_free)
-#define _xdg_mime_alias_list_lookup XDG_ENTRY(alias_list_lookup)
-#define _xdg_mime_alias_list_dump XDG_ENTRY(alias_list_dump)
-#endif
-
-void _xdg_mime_alias_read_from_file (XdgAliasList *list,
- const char *file_name);
-XdgAliasList *_xdg_mime_alias_list_new (void);
-void _xdg_mime_alias_list_free (XdgAliasList *list);
-const char *_xdg_mime_alias_list_lookup (XdgAliasList *list,
- const char *alias);
-void _xdg_mime_alias_list_dump (XdgAliasList *list);
-
-#endif /* __XDG_MIME_ALIAS_H__ */
diff --git a/gtk/xdgmime/xdgmimecache.c b/gtk/xdgmime/xdgmimecache.c
deleted file mode 100644
index 8e762a175..000000000
--- a/gtk/xdgmime/xdgmimecache.c
+++ /dev/null
@@ -1,920 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmimealias.c: Private file. mmappable caches for mime data
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2005 Matthias Clasen <mclasen@redhat.com>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <fnmatch.h>
-#include <assert.h>
-
-#include <netinet/in.h> /* for ntohl/ntohs */
-
-#ifdef HAVE_MMAP
-#include <sys/mman.h>
-#endif
-
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include "xdgmimecache.h"
-#include "xdgmimeint.h"
-
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#ifndef TRUE
-#define TRUE (!FALSE)
-#endif
-
-#ifndef _O_BINARY
-#define _O_BINARY 0
-#endif
-
-#ifndef MAP_FAILED
-#define MAP_FAILED ((void *) -1)
-#endif
-
-#define MAJOR_VERSION 1
-#define MINOR_VERSION 0
-
-struct _XdgMimeCache
-{
- int ref_count;
-
- size_t size;
- char *buffer;
-};
-
-#define GET_UINT16(cache,offset) (ntohs(*(xdg_uint16_t*)((cache) + (offset))))
-#define GET_UINT32(cache,offset) (ntohl(*(xdg_uint32_t*)((cache) + (offset))))
-
-XdgMimeCache *
-_xdg_mime_cache_ref (XdgMimeCache *cache)
-{
- cache->ref_count++;
- return cache;
-}
-
-void
-_xdg_mime_cache_unref (XdgMimeCache *cache)
-{
- cache->ref_count--;
-
- if (cache->ref_count == 0)
- {
-#ifdef HAVE_MMAP
- munmap (cache->buffer, cache->size);
-#endif
- free (cache);
- }
-}
-
-XdgMimeCache *
-_xdg_mime_cache_new_from_file (const char *file_name)
-{
- XdgMimeCache *cache = NULL;
-
-#ifdef HAVE_MMAP
- int fd = -1;
- struct stat st;
- char *buffer = NULL;
-
- /* Open the file and map it into memory */
- fd = open (file_name, O_RDONLY|_O_BINARY, 0);
-
- if (fd < 0)
- return NULL;
-
- if (fstat (fd, &st) < 0 || st.st_size < 4)
- goto done;
-
- buffer = (char *) mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-
- if (buffer == MAP_FAILED)
- goto done;
-
- /* Verify version */
- if (GET_UINT16 (buffer, 0) != MAJOR_VERSION ||
- GET_UINT16 (buffer, 2) != MINOR_VERSION)
- {
- munmap (buffer, st.st_size);
-
- goto done;
- }
-
- cache = (XdgMimeCache *) malloc (sizeof (XdgMimeCache));
- cache->ref_count = 1;
- cache->buffer = buffer;
- cache->size = st.st_size;
-
- done:
- if (fd != -1)
- close (fd);
-
-#endif /* HAVE_MMAP */
-
- return cache;
-}
-
-static int
-cache_magic_matchlet_compare_to_data (XdgMimeCache *cache,
- xdg_uint32_t offset,
- const void *data,
- size_t len)
-{
- xdg_uint32_t range_start = GET_UINT32 (cache->buffer, offset);
- xdg_uint32_t range_length = GET_UINT32 (cache->buffer, offset + 4);
- xdg_uint32_t data_length = GET_UINT32 (cache->buffer, offset + 12);
- xdg_uint32_t data_offset = GET_UINT32 (cache->buffer, offset + 16);
- xdg_uint32_t mask_offset = GET_UINT32 (cache->buffer, offset + 20);
-
- int i, j;
-
- for (i = range_start; i <= range_start + range_length; i++)
- {
- int valid_matchlet = TRUE;
-
- if (i + data_length > len)
- return FALSE;
-
- if (mask_offset)
- {
- for (j = 0; j < data_length; j++)
- {
- if ((((unsigned char *)cache->buffer)[data_offset + j] & ((unsigned char *)cache->buffer)[mask_offset + j]) !=
- ((((unsigned char *) data)[j + i]) & ((unsigned char *)cache->buffer)[mask_offset + j]))
- {
- valid_matchlet = FALSE;
- break;
- }
- }
- }
- else
- {
- for (j = 0; j < data_length; j++)
- {
- if (((unsigned char *)cache->buffer)[data_offset + j] != ((unsigned char *) data)[j + i])
- {
- valid_matchlet = FALSE;
- break;
- }
- }
- }
-
- if (valid_matchlet)
- return TRUE;
- }
-
- return FALSE;
-}
-
-static int
-cache_magic_matchlet_compare (XdgMimeCache *cache,
- xdg_uint32_t offset,
- const void *data,
- size_t len)
-{
- xdg_uint32_t n_children = GET_UINT32 (cache->buffer, offset + 24);
- xdg_uint32_t child_offset = GET_UINT32 (cache->buffer, offset + 28);
-
- int i;
-
- if (cache_magic_matchlet_compare_to_data (cache, offset, data, len))
- {
- if (n_children == 0)
- return TRUE;
-
- for (i = 0; i < n_children; i++)
- {
- if (cache_magic_matchlet_compare (cache, child_offset + 32 * i,
- data, len))
- return TRUE;
- }
- }
-
- return FALSE;
-}
-
-static const char *
-cache_magic_compare_to_data (XdgMimeCache *cache,
- xdg_uint32_t offset,
- const void *data,
- size_t len,
- int *prio)
-{
- xdg_uint32_t priority = GET_UINT32 (cache->buffer, offset);
- xdg_uint32_t mimetype_offset = GET_UINT32 (cache->buffer, offset + 4);
- xdg_uint32_t n_matchlets = GET_UINT32 (cache->buffer, offset + 8);
- xdg_uint32_t matchlet_offset = GET_UINT32 (cache->buffer, offset + 12);
-
- int i;
-
- for (i = 0; i < n_matchlets; i++)
- {
- if (cache_magic_matchlet_compare (cache, matchlet_offset + i * 32,
- data, len))
- {
- *prio = priority;
-
- return cache->buffer + mimetype_offset;
- }
- }
-
- return NULL;
-}
-
-static const char *
-cache_magic_lookup_data (XdgMimeCache *cache,
- const void *data,
- size_t len,
- int *prio,
- const char *mime_types[],
- int n_mime_types)
-{
- xdg_uint32_t list_offset;
- xdg_uint32_t n_entries;
- xdg_uint32_t offset;
-
- int j, n;
-
- *prio = 0;
-
- list_offset = GET_UINT32 (cache->buffer, 24);
- n_entries = GET_UINT32 (cache->buffer, list_offset);
- offset = GET_UINT32 (cache->buffer, list_offset + 8);
-
- for (j = 0; j < n_entries; j++)
- {
- const char *match;
-
- match = cache_magic_compare_to_data (cache, offset + 16 * j,
- data, len, prio);
- if (match)
- return match;
- else
- {
- xdg_uint32_t mimetype_offset;
- const char *non_match;
-
- mimetype_offset = GET_UINT32 (cache->buffer, offset + 16 * j + 4);
- non_match = cache->buffer + mimetype_offset;
-
- for (n = 0; n < n_mime_types; n++)
- {
- if (mime_types[n] &&
- _xdg_mime_mime_type_equal (mime_types[n], non_match))
- mime_types[n] = NULL;
- }
- }
- }
-
- return NULL;
-}
-
-static const char *
-cache_alias_lookup (const char *alias)
-{
- const char *ptr;
- int i, min, max, mid, cmp;
-
- for (i = 0; _caches[i]; i++)
- {
- XdgMimeCache *cache = _caches[i];
- xdg_uint32_t list_offset = GET_UINT32 (cache->buffer, 4);
- xdg_uint32_t n_entries = GET_UINT32 (cache->buffer, list_offset);
- xdg_uint32_t offset;
-
- min = 0;
- max = n_entries - 1;
- while (max >= min)
- {
- mid = (min + max) / 2;
-
- offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * mid);
- ptr = cache->buffer + offset;
- cmp = strcmp (ptr, alias);
-
- if (cmp < 0)
- min = mid + 1;
- else if (cmp > 0)
- max = mid - 1;
- else
- {
- offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * mid + 4);
- return cache->buffer + offset;
- }
- }
- }
-
- return NULL;
-}
-
-static int
-cache_glob_lookup_literal (const char *file_name,
- const char *mime_types[],
- int n_mime_types)
-{
- const char *ptr;
- int i, min, max, mid, cmp;
-
- for (i = 0; _caches[i]; i++)
- {
- XdgMimeCache *cache = _caches[i];
- xdg_uint32_t list_offset = GET_UINT32 (cache->buffer, 12);
- xdg_uint32_t n_entries = GET_UINT32 (cache->buffer, list_offset);
- xdg_uint32_t offset;
-
- min = 0;
- max = n_entries - 1;
- while (max >= min)
- {
- mid = (min + max) / 2;
-
- offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * mid);
- ptr = cache->buffer + offset;
- cmp = strcmp (ptr, file_name);
-
- if (cmp < 0)
- min = mid + 1;
- else if (cmp > 0)
- max = mid - 1;
- else
- {
- offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * mid + 4);
- mime_types[0] = (const char *)(cache->buffer + offset);
-
- return 1;
- }
- }
- }
-
- return 0;
-}
-
-static int
-cache_glob_lookup_fnmatch (const char *file_name,
- const char *mime_types[],
- int n_mime_types)
-{
- const char *mime_type;
- const char *ptr;
-
- int i, j, n;
-
- n = 0;
- for (i = 0; _caches[i]; i++)
- {
- XdgMimeCache *cache = _caches[i];
-
- xdg_uint32_t list_offset = GET_UINT32 (cache->buffer, 20);
- xdg_uint32_t n_entries = GET_UINT32 (cache->buffer, list_offset);
-
- for (j = 0; j < n_entries && n < n_mime_types; j++)
- {
- xdg_uint32_t offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * j);
- xdg_uint32_t mimetype_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * j + 4);
- ptr = cache->buffer + offset;
- mime_type = cache->buffer + mimetype_offset;
-
- /* FIXME: Not UTF-8 safe */
- if (fnmatch (ptr, file_name, 0) == 0)
- mime_types[n++] = mime_type;
- }
-
- if (n > 0)
- return n;
- }
-
- return 0;
-}
-
-static int
-cache_glob_node_lookup_suffix (XdgMimeCache *cache,
- xdg_uint32_t n_entries,
- xdg_uint32_t offset,
- const char *suffix,
- int ignore_case,
- const char *mime_types[],
- int n_mime_types)
-{
- xdg_unichar_t character;
- xdg_unichar_t match_char;
- xdg_uint32_t mimetype_offset;
- xdg_uint32_t n_children;
- xdg_uint32_t child_offset;
-
- int min, max, mid, n, i;
-
- character = _xdg_utf8_to_ucs4 (suffix);
- if (ignore_case)
- character = _xdg_ucs4_to_lower (character);
-
- min = 0;
- max = n_entries - 1;
- while (max >= min)
- {
- mid = (min + max) / 2;
-
- match_char = GET_UINT32 (cache->buffer, offset + 16 * mid);
-
- if (match_char < character)
- min = mid + 1;
- else if (match_char > character)
- max = mid - 1;
- else
- {
- suffix = _xdg_utf8_next_char (suffix);
- if (*suffix == '\0')
- {
- mimetype_offset = GET_UINT32 (cache->buffer, offset + 16 * mid + 4);
- n = 0;
- if (mimetype_offset)
- mime_types[n++] = cache->buffer + mimetype_offset;
-
- n_children = GET_UINT32 (cache->buffer, offset + 16 * mid + 8);
- child_offset = GET_UINT32 (cache->buffer, offset + 16 * mid + 12);
- i = 0;
- while (n < n_mime_types && i < n_children)
- {
- match_char = GET_UINT32 (cache->buffer, child_offset + 16 * i);
- mimetype_offset = GET_UINT32 (cache->buffer, offset + 16 * i + 4);
- if (match_char != 0)
- break;
-
- mime_types[n++] = cache->buffer + mimetype_offset;
- i++;
- }
-
- return n;
- }
- else
- {
- n_children = GET_UINT32 (cache->buffer, offset + 16 * mid + 8);
- child_offset = GET_UINT32 (cache->buffer, offset + 16 * mid + 12);
-
- return cache_glob_node_lookup_suffix (cache,
- n_children, child_offset,
- suffix, ignore_case,
- mime_types,
- n_mime_types);
- }
- }
- }
-
- return 0;
-}
-
-static int
-cache_glob_lookup_suffix (const char *suffix,
- int ignore_case,
- const char *mime_types[],
- int n_mime_types)
-{
- int i, n;
-
- for (i = 0; _caches[i]; i++)
- {
- XdgMimeCache *cache = _caches[i];
-
- xdg_uint32_t list_offset = GET_UINT32 (cache->buffer, 16);
- xdg_uint32_t n_entries = GET_UINT32 (cache->buffer, list_offset);
- xdg_uint32_t offset = GET_UINT32 (cache->buffer, list_offset + 4);
-
- n = cache_glob_node_lookup_suffix (cache,
- n_entries, offset,
- suffix, ignore_case,
- mime_types,
- n_mime_types);
- if (n > 0)
- return n;
- }
-
- return 0;
-}
-
-static void
-find_stopchars (char *stopchars)
-{
- int i, j, k, l;
-
- k = 0;
- for (i = 0; _caches[i]; i++)
- {
- XdgMimeCache *cache = _caches[i];
-
- xdg_uint32_t list_offset = GET_UINT32 (cache->buffer, 16);
- xdg_uint32_t n_entries = GET_UINT32 (cache->buffer, list_offset);
- xdg_uint32_t offset = GET_UINT32 (cache->buffer, list_offset + 4);
-
- for (j = 0; j < n_entries; j++)
- {
- xdg_uint32_t match_char = GET_UINT32 (cache->buffer, offset);
-
- if (match_char < 128)
- {
- for (l = 0; l < k; l++)
- if (stopchars[l] == match_char)
- break;
- if (l == k)
- {
- stopchars[k] = (char) match_char;
- k++;
- }
- }
-
- offset += 16;
- }
- }
-
- stopchars[k] = '\0';
-}
-
-static int
-cache_glob_lookup_file_name (const char *file_name,
- const char *mime_types[],
- int n_mime_types)
-{
- const char *ptr;
- char stopchars[128];
- int n;
-
- assert (file_name != NULL);
-
- /* First, check the literals */
- n = cache_glob_lookup_literal (file_name, mime_types, n_mime_types);
- if (n > 0)
- return n;
-
- find_stopchars (stopchars);
-
- /* Next, check suffixes */
- ptr = strpbrk (file_name, stopchars);
- while (ptr)
- {
- n = cache_glob_lookup_suffix (ptr, FALSE, mime_types, n_mime_types);
- if (n > 0)
- return n;
-
- n = cache_glob_lookup_suffix (ptr, TRUE, mime_types, n_mime_types);
- if (n > 0)
- return n;
-
- ptr = strpbrk (ptr + 1, stopchars);
- }
-
- /* Last, try fnmatch */
- return cache_glob_lookup_fnmatch (file_name, mime_types, n_mime_types);
-}
-
-int
-_xdg_mime_cache_get_max_buffer_extents (void)
-{
- xdg_uint32_t offset;
- xdg_uint32_t max_extent;
- int i;
-
- max_extent = 0;
- for (i = 0; _caches[i]; i++)
- {
- XdgMimeCache *cache = _caches[i];
-
- offset = GET_UINT32 (cache->buffer, 24);
- max_extent = MAX (max_extent, GET_UINT32 (cache->buffer, offset + 4));
- }
-
- return max_extent;
-}
-
-static const char *
-cache_get_mime_type_for_data (const void *data,
- size_t len,
- int *result_prio,
- const char *mime_types[],
- int n_mime_types)
-{
- const char *mime_type;
- int i, n, priority;
-
- priority = 0;
- mime_type = NULL;
- for (i = 0; _caches[i]; i++)
- {
- XdgMimeCache *cache = _caches[i];
-
- int prio;
- const char *match;
-
- match = cache_magic_lookup_data (cache, data, len, &prio,
- mime_types, n_mime_types);
- if (prio > priority)
- {
- priority = prio;
- mime_type = match;
- }
- }
-
- if (result_prio)
- *result_prio = priority;
-
- if (priority > 0)
- return mime_type;
-
- for (n = 0; n < n_mime_types; n++)
- {
-
- if (mime_types[n])
- return mime_types[n];
- }
-
- return XDG_MIME_TYPE_UNKNOWN;
-}
-
-const char *
-_xdg_mime_cache_get_mime_type_for_data (const void *data,
- size_t len,
- int *result_prio)
-{
- return cache_get_mime_type_for_data (data, len, result_prio, NULL, 0);
-}
-
-const char *
-_xdg_mime_cache_get_mime_type_for_file (const char *file_name,
- struct stat *statbuf)
-{
- const char *mime_type;
- const char *mime_types[2];
- FILE *file;
- unsigned char *data;
- int max_extent;
- int bytes_read;
- struct stat buf;
- const char *base_name;
- int n;
-
- if (file_name == NULL)
- return NULL;
-
- if (! _xdg_utf8_validate (file_name))
- return NULL;
-
- base_name = _xdg_get_base_name (file_name);
- n = cache_glob_lookup_file_name (base_name, mime_types, 2);
-
- if (n == 1)
- return mime_types[0];
-
- if (!statbuf)
- {
- if (stat (file_name, &buf) != 0)
- return XDG_MIME_TYPE_UNKNOWN;
-
- statbuf = &buf;
- }
-
- if (!S_ISREG (statbuf->st_mode))
- return XDG_MIME_TYPE_UNKNOWN;
-
- /* FIXME: Need to make sure that max_extent isn't totally broken. This could
- * be large and need getting from a stream instead of just reading it all
- * in. */
- max_extent = _xdg_mime_cache_get_max_buffer_extents ();
- data = malloc (max_extent);
- if (data == NULL)
- return XDG_MIME_TYPE_UNKNOWN;
-
- file = fopen (file_name, "r");
- if (file == NULL)
- {
- free (data);
- return XDG_MIME_TYPE_UNKNOWN;
- }
-
- bytes_read = fread (data, 1, max_extent, file);
- if (ferror (file))
- {
- free (data);
- fclose (file);
- return XDG_MIME_TYPE_UNKNOWN;
- }
-
- mime_type = cache_get_mime_type_for_data (data, bytes_read, NULL,
- mime_types, n);
-
- free (data);
- fclose (file);
-
- return mime_type;
-}
-
-const char *
-_xdg_mime_cache_get_mime_type_from_file_name (const char *file_name)
-{
- const char *mime_type;
-
- if (cache_glob_lookup_file_name (file_name, &mime_type, 1))
- return mime_type;
- else
- return XDG_MIME_TYPE_UNKNOWN;
-}
-
-int
-_xdg_mime_cache_get_mime_types_from_file_name (const char *file_name,
- const char *mime_types[],
- int n_mime_types)
-{
- return cache_glob_lookup_file_name (file_name, mime_types, n_mime_types);
-}
-
-#if 1
-static int
-is_super_type (const char *mime)
-{
- int length;
- const char *type;
-
- length = strlen (mime);
- type = &(mime[length - 2]);
-
- if (strcmp (type, "/*") == 0)
- return 1;
-
- return 0;
-}
-#endif
-
-int
-_xdg_mime_cache_mime_type_subclass (const char *mime,
- const char *base)
-{
- const char *umime, *ubase;
-
- int i, j, min, max, med, cmp;
-
- umime = _xdg_mime_cache_unalias_mime_type (mime);
- ubase = _xdg_mime_cache_unalias_mime_type (base);
-
- if (strcmp (umime, ubase) == 0)
- return 1;
-
- /* We really want to handle text/ * in GtkFileFilter, so we just
- * turn on the supertype matching
- */
-#if 1
- /* Handle supertypes */
- if (is_super_type (ubase) &&
- xdg_mime_media_type_equal (umime, ubase))
- return 1;
-#endif
-
- /* Handle special cases text/plain and application/octet-stream */
- if (strcmp (ubase, "text/plain") == 0 &&
- strncmp (umime, "text/", 5) == 0)
- return 1;
-
- if (strcmp (ubase, "application/octet-stream") == 0)
- return 1;
-
- for (i = 0; _caches[i]; i++)
- {
- XdgMimeCache *cache = _caches[i];
-
- xdg_uint32_t list_offset = GET_UINT32 (cache->buffer, 8);
- xdg_uint32_t n_entries = GET_UINT32 (cache->buffer, list_offset);
- xdg_uint32_t offset, n_parents, parent_offset;
-
- min = 0;
- max = n_entries - 1;
- while (max >= min)
- {
- med = (min + max)/2;
-
- offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * med);
- cmp = strcmp (cache->buffer + offset, umime);
- if (cmp < 0)
- min = med + 1;
- else if (cmp > 0)
- max = med - 1;
- else
- {
- offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * med + 4);
- n_parents = GET_UINT32 (cache->buffer, offset);
-
- for (j = 0; j < n_parents; j++)
- {
- parent_offset = GET_UINT32 (cache->buffer, offset + 4 + 4 * j);
- if (_xdg_mime_cache_mime_type_subclass (cache->buffer + parent_offset, ubase))
- return 1;
- }
-
- break;
- }
- }
- }
-
- return 0;
-}
-
-const char *
-_xdg_mime_cache_unalias_mime_type (const char *mime)
-{
- const char *lookup;
-
- lookup = cache_alias_lookup (mime);
-
- if (lookup)
- return lookup;
-
- return mime;
-}
-
-char **
-_xdg_mime_cache_list_mime_parents (const char *mime)
-{
- int i, j, k, l, p;
- char *all_parents[128]; /* we'll stop at 128 */
- char **result;
-
- mime = xdg_mime_unalias_mime_type (mime);
-
- p = 0;
- for (i = 0; _caches[i]; i++)
- {
- XdgMimeCache *cache = _caches[i];
-
- xdg_uint32_t list_offset = GET_UINT32 (cache->buffer, 8);
- xdg_uint32_t n_entries = GET_UINT32 (cache->buffer, list_offset);
-
- for (j = 0; j < n_entries; j++)
- {
- xdg_uint32_t mimetype_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * j);
- xdg_uint32_t parents_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * j + 4);
-
- if (strcmp (cache->buffer + mimetype_offset, mime) == 0)
- {
- xdg_uint32_t parent_mime_offset;
- xdg_uint32_t n_parents = GET_UINT32 (cache->buffer, parents_offset);
-
- for (k = 0; k < n_parents && p < 127; k++)
- {
- parent_mime_offset = GET_UINT32 (cache->buffer, parents_offset + 4 + 4 * k);
-
- /* Don't add same parent multiple times.
- * This can happen for instance if the same type is listed in multiple directories
- */
- for (l = 0; l < p; l++)
- {
- if (strcmp (all_parents[l], cache->buffer + parent_mime_offset) == 0)
- break;
- }
-
- if (l == p)
- all_parents[p++] = cache->buffer + parent_mime_offset;
- }
-
- break;
- }
- }
- }
- all_parents[p++] = NULL;
-
- result = (char **) malloc (p * sizeof (char *));
- memcpy (result, all_parents, p * sizeof (char *));
-
- return result;
-}
-
diff --git a/gtk/xdgmime/xdgmimecache.h b/gtk/xdgmime/xdgmimecache.h
deleted file mode 100644
index 1cd978fae..000000000
--- a/gtk/xdgmime/xdgmimecache.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmimecache.h: Private file. Datastructure for mmapped caches.
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2005 Matthias Clasen <mclasen@redhat.com>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __XDG_MIME_CACHE_H__
-#define __XDG_MIME_CACHE_H__
-
-#include "xdgmime.h"
-
-typedef struct _XdgMimeCache XdgMimeCache;
-
-#ifdef XDG_PREFIX
-#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file)
-#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref)
-#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref)
-#define _xdg_mime_cache_get_max_buffer_extents XDG_ENTRY(cache_get_max_buffer_extents)
-#define _xdg_mime_cache_get_mime_type_for_data XDG_ENTRY(cache_get_mime_type_for_data)
-#define _xdg_mime_cache_get_mime_type_for_file XDG_ENTRY(cache_get_mime_type_for_file)
-#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name)
-#define _xdg_mime_cache_get_mime_types_from_file_name XDG_ENTRY(cache_get_mime_types_from_file_name)
-#define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents)
-#define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass)
-#define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type)
-
-#endif
-
-extern XdgMimeCache **_caches;
-
-XdgMimeCache *_xdg_mime_cache_new_from_file (const char *file_name);
-XdgMimeCache *_xdg_mime_cache_ref (XdgMimeCache *cache);
-void _xdg_mime_cache_unref (XdgMimeCache *cache);
-
-
-const char *_xdg_mime_cache_get_mime_type_for_data (const void *data,
- size_t len,
- int *result_prio);
-const char *_xdg_mime_cache_get_mime_type_for_file (const char *file_name,
- struct stat *statbuf);
-int _xdg_mime_cache_get_mime_types_from_file_name (const char *file_name,
- const char *mime_types[],
- int n_mime_types);
-const char *_xdg_mime_cache_get_mime_type_from_file_name (const char *file_name);
-int _xdg_mime_cache_is_valid_mime_type (const char *mime_type);
-int _xdg_mime_cache_mime_type_equal (const char *mime_a,
- const char *mime_b);
-int _xdg_mime_cache_media_type_equal (const char *mime_a,
- const char *mime_b);
-int _xdg_mime_cache_mime_type_subclass (const char *mime_a,
- const char *mime_b);
-char **_xdg_mime_cache_list_mime_parents (const char *mime);
-const char *_xdg_mime_cache_unalias_mime_type (const char *mime);
-int _xdg_mime_cache_get_max_buffer_extents (void);
-
-#endif /* __XDG_MIME_CACHE_H__ */
diff --git a/gtk/xdgmime/xdgmimeglob.c b/gtk/xdgmime/xdgmimeglob.c
deleted file mode 100644
index 3aad6113c..000000000
--- a/gtk/xdgmime/xdgmimeglob.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmimeglob.c: Private file. Datastructure for storing the globs.
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2003 Red Hat, Inc.
- * Copyright (C) 2003 Jonathan Blandford <jrb@alum.mit.edu>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "xdgmimeglob.h"
-#include "xdgmimeint.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include <fnmatch.h>
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#ifndef TRUE
-#define TRUE (!FALSE)
-#endif
-
-typedef struct XdgGlobHashNode XdgGlobHashNode;
-typedef struct XdgGlobList XdgGlobList;
-
-struct XdgGlobHashNode
-{
- xdg_unichar_t character;
- const char *mime_type;
- XdgGlobHashNode *next;
- XdgGlobHashNode *child;
-};
-struct XdgGlobList
-{
- const char *data;
- const char *mime_type;
- XdgGlobList *next;
-};
-
-struct XdgGlobHash
-{
- XdgGlobList *literal_list;
- XdgGlobHashNode *simple_node;
- XdgGlobList *full_list;
-};
-
-
-/* XdgGlobList
- */
-static XdgGlobList *
-_xdg_glob_list_new (void)
-{
- XdgGlobList *new_element;
-
- new_element = calloc (1, sizeof (XdgGlobList));
-
- return new_element;
-}
-
-/* Frees glob_list and all of it's children */
-static void
-_xdg_glob_list_free (XdgGlobList *glob_list)
-{
- XdgGlobList *ptr, *next;
-
- ptr = glob_list;
-
- while (ptr != NULL)
- {
- next = ptr->next;
-
- if (ptr->data)
- free ((void *) ptr->data);
- if (ptr->mime_type)
- free ((void *) ptr->mime_type);
- free (ptr);
-
- ptr = next;
- }
-}
-
-static XdgGlobList *
-_xdg_glob_list_append (XdgGlobList *glob_list,
- void *data,
- const char *mime_type)
-{
- XdgGlobList *new_element;
- XdgGlobList *tmp_element;
-
- new_element = _xdg_glob_list_new ();
- new_element->data = data;
- new_element->mime_type = mime_type;
- if (glob_list == NULL)
- return new_element;
-
- tmp_element = glob_list;
- while (tmp_element->next != NULL)
- tmp_element = tmp_element->next;
-
- tmp_element->next = new_element;
-
- return glob_list;
-}
-
-#if 0
-static XdgGlobList *
-_xdg_glob_list_prepend (XdgGlobList *glob_list,
- void *data,
- const char *mime_type)
-{
- XdgGlobList *new_element;
-
- new_element = _xdg_glob_list_new ();
- new_element->data = data;
- new_element->next = glob_list;
- new_element->mime_type = mime_type;
-
- return new_element;
-}
-#endif
-
-/* XdgGlobHashNode
- */
-
-static XdgGlobHashNode *
-_xdg_glob_hash_node_new (void)
-{
- XdgGlobHashNode *glob_hash_node;
-
- glob_hash_node = calloc (1, sizeof (XdgGlobHashNode));
-
- return glob_hash_node;
-}
-
-static void
-_xdg_glob_hash_node_dump (XdgGlobHashNode *glob_hash_node,
- int depth)
-{
- int i;
- for (i = 0; i < depth; i++)
- printf (" ");
-
- printf ("%c", (char)glob_hash_node->character);
- if (glob_hash_node->mime_type)
- printf (" - %s\n", glob_hash_node->mime_type);
- else
- printf ("\n");
- if (glob_hash_node->child)
- _xdg_glob_hash_node_dump (glob_hash_node->child, depth + 1);
- if (glob_hash_node->next)
- _xdg_glob_hash_node_dump (glob_hash_node->next, depth);
-}
-
-static XdgGlobHashNode *
-_xdg_glob_hash_insert_text (XdgGlobHashNode *glob_hash_node,
- const char *text,
- const char *mime_type)
-{
- XdgGlobHashNode *node;
- xdg_unichar_t character;
-
- character = _xdg_utf8_to_ucs4 (text);
-
- if ((glob_hash_node == NULL) ||
- (character < glob_hash_node->character))
- {
- node = _xdg_glob_hash_node_new ();
- node->character = character;
- node->next = glob_hash_node;
- glob_hash_node = node;
- }
- else if (character == glob_hash_node->character)
- {
- node = glob_hash_node;
- }
- else
- {
- XdgGlobHashNode *prev_node;
- int found_node = FALSE;
-
- /* Look for the first character of text in glob_hash_node, and insert it if we
- * have to.*/
- prev_node = glob_hash_node;
- node = prev_node->next;
-
- while (node != NULL)
- {
- if (character < node->character)
- {
- node = _xdg_glob_hash_node_new ();
- node->character = character;
- node->next = prev_node->next;
- prev_node->next = node;
-
- found_node = TRUE;
- break;
- }
- else if (character == node->character)
- {
- found_node = TRUE;
- break;
- }
- prev_node = node;
- node = node->next;
- }
-
- if (! found_node)
- {
- node = _xdg_glob_hash_node_new ();
- node->character = character;
- node->next = prev_node->next;
- prev_node->next = node;
- }
- }
-
- text = _xdg_utf8_next_char (text);
- if (*text == '\000')
- {
- if (node->mime_type)
- {
- if (strcmp (node->mime_type, mime_type))
- {
- XdgGlobHashNode *child;
- int found_node = FALSE;
-
- child = node->child;
- while (child && child->character == '\0')
- {
- if (strcmp (child->mime_type, mime_type) == 0)
- {
- found_node = TRUE;
- break;
- }
- child = child->next;
- }
-
- if (!found_node)
- {
- child = _xdg_glob_hash_node_new ();
- child->character = '\000';
- child->mime_type = strdup (mime_type);
- child->child = NULL;
- child->next = node->child;
- node->child = child;
- }
- }
- }
- else
- {
- node->mime_type = strdup (mime_type);
- }
- }
- else
- {
- node->child = _xdg_glob_hash_insert_text (node->child, text, mime_type);
- }
- return glob_hash_node;
-}
-
-static int
-_xdg_glob_hash_node_lookup_file_name (XdgGlobHashNode *glob_hash_node,
- const char *file_name,
- int ignore_case,
- const char *mime_types[],
- int n_mime_types)
-{
- int n;
- XdgGlobHashNode *node;
- xdg_unichar_t character;
-
- if (glob_hash_node == NULL)
- return 0;
-
- character = _xdg_utf8_to_ucs4 (file_name);
- if (ignore_case)
- character = _xdg_ucs4_to_lower(character);
-
- for (node = glob_hash_node; node && character >= node->character; node = node->next)
- {
- if (character == node->character)
- {
- file_name = _xdg_utf8_next_char (file_name);
- if (*file_name == '\000')
- {
- n = 0;
- if (node->mime_type)
- mime_types[n++] = node->mime_type;
- node = node->child;
- while (n < n_mime_types && node && node->character == 0)
- {
- if (node->mime_type)
- mime_types[n++] = node->mime_type;
- node = node->next;
- }
- }
- else
- {
- n = _xdg_glob_hash_node_lookup_file_name (node->child,
- file_name,
- ignore_case,
- mime_types,
- n_mime_types);
- }
- return n;
- }
- }
-
- return 0;
-}
-
-int
-_xdg_glob_hash_lookup_file_name (XdgGlobHash *glob_hash,
- const char *file_name,
- const char *mime_types[],
- int n_mime_types)
-{
- XdgGlobList *list;
- const char *ptr;
- char stopchars[128];
- int i, n;
- XdgGlobHashNode *node;
-
- /* First, check the literals */
-
- assert (file_name != NULL && n_mime_types > 0);
-
- for (list = glob_hash->literal_list; list; list = list->next)
- {
- if (strcmp ((const char *)list->data, file_name) == 0)
- {
- mime_types[0] = list->mime_type;
- return 1;
- }
- }
-
- i = 0;
- for (node = glob_hash->simple_node; node; node = node->next)
- {
- if (node->character < 128)
- stopchars[i++] = (char)node->character;
- }
- stopchars[i] = '\0';
-
- ptr = strpbrk (file_name, stopchars);
- while (ptr)
- {
- n = _xdg_glob_hash_node_lookup_file_name (glob_hash->simple_node, ptr, FALSE,
- mime_types, n_mime_types);
- if (n > 0)
- return n;
-
- n = _xdg_glob_hash_node_lookup_file_name (glob_hash->simple_node, ptr, TRUE,
- mime_types, n_mime_types);
- if (n > 0)
- return n;
-
- ptr = strpbrk (ptr + 1, stopchars);
- }
-
- /* FIXME: Not UTF-8 safe */
- n = 0;
- for (list = glob_hash->full_list; list && n < n_mime_types; list = list->next)
- {
- if (fnmatch ((const char *)list->data, file_name, 0) == 0)
- mime_types[n++] = list->mime_type;
- }
-
- return n;
-}
-
-
-
-/* XdgGlobHash
- */
-
-XdgGlobHash *
-_xdg_glob_hash_new (void)
-{
- XdgGlobHash *glob_hash;
-
- glob_hash = calloc (1, sizeof (XdgGlobHash));
-
- return glob_hash;
-}
-
-
-static void
-_xdg_glob_hash_free_nodes (XdgGlobHashNode *node)
-{
- if (node)
- {
- if (node->child)
- _xdg_glob_hash_free_nodes (node->child);
- if (node->next)
- _xdg_glob_hash_free_nodes (node->next);
- if (node->mime_type)
- free ((void *) node->mime_type);
- free (node);
- }
-}
-
-void
-_xdg_glob_hash_free (XdgGlobHash *glob_hash)
-{
- _xdg_glob_list_free (glob_hash->literal_list);
- _xdg_glob_list_free (glob_hash->full_list);
- _xdg_glob_hash_free_nodes (glob_hash->simple_node);
- free (glob_hash);
-}
-
-XdgGlobType
-_xdg_glob_determine_type (const char *glob)
-{
- const char *ptr;
- int maybe_in_simple_glob = FALSE;
- int first_char = TRUE;
-
- ptr = glob;
-
- while (*ptr != '\000')
- {
- if (*ptr == '*' && first_char)
- maybe_in_simple_glob = TRUE;
- else if (*ptr == '\\' || *ptr == '[' || *ptr == '?' || *ptr == '*')
- return XDG_GLOB_FULL;
-
- first_char = FALSE;
- ptr = _xdg_utf8_next_char (ptr);
- }
- if (maybe_in_simple_glob)
- return XDG_GLOB_SIMPLE;
- else
- return XDG_GLOB_LITERAL;
-}
-
-/* glob must be valid UTF-8 */
-void
-_xdg_glob_hash_append_glob (XdgGlobHash *glob_hash,
- const char *glob,
- const char *mime_type)
-{
- XdgGlobType type;
-
- assert (glob_hash != NULL);
- assert (glob != NULL);
-
- type = _xdg_glob_determine_type (glob);
-
- switch (type)
- {
- case XDG_GLOB_LITERAL:
- glob_hash->literal_list = _xdg_glob_list_append (glob_hash->literal_list, strdup (glob), strdup (mime_type));
- break;
- case XDG_GLOB_SIMPLE:
- glob_hash->simple_node = _xdg_glob_hash_insert_text (glob_hash->simple_node, glob + 1, mime_type);
- break;
- case XDG_GLOB_FULL:
- glob_hash->full_list = _xdg_glob_list_append (glob_hash->full_list, strdup (glob), strdup (mime_type));
- break;
- }
-}
-
-void
-_xdg_glob_hash_dump (XdgGlobHash *glob_hash)
-{
- XdgGlobList *list;
- printf ("LITERAL STRINGS\n");
- if (glob_hash->literal_list == NULL)
- {
- printf (" None\n");
- }
- else
- {
- for (list = glob_hash->literal_list; list; list = list->next)
- printf (" %s - %s\n", (char *)list->data, list->mime_type);
- }
- printf ("\nSIMPLE GLOBS\n");
- _xdg_glob_hash_node_dump (glob_hash->simple_node, 4);
-
- printf ("\nFULL GLOBS\n");
- if (glob_hash->full_list == NULL)
- {
- printf (" None\n");
- }
- else
- {
- for (list = glob_hash->full_list; list; list = list->next)
- printf (" %s - %s\n", (char *)list->data, list->mime_type);
- }
-}
-
-
-void
-_xdg_mime_glob_read_from_file (XdgGlobHash *glob_hash,
- const char *file_name)
-{
- FILE *glob_file;
- char line[255];
-
- glob_file = fopen (file_name, "r");
-
- if (glob_file == NULL)
- return;
-
- /* FIXME: Not UTF-8 safe. Doesn't work if lines are greater than 255 chars.
- * Blah */
- while (fgets (line, 255, glob_file) != NULL)
- {
- char *colon;
- if (line[0] == '#')
- continue;
-
- colon = strchr (line, ':');
- if (colon == NULL)
- continue;
- *(colon++) = '\000';
- colon[strlen (colon) -1] = '\000';
- _xdg_glob_hash_append_glob (glob_hash, colon, line);
- }
-
- fclose (glob_file);
-}
diff --git a/gtk/xdgmime/xdgmimeglob.h b/gtk/xdgmime/xdgmimeglob.h
deleted file mode 100644
index 25a1f20e5..000000000
--- a/gtk/xdgmime/xdgmimeglob.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmimeglob.h: Private file. Datastructure for storing the globs.
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2003 Red Hat, Inc.
- * Copyright (C) 2003 Jonathan Blandford <jrb@alum.mit.edu>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __XDG_MIME_GLOB_H__
-#define __XDG_MIME_GLOB_H__
-
-#include "xdgmime.h"
-
-typedef struct XdgGlobHash XdgGlobHash;
-
-typedef enum
-{
- XDG_GLOB_LITERAL, /* Makefile */
- XDG_GLOB_SIMPLE, /* *.gif */
- XDG_GLOB_FULL /* x*.[ch] */
-} XdgGlobType;
-
-
-#ifdef XDG_PREFIX
-#define _xdg_mime_glob_read_from_file XDG_ENTRY(glob_read_from_file)
-#define _xdg_glob_hash_new XDG_ENTRY(hash_new)
-#define _xdg_glob_hash_free XDG_ENTRY(hash_free)
-#define _xdg_glob_hash_lookup_file_name XDG_ENTRY(hash_lookup_file_name)
-#define _xdg_glob_hash_append_glob XDG_ENTRY(hash_append_glob)
-#define _xdg_glob_determine_type XDG_ENTRY(determine_type)
-#define _xdg_glob_hash_dump XDG_ENTRY(hash_dump)
-#endif
-
-void _xdg_mime_glob_read_from_file (XdgGlobHash *glob_hash,
- const char *file_name);
-XdgGlobHash *_xdg_glob_hash_new (void);
-void _xdg_glob_hash_free (XdgGlobHash *glob_hash);
-int _xdg_glob_hash_lookup_file_name (XdgGlobHash *glob_hash,
- const char *text,
- const char *mime_types[],
- int n_mime_types);
-void _xdg_glob_hash_append_glob (XdgGlobHash *glob_hash,
- const char *glob,
- const char *mime_type);
-XdgGlobType _xdg_glob_determine_type (const char *glob);
-void _xdg_glob_hash_dump (XdgGlobHash *glob_hash);
-
-#endif /* __XDG_MIME_GLOB_H__ */
diff --git a/gtk/xdgmime/xdgmimeint.c b/gtk/xdgmime/xdgmimeint.c
deleted file mode 100644
index 4a0ac4cc3..000000000
--- a/gtk/xdgmime/xdgmimeint.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmimeint.c: Internal defines and functions.
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2003 Red Hat, Inc.
- * Copyright (C) 2003 Jonathan Blandford <jrb@alum.mit.edu>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "xdgmimeint.h"
-#include <ctype.h>
-#include <string.h>
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#ifndef TRUE
-#define TRUE (!FALSE)
-#endif
-
-static const char _xdg_utf8_skip_data[256] = {
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
- 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1
-};
-
-const char * const _xdg_utf8_skip = _xdg_utf8_skip_data;
-
-
-
-/* Returns the number of unprocessed characters. */
-xdg_unichar_t
-_xdg_utf8_to_ucs4(const char *source)
-{
- xdg_unichar_t ucs32;
- if( ! ( *source & 0x80 ) )
- {
- ucs32 = *source;
- }
- else
- {
- int bytelength = 0;
- xdg_unichar_t result;
- if ( ! (*source & 0x40) )
- {
- ucs32 = *source;
- }
- else
- {
- if ( ! (*source & 0x20) )
- {
- result = *source++ & 0x1F;
- bytelength = 2;
- }
- else if ( ! (*source & 0x10) )
- {
- result = *source++ & 0x0F;
- bytelength = 3;
- }
- else if ( ! (*source & 0x08) )
- {
- result = *source++ & 0x07;
- bytelength = 4;
- }
- else if ( ! (*source & 0x04) )
- {
- result = *source++ & 0x03;
- bytelength = 5;
- }
- else if ( ! (*source & 0x02) )
- {
- result = *source++ & 0x01;
- bytelength = 6;
- }
- else
- {
- result = *source++;
- bytelength = 1;
- }
-
- for ( bytelength --; bytelength > 0; bytelength -- )
- {
- result <<= 6;
- result |= *source++ & 0x3F;
- }
- ucs32 = result;
- }
- }
- return ucs32;
-}
-
-
-/* hullo. this is great code. don't rewrite it */
-
-xdg_unichar_t
-_xdg_ucs4_to_lower (xdg_unichar_t source)
-{
- /* FIXME: Do a real to_upper sometime */
- /* CaseFolding-3.2.0.txt has a table of rules. */
- if ((source & 0xFF) == source)
- return (xdg_unichar_t) tolower ((unsigned char) source);
- return source;
-}
-
-int
-_xdg_utf8_validate (const char *source)
-{
- /* FIXME: actually write */
- return TRUE;
-}
-
-const char *
-_xdg_get_base_name (const char *file_name)
-{
- const char *base_name;
-
- if (file_name == NULL)
- return NULL;
-
- base_name = strrchr (file_name, '/');
-
- if (base_name == NULL)
- return file_name;
- else
- return base_name + 1;
-}
diff --git a/gtk/xdgmime/xdgmimeint.h b/gtk/xdgmime/xdgmimeint.h
deleted file mode 100644
index 288148719..000000000
--- a/gtk/xdgmime/xdgmimeint.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmimeint.h: Internal defines and functions.
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2003 Red Hat, Inc.
- * Copyright (C) 2003 Jonathan Blandford <jrb@alum.mit.edu>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __XDG_MIME_INT_H__
-#define __XDG_MIME_INT_H__
-
-#include "xdgmime.h"
-
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#ifndef TRUE
-#define TRUE (!FALSE)
-#endif
-
-/* FIXME: Needs to be configure check */
-typedef unsigned int xdg_unichar_t;
-typedef unsigned char xdg_uchar8_t;
-typedef unsigned short xdg_uint16_t;
-typedef unsigned int xdg_uint32_t;
-
-#ifdef XDG_PREFIX
-#define _xdg_utf8_skip XDG_ENTRY(utf8_skip)
-#define _xdg_utf8_to_ucs4 XDG_ENTRY(utf8_to_ucs4)
-#define _xdg_ucs4_to_lower XDG_ENTRY(ucs4_to_lower)
-#define _xdg_utf8_validate XDG_ENTRY(utf8_validate)
-#define _xdg_get_base_name XDG_ENTRY(get_ase_name)
-#endif
-
-#define SWAP_BE16_TO_LE16(val) (xdg_uint16_t)(((xdg_uint16_t)(val) << 8)|((xdg_uint16_t)(val) >> 8))
-
-#define SWAP_BE32_TO_LE32(val) (xdg_uint32_t)((((xdg_uint32_t)(val) & 0xFF000000U) >> 24) | \
- (((xdg_uint32_t)(val) & 0x00FF0000U) >> 8) | \
- (((xdg_uint32_t)(val) & 0x0000FF00U) << 8) | \
- (((xdg_uint32_t)(val) & 0x000000FFU) << 24))
-/* UTF-8 utils
- */
-extern const char *const _xdg_utf8_skip;
-#define _xdg_utf8_next_char(p) (char *)((p) + _xdg_utf8_skip[*(unsigned char *)(p)])
-#define _xdg_utf8_char_size(p) (int) (_xdg_utf8_skip[*(unsigned char *)(p)])
-
-xdg_unichar_t _xdg_utf8_to_ucs4 (const char *source);
-xdg_unichar_t _xdg_ucs4_to_lower (xdg_unichar_t source);
-int _xdg_utf8_validate (const char *source);
-const char *_xdg_get_base_name (const char *file_name);
-
-#endif /* __XDG_MIME_INT_H__ */
diff --git a/gtk/xdgmime/xdgmimemagic.c b/gtk/xdgmime/xdgmimemagic.c
deleted file mode 100644
index a2320f584..000000000
--- a/gtk/xdgmime/xdgmimemagic.c
+++ /dev/null
@@ -1,813 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmimemagic.: Private file. Datastructure for storing magic files.
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2003 Red Hat, Inc.
- * Copyright (C) 2003 Jonathan Blandford <jrb@alum.mit.edu>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <assert.h>
-#include "xdgmimemagic.h"
-#include "xdgmimeint.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#ifndef TRUE
-#define TRUE (!FALSE)
-#endif
-
-#if !defined getc_unlocked && !defined HAVE_GETC_UNLOCKED
-# define getc_unlocked(fp) getc (fp)
-#endif
-
-typedef struct XdgMimeMagicMatch XdgMimeMagicMatch;
-typedef struct XdgMimeMagicMatchlet XdgMimeMagicMatchlet;
-
-typedef enum
-{
- XDG_MIME_MAGIC_SECTION,
- XDG_MIME_MAGIC_MAGIC,
- XDG_MIME_MAGIC_ERROR,
- XDG_MIME_MAGIC_EOF
-} XdgMimeMagicState;
-
-struct XdgMimeMagicMatch
-{
- const char *mime_type;
- int priority;
- XdgMimeMagicMatchlet *matchlet;
- XdgMimeMagicMatch *next;
-};
-
-
-struct XdgMimeMagicMatchlet
-{
- int indent;
- int offset;
- unsigned int value_length;
- unsigned char *value;
- unsigned char *mask;
- unsigned int range_length;
- unsigned int word_size;
- XdgMimeMagicMatchlet *next;
-};
-
-
-struct XdgMimeMagic
-{
- XdgMimeMagicMatch *match_list;
- int max_extent;
-};
-
-static XdgMimeMagicMatch *
-_xdg_mime_magic_match_new (void)
-{
- return calloc (1, sizeof (XdgMimeMagicMatch));
-}
-
-
-static XdgMimeMagicMatchlet *
-_xdg_mime_magic_matchlet_new (void)
-{
- XdgMimeMagicMatchlet *matchlet;
-
- matchlet = malloc (sizeof (XdgMimeMagicMatchlet));
-
- matchlet->indent = 0;
- matchlet->offset = 0;
- matchlet->value_length = 0;
- matchlet->value = NULL;
- matchlet->mask = NULL;
- matchlet->range_length = 1;
- matchlet->word_size = 1;
- matchlet->next = NULL;
-
- return matchlet;
-}
-
-
-static void
-_xdg_mime_magic_matchlet_free (XdgMimeMagicMatchlet *mime_magic_matchlet)
-{
- if (mime_magic_matchlet)
- {
- if (mime_magic_matchlet->next)
- _xdg_mime_magic_matchlet_free (mime_magic_matchlet->next);
- if (mime_magic_matchlet->value)
- free (mime_magic_matchlet->value);
- if (mime_magic_matchlet->mask)
- free (mime_magic_matchlet->mask);
- free (mime_magic_matchlet);
- }
-}
-
-
-/* Frees mime_magic_match and the remainder of its list
- */
-static void
-_xdg_mime_magic_match_free (XdgMimeMagicMatch *mime_magic_match)
-{
- XdgMimeMagicMatch *ptr, *next;
-
- ptr = mime_magic_match;
- while (ptr)
- {
- next = ptr->next;
-
- if (ptr->mime_type)
- free ((void *) ptr->mime_type);
- if (ptr->matchlet)
- _xdg_mime_magic_matchlet_free (ptr->matchlet);
- free (ptr);
-
- ptr = next;
- }
-}
-
-/* Reads in a hunk of data until a newline character or a '\000' is hit. The
- * returned string is null terminated, and doesn't include the newline.
- */
-static unsigned char *
-_xdg_mime_magic_read_to_newline (FILE *magic_file,
- int *end_of_file)
-{
- unsigned char *retval;
- int c;
- int len, pos;
-
- len = 128;
- pos = 0;
- retval = malloc (len);
- *end_of_file = FALSE;
-
- while (TRUE)
- {
- c = getc_unlocked (magic_file);
- if (c == EOF)
- {
- *end_of_file = TRUE;
- break;
- }
- if (c == '\n' || c == '\000')
- break;
- retval[pos++] = (unsigned char) c;
- if (pos % 128 == 127)
- {
- len = len + 128;
- retval = realloc (retval, len);
- }
- }
-
- retval[pos] = '\000';
- return retval;
-}
-
-/* Returns the number read from the file, or -1 if no number could be read.
- */
-static int
-_xdg_mime_magic_read_a_number (FILE *magic_file,
- int *end_of_file)
-{
- /* LONG_MAX is about 20 characters on my system */
-#define MAX_NUMBER_SIZE 30
- char number_string[MAX_NUMBER_SIZE + 1];
- int pos = 0;
- int c;
- long retval = -1;
-
- while (TRUE)
- {
- c = getc_unlocked (magic_file);
-
- if (c == EOF)
- {
- *end_of_file = TRUE;
- break;
- }
- if (! isdigit (c))
- {
- ungetc (c, magic_file);
- break;
- }
- number_string[pos] = (char) c;
- pos++;
- if (pos == MAX_NUMBER_SIZE)
- break;
- }
- if (pos > 0)
- {
- number_string[pos] = '\000';
- errno = 0;
- retval = strtol (number_string, NULL, 10);
-
- if ((retval < INT_MIN) || (retval > INT_MAX) || (errno != 0))
- return -1;
- }
-
- return retval;
-}
-
-/* Headers are of the format:
- * [<priority>:<mime-type>]
- */
-static XdgMimeMagicState
-_xdg_mime_magic_parse_header (FILE *magic_file, XdgMimeMagicMatch *match)
-{
- int c;
- char *buffer;
- char *end_ptr;
- int end_of_file = 0;
-
- assert (magic_file != NULL);
- assert (match != NULL);
-
- c = getc_unlocked (magic_file);
- if (c == EOF)
- return XDG_MIME_MAGIC_EOF;
- if (c != '[')
- return XDG_MIME_MAGIC_ERROR;
-
- match->priority = _xdg_mime_magic_read_a_number (magic_file, &end_of_file);
- if (end_of_file)
- return XDG_MIME_MAGIC_EOF;
- if (match->priority == -1)
- return XDG_MIME_MAGIC_ERROR;
-
- c = getc_unlocked (magic_file);
- if (c == EOF)
- return XDG_MIME_MAGIC_EOF;
- if (c != ':')
- return XDG_MIME_MAGIC_ERROR;
-
- buffer = (char *)_xdg_mime_magic_read_to_newline (magic_file, &end_of_file);
- if (end_of_file)
- return XDG_MIME_MAGIC_EOF;
-
- end_ptr = buffer;
- while (*end_ptr != ']' && *end_ptr != '\000' && *end_ptr != '\n')
- end_ptr++;
- if (*end_ptr != ']')
- {
- free (buffer);
- return XDG_MIME_MAGIC_ERROR;
- }
- *end_ptr = '\000';
-
- match->mime_type = strdup (buffer);
- free (buffer);
-
- return XDG_MIME_MAGIC_MAGIC;
-}
-
-static XdgMimeMagicState
-_xdg_mime_magic_parse_error (FILE *magic_file)
-{
- int c;
-
- while (1)
- {
- c = getc_unlocked (magic_file);
- if (c == EOF)
- return XDG_MIME_MAGIC_EOF;
- if (c == '\n')
- return XDG_MIME_MAGIC_SECTION;
- }
-}
-
-/* Headers are of the format:
- * [ indent ] ">" start-offset "=" value
- * [ "&" mask ] [ "~" word-size ] [ "+" range-length ] "\n"
- */
-static XdgMimeMagicState
-_xdg_mime_magic_parse_magic_line (FILE *magic_file,
- XdgMimeMagicMatch *match)
-{
- XdgMimeMagicMatchlet *matchlet;
- int c;
- int end_of_file;
- int indent = 0;
- int bytes_read;
-
- assert (magic_file != NULL);
-
- /* Sniff the buffer to make sure it's a valid line */
- c = getc_unlocked (magic_file);
- if (c == EOF)
- return XDG_MIME_MAGIC_EOF;
- else if (c == '[')
- {
- ungetc (c, magic_file);
- return XDG_MIME_MAGIC_SECTION;
- }
- else if (c == '\n')
- return XDG_MIME_MAGIC_MAGIC;
-
- /* At this point, it must be a digit or a '>' */
- end_of_file = FALSE;
- if (isdigit (c))
- {
- ungetc (c, magic_file);
- indent = _xdg_mime_magic_read_a_number (magic_file, &end_of_file);
- if (end_of_file)
- return XDG_MIME_MAGIC_EOF;
- if (indent == -1)
- return XDG_MIME_MAGIC_ERROR;
- c = getc_unlocked (magic_file);
- if (c == EOF)
- return XDG_MIME_MAGIC_EOF;
- }
-
- if (c != '>')
- return XDG_MIME_MAGIC_ERROR;
-
- matchlet = _xdg_mime_magic_matchlet_new ();
- matchlet->indent = indent;
- matchlet->offset = _xdg_mime_magic_read_a_number (magic_file, &end_of_file);
- if (end_of_file)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- return XDG_MIME_MAGIC_EOF;
- }
- if (matchlet->offset == -1)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- return XDG_MIME_MAGIC_ERROR;
- }
- c = getc_unlocked (magic_file);
- if (c == EOF)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- return XDG_MIME_MAGIC_EOF;
- }
- else if (c != '=')
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- return XDG_MIME_MAGIC_ERROR;
- }
-
- /* Next two bytes determine how long the value is */
- matchlet->value_length = 0;
- c = getc_unlocked (magic_file);
- if (c == EOF)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- return XDG_MIME_MAGIC_EOF;
- }
- matchlet->value_length = c & 0xFF;
- matchlet->value_length = matchlet->value_length << 8;
-
- c = getc_unlocked (magic_file);
- if (c == EOF)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- return XDG_MIME_MAGIC_EOF;
- }
- matchlet->value_length = matchlet->value_length + (c & 0xFF);
-
- matchlet->value = malloc (matchlet->value_length);
-
- /* OOM */
- if (matchlet->value == NULL)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- return XDG_MIME_MAGIC_ERROR;
- }
- bytes_read = fread (matchlet->value, 1, matchlet->value_length, magic_file);
- if (bytes_read != matchlet->value_length)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- if (feof (magic_file))
- return XDG_MIME_MAGIC_EOF;
- else
- return XDG_MIME_MAGIC_ERROR;
- }
-
- c = getc_unlocked (magic_file);
- if (c == '&')
- {
- matchlet->mask = malloc (matchlet->value_length);
- /* OOM */
- if (matchlet->mask == NULL)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- return XDG_MIME_MAGIC_ERROR;
- }
- bytes_read = fread (matchlet->mask, 1, matchlet->value_length, magic_file);
- if (bytes_read != matchlet->value_length)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- if (feof (magic_file))
- return XDG_MIME_MAGIC_EOF;
- else
- return XDG_MIME_MAGIC_ERROR;
- }
- c = getc_unlocked (magic_file);
- }
-
- if (c == '~')
- {
- matchlet->word_size = _xdg_mime_magic_read_a_number (magic_file, &end_of_file);
- if (end_of_file)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- return XDG_MIME_MAGIC_EOF;
- }
- if (matchlet->word_size != 0 &&
- matchlet->word_size != 1 &&
- matchlet->word_size != 2 &&
- matchlet->word_size != 4)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- return XDG_MIME_MAGIC_ERROR;
- }
- c = getc_unlocked (magic_file);
- }
-
- if (c == '+')
- {
- matchlet->range_length = _xdg_mime_magic_read_a_number (magic_file, &end_of_file);
- if (end_of_file)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- return XDG_MIME_MAGIC_EOF;
- }
- if (matchlet->range_length == -1)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- return XDG_MIME_MAGIC_ERROR;
- }
- c = getc_unlocked (magic_file);
- }
-
-
- if (c == '\n')
- {
- /* We clean up the matchlet, byte swapping if needed */
- if (matchlet->word_size > 1)
- {
- int i;
- if (matchlet->value_length % matchlet->word_size != 0)
- {
- _xdg_mime_magic_matchlet_free (matchlet);
- return XDG_MIME_MAGIC_ERROR;
- }
- /* FIXME: need to get this defined in a <config.h> style file */
-#if LITTLE_ENDIAN
- for (i = 0; i < matchlet->value_length; i = i + matchlet->word_size)
- {
- if (matchlet->word_size == 2)
- *((xdg_uint16_t *) matchlet->value + i) = SWAP_BE16_TO_LE16 (*((xdg_uint16_t *) (matchlet->value + i)));
- else if (matchlet->word_size == 4)
- *((xdg_uint32_t *) matchlet->value + i) = SWAP_BE32_TO_LE32 (*((xdg_uint32_t *) (matchlet->value + i)));
- if (matchlet->mask)
- {
- if (matchlet->word_size == 2)
- *((xdg_uint16_t *) matchlet->mask + i) = SWAP_BE16_TO_LE16 (*((xdg_uint16_t *) (matchlet->mask + i)));
- else if (matchlet->word_size == 4)
- *((xdg_uint32_t *) matchlet->mask + i) = SWAP_BE32_TO_LE32 (*((xdg_uint32_t *) (matchlet->mask + i)));
-
- }
- }
-#endif
- }
-
- matchlet->next = match->matchlet;
- match->matchlet = matchlet;
-
-
- return XDG_MIME_MAGIC_MAGIC;
- }
-
- _xdg_mime_magic_matchlet_free (matchlet);
- if (c == EOF)
- return XDG_MIME_MAGIC_EOF;
-
- return XDG_MIME_MAGIC_ERROR;
-}
-
-static int
-_xdg_mime_magic_matchlet_compare_to_data (XdgMimeMagicMatchlet *matchlet,
- const void *data,
- size_t len)
-{
- int i, j;
- for (i = matchlet->offset; i < matchlet->offset + matchlet->range_length; i++)
- {
- int valid_matchlet = TRUE;
-
- if (i + matchlet->value_length > len)
- return FALSE;
-
- if (matchlet->mask)
- {
- for (j = 0; j < matchlet->value_length; j++)
- {
- if ((matchlet->value[j] & matchlet->mask[j]) !=
- ((((unsigned char *) data)[j + i]) & matchlet->mask[j]))
- {
- valid_matchlet = FALSE;
- break;
- }
- }
- }
- else
- {
- for (j = 0; j < matchlet->value_length; j++)
- {
- if (matchlet->value[j] != ((unsigned char *) data)[j + i])
- {
- valid_matchlet = FALSE;
- break;
- }
- }
- }
- if (valid_matchlet)
- return TRUE;
- }
- return FALSE;
-}
-
-static int
-_xdg_mime_magic_matchlet_compare_level (XdgMimeMagicMatchlet *matchlet,
- const void *data,
- size_t len,
- int indent)
-{
- while ((matchlet != NULL) && (matchlet->indent == indent))
- {
- if (_xdg_mime_magic_matchlet_compare_to_data (matchlet, data, len))
- {
- if ((matchlet->next == NULL) ||
- (matchlet->next->indent <= indent))
- return TRUE;
-
- if (_xdg_mime_magic_matchlet_compare_level (matchlet->next,
- data,
- len,
- indent + 1))
- return TRUE;
- }
-
- do
- {
- matchlet = matchlet->next;
- }
- while (matchlet && matchlet->indent > indent);
- }
-
- return FALSE;
-}
-
-static int
-_xdg_mime_magic_match_compare_to_data (XdgMimeMagicMatch *match,
- const void *data,
- size_t len)
-{
- return _xdg_mime_magic_matchlet_compare_level (match->matchlet, data, len, 0);
-}
-
-static void
-_xdg_mime_magic_insert_match (XdgMimeMagic *mime_magic,
- XdgMimeMagicMatch *match)
-{
- XdgMimeMagicMatch *list;
-
- if (mime_magic->match_list == NULL)
- {
- mime_magic->match_list = match;
- return;
- }
-
- if (match->priority > mime_magic->match_list->priority)
- {
- match->next = mime_magic->match_list;
- mime_magic->match_list = match;
- return;
- }
-
- list = mime_magic->match_list;
- while (list->next != NULL)
- {
- if (list->next->priority < match->priority)
- {
- match->next = list->next;
- list->next = match;
- return;
- }
- list = list->next;
- }
- list->next = match;
- match->next = NULL;
-}
-
-XdgMimeMagic *
-_xdg_mime_magic_new (void)
-{
- return calloc (1, sizeof (XdgMimeMagic));
-}
-
-void
-_xdg_mime_magic_free (XdgMimeMagic *mime_magic)
-{
- if (mime_magic) {
- _xdg_mime_magic_match_free (mime_magic->match_list);
- free (mime_magic);
- }
-}
-
-int
-_xdg_mime_magic_get_buffer_extents (XdgMimeMagic *mime_magic)
-{
- return mime_magic->max_extent;
-}
-
-const char *
-_xdg_mime_magic_lookup_data (XdgMimeMagic *mime_magic,
- const void *data,
- size_t len,
- int *result_prio,
- const char *mime_types[],
- int n_mime_types)
-{
- XdgMimeMagicMatch *match;
- const char *mime_type;
- int n;
- int prio;
-
- prio = 0;
- mime_type = NULL;
- for (match = mime_magic->match_list; match; match = match->next)
- {
- if (_xdg_mime_magic_match_compare_to_data (match, data, len))
- {
- prio = match->priority;
- mime_type = match->mime_type;
- break;
- }
- else
- {
- for (n = 0; n < n_mime_types; n++)
- {
- if (mime_types[n] &&
- _xdg_mime_mime_type_equal (mime_types[n], match->mime_type))
- mime_types[n] = NULL;
- }
- }
- }
-
- if (mime_type == NULL)
- {
- for (n = 0; n < n_mime_types; n++)
- {
- if (mime_types[n])
- mime_type = mime_types[n];
- }
- }
-
- if (result_prio)
- *result_prio = prio;
-
- return mime_type;
-}
-
-static void
-_xdg_mime_update_mime_magic_extents (XdgMimeMagic *mime_magic)
-{
- XdgMimeMagicMatch *match;
- int max_extent = 0;
-
- for (match = mime_magic->match_list; match; match = match->next)
- {
- XdgMimeMagicMatchlet *matchlet;
-
- for (matchlet = match->matchlet; matchlet; matchlet = matchlet->next)
- {
- int extent;
-
- extent = matchlet->value_length + matchlet->offset + matchlet->range_length;
- if (max_extent < extent)
- max_extent = extent;
- }
- }
-
- mime_magic->max_extent = max_extent;
-}
-
-static XdgMimeMagicMatchlet *
-_xdg_mime_magic_matchlet_mirror (XdgMimeMagicMatchlet *matchlets)
-{
- XdgMimeMagicMatchlet *new_list;
- XdgMimeMagicMatchlet *tmp;
-
- if ((matchlets == NULL) || (matchlets->next == NULL))
- return matchlets;
-
- new_list = NULL;
- tmp = matchlets;
- while (tmp != NULL)
- {
- XdgMimeMagicMatchlet *matchlet;
-
- matchlet = tmp;
- tmp = tmp->next;
- matchlet->next = new_list;
- new_list = matchlet;
- }
-
- return new_list;
-
-}
-
-static void
-_xdg_mime_magic_read_magic_file (XdgMimeMagic *mime_magic,
- FILE *magic_file)
-{
- XdgMimeMagicState state;
- XdgMimeMagicMatch *match = NULL; /* Quiet compiler */
-
- state = XDG_MIME_MAGIC_SECTION;
-
- while (state != XDG_MIME_MAGIC_EOF)
- {
- switch (state)
- {
- case XDG_MIME_MAGIC_SECTION:
- match = _xdg_mime_magic_match_new ();
- state = _xdg_mime_magic_parse_header (magic_file, match);
- if (state == XDG_MIME_MAGIC_EOF || state == XDG_MIME_MAGIC_ERROR)
- _xdg_mime_magic_match_free (match);
- break;
- case XDG_MIME_MAGIC_MAGIC:
- state = _xdg_mime_magic_parse_magic_line (magic_file, match);
- if (state == XDG_MIME_MAGIC_SECTION ||
- (state == XDG_MIME_MAGIC_EOF && match->mime_type))
- {
- match->matchlet = _xdg_mime_magic_matchlet_mirror (match->matchlet);
- _xdg_mime_magic_insert_match (mime_magic, match);
- }
- else if (state == XDG_MIME_MAGIC_EOF || state == XDG_MIME_MAGIC_ERROR)
- _xdg_mime_magic_match_free (match);
- break;
- case XDG_MIME_MAGIC_ERROR:
- state = _xdg_mime_magic_parse_error (magic_file);
- break;
- case XDG_MIME_MAGIC_EOF:
- default:
- /* Make the compiler happy */
- assert (0);
- }
- }
- _xdg_mime_update_mime_magic_extents (mime_magic);
-}
-
-void
-_xdg_mime_magic_read_from_file (XdgMimeMagic *mime_magic,
- const char *file_name)
-{
- FILE *magic_file;
- char header[12];
-
- magic_file = fopen (file_name, "r");
-
- if (magic_file == NULL)
- return;
-
- if (fread (header, 1, 12, magic_file) == 12)
- {
- if (memcmp ("MIME-Magic\0\n", header, 12) == 0)
- _xdg_mime_magic_read_magic_file (mime_magic, magic_file);
- }
-
- fclose (magic_file);
-}
diff --git a/gtk/xdgmime/xdgmimemagic.h b/gtk/xdgmime/xdgmimemagic.h
deleted file mode 100644
index 8f113051e..000000000
--- a/gtk/xdgmime/xdgmimemagic.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmimemagic.h: Private file. Datastructure for storing the magic files.
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2003 Red Hat, Inc.
- * Copyright (C) 2003 Jonathan Blandford <jrb@alum.mit.edu>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __XDG_MIME_MAGIC_H__
-#define __XDG_MIME_MAGIC_H__
-
-#include <unistd.h>
-#include "xdgmime.h"
-typedef struct XdgMimeMagic XdgMimeMagic;
-
-#ifdef XDG_PREFIX
-#define _xdg_mime_glob_read_from_file XDG_ENTRY(glob_read_from_file)
-#define _xdg_mime_magic_new XDG_ENTRY(magic_new)
-#define _xdg_mime_magic_read_from_file XDG_ENTRY(magic_read_from_file)
-#define _xdg_mime_magic_free XDG_ENTRY(magic_free)
-#define _xdg_mime_magic_get_buffer_extents XDG_ENTRY(magic_get_buffer_extents)
-#define _xdg_mime_magic_lookup_data XDG_ENTRY(magic_lookup_data)
-#endif
-
-
-XdgMimeMagic *_xdg_mime_magic_new (void);
-void _xdg_mime_magic_read_from_file (XdgMimeMagic *mime_magic,
- const char *file_name);
-void _xdg_mime_magic_free (XdgMimeMagic *mime_magic);
-int _xdg_mime_magic_get_buffer_extents (XdgMimeMagic *mime_magic);
-const char *_xdg_mime_magic_lookup_data (XdgMimeMagic *mime_magic,
- const void *data,
- size_t len,
- int *result_prio,
- const char *mime_types[],
- int n_mime_types);
-
-#endif /* __XDG_MIME_MAGIC_H__ */
diff --git a/gtk/xdgmime/xdgmimeparent.c b/gtk/xdgmime/xdgmimeparent.c
deleted file mode 100644
index 511bbacbc..000000000
--- a/gtk/xdgmime/xdgmimeparent.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmimealias.c: Private file. Datastructure for storing the hierarchy.
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2004 Red Hat, Inc.
- * Copyright (C) 2004 Matthias Clasen <mclasen@redhat.com>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "xdgmimeparent.h"
-#include "xdgmimeint.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include <fnmatch.h>
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#ifndef TRUE
-#define TRUE (!FALSE)
-#endif
-
-typedef struct XdgMimeParents XdgMimeParents;
-
-struct XdgMimeParents
-{
- char *mime;
- char **parents;
- int n_parents;
-};
-
-struct XdgParentList
-{
- struct XdgMimeParents *parents;
- int n_mimes;
-};
-
-XdgParentList *
-_xdg_mime_parent_list_new (void)
-{
- XdgParentList *list;
-
- list = malloc (sizeof (XdgParentList));
-
- list->parents = NULL;
- list->n_mimes = 0;
-
- return list;
-}
-
-void
-_xdg_mime_parent_list_free (XdgParentList *list)
-{
- int i;
- char **p;
-
- if (list->parents)
- {
- for (i = 0; i < list->n_mimes; i++)
- {
- for (p = list->parents[i].parents; *p; p++)
- free (*p);
-
- free (list->parents[i].parents);
- free (list->parents[i].mime);
- }
- free (list->parents);
- }
- free (list);
-}
-
-static int
-parent_entry_cmp (const void *v1, const void *v2)
-{
- return strcmp (((XdgMimeParents *)v1)->mime, ((XdgMimeParents *)v2)->mime);
-}
-
-const char **
-_xdg_mime_parent_list_lookup (XdgParentList *list,
- const char *mime)
-{
- XdgMimeParents *entry;
- XdgMimeParents key;
-
- if (list->n_mimes > 0)
- {
- key.mime = (char *)mime;
- key.parents = NULL;
-
- entry = bsearch (&key, list->parents, list->n_mimes,
- sizeof (XdgMimeParents), &parent_entry_cmp);
- if (entry)
- return (const char **)entry->parents;
- }
-
- return NULL;
-}
-
-void
-_xdg_mime_parent_read_from_file (XdgParentList *list,
- const char *file_name)
-{
- FILE *file;
- char line[255];
- int i, alloc;
- XdgMimeParents *entry;
-
- file = fopen (file_name, "r");
-
- if (file == NULL)
- return;
-
- /* FIXME: Not UTF-8 safe. Doesn't work if lines are greater than 255 chars.
- * Blah */
- alloc = list->n_mimes + 16;
- list->parents = realloc (list->parents, alloc * sizeof (XdgMimeParents));
- while (fgets (line, 255, file) != NULL)
- {
- char *sep;
- if (line[0] == '#')
- continue;
-
- sep = strchr (line, ' ');
- if (sep == NULL)
- continue;
- *(sep++) = '\000';
- sep[strlen (sep) -1] = '\000';
- entry = NULL;
- for (i = 0; i < list->n_mimes; i++)
- {
- if (strcmp (list->parents[i].mime, line) == 0)
- {
- entry = &(list->parents[i]);
- break;
- }
- }
-
- if (!entry)
- {
- if (list->n_mimes == alloc)
- {
- alloc <<= 1;
- list->parents = realloc (list->parents,
- alloc * sizeof (XdgMimeParents));
- }
- list->parents[list->n_mimes].mime = strdup (line);
- list->parents[list->n_mimes].parents = NULL;
- entry = &(list->parents[list->n_mimes]);
- list->n_mimes++;
- }
-
- if (!entry->parents)
- {
- entry->n_parents = 1;
- entry->parents = malloc ((entry->n_parents + 1) * sizeof (char *));
- }
- else
- {
- entry->n_parents += 1;
- entry->parents = realloc (entry->parents,
- (entry->n_parents + 2) * sizeof (char *));
- }
- entry->parents[entry->n_parents - 1] = strdup (sep);
- entry->parents[entry->n_parents] = NULL;
- }
-
- list->parents = realloc (list->parents,
- list->n_mimes * sizeof (XdgMimeParents));
-
- fclose (file);
-
- if (list->n_mimes > 1)
- qsort (list->parents, list->n_mimes,
- sizeof (XdgMimeParents), &parent_entry_cmp);
-}
-
-
-void
-_xdg_mime_parent_list_dump (XdgParentList *list)
-{
- int i;
- char **p;
-
- if (list->parents)
- {
- for (i = 0; i < list->n_mimes; i++)
- {
- for (p = list->parents[i].parents; *p; p++)
- printf ("%s %s\n", list->parents[i].mime, *p);
- }
- }
-}
-
-
diff --git a/gtk/xdgmime/xdgmimeparent.h b/gtk/xdgmime/xdgmimeparent.h
deleted file mode 100644
index 257ea0497..000000000
--- a/gtk/xdgmime/xdgmimeparent.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* xdgmimeparent.h: Private file. Datastructure for storing the hierarchy.
- *
- * More info can be found at http://www.freedesktop.org/standards/
- *
- * Copyright (C) 2004 Red Hat, Inc.
- * Copyright (C) 200 Matthias Clasen <mclasen@redhat.com>
- *
- * Licensed under the Academic Free License version 2.0
- * Or under the following terms:
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __XDG_MIME_PARENT_H__
-#define __XDG_MIME_PARENT_H__
-
-#include "xdgmime.h"
-
-typedef struct XdgParentList XdgParentList;
-
-#ifdef XDG_PREFIX
-#define _xdg_mime_parent_read_from_file XDG_ENTRY(parent_read_from_file)
-#define _xdg_mime_parent_list_new XDG_ENTRY(parent_list_new)
-#define _xdg_mime_parent_list_free XDG_ENTRY(parent_list_free)
-#define _xdg_mime_parent_list_lookup XDG_ENTRY(parent_list_lookup)
-#define _xdg_mime_parent_list_dump XDG_ENTRY(parent_list_dump)
-#endif
-
-void _xdg_mime_parent_read_from_file (XdgParentList *list,
- const char *file_name);
-XdgParentList *_xdg_mime_parent_list_new (void);
-void _xdg_mime_parent_list_free (XdgParentList *list);
-const char **_xdg_mime_parent_list_lookup (XdgParentList *list,
- const char *mime);
-void _xdg_mime_parent_list_dump (XdgParentList *list);
-
-#endif /* __XDG_MIME_PARENT_H__ */