36c36
< __FBSDID("$FreeBSD: head/tools/regression/environ/envctl.c 171195 2007-07-04 00:00:41Z scf $");
---
> __FBSDID("$FreeBSD: head/tools/regression/environ/envctl.c 171525 2007-07-20 23:30:13Z scf $");
57c57
< fprintf(stderr, "Usage: %s [-DGUcht] [-gu name] [-p name=value] "
---
> fprintf(stderr, "Usage: %s [-CDGUchrt] [-gu name] [-p name=value] "
59a60
> " -C\t\t\t\tClear environ variable with NULL pointer\n"
64c65
< " -c\t\t\t\tClear environ variable\n"
---
> " -c\t\t\t\tClear environ variable with calloc()'d memory\n"
67a69
> " -r\t\t\t\treplace environ with { \"FOO=bar\", NULL }\n"
80c82
< char *cleanEnv[] = { NULL };
---
> char *staticEnv[] = { "FOO=bar", NULL };
90c92
< while ((arg = getopt(argc, argv, "DGS:Ucg:hp:s:tu:")) != -1) {
---
> while ((arg = getopt(argc, argv, "CDGS:Ucg:hp:rs:tu:")) != -1) {
92,94c94,95
< case 'D':
< errno = 0;
< dump_environ();
---
> case 'C':
> environ = NULL;
98c99
< environ = cleanEnv;
---
> environ = calloc(1, sizeof(*environ));
100a102,106
> case 'D':
> errno = 0;
> dump_environ();
> break;
>
115a122,125
> case 'r':
> environ = staticEnv;
> break;
>