--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-09-22  Eric Blake  <ebb9@byu.net>
 
+	open, openat: minor optimization
+	* lib/open.c (open): If open succeeded, len is non-zero.
+	* lib/openat.c (rpl_openat): Likewise.
+
 	link-follow: ensure correct result
 	* m4/fcntl_h.m4 (gl_FCNTL_H): Clean up temporary file.
 	* m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK): Likewise, and

--- a/lib/open.c
+++ b/lib/open.c
@@ -141,8 +141,9 @@
      with ENOTDIR.  */
   if (fd >= 0)
     {
+      /* We know len is positive, since open did not fail with ENOENT.  */
       size_t len = strlen (filename);
-      if (len > 0 && filename[len - 1] == '/')
+      if (filename[len - 1] == '/')
 	{
 	  struct stat statbuf;
 

--- a/lib/openat.c
+++ b/lib/openat.c
@@ -103,8 +103,9 @@
      with ENOTDIR.  */
   if (fd >= 0)
     {
+      /* We know len is positive, since open did not fail with ENOENT.  */
       size_t len = strlen (filename);
-      if (len > 0 && filename[len - 1] == '/')
+      if (filename[len - 1] == '/')
 	{
 	  struct stat statbuf;