-again:
- for (i=0; __environ[i] && (memcmp(name, __environ[i], l) || __environ[i][l] != '='); i++);
- if (__environ[i]) {
- if (__env_map) {
- for (j=0; __env_map[j] && __env_map[j] != __environ[i]; j++);
- free (__env_map[j]);
- for (; __env_map[j]; j++)
- __env_map[j] = __env_map[j+1];
- }
- for (; __environ[i]; i++)
- __environ[i] = __environ[i+1];
- goto again;
+ if (__environ) {
+ char **e = __environ, **eo = e;
+ for (; *e; e++)
+ if (!strncmp(name, *e, l) && l[*e] == '=')
+ __env_rm_add(*e, 0);
+ else if (eo != e)
+ *eo++ = *e;
+ else
+ eo++;
+ if (eo != e) *eo = 0;