summaryrefslogtreecommitdiffstats
path: root/devel/gnomevfs2
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-02-23 07:05:14 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-02-23 07:05:14 +0800
commit52adbaa07fdb9e701dad5405314537027c633572 (patch)
tree1a2d0d74f39a2762b3ac7dee055b8d322c51feec /devel/gnomevfs2
parent58caf6f0775eec06a93f4f9731f4313f1a936001 (diff)
downloadmarcuscom-ports-52adbaa07fdb9e701dad5405314537027c633572.tar
marcuscom-ports-52adbaa07fdb9e701dad5405314537027c633572.tar.gz
marcuscom-ports-52adbaa07fdb9e701dad5405314537027c633572.tar.bz2
marcuscom-ports-52adbaa07fdb9e701dad5405314537027c633572.tar.lz
marcuscom-ports-52adbaa07fdb9e701dad5405314537027c633572.tar.xz
marcuscom-ports-52adbaa07fdb9e701dad5405314537027c633572.tar.zst
marcuscom-ports-52adbaa07fdb9e701dad5405314537027c633572.zip
This patch is no longer needed.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3695 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gnomevfs2')
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c10
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c25
2 files changed, 22 insertions, 13 deletions
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
deleted file mode 100644
index 5d37cc768..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Sun Sep 5 02:34:30 2004
-+++ libgnomevfs/gnome-vfs-unix-mounts.c Sun Sep 5 02:35:08 2004
-@@ -43,6 +43,7 @@
- #include <errno.h>
- #include <string.h>
- #include <signal.h>
-+#include <poll.h>
- #include <libgnomevfs/gnome-vfs.h>
-
- #include "gnome-vfs-unix-mounts.h"
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
index 9788a89f0..249ca0811 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -1,6 +1,6 @@
---- libgnomevfs/gnome-vfs-utils.c.orig Mon Aug 16 11:11:09 2004
-+++ libgnomevfs/gnome-vfs-utils.c Mon Aug 16 11:11:16 2004
-@@ -871,7 +871,7 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig Thu Feb 10 05:00:21 2005
++++ libgnomevfs/gnome-vfs-utils.c Mon Feb 21 16:32:20 2005
+@@ -880,7 +880,7 @@ gnome_vfs_icon_path_from_filename (const
paths = g_strsplit (gnome_var, ":", 0);
for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
@@ -9,3 +9,22 @@
if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) {
g_strfreev (paths);
return full_filename;
+@@ -1083,6 +1083,9 @@ gnome_vfs_read_entire_file (const char *
+ total_bytes_read += bytes_read;
+ } while (result == GNOME_VFS_OK);
+
++ buffer = g_realloc (buffer, total_bytes_read + 1);
++ buffer[total_bytes_read] = '\0';
++
+ /* Close the file. */
+ result = gnome_vfs_close (handle);
+ if (result != GNOME_VFS_OK) {
+@@ -1092,7 +1095,7 @@ gnome_vfs_read_entire_file (const char *
+
+ /* Return the file. */
+ *file_size = total_bytes_read;
+- *file_contents = g_realloc (buffer, total_bytes_read);
++ *file_contents = g_realloc (buffer, total_bytes_read + 1);
+ return GNOME_VFS_OK;
+ }
+