Changeset 3280 for trunk

Timestamp:

May 1, 2007, 8:15:31 PM (18 years ago)

Author:

bird

Message:

optimized.

File:

• trunk/essentials/app-shells/bash/findcmd.c (modified) (1 diff)

trunk/essentials/app-shells/bash/findcmd.c

@@ -235 +235 @@
      int flags;
 {
-#if defined __WIN32__ || defined __OS2__
-  char *res, *dotexe;
-
-  dotexe = (char *)xmalloc (strlen (name) + 5);
-  strcpy (dotexe, name);
-  strcat (dotexe, ".exe");
-  res = _find_user_command_internal (dotexe, flags);
-  free (dotexe);
-  if (res == 0)
-    res = _find_user_command_internal (name, flags);
-  return res;
-#else
+#if defined (__OS2__)
+  /* search for .exe first. */
+  size_t len = strlen (name);
+  if (len < sizeof (".exe") - 1
+   || stricmp (name + (len - sizeof (".exe") - 1), ".exe") != 0)
+    {
+      char *res;
+      char *dotexe = alloca (len + sizeof (".exe"));
+      memcpy (dotexe, name, len);
+      memcpy (dotexe + len, ".exe", sizeof (".exe"));
+      res = _find_user_command_internal (dotexe, flags);
+      if (res)
+        return res;
+    }
+#endif /* __OS2__ */
   return (_find_user_command_internal (name, flags));
-#endif
 }