From: Jan Tulak <jtulak@redhat.com>
Date: Tue, 18 Aug 2015 07:53:17 +0000 (+1000)
Subject: xfsprogs: Add ifdef dirent checks where it was missing
X-Git-Tag: v4.2.0-rc2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19863f7bb1d20dc72908ecafe93d0d30bd3343dc;p=thirdparty%2Fxfsprogs-dev.git

xfsprogs: Add ifdef dirent checks where it was missing

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@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/io/readdir.c b/io/readdir.c
index 7b0edbc61..151b72eb4 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
 		}
 	}