xfs
[Top] [All Lists]

[PATCH] libxfs: don't pass negative errnos to strerror()

To: xfs@xxxxxxxxxxx
Subject: [PATCH] libxfs: don't pass negative errnos to strerror()
From: Eric Sandeen <sandeen@xxxxxxxxxx>
Date: Thu, 14 Jan 2016 10:35:53 -0600
Delivered-to: xfs@xxxxxxxxxxx
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0) Gecko/20100101 Thunderbird/38.5.1
The error negation work in 12b5319 tripped up a little bit
when we're reporting errors via strerror().  By negating
the error before passing it to strerror, we get i.e.

   mkfs.xfs: pwrite64 failed: Unknown error -22

Keep the error positive, but return -error, just as we
do in the else clauses in these functions.

Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
---

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 7a04985..7b23394 100644
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -913,12 +913,12 @@ __read_buf(int fd, void *buf, int len, off64_t offset, 
int flags)
 
        sts = pread64(fd, buf, len, offset);
        if (sts < 0) {
-               int error = -errno;
+               int error = errno;
                fprintf(stderr, _("%s: read failed: %s\n"),
                        progname, strerror(error));
                if (flags & LIBXFS_EXIT_ON_FAILURE)
                        exit(1);
-               return error;
+               return -error;
        } else if (sts != len) {
                fprintf(stderr, _("%s: error - read only %d of %d bytes\n"),
                        progname, sts, len);
@@ -1081,12 +1081,12 @@ __write_buf(int fd, void *buf, int len, off64_t offset, 
int flags)
 
        sts = pwrite64(fd, buf, len, offset);
        if (sts < 0) {
-               int error = -errno;
+               int error = errno;
                fprintf(stderr, _("%s: pwrite64 failed: %s\n"),
                        progname, strerror(error));
                if (flags & LIBXFS_B_EXIT)
                        exit(1);
-               return error;
+               return -error;
        } else if (sts != len) {
                fprintf(stderr, _("%s: error - pwrite64 only %d of %d bytes\n"),
                        progname, sts, len);

<Prev in Thread] Current Thread [Next in Thread>