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 /usr.sbin/config/main.c | |
| 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 'usr.sbin/config/main.c')
| -rw-r--r-- | usr.sbin/config/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c index 4d3cccb..3e6778f 100644 --- a/usr.sbin/config/main.c +++ b/usr.sbin/config/main.c @@ -405,11 +405,11 @@ moveifchanged(const char *from_name, const char *to_name) tsize = (size_t)from_sb.st_size; if (!changed) { - p = mmap(NULL, tsize, PROT_READ, 0, from_fd, (off_t)0); - if ((long)p == -1) + p = mmap(NULL, tsize, PROT_READ, MAP_SHARED, from_fd, (off_t)0); + if (p == MAP_FAILED) err(EX_OSERR, "mmap %s", from_name); - q = mmap(NULL, tsize, PROT_READ, 0, to_fd, (off_t)0); - if ((long)q == -1) + q = mmap(NULL, tsize, PROT_READ, MAP_SHARED, to_fd, (off_t)0); + if (q == MAP_FAILED) err(EX_OSERR, "mmap %s", to_name); changed = memcmp(p, q, tsize); |
