Merge branch 'dev' into fix-fd-closing

Author: JohnoKing

src/cmd/ksh93/include/version.h

@@ -18,7 +18,7 @@
 #include <ast_release.h>
 #include "git.h"
 
-#define SH_RELEASE_DATE	"2025-06-19"	/* must be in this format for $((.sh.version)) */
+#define SH_RELEASE_DATE	"2025-06-22"	/* must be in this format for $((.sh.version)) */
 /*
  * This comment keeps SH_RELEASE_DATE a few lines away from SH_RELEASE_SVER to avoid
  * merge conflicts when cherry-picking dev branch commits onto a release branch.

src/cmd/ksh93/sh/path.c

@@ -46,7 +46,7 @@ static void		funload(int,const char*);
 static void noreturn	exscript(char*, char*[]);
 static int		checkdotpaths(Pathcomp_t*,Pathcomp_t*,Pathcomp_t*,int);
 static void		checkdup(Pathcomp_t*);
-static Pathcomp_t	*defpathinit(void);
+static Pathcomp_t	*defpath(void);
 
 static const char *std_path(void)
 {
@@ -406,9 +406,12 @@ Pathcomp_t *path_nextcomp(Pathcomp_t *pp, const char *name, Pathcomp_t *last)
 	return NULL;
 }
 
-static Pathcomp_t* defpathinit(void)
+static Pathcomp_t *defpath(void)
 {
-	return path_addpath(NULL,std_path(),PATH_PATH);
+	static Pathcomp_t *dp;
+	if (!dp)
+		dp = path_addpath(NULL, std_path(), PATH_PATH);
+	return dp;
 }
 
 static void pathinit(void)
@@ -419,7 +422,7 @@ static void pathinit(void)
 		sh.pathlist = pp = path_addpath((Pathcomp_t*)sh.pathlist,val,PATH_PATH);
 	else
 	{
-		pp = defpathinit();
+		pp = defpath();
 		sh.pathlist = path_dup(pp);
 	}
 	if(val=sh_scoped((FPATHNOD))->nvalue)
@@ -441,7 +444,7 @@ Pathcomp_t *path_get(const char *name)
 		pp = (Pathcomp_t*)sh.pathlist;
 	}
 	if(!pp && (!(sh_scoped(PATHNOD)->nvalue)) || sh_isstate(SH_DEFPATH))
-		pp = defpathinit();
+		pp = defpath();
 	return pp;
 }
 
@@ -1619,7 +1622,7 @@ Pathcomp_t *path_addpath(Pathcomp_t *first, const char *path,int type)
 	if(old)
 	{
 		if(!first && !path)
-			first = path_dup(defpathinit());
+			first = path_dup(defpath());
 		if(cp=(sh_scoped(FPATHNOD))->nvalue)
 			first = path_addpath((Pathcomp_t*)first,cp,PATH_FPATH);
 		path_delete(old);

src/cmd/ksh93/tests/leaks.sh

@@ -356,7 +356,7 @@ DO
 	hash "${random_utils[@]}"
 DONE
 
-TEST	title='unset PATH in main shell' known=y url=https://github.com/ksh93/ksh/issues/405
+TEST	title='unset PATH in main shell'
 DO
 	unset PATH
 	PATH=$save_PATH
@@ -445,5 +445,11 @@ DO
 	(((foo = amet) && foo == amet && foo != fermentum))
 DONE
 
+# ======
+TEST	title='running external command by default path'
+DO
+	command -px true
+DONE
+
 # ======
 exit $((Errors<125?Errors:125))