From 3104620cf0123eea8aa1089da44175e7d0dd51f3 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Fri, 6 Aug 2004 22:36:55 +0000
Subject: [PATCH] Made clean_fname() return the length of the string.

---
 util.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/util.c b/util.c
index 96b7ac4f..a8787203 100644
--- a/util.c
+++ b/util.c
@@ -650,13 +650,13 @@ size_t stringjoin(char *dest, size_t destsize, ...)
 	return ret;
 }
 
-void clean_fname(char *name)
+unsigned int clean_fname(char *name)
 {
 	char *limit = name, *t = name, *f = name;
 	int anchored;
 
 	if (!name)
-		return;
+		return 0;
 
 	if ((anchored = *f == '/') != 0)
 		*t++ = *f++;
@@ -698,6 +698,8 @@ void clean_fname(char *name)
 	if (t == name)
 		*t++ = '.';
 	*t = '\0';
+
+	return t - name;
 }
 
 /* Make path appear as if a chroot had occurred.  This handles a leading
@@ -867,7 +869,7 @@ int push_dir(char *dir)
 		curr_dir_len += len;
 	}
 
-	clean_fname(curr_dir);
+	curr_dir_len = clean_fname(curr_dir);
 
 	return 1;
 }
-- 
2.34.1