Formerly function.c.~21~

diff --git a/function.c b/function.c
index 993667fd76cd4e683a496ebb2e68d14d4a7f734d..96ecb86beec9adbe984abb9be96757a5d8b8070a 100644 (file)
--- a/function.c
+++ b/function.c
@@ -265,7 +265,7 @@ int
 pattern_matches (pattern, percent, word)
      register char *pattern, *percent, *word;
 {
-  unsigned int len;
+  unsigned int sfxlen, wordlen;
 
   if (percent == 0)
     {
@@ -278,13 +278,14 @@ pattern_matches (pattern, percent, word)
        return streq (pattern, word);
     }
 
-  len = strlen (percent + 1);
+  sfxlen = strlen (percent + 1);
+  wordlen = strlen (word);
 
-  if (strlen (word) < (percent - pattern) + len
+  if (wordlen < (percent - pattern) + sfxlen
       || strncmp (pattern, word, percent - pattern))
     return 0;
 
-  return !strcmp (percent + 1, word + (strlen (word) - len));
+  return !strcmp (percent + 1, word + (wordlen - sfxlen));
 }
 \f
 int shell_function_pid = 0, shell_function_completed;