diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:42:36 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:42:36 +0000 |
| commit | 22ddccbe44529c7299086eb9c41c4eab78fa0500 (patch) | |
| tree | 3d0048b1835001d80b53e980cd484f1c586b8320 | |
| parent | 1b3236e1c86afa9e0f35d15445c614e78c154f82 (diff) | |
Merge the new release from HEADXACE-SELINUX
| -rw-r--r-- | src/FSlibInt.c | 5 | ||||
| -rw-r--r-- | src/FSlibos.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/FSlibInt.c b/src/FSlibInt.c index 70167bd..fc17e4f 100644 --- a/src/FSlibInt.c +++ b/src/FSlibInt.c @@ -498,9 +498,10 @@ _FSReadPad(svr, data, size) if (bytes_read > 0) { size -= bytes_read; if (iov[0].iov_len < bytes_read) { - iov[1].iov_len += iov[0].iov_len - bytes_read; + int pad_bytes_read = bytes_read - iov[0].iov_len; + iov[1].iov_len -= pad_bytes_read; iov[1].iov_base = - (char *)iov[1].iov_base +bytes_read - iov[0].iov_len; + (char *)iov[1].iov_base + pad_bytes_read; iov[0].iov_len = 0; } else { iov[0].iov_len -= bytes_read; diff --git a/src/FSlibos.h b/src/FSlibos.h index 9113817..341a615 100644 --- a/src/FSlibos.h +++ b/src/FSlibos.h @@ -1,4 +1,4 @@ -/* $XdotOrg: FSlibos.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ +/* $XdotOrg: xc/lib/FS/FSlibos.h,v 1.2 2004/04/23 18:43:08 eich Exp $ */ /* $Xorg: FSlibos.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSlibos.h 4.1 91/05/02 |