Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a small mistake in r11503 causing a fatal error&exit on unix when you try to do a graceful exit (by ctrl+c for example)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11538 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-10-21 13:37:46 +00:00
parent 9d1359a5c2
commit 33decb0759
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/10/21 2007/10/21
* Fixed a small mistake in r11503 causing a fatal error&exit on unix
when you try to do a graceful exit (by ctrl+c for example) [ultramage]
* Removed SC_INCAGIRATE/SC_INCDEXRATE as they are not used anymore. * Removed SC_INCAGIRATE/SC_INCDEXRATE as they are not used anymore.
* Added SC_INCASPDRATE, SC_INCFLEE2, SC_INCCRI, SC_INCDEF, SC_INCBASEATK * Added SC_INCASPDRATE, SC_INCFLEE2, SC_INCCRI, SC_INCDEF, SC_INCBASEATK
and SC_FASTCAST as these are required by the newer items. [Skotlex] and SC_FASTCAST as these are required by the newer items. [Skotlex]

8
src/common/socket.c
View File

@ -551,14 +551,14 @@ int do_sockets(int next)
memcpy(&rfd, &readfds, sizeof(rfd)); memcpy(&rfd, &readfds, sizeof(rfd));
ret = select(fd_max, &rfd, NULL, NULL, &timeout); ret = select(fd_max, &rfd, NULL, NULL, &timeout);
if( ret < 0 ) if( ret == SOCKET_ERROR )
{ {
if( ret != S_EINTR ) if( s_errno != S_EINTR )
{ {
ShowFatalError("do_sockets: select() returned %d!\n", ret); ShowFatalError("do_sockets: select() failed, error code %d!\n", s_errno);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
return 0; return 0; // interrupted by a signal, just loop and try again
} }
#ifdef WIN32 #ifdef WIN32