luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-25 08:36:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Silently return G_IO_CHANNEL_ERROR_FAILED for EINTR, since close() can

Browse Source 
Fri May 30 16:48:26 2003  Owen Taylor  <otaylor@redhat.com>

        * glib/giochannel.c (g_io_channel_error_from_errno):
        Silently return G_IO_CHANNEL_ERROR_FAILED for EINTR,
        since close() can return EINTR. (#11842, Balazs Scheidler)
This commit is contained in:
Owen Taylor 2003-05-30 21:11:08 +00:00 committed by Owen Taylor
parent 9ff5d0eeed
commit e41ebdcfcd
7 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri May 30 16:48:26 2003 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_channel_error_from_errno):
Silently return G_IO_CHANNEL_ERROR_FAILED for EINTR,
since close() can return EINTR. (#11842, Balazs Scheidler)
Fri May 30 15:51:43 2003 Owen Taylor <otaylor@redhat.com> Fri May 30 15:51:43 2003 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_error_get_from_g_error): * glib/giochannel.c (g_io_error_get_from_g_error):

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Fri May 30 16:48:26 2003 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_channel_error_from_errno):
Silently return G_IO_CHANNEL_ERROR_FAILED for EINTR,
since close() can return EINTR. (#11842, Balazs Scheidler)
Fri May 30 15:51:43 2003 Owen Taylor <otaylor@redhat.com> Fri May 30 15:51:43 2003 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_error_get_from_g_error): * glib/giochannel.c (g_io_error_get_from_g_error):

6
ChangeLog.pre-2-12
View File

@ -1,3 +1,9 @@
Fri May 30 16:48:26 2003 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_channel_error_from_errno):
Silently return G_IO_CHANNEL_ERROR_FAILED for EINTR,
since close() can return EINTR. (#11842, Balazs Scheidler)
Fri May 30 15:51:43 2003 Owen Taylor <otaylor@redhat.com> Fri May 30 15:51:43 2003 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_error_get_from_g_error): * glib/giochannel.c (g_io_error_get_from_g_error):

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Fri May 30 16:48:26 2003 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_channel_error_from_errno):
Silently return G_IO_CHANNEL_ERROR_FAILED for EINTR,
since close() can return EINTR. (#11842, Balazs Scheidler)
Fri May 30 15:51:43 2003 Owen Taylor <otaylor@redhat.com> Fri May 30 15:51:43 2003 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_error_get_from_g_error): * glib/giochannel.c (g_io_error_get_from_g_error):

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Fri May 30 16:48:26 2003 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_channel_error_from_errno):
Silently return G_IO_CHANNEL_ERROR_FAILED for EINTR,
since close() can return EINTR. (#11842, Balazs Scheidler)
Fri May 30 15:51:43 2003 Owen Taylor <otaylor@redhat.com> Fri May 30 15:51:43 2003 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_error_get_from_g_error): * glib/giochannel.c (g_io_error_get_from_g_error):

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Fri May 30 16:48:26 2003 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_channel_error_from_errno):
Silently return G_IO_CHANNEL_ERROR_FAILED for EINTR,
since close() can return EINTR. (#11842, Balazs Scheidler)
Fri May 30 15:51:43 2003 Owen Taylor <otaylor@redhat.com> Fri May 30 15:51:43 2003 Owen Taylor <otaylor@redhat.com>
* glib/giochannel.c (g_io_error_get_from_g_error): * glib/giochannel.c (g_io_error_get_from_g_error):

15
glib/giochannel.c
View File

@ -547,9 +547,6 @@ g_io_channel_error_from_errno (gint en)
#ifdef EAGAIN #ifdef EAGAIN
g_return_val_if_fail (en != EAGAIN, G_IO_CHANNEL_ERROR_FAILED); g_return_val_if_fail (en != EAGAIN, G_IO_CHANNEL_ERROR_FAILED);
#endif #endif
#ifdef EINTR
g_return_val_if_fail (en != EINTR, G_IO_CHANNEL_ERROR_FAILED);
#endif
switch (en) switch (en)
{ {
@ -570,6 +567,18 @@ g_io_channel_error_from_errno (gint en)
return G_IO_CHANNEL_ERROR_FBIG; return G_IO_CHANNEL_ERROR_FBIG;
#endif #endif
#ifdef EINTR
/* In general, we should catch EINTR before we get here,
* but close() is allowed to return EINTR by POSIX, so
* we need to catch it here; EINTR from close() is
* unrecoverable, because it's undefined whether
* the fd was actually closed or not, so we just return
* a generic error code.
*/
case EINTR:
return G_IO_CHANNEL_ERROR_FAILED;
#endif
#ifdef EINVAL #ifdef EINVAL
case EINVAL: case EINVAL:
return G_IO_CHANNEL_ERROR_INVAL; return G_IO_CHANNEL_ERROR_INVAL;