another round of minor cleanups

Resolves: #675
ksh93 · Sep 9, 2023 · b9692f4 · b9692f4
1 parent dec856f
commit b9692f4
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 18 deletions.
diff --git a/src/cmd/ksh93/RELEASE88 b/src/cmd/ksh93/RELEASE88
@@ -1,5 +1,5 @@
-This file is of historic interest. For recent changes in both ksh 93u+m and
-the accompanying libraries, see the file NEWS in the top-level directory.
+This file is of historical interest only. For recent changes in both ksh 93u+m
+and the accompanying libraries, see the file NEWS in the top-level directory.
 ____
 
 This is a list of changes that have been made since the 11/16/88 version

diff --git a/src/cmd/ksh93/RELEASE93 b/src/cmd/ksh93/RELEASE93
@@ -1,5 +1,5 @@
-This file is of historic interest. For recent changes in both ksh 93u+m and
-the accompanying libraries, see the file NEWS in the top-level directory.
+This file is of historical interest only. For recent changes in both ksh 93u+m
+and the accompanying libraries, see the file NEWS in the top-level directory.
 ____
 
 This is a list of changes that have been made since the 12/28/93 version

diff --git a/src/cmd/ksh93/bltins/test.c b/src/cmd/ksh93/bltins/test.c
@@ -600,7 +600,6 @@ int test_inode(const char *file1,const char *file2)
 
 /*
  * This version of access checks against the effective UID/GID
- * The static buffer statb is shared with test_mode.
  */
 int sh_access(const char *name, int mode)
 {

diff --git a/src/cmd/ksh93/data/builtins.c b/src/cmd/ksh93/data/builtins.c
@@ -841,7 +841,7 @@ const char sh_optgetopts[] =
     "values can be specified with a [...]] containing the "
     "value followed by a description.]"
   "[+6.?A group of the form [+\\n...]] will display the characters "
-    "representing ... in fixed with font without adding line breaks.]"
+    "representing ... in fixed-width font without adding line breaks.]"
   "[+7.?A group of the form [+\aname\a?\atext\a]] specifies a section "
     "\aname\a with descriptive \atext\a. If \aname\a is omitted then "
     "\atext\a is placed in a new paragraph.]"

diff --git a/src/cmd/ksh93/data/lexstates.c b/src/cmd/ksh93/data/lexstates.c
@@ -736,7 +736,6 @@ const char e_lexsyntax4[]	= "syntax error at line %d: invalid reference list";
 const char e_lexsyntax5[]	= "syntax error at line %d: `<<%s' here-document not contained within command substitution";
 const char e_lexwarnvar[]	= "line %d: in '((%s))', using '$' as in '$%.*s' is slower and can introduce rounding errors";
 const char e_lexarithwarn[]	= "line %d: %s is slower than ((%.*s%s";
-const char e_lexlabunknown[]	= "line %d: %s unknown label";
 const char e_lexobsolete1[]	= "line %d: `...` obsolete, use $(...)";
 const char e_lexobsolete2[]	= "line %d: -a obsolete, use -e";
 const char e_lexobsolete3[]	= "line %d: '=' obsolete, use '=='";

diff --git a/src/cmd/ksh93/include/lexstates.h b/src/cmd/ksh93/include/lexstates.h
@@ -129,7 +129,6 @@ extern const char *sh_lexrstates[ST_NONE];
 extern const char e_lexversion[];
 extern const char e_lexspace[];
 extern const char e_lexslash[];
-extern const char e_lexlabunknown[];
 extern const char e_lexsyntax1[];
 extern const char e_lexsyntax2[];
 extern const char e_lexsyntax3[];

diff --git a/src/cmd/ksh93/include/shlex.h b/src/cmd/ksh93/include/shlex.h
@@ -83,7 +83,7 @@ typedef struct  _shlex_
 	char		intypeset;	/* 1 when processing typeset, 2 when processing enum */
 	char		comp_assign;	/* in compound assignment */
 	char		comsub;		/* parsing command substitution */
-	char		noreserv;	/* reserved works not legal */
+	char		noreserv;	/* reserved words not legal */
 	int		inlineno;	/* saved value of sh.inlineno */
 	int		firstline;	/* saved value of sh.st.firstline */
 	int		assignlevel;	/* nesting level for assignment */

diff --git a/src/cmd/ksh93/sh/path.c b/src/cmd/ksh93/sh/path.c
@@ -408,18 +408,14 @@ static void pathinit(void)
 	const char *val;
 	Pathcomp_t *pp;
 	if(val=sh_scoped((PATHNOD))->nvalue.cp)
-	{
 		sh.pathlist = pp = path_addpath((Pathcomp_t*)sh.pathlist,val,PATH_PATH);
-	}
 	else
 	{
 		pp = defpathinit();
 		sh.pathlist = path_dup(pp);
 	}
 	if(val=sh_scoped((FPATHNOD))->nvalue.cp)
-	{
 		pp = path_addpath((Pathcomp_t*)sh.pathlist,val,PATH_FPATH);
-	}
 }
 
 /*
@@ -437,9 +433,7 @@ Pathcomp_t *path_get(const char *name)
 		pp = (Pathcomp_t*)sh.pathlist;
 	}
 	if(!pp && (!(sh_scoped(PATHNOD)->nvalue.cp)) || sh_isstate(SH_DEFPATH))
-	{
 		pp = defpathinit();
-	}
 	return pp;
 }
 

diff --git a/src/lib/libast/features/sys b/src/lib/libast/features/sys
@@ -228,7 +228,4 @@ extern	wctomb		int		(char*, wchar_t)
 extern	write		ssize_t		(int, const void*, size_t)
 
 print	#undef	extern
-
-# <stdarg.h> is handled by proto so this must be after the last test
-
 print	#include <stdarg.h>