diff options
| author | alex <alex@FreeBSD.org> | 1997-01-16 21:58:40 +0000 |
|---|---|---|
| committer | alex <alex@FreeBSD.org> | 1997-01-16 21:58:40 +0000 |
| commit | a3118e8c6826349b3fc54da3850d6dea994a3a35 (patch) | |
| tree | d61898dd79824c10ca33127214d8569c804559c2 /libexec | |
| parent | 752ba4d26f2e94cc31940f50407a6b18b86ee0e8 (diff) | |
| download | FreeBSD-src-a3118e8c6826349b3fc54da3850d6dea994a3a35.zip FreeBSD-src-a3118e8c6826349b3fc54da3850d6dea994a3a35.tar.gz | |
Sweep through the tree fixing mmap() usage:
- Use MAP_FAILED instead of the constant -1 to indicate
failure (required by POSIX).
- Removed flag arguments of '0' (required by POSIX).
- Fixed code which expected an error return of 0.
- Fixed code which thought any address with the high bit set
was an error.
- Check for failure where no checks were present.
Discussed with: bde
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/ftpd.c | 2 | ||||
| -rw-r--r-- | libexec/lfs_cleanerd/library.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index ebe7dd3..71565cf 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1189,7 +1189,7 @@ send_data(instr, outstr, blksize, filesize, isreg) if (isreg && filesize < (off_t)16 * 1024 * 1024) { buf = mmap(0, filesize, PROT_READ, MAP_SHARED, filefd, (off_t)0); - if (!buf) { + if (buf == MAP_FAILED) { syslog(LOG_WARNING, "mmap(%lu): %m", (unsigned long)filesize); goto oldway; diff --git a/libexec/lfs_cleanerd/library.c b/libexec/lfs_cleanerd/library.c index 9397f62..93951c6 100644 --- a/libexec/lfs_cleanerd/library.c +++ b/libexec/lfs_cleanerd/library.c @@ -204,8 +204,8 @@ get_ifile (fsp, use_mmap) if (fsp->fi_cip) munmap((caddr_t)fsp->fi_cip, fsp->fi_ifile_length); ifp = mmap ((caddr_t)0, file_stat.st_size, - PROT_READ|PROT_WRITE, 0, fid, (off_t)0); - if (ifp == (caddr_t)(-1)) + PROT_READ|PROT_WRITE, MAP_SHARED, fid, (off_t)0); + if (ifp == MAP_FAILED) err(1, "get_ifile: mmap failed"); } else { if (fsp->fi_cip) @@ -541,8 +541,8 @@ mmap_segment (fsp, segment, segbuf, use_mmap) if (use_mmap) { *segbuf = mmap ((caddr_t)0, seg_size(lfsp), PROT_READ, - 0, fid, seg_byte); - if (*(long *)segbuf < 0) { + MAP_SHARED, fid, seg_byte); + if (*segbuf == MAP_FAILED) { err(0, "mmap_segment: mmap failed"); return (NULL); } |
