diff --git a/files/directory.c b/files/directory.c
index 1abc4b2..6bc5c45 100644
--- a/files/directory.c
+++ b/files/directory.c
@@ -502,9 +502,9 @@
 
     /* First check the supplied parameters */
 
-    if (!(p = strrchr( name, '\\' ))) p = name;
-    if (!(p = strrchr( p, '/' ))) p = name;
-    if (strchr( p, '.' )) ext = NULL;  /* Ignore the specified extension */
+    p = strrchr( name, '.' );
+    if (p && !strchr( p, '/' ) && !strchr( p, '\\' ))
+        ext = NULL;  /* Ignore the specified extension */
     if ((*name && (name[1] == ':')) ||
         strchr( name, '/' ) || strchr( name, '\\' ))
         path = NULL;  /* Ignore path if name already contains a path */