From 692ce678922891f6e6f74c4b61461a64e67854a4 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Mon, 20 Mar 2000 13:19:20 +0000 Subject: [PATCH] Interpret EINTR as G_IO_ERROR_AGAIN. 2000-03-17 Sebastian Wilhelmi * giounix.c (g_io_unix_write, g_io_unix_read): Interpret EINTR as G_IO_ERROR_AGAIN. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ giounix.c | 2 ++ glib/giounix.c | 2 ++ 10 files changed, 44 insertions(+) diff --git a/ChangeLog b/ChangeLog index c998e48d7..8d8c41e3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-03-17 Sebastian Wilhelmi + + * giounix.c (g_io_unix_write, g_io_unix_read): Interpret EINTR as + G_IO_ERROR_AGAIN. + 2000-03-17 Sebastian Wilhelmi * configure.in: Added the missing POSIX_NO_YIELD and diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c998e48d7..8d8c41e3a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2000-03-17 Sebastian Wilhelmi + + * giounix.c (g_io_unix_write, g_io_unix_read): Interpret EINTR as + G_IO_ERROR_AGAIN. + 2000-03-17 Sebastian Wilhelmi * configure.in: Added the missing POSIX_NO_YIELD and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c998e48d7..8d8c41e3a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2000-03-17 Sebastian Wilhelmi + + * giounix.c (g_io_unix_write, g_io_unix_read): Interpret EINTR as + G_IO_ERROR_AGAIN. + 2000-03-17 Sebastian Wilhelmi * configure.in: Added the missing POSIX_NO_YIELD and diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index c998e48d7..8d8c41e3a 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2000-03-17 Sebastian Wilhelmi + + * giounix.c (g_io_unix_write, g_io_unix_read): Interpret EINTR as + G_IO_ERROR_AGAIN. + 2000-03-17 Sebastian Wilhelmi * configure.in: Added the missing POSIX_NO_YIELD and diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c998e48d7..8d8c41e3a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2000-03-17 Sebastian Wilhelmi + + * giounix.c (g_io_unix_write, g_io_unix_read): Interpret EINTR as + G_IO_ERROR_AGAIN. + 2000-03-17 Sebastian Wilhelmi * configure.in: Added the missing POSIX_NO_YIELD and diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c998e48d7..8d8c41e3a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2000-03-17 Sebastian Wilhelmi + + * giounix.c (g_io_unix_write, g_io_unix_read): Interpret EINTR as + G_IO_ERROR_AGAIN. + 2000-03-17 Sebastian Wilhelmi * configure.in: Added the missing POSIX_NO_YIELD and diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c998e48d7..8d8c41e3a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2000-03-17 Sebastian Wilhelmi + + * giounix.c (g_io_unix_write, g_io_unix_read): Interpret EINTR as + G_IO_ERROR_AGAIN. + 2000-03-17 Sebastian Wilhelmi * configure.in: Added the missing POSIX_NO_YIELD and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c998e48d7..8d8c41e3a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2000-03-17 Sebastian Wilhelmi + + * giounix.c (g_io_unix_write, g_io_unix_read): Interpret EINTR as + G_IO_ERROR_AGAIN. + 2000-03-17 Sebastian Wilhelmi * configure.in: Added the missing POSIX_NO_YIELD and diff --git a/giounix.c b/giounix.c index 108527516..0f9b4614e 100644 --- a/giounix.c +++ b/giounix.c @@ -166,6 +166,7 @@ g_io_unix_read (GIOChannel *channel, case EINVAL: return G_IO_ERROR_INVAL; case EAGAIN: + case EINTR: return G_IO_ERROR_AGAIN; default: return G_IO_ERROR_UNKNOWN; @@ -197,6 +198,7 @@ g_io_unix_write(GIOChannel *channel, case EINVAL: return G_IO_ERROR_INVAL; case EAGAIN: + case EINTR: return G_IO_ERROR_AGAIN; default: return G_IO_ERROR_UNKNOWN; diff --git a/glib/giounix.c b/glib/giounix.c index 108527516..0f9b4614e 100644 --- a/glib/giounix.c +++ b/glib/giounix.c @@ -166,6 +166,7 @@ g_io_unix_read (GIOChannel *channel, case EINVAL: return G_IO_ERROR_INVAL; case EAGAIN: + case EINTR: return G_IO_ERROR_AGAIN; default: return G_IO_ERROR_UNKNOWN; @@ -197,6 +198,7 @@ g_io_unix_write(GIOChannel *channel, case EINVAL: return G_IO_ERROR_INVAL; case EAGAIN: + case EINTR: return G_IO_ERROR_AGAIN; default: return G_IO_ERROR_UNKNOWN;