250-ash_export-n.patch 765 B

12345678910111213141516171819202122232425262728293031323334
  1. --- a/shell/ash.c
  2. +++ b/shell/ash.c
  3. @@ -11909,8 +11909,17 @@ exportcmd(int argc ATTRIBUTE_UNUSED, cha
  4. const char *p;
  5. char **aptr;
  6. int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT;
  7. + int mask = ~0;
  8. + int nopt;
  9. + while ((nopt = nextopt("np"))) {
  10. + if (nopt == 'n') {
  11. + mask = ~flag;
  12. + } else { /* p */
  13. + break;
  14. + }
  15. + }
  16. - if (nextopt("p") != 'p') {
  17. + if (nopt != 'p') {
  18. aptr = argptr;
  19. name = *aptr;
  20. if (name) {
  21. @@ -11922,10 +11931,12 @@ exportcmd(int argc ATTRIBUTE_UNUSED, cha
  22. vp = *findvar(hashvar(name), name);
  23. if (vp) {
  24. vp->flags |= flag;
  25. + vp->flags &= mask;
  26. continue;
  27. }
  28. }
  29. setvar(name, p, flag);
  30. + setvar(name, p, flag & mask);
  31. } while ((name = *++aptr) != NULL);
  32. return 0;
  33. }