Attachment 2284 Details for Bug 2805 – a complete patch

[patch] a complete patch

xdgmime.diff2 (text/plain), 27.74 KB, created by Matthias Clasen on 2005-04-01 11:51:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Clasen

Created: 2005-04-01 11:51:39 UTC

Size: 27.74 KB

patch

obsolete

>Index: xdgmime/Makefile.am
>===================================================================
>RCS file: /cvs/gnome/gtk+/gtk/xdgmime/Makefile.am,v
>retrieving revision 1.4
>diff -u -p -r1.4 Makefile.am
>--- xdgmime/Makefile.am	8 Nov 2004 19:36:12 -0000	1.4
>+++ xdgmime/Makefile.am	1 Apr 2005 06:42:42 -0000
>@@ -5,6 +5,8 @@ noinst_LTLIBRARIES = libxdgmime.la
> libxdgmime_la_SOURCES = \
> 	xdgmime.c 	\
> 	xdgmime.h	\
>+	xdgmimecache.c 	\
>+	xdgmimecache.h	\
> 	xdgmimealias.c	\
> 	xdgmimealias.h	\
> 	xdgmimeglob.c 	\
>Index: xdgmime/test-mime.c
>===================================================================
>RCS file: /cvs/gnome/gtk+/gtk/xdgmime/test-mime.c,v
>retrieving revision 1.4
>diff -u -p -r1.4 test-mime.c
>--- xdgmime/test-mime.c	8 Nov 2004 19:36:12 -0000	1.4
>+++ xdgmime/test-mime.c	1 Apr 2005 06:42:42 -0000
>@@ -112,7 +112,7 @@ main (int argc, char *argv[])
>       printf ("File \"%s\" has a mime-type of %s\n", file_name, result);
>     }
> 
>-#if 0
>+#if 1
>   xdg_mime_dump ();
> #endif
>   return 0;
>Index: xdgmime/xdgmime.c
>===================================================================
>RCS file: /cvs/gnome/gtk+/gtk/xdgmime/xdgmime.c,v
>retrieving revision 1.11.2.2
>diff -u -p -r1.11.2.2 xdgmime.c
>--- xdgmime/xdgmime.c	1 Mar 2005 17:40:57 -0000	1.11.2.2
>+++ xdgmime/xdgmime.c	1 Apr 2005 06:42:42 -0000
>@@ -35,6 +35,7 @@
> #include "xdgmimemagic.h"
> #include "xdgmimealias.h"
> #include "xdgmimeparent.h"
>+#include "xdgmimecache.h"
> #include <stdio.h>
> #include <string.h>
> #include <sys/stat.h>
>@@ -55,6 +56,9 @@ static XdgAliasList *alias_list = NULL;
> static XdgParentList *parent_list = NULL;
> static XdgDirTimeList *dir_time_list = NULL;
> static XdgCallbackList *callback_list = NULL;
>+XdgMimeCache **caches = NULL;
>+int n_caches = 0;
>+
> const char *xdg_mime_type_unknown = "application/octet-stream";
> 
> 
>@@ -122,6 +126,28 @@ xdg_mime_init_from_directory (const char
> 
>   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)
>+	{
>+	  list = xdg_dir_time_list_new ();
>+	  list->directory_name = file_name;
>+	  list->mtime = st.st_mtime;
>+	  list->next = dir_time_list;
>+	  dir_time_list = list;
>+
>+	  caches = realloc (caches, n_caches + 1);
>+	  caches[n_caches] = cache;
>+	  n_caches++;
>+
>+	  return FALSE;
>+	}
>+    }
>+
>   file_name = malloc (strlen (directory) + strlen ("/mime/globs") + 1);
>   strcpy (file_name, directory); strcat (file_name, "/mime/globs");
>   if (stat (file_name, &st) == 0)
>@@ -311,6 +337,17 @@ xdg_check_dir (const char *directory,
>       return TRUE;
>     }
> 
>+  /* 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);
>+  free (file_name);
>+  if (invalid)
>+    {
>+      *invalid_dir_list = TRUE;
>+      return TRUE;
>+    }
>+
>   return FALSE; /* Keep processing */
> }
> 
>@@ -395,6 +432,9 @@ xdg_mime_get_mime_type_for_data (const v
> 
>   xdg_mime_init ();
> 
>+  if (caches)
>+    return _xdg_mime_cache_get_mime_type_for_data (data, len);
>+
>   mime_type = _xdg_mime_magic_lookup_data (global_magic, data, len);
> 
>   if (mime_type)
>@@ -421,6 +461,9 @@ xdg_mime_get_mime_type_for_file (const c
> 
>   xdg_mime_init ();
> 
>+  if (caches)
>+    return _xdg_mime_cache_get_mime_type_for_file (file_name);
>+
>   base_name = _xdg_get_base_name (file_name);
>   mime_type = xdg_mime_get_mime_type_from_file_name (base_name);
> 
>@@ -474,6 +517,9 @@ xdg_mime_get_mime_type_from_file_name (c
> 
>   xdg_mime_init ();
> 
>+  if (caches)
>+    return _xdg_mime_cache_get_mime_type_from_file_name (file_name);
>+
>   mime_type = _xdg_glob_hash_lookup_file_name (global_hash, file_name);
>   if (mime_type)
>     return mime_type;
>@@ -529,6 +575,9 @@ 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);
> }
> 
>@@ -539,6 +588,9 @@ xdg_mime_unalias_mime_type (const char *
> 
>   xdg_mime_init ();
> 
>+  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;
> 
>@@ -604,6 +656,9 @@ xdg_mime_mime_type_subclass (const char 
> 
>   xdg_mime_init ();
> 
>+  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);
> 
>@@ -636,6 +691,26 @@ xdg_mime_mime_type_subclass (const char 
>     }
> 
>   return 0;
>+}
>+
>+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);
>+  for (i = 0; parents[i]; i++) ;
>+  
>+  n = (i + 1) * sizeof (char *);
>+  result = (char **) malloc (n);
>+  memcpy (result, parents, n);
>+
>+  return result;
> }
> 
> const char **
>Index: xdgmime/xdgmime.h
>===================================================================
>RCS file: /cvs/gnome/gtk+/gtk/xdgmime/xdgmime.h,v
>retrieving revision 1.9.2.2
>diff -u -p -r1.9.2.2 xdgmime.h
>--- xdgmime/xdgmime.h	1 Mar 2005 17:40:57 -0000	1.9.2.2
>+++ xdgmime/xdgmime.h	1 Apr 2005 06:42:42 -0000
>@@ -54,6 +54,7 @@ typedef void (*XdgMimeDestroy)  (void *u
> #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_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_get_max_buffer_extents       XDG_ENTRY(get_max_buffer_extents)
> #define xdg_mime_shutdown                     XDG_ENTRY(shutdown)
>@@ -77,7 +78,13 @@ int          xdg_mime_media_type_equal  
> 						    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);
>--- /dev/null	2005-03-23 11:32:28.154653280 -0500
>+++ xdgmime/xdgmimecache.c	2005-03-25 01:17:45.825143112 -0500
>@@ -0,0 +1,811 @@
>+/* -*- 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
>+
>+#define MAJOR_VERSION 1
>+#define MINOR_VERSION 0
>+
>+extern XdgMimeCache **caches;
>+extern int n_caches;
>+
>+struct _XdgMimeCache
>+{
>+  int ref_count;
>+
>+  size_t  size;
>+  char   *buffer;
>+};
>+
>+#define GET_UINT16(cache,offset) (ntohs(*(uint16_t*)&(cache)[offset]))
>+#define GET_UINT32(cache,offset) (ntohl(*(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, offset);
>+  xdg_uint32_t range_length = GET_UINT32 (cache, offset + 4);
>+  xdg_uint32_t data_length = GET_UINT32 (cache, offset + 12);
>+  xdg_uint32_t data_offset = GET_UINT32 (cache, offset + 16);
>+  xdg_uint32_t mask_offset = GET_UINT32 (cache, 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 ((cache->buffer[data_offset + j] & cache->buffer[mask_offset + j]) !=
>+		  ((((unsigned char *) data)[j + i]) & cache->buffer[mask_offset + j]))
>+		{
>+		  valid_matchlet = FALSE;
>+		  break;
>+		}
>+	    }
>+	}
>+      else
>+	{
>+	  for (j = 0; j < data_length; j++)
>+	    {
>+	      if (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, offset + 24);
>+  xdg_uint32_t child_offset = GET_UINT32 (cache, 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)
>+{
>+  xdg_uint32_t list_offset;
>+  xdg_uint32_t n_entries;
>+  xdg_uint32_t offset;
>+
>+  int j;
>+
>+  *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 = cache_magic_compare_to_data (cache, offset + 16 * j, 
>+						       data, len, prio);
>+      if (match)
>+	return match;
>+    }
>+
>+  return NULL;
>+}
>+
>+static const char *
>+cache_alias_lookup (const char *alias)
>+{
>+  const char *ptr;
>+  int i, min, max, mid, cmp;
>+
>+  for (i = 0; i < n_caches; 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 const char *
>+cache_glob_lookup_literal (const char *file_name)
>+{
>+  const char *ptr;
>+  int i, min, max, mid, cmp;
>+
>+  for (i = 0; i < n_caches; 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);
>+	      return  cache->buffer + offset;
>+	    }
>+	}
>+    }
>+
>+  return NULL;
>+}
>+
>+static const char *
>+cache_glob_lookup_fnmatch (const char *file_name)
>+{
>+  const char *mime_type;
>+  const char *ptr;
>+
>+  int i, j;
>+
>+  for (i = 0; i < n_caches; 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; 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)
>+	    return mime_type;
>+	}
>+    }
>+
>+  return NULL;
>+}
>+
>+static const char *
>+cache_glob_node_lookup_suffix (XdgMimeCache *cache,
>+			       xdg_uint32_t  n_entries,
>+			       xdg_uint32_t  offset,
>+			       const char   *suffix, 
>+			       int           ignore_case)
>+{
>+  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;
>+
>+  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);
>+
>+	      return cache->buffer + mimetype_offset;
>+	    }
>+	  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);
>+	    }
>+	}
>+    }
>+
>+  return NULL;
>+}
>+
>+static const char *
>+cache_glob_lookup_suffix (const char *suffix, 
>+			  int         ignore_case)
>+{
>+  const char *mime_type;
>+
>+  int i;
>+
>+  for (i = 0; i < n_caches; 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);
>+
>+      mime_type = cache_glob_node_lookup_suffix (cache, 
>+						 n_entries, offset, 
>+						 suffix, ignore_case);
>+      if (mime_type)
>+	return mime_type;
>+    }
>+
>+  return NULL;
>+}
>+
>+static void
>+find_stopchars (char *stopchars)
>+{
>+  int i, j, k, l;
>+ 
>+  k = 0;
>+  for (i = 0; i < n_caches; 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 const char *
>+cache_glob_lookup_file_name (const char *file_name)
>+{
>+  const char *mime_type;
>+  const char *ptr;
>+  char stopchars[128];
>+
>+  assert (file_name != NULL);
>+
>+  /* First, check the literals */
>+  mime_type = cache_glob_lookup_literal (file_name);
>+  if (mime_type)
>+    return mime_type;
>+
>+  find_stopchars (stopchars);
>+
>+  /* Next, check suffixes */
>+  ptr = strpbrk (file_name, stopchars);
>+  while (ptr)
>+    {
>+      mime_type = cache_glob_lookup_suffix (ptr, FALSE);
>+      if (mime_type != NULL)
>+	return mime_type;
>+      
>+      mime_type = cache_glob_lookup_suffix (ptr, TRUE);
>+      if (mime_type != NULL)
>+	return mime_type;
>+
>+      ptr = strpbrk (ptr + 1, stopchars);
>+    }
>+  
>+  /* Last, try fnmatch */
>+  return cache_glob_lookup_fnmatch (file_name);
>+}
>+
>+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; i < n_caches; 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;
>+}
>+
>+const char *
>+_xdg_mime_cache_get_mime_type_for_data (const void *data,
>+					size_t      len)
>+{
>+  const char *mime_type;
>+  int i, priority;
>+
>+  priority = 0;
>+  mime_type = NULL;
>+  for (i = 0; i < n_caches; i++)
>+    {
>+      XdgMimeCache *cache = caches[i];
>+
>+      int prio;
>+      const char *match;
>+
>+      match = cache_magic_lookup_data (cache, data, len, &prio);
>+      if (prio > priority)
>+	{
>+	  priority = prio;
>+	  mime_type = match;
>+	}
>+    }
>+
>+  if (priority > 0)
>+    return mime_type;
>+
>+  return XDG_MIME_TYPE_UNKNOWN;
>+}
>+
>+const char *
>+_xdg_mime_cache_get_mime_type_for_file (const char *file_name)
>+{
>+  const char *mime_type;
>+  FILE *file;
>+  unsigned char *data;
>+  int max_extent;
>+  int bytes_read;
>+  struct stat statbuf;
>+  const char *base_name;
>+
>+  if (file_name == NULL)
>+    return NULL;
>+
>+  if (! _xdg_utf8_validate (file_name))
>+    return NULL;
>+
>+  base_name = _xdg_get_base_name (file_name);
>+  mime_type = _xdg_mime_cache_get_mime_type_from_file_name (base_name);
>+
>+  if (mime_type != XDG_MIME_TYPE_UNKNOWN)
>+    return mime_type;
>+
>+  if (stat (file_name, &statbuf) != 0)
>+    return XDG_MIME_TYPE_UNKNOWN;
>+
>+  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 = _xdg_mime_cache_get_mime_type_for_data (data, bytes_read);
>+
>+  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;
>+
>+  mime_type = cache_glob_lookup_file_name (file_name);
>+
>+  if (mime_type)
>+    return mime_type;
>+  else
>+    return XDG_MIME_TYPE_UNKNOWN;
>+}
>+
>+#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; i < n_caches; 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, p;
>+  char *all_parents[128]; /* we'll stop at 128 */ 
>+  char **result;
>+
>+  p = 0;
>+  for (i = 0; i < n_caches; 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 * i);
>+	  xdg_uint32_t parents_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * i + 4);
>+	  
>+	  if (strcmp (cache->buffer + mimetype_offset, mime) == 0)
>+	    {
>+	      xdg_uint32_t n_parents = GET_UINT32 (cache->buffer, parents_offset);
>+	      
>+	      for (j = 0; j < n_parents; j++)
>+		all_parents[p++] = cache->buffer + parents_offset + 4 + 4 * j;
>+
>+	      break;
>+	    }
>+	}
>+    }
>+  all_parents[p++] = 0;
>+  
>+  result = (char **) malloc (p * sizeof (char *));
>+  memcpy (result, all_parents, p * sizeof (char *));
>+
>+  return result;
>+}
>+
>
>
>
>--- /dev/null	2005-03-23 11:32:28.154653280 -0500
>+++ xdgmime/xdgmimecache.h	2005-03-25 00:08:29.622981880 -0500
>@@ -0,0 +1,60 @@
>+/* -*- 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)
>+#endif
>+
>+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);
>+const char  *_xdg_mime_cache_get_mime_type_for_file       (const char *file_name);
>+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__ */

Actions: View | Splinter Review

Attachments on bug 2805: 2211 | 2280 | 2284

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.