external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Port more shell lint improvements from illumos and ksh93v- (#374)

Browse source 
This commit adds onto <https://github.com/ksh93/ksh/pull/353> by porting
over two additional improvements to the shell linter:

1) The changes in the aforementioned pull request were merged into
   illumos-gate with an additional change.[*] The illumos revision of
   the patch improved the warning for (( $foo = $? )) to specify '$foo'
   causes the warning.[**] Example:
      $ ksh -n -c '(( $? != $bar ))'
      ksh: warning: line 1: in '(( $? != $bar ))', using '$' as in '$bar' is slower and can introduce rounding errors
   While I was porting the illumos patch I did notice one problem. The
   string it uses from paramsub() skips over the initial '{' in
   '${var}', resulting in the warning printing '$var}' instead:
      $ ksh -n -c '(( ${.sh.pid} != $$ ))'
      ...  in '(( ${.sh.pid} != $$ ))', using '$' as in '$.sh.pid}' is slower  ...
   This was fixed by including the missing '{' in the string returned by
   paramsub for ${var} variables.

2) In ksh93v-, parsing x=$((expr)) with the shell linter will cause ksh
   to warn the user x=$((expr)) is slower than ((x=expr)). This
   improvement has been backported with a modified warning:
      # Result from this commit
      $ ksh -n -c 'x=$((1 + 2))'
      ksh: warning: line 1: x=$((1 + 2)) is slower than ((x=1 + 2))
      # Result from ksh93v-
      $ ksh93v -n -c 'x=$((1 + 2))'
      ksh93v: warning: line 1: ((x=1 + 2)) is more efficient than x=$((1 + 2))
   Minor note: the ksh93v- patch had an invalid use of memcmp; this
   version of the patch uses strncmp instead.

References:
be548e87bc
65722363_22fdf8e7/
This commit is contained in:
Johnothan King 2021-12-12 13:25:07 -08:00 • committed by Martijn Dekker
parent 66a50ece82
commit cd562b16e2
5 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/cmd/ksh93/sh/lex.c
View file

@ -1327,7 +1327,16 @@ breakloop:
state = lp->arg->argval;
lp->comp_assign = assignment;
if(assignment)
{
lp->arg->argflag |= ARG_ASSIGN;
if(sh_isoption(SH_NOEXEC))
{
char *cp = strchr(state, '=');
if(cp && strncmp(++cp, "$((", 3) == 0)
errormsg(SH_DICT, ERROR_warn(0), e_lexarithwarn, shp->inlineno,
state, cp - state, state, cp + 3);
}
}
else if(!lp->lex.skipword)
lp->assignok = 0;
lp->arg->argchn.cp = 0;