diff options
| author | Michael Biebl <biebl@debian.org> | 2011-03-26 19:16:55 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-03-26 19:16:55 +0100 |
| commit | dea543841bb1f1c46586a68da21d55b44c6bf158 (patch) | |
| tree | 46dd88ab15d5da40adae5ca8748f73e079df979a /runtime | |
| parent | a362b3333f84518889cefc1706d4e6adaa92888c (diff) | |
| download | rsyslog-dea543841bb1f1c46586a68da21d55b44c6bf158.tar.gz | |
Imported Upstream version 5.7.9upstream/5.7.9
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/cfsysline.c | 3 | ||||
| -rw-r--r-- | runtime/nsdpoll_ptcp.c | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c index 037e9f8..646ab39 100644 --- a/runtime/cfsysline.c +++ b/runtime/cfsysline.c @@ -41,6 +41,7 @@ #include "obj.h" #include "errmsg.h" #include "srUtils.h" +#include "unicode-helper.h" /* static data */ @@ -511,6 +512,8 @@ static rsRetVal doGetWord(uchar **pp, rsRetVal (*pSetHdlr)(void*, uchar*), void CHKiRet(cstrConvSzStrAndDestruct(pStrB, &pNewVal, 0)); pStrB = NULL; + DBGPRINTF("doGetWord: get newval '%s' (len %d), hdlr %p\n", + pNewVal, (int) ustrlen(pNewVal), pSetHdlr); /* we got the word, now set it */ if(pSetHdlr == NULL) { /* we should set value directly to var */ diff --git a/runtime/nsdpoll_ptcp.c b/runtime/nsdpoll_ptcp.c index bc374c6..ef9c37a 100644 --- a/runtime/nsdpoll_ptcp.c +++ b/runtime/nsdpoll_ptcp.c @@ -133,13 +133,16 @@ delEvent(nsdpoll_epollevt_lst_t **ppEvtLst) { /* Standard-Constructor */ BEGINobjConstruct(nsdpoll_ptcp) /* be sure to specify the object type also in END macro! */ -# if defined(EPOLL_CLOEXEC) && defined(HAVE_EPOLL_CREATE1) - DBGPRINTF("nsdpoll_ptcp uses epoll_create1()\n"); - pThis->efd = epoll_create1(EPOLL_CLOEXEC); -# else +#if defined(EPOLL_CLOEXEC) && defined(HAVE_EPOLL_CREATE1) + DBGPRINTF("nsdpoll_ptcp uses epoll_create1()\n"); + pThis->efd = epoll_create1(EPOLL_CLOEXEC); + if(pThis->efd < 0 && errno == ENOSYS) +#endif + { DBGPRINTF("nsdpoll_ptcp uses epoll_create()\n"); pThis->efd = epoll_create(100); /* size is ignored in newer kernels, but 100 is not bad... */ -# endif + } + if(pThis->efd < 0) { DBGPRINTF("epoll_create1() could not create fd\n"); ABORT_FINALIZE(RS_RET_IO_ERROR); |