JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eliminate legacy macros

Browse Source
This commit is contained in:
tg
2017-04-27 19:33:53 +00:00
parent 91a3d6751e
commit 1080008a8f
12 changed files with 114 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
main.c
View File

@@ -34,7 +34,7 @@
#include <locale.h>
#endif
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.336 2017/04/27 19:16:08 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.337 2017/04/27 19:33:51 tg Exp $");
extern char **environ;
@@ -410,62 +410,6 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
/* for security */
typeset(TinitIFS, 0, 0, 0, 0);
#define dmpcf(a,f) do { \
int c = -1, lc = -3, il = 0; \
shellf("%s\t",a); \
while (++c < 256) { \
if (!f) continue; \
if (lc + 1 == c) { \
il = 1; \
} else { \
if (il) \
shellf("‥%02X", lc); \
il = 0; \
shellf(" %02X", c); \
} \
lc = c; \
} \
if (il) \
shellf("‥%02X", lc); \
shellf(" .\n"); \
} while (0)
#define dmpct(a,b) dmpcf(a,ctype(c,b))
dmpct("C_ALIAS",C_ALIAS);
dmpct("C_ALNUM",C_ALNUM);
dmpct("C_ALNUX",C_ALNUX);
dmpct("C_ALPHA",C_ALPHA);
dmpct("C_ALPHX",C_ALPHX);
dmpct("C_BLANK",C_BLANK);
dmpct("C_CFS",C_CFS);
dmpct("C_CNTRL",C_CNTRL);
dmpct("C_DIGIT",C_DIGIT);
dmpct("C_DOLAR",C_DOLAR);
dmpct("C_GRAPH",C_GRAPH);
dmpct("C_HEXLT",C_HEXLT);
dmpct("C_IFS",C_IFS);
dmpct("C_IFSWS",C_IFSWS);
dmpct("C_LEX1",C_LEX1);
dmpct("C_LF",C_LF);
dmpct("C_LOWER",C_LOWER);
dmpct("C_MFS",C_MFS);
dmpct("C_NL",C_NL);
dmpct("C_NUL",C_NUL);
dmpct("C_OCTAL",C_OCTAL);
dmpct("C_PRINT",C_PRINT);
dmpct("C_PUNCT",C_PUNCT);
dmpct("C_QC",C_QC);
dmpct("C_QUOTE",C_QUOTE);
dmpct("C_SEDEC",C_SEDEC);
dmpct("C_SPACE",C_SPACE);
dmpct("C_SPC",C_SPC);
dmpct("C_SUB1",C_SUB1);
dmpct("C_SUB2",C_SUB2);
dmpct("C_TAB",C_TAB);
dmpct("C_UNDER",C_UNDER);
dmpct("C_UPPER",C_UPPER);
dmpct("C_VAR1",C_VAR1);
exit(0);
/* assign default shell variable values */
typeset("PATHSEP=" MKSH_PATHSEPS, 0, 0, 0, 0);
substitute(initsubs, 0);
@@ -1604,7 +1548,7 @@ check_fd(const char *name, int mode, const char **emsgp)
goto illegal_fd_name;
if (name[0] == 'p')
return (coproc_getfd(mode, emsgp));
if (!ksh_isdigit(name[0])) {
if (!ctype(name[0], C_DIGIT)) {
illegal_fd_name:
if (emsgp)
*emsgp = "illegal file descriptor name";