diff --git a/src/cmd/ksh93/bltins/print.c b/src/cmd/ksh93/bltins/print.c index 87658de2b..75b1c0e8a 100644 --- a/src/cmd/ksh93/bltins/print.c +++ b/src/cmd/ksh93/bltins/print.c @@ -1056,7 +1056,6 @@ static int fmtvecho(const char *string, struct printf *pp) register const char *cp = string, *cpmax; register int c; register int offset = staktell(); -#if SHOPT_MULTIBYTE int chlen; if(mbwide()) { @@ -1070,8 +1069,8 @@ static int fmtvecho(const char *string, struct printf *pp) } } else -#endif /* SHOPT_MULTIBYTE */ - while((c= *cp++) && (c!='\\')); + while((c= *cp++) && (c!='\\')) + ; if(c==0) return(-1); c = --cp - string; @@ -1079,14 +1078,12 @@ static int fmtvecho(const char *string, struct printf *pp) stakwrite((void*)string,c); for(; c= *cp; cp++) { -#if SHOPT_MULTIBYTE if (mbwide() && ((chlen = mbsize(cp)) > 1)) { stakwrite(cp,chlen); cp += (chlen-1); continue; } -#endif /* SHOPT_MULTIBYTE */ if( c=='\\') switch(*++cp) { case 'E': diff --git a/src/cmd/ksh93/bltins/read.c b/src/cmd/ksh93/bltins/read.c index a94657a07..76e7aff60 100644 --- a/src/cmd/ksh93/bltins/read.c +++ b/src/cmd/ksh93/bltins/read.c @@ -425,8 +425,7 @@ int sh_readline(register Shell_t *shp,char **names, volatile int fd, int flags,s if(f) sfread(iop,cp,c); cur += c; -#if SHOPT_MULTIBYTE - if(!binary && mbwide()) + if(mbwide() && !binary) { int x; int z; @@ -442,12 +441,9 @@ int sh_readline(register Shell_t *shp,char **names, volatile int fd, int flags,s if((size -= x) > 0 && (up >= cur || z < 0) && ((flags & NN_FLAG) || z < 0 || m > c)) continue; } -#endif } -#if SHOPT_MULTIBYTE - if(!binary && mbwide() && (up == var || (flags & NN_FLAG) && size)) + if(mbwide() && !binary && (up == var || (flags & NN_FLAG) && size)) cur = var; -#endif *cur = 0; if(c>=size || (flags&N_FLAG) || m==0) { diff --git a/src/cmd/ksh93/edit/completion.c b/src/cmd/ksh93/edit/completion.c index 7f74c20de..dd9dd3980 100644 --- a/src/cmd/ksh93/edit/completion.c +++ b/src/cmd/ksh93/edit/completion.c @@ -31,10 +31,6 @@ #include "edit.h" #include "history.h" -#if !SHOPT_MULTIBYTE -#define mbchar(p) (*(unsigned char*)p++) -#endif - static char *fmtx(const char *string) { register const char *cp = string; diff --git a/src/cmd/ksh93/edit/history.c b/src/cmd/ksh93/edit/history.c index f40f27b4a..3b115acec 100644 --- a/src/cmd/ksh93/edit/history.c +++ b/src/cmd/ksh93/edit/history.c @@ -1013,9 +1013,7 @@ int hist_match(register History_t *hp,off_t offset,char *string,int *coffset) { register unsigned char *first, *cp; register int m,n,c=1,line=0; -#if SHOPT_MULTIBYTE mbinit(); -#endif /* SHOPT_MULTIBYTE */ sfseek(hp->histfp,offset,SEEK_SET); if(!(cp = first = (unsigned char*)sfgetr(hp->histfp,0,0))) return(-1); @@ -1033,10 +1031,8 @@ int hist_match(register History_t *hp,off_t offset,char *string,int *coffset) break; if(*cp=='\n') line++; -#if SHOPT_MULTIBYTE if((c=mbsize(cp)) < 0) c = 1; -#endif /* SHOPT_MULTIBYTE */ cp += c; m -= c; } diff --git a/src/cmd/ksh93/include/defs.h b/src/cmd/ksh93/include/defs.h index a0645944b..543c777fa 100644 --- a/src/cmd/ksh93/include/defs.h +++ b/src/cmd/ksh93/include/defs.h @@ -30,8 +30,9 @@ #include #if !SHOPT_MULTIBYTE + /* disable multibyte without need for further '#if SHOPT_MULTIBYTE' */ # undef mbwide -# define mbwide() (0) /* disable multibyte without need for further '#if SHOPT_MULTIBTYE' */ +# define mbwide() 0 #endif #include diff --git a/src/cmd/ksh93/sh/lex.c b/src/cmd/ksh93/sh/lex.c index 3ea25437e..dac33aa66 100644 --- a/src/cmd/ksh93/sh/lex.c +++ b/src/cmd/ksh93/sh/lex.c @@ -1521,7 +1521,7 @@ breakloop: lp->lex.reservok = 0; else if(c==TIMESYM) { - /* yech - POSIX requires time -p */ + /* POSIX requires time -p */ while(fcgetc(n)==' ' || n=='\t'); if(n>0) fcseek(-LEN); @@ -2187,7 +2187,6 @@ struct argnod *sh_endword(Shell_t *shp,int mode) Stk_t *stkp=shp->stk; sfputc(stkp,0); sp = stkptr(stkp,ARGVAL); -#if SHOPT_MULTIBYTE if(mbwide()) { do @@ -2216,8 +2215,8 @@ struct argnod *sh_endword(Shell_t *shp,int mode) while(n == 0); } else -#endif /* SHOPT_MULTIBYTE */ - while((n=state[*sp++])==0); + while((n = state[*sp++]) == 0) + ; dp = sp; if(mode<0) inquote = 1; @@ -2396,7 +2395,6 @@ struct argnod *sh_endword(Shell_t *shp,int mode) } break; } -#if SHOPT_MULTIBYTE if(mbwide()) { do @@ -2426,8 +2424,8 @@ struct argnod *sh_endword(Shell_t *shp,int mode) while(n == 0); } else -#endif /* SHOPT_MULTIBYTE */ - while((n=state[*dp++ = *sp++])==0); + while((n=state[*dp++ = *sp++])==0) + ; } } diff --git a/src/cmd/ksh93/sh/macro.c b/src/cmd/ksh93/sh/macro.c index 038619554..04a026e9e 100644 --- a/src/cmd/ksh93/sh/macro.c +++ b/src/cmd/ksh93/sh/macro.c @@ -51,13 +51,6 @@ # define STR_GROUP 0 #endif -#if SHOPT_MULTIBYTE -# undef isascii -# define isacii(c) ((c)<=UCHAR_MAX) -#else -# define mbchar(p) (*(unsigned char*)p++) -#endif /* SHOPT_MULTIBYTE */ - #if _WINIX static int Skip; #endif /*_WINIX */ @@ -75,7 +68,7 @@ typedef struct _mac_ char atmode; /* when processing $@ */ char quote; /* set within double quoted contexts */ char lit; /* set within single quotes */ - char split; /* set when word splittin is possible */ + char split; /* set when word splitting is possible */ char pattern; /* set when file expansion follows */ char patfound; /* set if pattern character found */ char assign; /* set for assignments */ @@ -85,7 +78,7 @@ typedef struct _mac_ char arrayok; /* $x[] ok for arrays */ char subcopy; /* set when copying subscript */ int dotdot; /* set for .. in subscript */ - void *nvwalk; /* for name space walking*/ + void *nvwalk; /* for name space walking */ } Mac_t; #undef ESCAPE @@ -119,6 +112,8 @@ static char *mac_getstring(char*); static int charlen(const char*,int); #if SHOPT_MULTIBYTE static char *lastchar(const char*,const char*); +#else +# define lastchar(string,endstring) (endstring) #endif /* SHOPT_MULTIBYTE */ void *sh_macopen(Shell_t *shp) @@ -293,7 +288,6 @@ void sh_machere(Shell_t *shp,Sfio_t *infile, Sfio_t *outfile, char *string) cp = fcseek(0); while(1) { -#if SHOPT_MULTIBYTE if(mbwide()) { do @@ -315,8 +309,8 @@ void sh_machere(Shell_t *shp,Sfio_t *infile, Sfio_t *outfile, char *string) while(n == 0); } else -#endif /* SHOPT_MULTIBYTE */ - while((n=state[*(unsigned char*)cp++])==0); + while((n=state[*(unsigned char*)cp++])==0) + ; if(n==S_NL || n==S_QUOTE || n==S_RBRA) continue; if(c=(cp-1)-fcseek(0)) @@ -460,7 +454,6 @@ static void copyto(register Mac_t *mp,int endch, int newquote) cp++; while(1) { -#if SHOPT_MULTIBYTE if(mbwide()) { ssize_t len; @@ -484,7 +477,6 @@ static void copyto(register Mac_t *mp,int endch, int newquote) c = (cp-len) - first; } else -#endif /* SHOPT_MULTIBYTE */ { while((n=state[*(unsigned char*)cp++])==0); c = (cp-1) - first; @@ -501,8 +493,7 @@ static void copyto(register Mac_t *mp,int endch, int newquote) c = chresc(cp,&addr); cp = addr; first = fcseek(cp-first); -#if SHOPT_MULTIBYTE - if(c > UCHAR_MAX && mbwide()) + if(mbwide() && c > UCHAR_MAX) { int i; unsigned char mb[8]; @@ -512,8 +503,7 @@ static void copyto(register Mac_t *mp,int endch, int newquote) sfputc(stkp,mb[i]); } else -#endif /* SHOPT_MULTIBYTE */ - sfputc(stkp,c); + sfputc(stkp,c); if(c==ESCAPE && mp->pattern) sfputc(stkp,ESCAPE); break; @@ -717,8 +707,7 @@ static void copyto(register Mac_t *mp,int endch, int newquote) if(first[c-2]=='.') offset = stktell(stkp); if(isastchar(*cp) && cp[1]==']') - errormsg(SH_DICT,ERROR_exit(1), -e_badsubscript,*cp); + errormsg(SH_DICT,ERROR_exit(1),e_badsubscript,*cp); } first = fcseek(c); mp->pattern = 4; @@ -1713,7 +1702,6 @@ retry1: type = 0; if(vsize < type) v = 0; -#if SHOPT_MULTIBYTE else if(mbwide()) { mbinit(); @@ -1721,7 +1709,6 @@ retry1: mbchar(v); c = ':'; } -#endif /* SHOPT_MULTIBYTE */ else v += type; vsize = v?strlen(v):0; @@ -1745,7 +1732,6 @@ retry1: } else if(type < vsize) { -#if SHOPT_MULTIBYTE if(mbwide()) { char *vp = v; @@ -1759,7 +1745,6 @@ retry1: type = vp-v; c = ':'; } -#endif /* SHOPT_MULTIBYTE */ vsize = type; } else @@ -2322,14 +2307,12 @@ static void mac_copy(register Mac_t *mp,register const char *str, register int s /* insert \ before file expansion characters */ while(size-->0) { -#if SHOPT_MULTIBYTE if(mbwide() && (len=mbsize(cp))>1) { cp += len; size -= (len-1); continue; } -#endif c = state[n= *(unsigned char*)cp++]; if(mp->assign==3 && mp->pattern!=4) { @@ -2401,7 +2384,6 @@ static void mac_copy(register Mac_t *mp,register const char *str, register int s while(size-->0) { n=state[c= *(unsigned char*)cp++]; -#if SHOPT_MULTIBYTE if(mbwide() && n!=S_MBYTE && (len=mbsize(cp-1))>1) { sfwrite(stkp,cp-1, len); @@ -2409,7 +2391,6 @@ static void mac_copy(register Mac_t *mp,register const char *str, register int s size -= len; continue; } -#endif if(n==S_ESC || n==S_EPAT) { /* don't allow extended patterns in this case */ @@ -2420,8 +2401,7 @@ static void mac_copy(register Mac_t *mp,register const char *str, register int s mp->patfound = mp->pattern; else if(n && mp->ifs) { -#if SHOPT_MULTIBYTE - if(n==S_MBYTE) + if(mbwide() && n==S_MBYTE) { if(sh_strchr(mp->ifsp,cp-1)<0) { @@ -2441,13 +2421,11 @@ static void mac_copy(register Mac_t *mp,register const char *str, register int s size -= n; n= S_DELIM; } -#endif /* SHOPT_MULTIBYTE */ if(n==S_SPACE || n==S_NL) { while(size>0 && ((n=state[c= *(unsigned char*)cp++])==S_SPACE||n==S_NL)) size--; -#if SHOPT_MULTIBYTE - if(n==S_MBYTE && sh_strchr(mp->ifsp,cp-1)>=0) + if(mbwide() && n==S_MBYTE && sh_strchr(mp->ifsp,cp-1)>=0) { n = mbsize(cp-1) - 1; if(n==-2) @@ -2456,9 +2434,7 @@ static void mac_copy(register Mac_t *mp,register const char *str, register int s size -= n; n=S_DELIM; } - else -#endif /* SHOPT_MULTIBYTE */ - if(n==S_DELIM) + else if(n==S_DELIM) size--; } endfield(mp,n==S_DELIM||mp->quoted); @@ -2499,7 +2475,7 @@ static void mac_copy(register Mac_t *mp,register const char *str, register int s /* * Terminate field. * If field is null count field if is non-zero - * Do filename expansion of required + * Do filename expansion if required */ static void endfield(register Mac_t *mp,int split) { @@ -2566,10 +2542,8 @@ static int substring(register const char *string,const char *pat,int match[], in sp += size; while(sp>=string) { -#if SHOPT_MULTIBYTE if(mbwide()) sp = lastchar(string,sp); -#endif /* SHOPT_MULTIBYTE */ if(n=strgrpmatch(sp,pat,smatch,elementsof(smatch)/2,STR_RIGHT|STR_LEFT|STR_MAXIMAL)) { nmatch = n; @@ -2611,7 +2585,6 @@ static int charlen(const char *string,int len) { if(!string) return(0); -#if SHOPT_MULTIBYTE if(mbwide()) { register const char *str = string, *strmax=string+len; @@ -2627,7 +2600,6 @@ static int charlen(const char *string,int len) return(n); } else -#endif /* SHOPT_MULTIBYTE */ { if(len<0) return(strlen(string)); diff --git a/src/cmd/ksh93/sh/name.c b/src/cmd/ksh93/sh/name.c index a11c4959d..4735d58ca 100644 --- a/src/cmd/ksh93/sh/name.c +++ b/src/cmd/ksh93/sh/name.c @@ -117,10 +117,6 @@ static void(*nullscan)(Namval_t*,void*); # define _data data #endif -#if !SHOPT_MULTIBYTE -# define mbchar(p) (*(unsigned char*)p++) -#endif /* SHOPT_MULTIBYTE */ - /* ======== name value pair routines ======== */ #include "shnodes.h" @@ -1881,9 +1877,11 @@ void nv_putval(register Namval_t *np, const char *string, int flags) } else if((nv_isattr(np, NV_RJUST|NV_ZFILL|NV_LJUST)) && sp) { - for(;*sp == ' '|| *sp=='\t';sp++); + for( ; *sp == ' ' || *sp == '\t'; sp++) + ; if((nv_isattr(np,NV_ZFILL)) && (nv_isattr(np,NV_LJUST))) - for(;*sp=='0';sp++); + for( ; *sp == '0'; sp++) + ; size = nv_size(np); #if SHOPT_MULTIBYTE if(size) diff --git a/src/cmd/ksh93/sh/string.c b/src/cmd/ksh93/sh/string.c index 41d7a3c3c..305448e6d 100644 --- a/src/cmd/ksh93/sh/string.c +++ b/src/cmd/ksh93/sh/string.c @@ -249,7 +249,6 @@ void sh_trim(register char *sp) dp = sp; while(c= *sp) { -#if SHOPT_MULTIBYTE int len; if(mbwide() && (len=mbsize(sp))>1) { @@ -258,7 +257,6 @@ void sh_trim(register char *sp) sp += len; continue; } -#endif /* SHOPT_MULTIBYTE */ sp++; if(c == '\\') c = *sp++;