diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-08-29 22:57:02 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-08-29 22:57:02 +0800 |
| commit | fc91a98cc1d6a69ab3df64eb9e971380a1e39397 (patch) | |
| tree | 830c5440969859d4afb8f6a8af38f89382b880ad /sysutils/nautilus-cd-burner | |
| parent | dd62b6a395df5252c18660564b48ec49c60c4070 (diff) | |
| download | marcuscom-ports-fc91a98cc1d6a69ab3df64eb9e971380a1e39397.tar marcuscom-ports-fc91a98cc1d6a69ab3df64eb9e971380a1e39397.tar.gz marcuscom-ports-fc91a98cc1d6a69ab3df64eb9e971380a1e39397.tar.bz2 marcuscom-ports-fc91a98cc1d6a69ab3df64eb9e971380a1e39397.tar.lz marcuscom-ports-fc91a98cc1d6a69ab3df64eb9e971380a1e39397.tar.xz marcuscom-ports-fc91a98cc1d6a69ab3df64eb9e971380a1e39397.tar.zst marcuscom-ports-fc91a98cc1d6a69ab3df64eb9e971380a1e39397.zip | |
Fix a runaway mapping-daemon process that is triggered by bad EOF checking
on file descriptors.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7168 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/nautilus-cd-burner')
| -rw-r--r-- | sysutils/nautilus-cd-burner/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c | 16 |
2 files changed, 17 insertions, 2 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 5d14423c1..e1bda2743 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.107 2006/08/08 00:40:07 ahze Exp $ +# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.108 2006/08/22 05:30:45 marcus Exp $ # PORTNAME= nautilus-cd-burner PORTVERSION= 2.15.7 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c b/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c index 1f80f045b..feff04bb3 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c @@ -1,5 +1,5 @@ --- src/mapping-protocol.c.orig Sun Aug 20 08:47:20 2006 -+++ src/mapping-protocol.c Tue Aug 22 01:28:24 2006 ++++ src/mapping-protocol.c Tue Aug 29 10:53:50 2006 @@ -26,6 +26,8 @@ #include "config.h" @@ -9,3 +9,17 @@ #include <stdio.h> #include <unistd.h> #include <string.h> +@@ -1188,6 +1190,13 @@ mapping_protocol_channel_fill_read_buffe + } + + status = g_io_channel_read_chars (channel->iochannel, data, count, &length, NULL); ++ ++ if (status == G_IO_STATUS_EOF) { ++ channel->read_watch_id = 0; ++ if (channel->message_handler != NULL) { ++ channel->message_handler (channel, NULL, channel->user_data); ++ } ++ } + + if (status != G_IO_STATUS_NORMAL) { + return; |