diff options
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/params.c | 178 |
1 files changed, 108 insertions, 70 deletions
diff --git a/Src/params.c b/Src/params.c index 9eab51a34..045ac1e34 100644 --- a/Src/params.c +++ b/Src/params.c @@ -5032,78 +5032,11 @@ static const struct paramtypes pmtypes[] = { #define PMTYPES_SIZE ((int)(sizeof(pmtypes)/sizeof(struct paramtypes))) -/**/ -mod_export void -printparamnode(HashNode hn, int printflags) +static void +printparamvalue(Param p, int printflags) { - Param p = (Param) hn; char *t, **u; - if (p->node.flags & PM_UNSET) { - if (isset(POSIXBUILTINS) && (p->node.flags & PM_READONLY) && - (printflags & PRINT_TYPESET)) - { - /* - * Special POSIX rules: show the parameter as readonly - * even though it's unset, but with no value. - */ - printflags |= PRINT_NAMEONLY; - } - else - return; - } - - if (printflags & PRINT_TYPESET) - printf("typeset "); - - /* Print the attributes of the parameter */ - if (printflags & (PRINT_TYPE|PRINT_TYPESET)) { - int doneminus = 0, i; - const struct paramtypes *pmptr; - - for (pmptr = pmtypes, i = 0; i < PMTYPES_SIZE; i++, pmptr++) { - int doprint = 0; - if (pmptr->flags & PMTF_TEST_LEVEL) { - if (p->level) - doprint = 1; - } else if (p->node.flags & pmptr->binflag) - doprint = 1; - - if (doprint) { - if (printflags & PRINT_TYPESET) { - if (pmptr->typeflag) { - if (!doneminus) { - putchar('-'); - doneminus = 1; - } - putchar(pmptr->typeflag); - } - } else { - printf("%s ", pmptr->string); - } - if ((pmptr->flags & PMTF_USE_BASE) && p->base) { - printf("%d ", p->base); - doneminus = 0; - } - if ((pmptr->flags & PMTF_USE_WIDTH) && p->width) { - printf("%d ", p->width); - doneminus = 0; - } - } - } - if (doneminus) - putchar(' '); - } - - if ((printflags & PRINT_NAMEONLY) || - ((p->node.flags & PM_HIDEVAL) && !(printflags & PRINT_INCLUDEVALUE))) { - zputs(p->node.nam, stdout); - putchar('\n'); - return; - } - - quotedzputs(p->node.nam, stdout); - if (p->node.flags & PM_AUTOLOAD) { putchar('\n'); return; @@ -5112,7 +5045,7 @@ printparamnode(HashNode hn, int printflags) putchar(' '); else if ((printflags & PRINT_TYPESET) && (PM_TYPE(p->node.flags) == PM_ARRAY || PM_TYPE(p->node.flags) == PM_HASHED)) - printf("\n%s=", p->node.nam); + printf("%s=", p->node.nam); else putchar('='); @@ -5171,3 +5104,108 @@ printparamnode(HashNode hn, int printflags) else putchar('\n'); } + +/**/ +mod_export void +printparamnode(HashNode hn, int printflags) +{ + Param p = (Param) hn; + int array_typeset; + + if (p->node.flags & PM_UNSET) { + if (isset(POSIXBUILTINS) && (p->node.flags & PM_READONLY) && + (printflags & PRINT_TYPESET)) + { + /* + * Special POSIX rules: show the parameter as readonly + * even though it's unset, but with no value. + */ + printflags |= PRINT_NAMEONLY; + } + else + return; + } + + if (printflags & PRINT_TYPESET) { + if ((p->node.flags & (PM_READONLY|PM_SPECIAL)) == + (PM_READONLY|PM_SPECIAL)) { + /* + * It's not possible to restore the state of + * these, so don't output. + */ + return; + } + /* + * Printing the value of array: this needs to be on + * a separate line so more care is required. + */ + array_typeset = (PM_TYPE(p->node.flags) == PM_ARRAY || + PM_TYPE(p->node.flags) == PM_HASHED) && + !(printflags & PRINT_NAMEONLY); + if (array_typeset && (p->node.flags & PM_READONLY)) { + /* + * We need to create the array before making it + * readonly. + */ + printf("typeset -a "); + zputs(p->node.nam, stdout); + putchar('\n'); + printparamvalue(p, printflags); + printflags |= PRINT_NAMEONLY; + } + printf("typeset "); + } + else + array_typeset = 0; + + /* Print the attributes of the parameter */ + if (printflags & (PRINT_TYPE|PRINT_TYPESET)) { + int doneminus = 0, i; + const struct paramtypes *pmptr; + + for (pmptr = pmtypes, i = 0; i < PMTYPES_SIZE; i++, pmptr++) { + int doprint = 0; + if (pmptr->flags & PMTF_TEST_LEVEL) { + if (p->level) + doprint = 1; + } else if (p->node.flags & pmptr->binflag) + doprint = 1; + + if (doprint) { + if (printflags & PRINT_TYPESET) { + if (pmptr->typeflag) { + if (!doneminus) { + putchar('-'); + doneminus = 1; + } + putchar(pmptr->typeflag); + } + } else { + printf("%s ", pmptr->string); + } + if ((pmptr->flags & PMTF_USE_BASE) && p->base) { + printf("%d ", p->base); + doneminus = 0; + } + if ((pmptr->flags & PMTF_USE_WIDTH) && p->width) { + printf("%d ", p->width); + doneminus = 0; + } + } + } + if (doneminus) + putchar(' '); + } + + if ((printflags & PRINT_NAMEONLY) || + ((p->node.flags & PM_HIDEVAL) && !(printflags & PRINT_INCLUDEVALUE))) { + zputs(p->node.nam, stdout); + putchar('\n'); + } else { + quotedzputs(p->node.nam, stdout); + + if (array_typeset) + putchar('\n'); + printparamvalue(p, printflags); + } +} |