diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-22 09:33:33 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-22 09:33:33 +0100 |
| commit | 223439934c20f38bc00ec5287124737932d33ddb (patch) | |
| tree | 83f1b2b82271574ddd503ab1c43049b86817f839 /plugins/omstdout/omstdout.c | |
| parent | 785e0c3c8b00614b6f780f902442025f4558a160 (diff) | |
| parent | 906ed9df906fe3a52b042929130e6fc9a00b53a8 (diff) | |
| download | rsyslog-223439934c20f38bc00ec5287124737932d33ddb.tar.gz rsyslog-223439934c20f38bc00ec5287124737932d33ddb.tar.bz2 rsyslog-223439934c20f38bc00ec5287124737932d33ddb.zip | |
Merge branch 'master' into master-gt
Conflicts:
configure.ac
runtime/rsyslog.h
Diffstat (limited to 'plugins/omstdout/omstdout.c')
| -rw-r--r-- | plugins/omstdout/omstdout.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/plugins/omstdout/omstdout.c b/plugins/omstdout/omstdout.c index 59f9c8bb..a84a7593 100644 --- a/plugins/omstdout/omstdout.c +++ b/plugins/omstdout/omstdout.c @@ -105,6 +105,7 @@ BEGINdoAction int iBuf; char szBuf[65564]; size_t len; + int r; CODESTARTdoAction if(pData->bUseArrayInterface) { /* if we use array passing, we need to put together a string @@ -140,9 +141,15 @@ CODESTARTdoAction * actually intends to use this module in production (why???), this code * needs to be more solid. -- rgerhards, 2012-11-28 */ - if(write(1, toWrite, len)) {}; /* 1 is stdout! */ + if((r = write(1, toWrite, len)) != (int) len) { /* 1 is stdout! */ + DBGPRINTF("omstdout: error %d writing to stdout[%d]: %s\n", + r, len, toWrite); + } if(pData->bEnsureLFEnding && toWrite[len-1] != '\n') { - if(write(1, "\n", 1)) {}; /* write missing LF */ + if((r = write(1, "\n", 1)) != 1) { /* write missing LF */ + DBGPRINTF("omstdout: error %d writing \\n to stdout\n", + r); + } } ENDdoAction |