X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib_internal%2Funify-copy.c;h=6fe282d383e0ddbc677b642881eb18f7cdc452ad;hb=e0bd9d55bfe2296e898dcae40abee65ad64c6615;hp=b879c32e44eec701ea4a55e3ff0d0f2bdd900ae5;hpb=bc1c1fe6383f4ad66377475ffb6a8fb08b719aaf;p=util-vserver.git diff --git a/lib_internal/unify-copy.c b/lib_internal/unify-copy.c index b879c32..6fe282d 100644 --- a/lib_internal/unify-copy.c +++ b/lib_internal/unify-copy.c @@ -132,8 +132,8 @@ copyMMap(int in_fd, int out_fd) buf_size = in_len - offset; if (buf_size > MMAP_BLOCKSIZE) buf_size = MMAP_BLOCKSIZE; - if ((in_buf = mmap(0, buf_size, PROT_READ, MAP_SHARED, in_fd, offset))==0 || - (out_buf = mmap(0, buf_size, PROT_WRITE, MAP_SHARED, out_fd, offset))==0) { + if ((in_buf = mmap(0, buf_size, PROT_READ, MAP_SHARED, in_fd, offset))==MAP_FAILED || + (out_buf = mmap(0, buf_size, PROT_WRITE, MAP_SHARED, out_fd, offset))==MAP_FAILED) { perror("mmap()"); goto out; } @@ -145,16 +145,16 @@ copyMMap(int in_fd, int out_fd) TESTSUITE_COPY_CODE; copyMem(out_buf, in_buf, buf_size); - munmap(const_cast(void *)(in_buf), buf_size); in_buf = 0; munmap(out_buf, buf_size); out_buf = 0; + munmap(const_cast(void *)(in_buf), buf_size); in_buf = 0; } res = true; } out: - if (in_buf !=0) munmap(const_cast(void *)(in_buf), buf_size); if (out_buf!=0) munmap(out_buf, buf_size); + if (in_buf !=0) munmap(const_cast(void *)(in_buf), buf_size); return res; }