diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-08-26 14:24:27 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-08-26 14:24:27 +0000 |
| commit | 8990690b587ab95de007ef709f4503e768089955 (patch) | |
| tree | 2f6ee112c64b5e3d4d94d9cdb85dbd9a5beeded0 /soltools/cpp | |
| parent | 99e6c346064861f49c0ef1da24fe652fc5da2618 (diff) | |
CWS-TOOLING: integrate CWS mh132
2009-08-06 12:20:52 +0200 mh r274712 : corrected error handling
2009-08-05 13:41:20 +0200 mh r274661 : #i93040# NetBSD compile issue
2009-08-05 13:40:32 +0200 mh r274660 : #i93040# NetBSD compile issue
2009-08-05 13:38:46 +0200 mh r274659 : #i93040# NetBSD compile issue
2009-08-05 13:29:15 +0200 mh r274658 : #i95193# increase includes limit
2009-08-05 13:22:07 +0200 mh r274657 : #i96811# honor return values of read calls
2009-08-05 13:16:47 +0200 mh r274654 : #i96802# honor return values of write calls
2009-08-05 13:07:06 +0200 mh r274653 : #i99835# do DestroyData
2009-08-05 13:01:42 +0200 mh r274651 : #i68557#: allow more dpi resolutions in scanner dialogue
2009-07-24 14:46:04 +0200 mh r274307 : #i103770# missing fclose added
Diffstat (limited to 'soltools/cpp')
| -rw-r--r-- | soltools/cpp/_tokens.c | 10 | ||||
| -rw-r--r-- | soltools/cpp/cpp.h | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c index 77c8bb4384ec..863de2fbef02 100644 --- a/soltools/cpp/_tokens.c +++ b/soltools/cpp/_tokens.c @@ -473,11 +473,13 @@ void if (wbp >= &wbuf[OBS]) { - write(1, wbuf, OBS); + if ( write(1, wbuf, OBS) != -1 ) { if (wbp > &wbuf[OBS]) memcpy(wbuf, wbuf + OBS, wbp - &wbuf[OBS]); wbp -= OBS; } + else exit(1); + } } trp->tp = tp; if (cursource->fd == 0) @@ -489,8 +491,10 @@ void { if (wbp > wbuf) { - write(1, wbuf, wbp - wbuf); - wbp = wbuf; + if ( write(1, wbuf, wbp - wbuf) != -1) + wbp = wbuf; + else + exit(1); } } diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h index df3070169aa6..da609dbe53c1 100644 --- a/soltools/cpp/cpp.h +++ b/soltools/cpp/cpp.h @@ -3,7 +3,7 @@ #define INS 32768 /* input buffer */ #define OBS 8092 /* outbut buffer */ #define NARG 32 /* Max number arguments to a macro */ -#define NINCLUDE 32 /* Max number of include directories (-I) */ +#define NINCLUDE 48 /* Max number of include directories (-I) */ #define NIF 64 /* depth of nesting of #if */ #define NINC 32 /* depth of nesting of #include */ |