From 5ed2b0cdcee2a06eafb5dbe06bec5b7d4a2e5f9d Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Mon, 28 May 2018 12:30:34 +0200
Subject: [PATCH] lib/strutils: fix strnlen() fallback

Addresses: https://github.com/karelzak/util-linux/issues/643
Signed-off-by: Karel Zak <kzak@redhat.com>
---
 lib/strutils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/strutils.c b/lib/strutils.c
index 74d2e5aa9c..c3c4222165 100644
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -243,11 +243,11 @@ void *mempcpy(void *restrict dest, const void *restrict src, size_t n)
 #ifndef HAVE_STRNLEN
 size_t strnlen(const char *s, size_t maxlen)
 {
-        int i;
+        size_t i;
 
         for (i = 0; i < maxlen; i++) {
                 if (s[i] == '\0')
-                        return i + 1;
+                        return i;
         }
         return maxlen;
 }
-- 
2.39.2