callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make it compile without mmap() and add some more checks. (#155973, Morten

Browse Source 
2004-10-21  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkiconcache.c: Make it compile without mmap() and
	add some more checks.  (#155973, Morten Welinder)
This commit is contained in:
Matthias Clasen 2004-10-21 05:19:27 +00:00 committed by Matthias Clasen
parent 968b192fec
commit 1cf454c93b
5 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2004-10-21 Matthias Clasen <mclasen@redhat.com> 2004-10-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconcache.c: Make it compile without mmap() and
add some more checks. (#155973, Morten Welinder)
Add convenience api for image dnd (#150165): Add convenience api for image dnd (#150165):
* gtk/gtkselection.h: * gtk/gtkselection.h:

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2004-10-21 Matthias Clasen <mclasen@redhat.com> 2004-10-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconcache.c: Make it compile without mmap() and
add some more checks. (#155973, Morten Welinder)
Add convenience api for image dnd (#150165): Add convenience api for image dnd (#150165):
* gtk/gtkselection.h: * gtk/gtkselection.h:

3
ChangeLog.pre-2-6
View File

@ -1,5 +1,8 @@
2004-10-21 Matthias Clasen <mclasen@redhat.com> 2004-10-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconcache.c: Make it compile without mmap() and
add some more checks. (#155973, Morten Welinder)
Add convenience api for image dnd (#150165): Add convenience api for image dnd (#150165):
* gtk/gtkselection.h: * gtk/gtkselection.h:

3
ChangeLog.pre-2-8
View File

@ -1,5 +1,8 @@
2004-10-21 Matthias Clasen <mclasen@redhat.com> 2004-10-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconcache.c: Make it compile without mmap() and
add some more checks. (#155973, Morten Welinder)
Add convenience api for image dnd (#150165): Add convenience api for image dnd (#150165):
* gtk/gtkselection.h: * gtk/gtkselection.h:

31
gtk/gtkiconcache.c
View File

@ -21,7 +21,10 @@
#include "gtkdebug.h" #include "gtkdebug.h"
#include "gtkiconcache.h" #include "gtkiconcache.h"
#ifdef HAVE_MMAP
#include <sys/mman.h> #include <sys/mman.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
@ -60,8 +63,9 @@ _gtk_icon_cache_unref (GtkIconCache *cache)
{ {
GTK_NOTE (ICONTHEME, GTK_NOTE (ICONTHEME,
g_print ("unmapping icon cache\n")); g_print ("unmapping icon cache\n"));
#ifdef HAVE_MMAP
munmap (cache->buffer, cache->size); munmap (cache->buffer, cache->size);
#endif
g_free (cache); g_free (cache);
} }
} }
@ -73,7 +77,7 @@ _gtk_icon_cache_new_for_path (const gchar *path)
gint fd; gint fd;
struct stat st; struct stat st;
struct stat path_st; struct stat path_st;
gchar *buffer; gchar *buffer = MAP_FAILED;
GtkIconCache *cache = NULL; GtkIconCache *cache = NULL;
if (g_getenv ("GTK_NO_ICON_CACHE")) if (g_getenv ("GTK_NO_ICON_CACHE"))
@ -85,21 +89,19 @@ _gtk_icon_cache_new_for_path (const gchar *path)
GTK_NOTE (ICONTHEME, GTK_NOTE (ICONTHEME,
g_print ("look for cache in %s\n", path)); g_print ("look for cache in %s\n", path));
if (!g_file_test (cache_filename, G_FILE_TEST_IS_REGULAR))
{
g_free (cache_filename);
return NULL;
};
/* Open the file and mmap it */ /* Open the file and mmap it */
fd = open (cache_filename, O_RDONLY); fd = open (cache_filename, O_RDONLY);
g_free (cache_filename);
if (fd < 0) if (fd < 0)
{
g_free (cache_filename);
return NULL; return NULL;
}
if (fstat (fd, &st) < 0) if (!g_file_test (cache_filename, G_FILE_TEST_IS_REGULAR))
goto done;
if (fstat (fd, &st) < 0 || st.st_size < 4)
goto done; goto done;
if (stat (path, &path_st) < 0) if (stat (path, &path_st) < 0)
@ -113,7 +115,9 @@ _gtk_icon_cache_new_for_path (const gchar *path)
goto done; goto done;
} }
buffer = mmap (0, st.st_size, PROT_READ, MAP_SHARED, fd, 0); #ifdef HAVE_MMAP
buffer = (gchar *) mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
#endif
if (buffer == MAP_FAILED) if (buffer == MAP_FAILED)
goto done; goto done;
@ -122,7 +126,9 @@ _gtk_icon_cache_new_for_path (const gchar *path)
if (GET_UINT16 (buffer, 0) != MAJOR_VERSION || if (GET_UINT16 (buffer, 0) != MAJOR_VERSION ||
GET_UINT16 (buffer, 2) != MINOR_VERSION) GET_UINT16 (buffer, 2) != MINOR_VERSION)
{ {
#ifdef HAVE_MMAP
munmap (buffer, st.st_size); munmap (buffer, st.st_size);
#endif
GTK_NOTE (ICONTHEME, GTK_NOTE (ICONTHEME,
g_print ("wrong cache version\n")); g_print ("wrong cache version\n"));
goto done; goto done;
@ -137,6 +143,7 @@ _gtk_icon_cache_new_for_path (const gchar *path)
cache->size = st.st_size; cache->size = st.st_size;
done: done:
g_free (cache_filename);
close (fd); close (fd);
return cache; return cache;