mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2025-01-10 18:13:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid unnecessary copying of environment.

Browse Source 
(main): Rather than clearing the environment and --
unless told to ignore environment -- copying all settings from
the saved, original environment, clear the environment only when
that is requested.  Suggested by Jens Elkner.
This commit is contained in:
Jim Meyering 2003-06-03 08:29:41 +00:00
parent ebe74e183e
commit e53732b471
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/env.c
View File

@ -139,7 +139,6 @@ A mere - implies -i. If no COMMAND, print the resulting environment.\n\
int int
main (register int argc, register char **argv, char **envp) main (register int argc, register char **argv, char **envp)
{ {
char *dummy_environ[1];
int optc; int optc;
int ignore_environment = 0; int ignore_environment = 0;
@ -171,12 +170,11 @@ main (register int argc, register char **argv, char **envp)
if (optind < argc && !strcmp (argv[optind], "-")) if (optind < argc && !strcmp (argv[optind], "-"))
ignore_environment = 1; ignore_environment = 1;
environ = dummy_environ; if (ignore_environment)
environ[0] = NULL; {
static char *dummy_environ[] = { NULL };
if (!ignore_environment) environ = dummy_environ;
for (; *envp; envp++) }
putenv (*envp);
optind = 0; /* Force GNU getopt to re-initialize. */ optind = 0; /* Force GNU getopt to re-initialize. */
while ((optc = getopt_long (argc, argv, "+iu:", longopts, NULL)) != -1) while ((optc = getopt_long (argc, argv, "+iu:", longopts, NULL)) != -1)