diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 767ceff06..0be6648fb 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-04  Corinna Vinschen  <corinna@vinschen.de>
+
+	* path.cc (check_sysfile): Don't scan string twice.
+
 2004-05-03  Corinna Vinschen  <corinna@vinschen.de>
 
 	* dir.cc (writable_directory): Remove.
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 59e454bfc..052749122 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -2786,8 +2786,9 @@ check_sysfile (const char *path, DWORD fileattr, HANDLE h,
 	     NUL.  The length returned is the path without
 	     *any* trailing NULs.  We also have to handle (or
 	     at least not die from) corrupted paths.  */
-	  if (memchr (contents, 0, got) != NULL)
-	    res = strlen (contents);
+	  char *end;
+	  if ((end = (char *) memchr (contents, 0, got)) != NULL)
+	    res = end - contents;
 	  else
 	    res = got;
 	}