diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-14 12:49:12 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-14 12:49:12 +0100 |
| commit | ef45e0ff714767b58e9069a1db78d92ef370e498 (patch) | |
| tree | 248849f1ba7abfda64bf30a9bc97b472f91955be /runtime | |
| parent | 5c7162879af11255aea4e6f6e1091a69ce14aff3 (diff) | |
| parent | da4c90af2592c1c1f7e55d3445df23131b035e27 (diff) | |
| download | rsyslog-ef45e0ff714767b58e9069a1db78d92ef370e498.tar.gz rsyslog-ef45e0ff714767b58e9069a1db78d92ef370e498.tar.xz rsyslog-ef45e0ff714767b58e9069a1db78d92ef370e498.zip | |
Merge branch 'v5-devel'
Conflicts:
tests/diag.sh
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 3cdf50ee..97b35bb2 100644 --- a/runtime/cfsysline.c +++ b/runtime/cfsysline.c @@ -42,6 +42,7 @@ #include "conf.h" #include "errmsg.h" #include "srUtils.h" +#include "unicode-helper.h" /* static data */ @@ -512,6 +513,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 6fd92df1..78203292 100644 --- a/runtime/nsdpoll_ptcp.c +++ b/runtime/nsdpoll_ptcp.c @@ -138,13 +138,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); |