summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorjsorg71 <jsorg71>2009-04-19 17:13:56 +0000
committerjsorg71 <jsorg71>2009-04-19 17:13:56 +0000
commit108cc8f03021f4b94a291c166e8a890c16893528 (patch)
tree605e947a8259782e032bf920b1a9977a516f0807 /common
parent3417482d107604f0ec97ff10148a45cb4e8ef79c (diff)
downloadxrdp-proprietary-108cc8f03021f4b94a291c166e8a890c16893528.tar.gz
xrdp-proprietary-108cc8f03021f4b94a291c166e8a890c16893528.zip
fix some minor error issues
Diffstat (limited to 'common')
-rw-r--r--common/os_calls.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/common/os_calls.c b/common/os_calls.c
index d6beac71..5fdcdd51 100644
--- a/common/os_calls.c
+++ b/common/os_calls.c
@@ -910,6 +910,14 @@ g_obj_wait(tbus* read_objs, int rcount, tbus* write_objs, int wcount,
i = select(max + 1, &rfds, &wfds, 0, ptime);
if (i < 0)
{
+ /* these are not really errors */
+ if ((errno == EAGAIN) ||
+ (errno == EWOULDBLOCK) ||
+ (errno == EINPROGRESS) ||
+ (errno == EINTR)) /* signal occured */
+ {
+ return 0;
+ }
return 1;
}
return 0;
@@ -1381,6 +1389,10 @@ g_strncasecmp(const char* c1, const char* c2, int len)
int APP_CC
g_atoi(char* str)
{
+ if (str == 0)
+ {
+ return 0;
+ }
return atoi(str);
}