xfs
[Top] [All Lists]

[PATCH v5 04/11] xfsprogs: Add ifdef dirent checks where it was missing

To: xfs@xxxxxxxxxxx
Subject: [PATCH v5 04/11] xfsprogs: Add ifdef dirent checks where it was missing
From: Jan Tulak <jtulak@xxxxxxxxxx>
Date: Wed, 5 Aug 2015 11:48:15 +0200
Cc: hch@xxxxxxxxxxxxx, Jan Tulak <jtulak@xxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1438680314-23950-1-git-send-email-jtulak@xxxxxxxxxx>
References: <1438680314-23950-1-git-send-email-jtulak@xxxxxxxxxx>
CHANGED: text width fix

Add check for _DIRENT_HAVED_RECLEN/_OFF to read_directory().
In dump_dirent() these checks already are used, but they were
missing in read_directory.

Signed-off-by: Jan Tulak <jtulak@xxxxxxxxxx>
---
 io/readdir.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/io/readdir.c b/io/readdir.c
index 7b0edbc..151b72e 100644
--- a/io/readdir.c
+++ b/io/readdir.c
@@ -103,12 +103,24 @@ read_directory(
                if (!dirent)
                        break;
 
+#ifdef _DIRENT_HAVE_D_RECLEN
                *total += dirent->d_reclen;
+#else
+               *total += dirent->d_namlen + sizeof(*dirent);
+#endif
                count++;
 
                if (dump) {
                        dump_dirent(offset, dirent);
+#ifdef _DIRENT_HAVE_D_OFF
                        offset = dirent->d_off;
+#else
+                       /* Some platforms don't have dirent->d_off, but because
+                        * it is used only for dumping the value, it should be
+                        * safe to only set it to zero in such case.
+                        */
+                       offset = 0;
+#endif
                }
        }
 
-- 
2.4.3

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