X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fenviron.c;h=ee471adc664173b7e21b89a73cb2355835f90e46;hb=c14c28ba117dee9fd0bf17fc3437e808221a7829;hp=0b9f913ca1747f0966d13e41ed211e467f2d7d61;hpb=7b4ac7e1ed2c4616bce56d1760807798be87ac9e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/environ.c b/gdb/environ.c index 0b9f913ca1..ee471adc66 100644 --- a/gdb/environ.c +++ b/gdb/environ.c @@ -1,110 +1,37 @@ /* environ.c -- library for manipulating environments for GNU. - Copyright (C) 1986 Free Software Foundation, Inc. - - NO WARRANTY - - BECAUSE THIS PROGRAM IS LICENSED FREE OF CHARGE, WE PROVIDE ABSOLUTELY -NO WARRANTY, TO THE EXTENT PERMITTED BY APPLICABLE STATE LAW. EXCEPT -WHEN OTHERWISE STATED IN WRITING, FREE SOFTWARE FOUNDATION, INC, -RICHARD M. STALLMAN AND/OR OTHER PARTIES PROVIDE THIS PROGRAM "AS IS" -WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY -AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE -DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR -CORRECTION. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL RICHARD M. -STALLMAN, THE FREE SOFTWARE FOUNDATION, INC., AND/OR ANY OTHER PARTY -WHO MAY MODIFY AND REDISTRIBUTE THIS PROGRAM AS PERMITTED BELOW, BE -LIABLE TO YOU FOR DAMAGES, INCLUDING ANY LOST PROFITS, LOST MONIES, OR -OTHER SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR -DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR -A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS) THIS -PROGRAM, EVEN IF YOU HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. - - GENERAL PUBLIC LICENSE TO COPY - - 1. You may copy and distribute verbatim copies of this source file -as you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy a valid copyright notice "Copyright -(C) 1986 Free Software Foundation, Inc."; and include following the -copyright notice a verbatim copy of the above disclaimer of warranty -and of this License. You may charge a distribution fee for the -physical act of transferring a copy. - - 2. You may modify your copy or copies of this source file or -any portion of it, and copy and distribute such modifications under -the terms of Paragraph 1 above, provided that you also do the following: - - a) cause the modified files to carry prominent notices stating - that you changed the files and the date of any change; and - - b) cause the whole of any work that you distribute or publish, - that in whole or in part contains or is a derivative of this - program or any part thereof, to be licensed at no charge to all - third parties on terms identical to those contained in this - License Agreement (except that you may choose to grant more - extensive warranty protection to third parties, at your option). - - c) You may charge a distribution fee for the physical act of - transferring a copy, and you may at your option offer warranty - protection in exchange for a fee. - - 3. You may copy and distribute this program or any portion of it in -compiled, executable or object code form under the terms of Paragraphs -1 and 2 above provided that you do the following: - - a) cause each such copy to be accompanied by the - corresponding machine-readable source code, which must - be distributed under the terms of Paragraphs 1 and 2 above; or, - - b) cause each such copy to be accompanied by a - written offer, with no time limit, to give any third party - free (except for a nominal shipping charge) a machine readable - copy of the corresponding source code, to be distributed - under the terms of Paragraphs 1 and 2 above; or, - - c) in the case of a recipient of this program in compiled, executable - or object code form (without the corresponding source code) you - shall cause copies you distribute to be accompanied by a copy - of the written offer of source code which you received along - with the copy you received. - - 4. You may not copy, sublicense, distribute or transfer this program -except as expressly provided under this License Agreement. Any attempt -otherwise to copy, sublicense, distribute or transfer this program is void and -your rights to use the program under this License agreement shall be -automatically terminated. However, parties who have received computer -software programs from you with this License Agreement will not have -their licenses terminated so long as such parties remain in full compliance. - - 5. If you wish to incorporate parts of this program into other free -programs whose distribution conditions are different, write to the Free -Software Foundation at 675 Mass Ave, Cambridge, MA 02139. We have not yet -worked out a simple rule that can be stated here, but we will often permit -this. We will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software. - -In other words, feel free to share this program, but don't try to -stop anyone else from sharing it. */ + + Copyright (C) 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2000, 2005 + 2003, 2007, 2008 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b)) +#include "defs.h" #include "environ.h" +#include "gdb_string.h" + /* Return a new environment object. */ -struct environ * -make_environ () +struct gdb_environ * +make_environ (void) { - register struct environ *e; + struct gdb_environ *e; - e = (struct environ *) xmalloc (sizeof (struct environ)); + e = (struct gdb_environ *) xmalloc (sizeof (struct gdb_environ)); e->allocated = 10; e->vector = (char **) xmalloc ((e->allocated + 1) * sizeof (char *)); @@ -115,15 +42,14 @@ make_environ () /* Free an environment and all the strings in it. */ void -free_environ (e) - register struct environ *e; +free_environ (struct gdb_environ *e) { - register char **vector = e->vector; + char **vector = e->vector; while (*vector) - free (*vector++); + xfree (*vector++); - free (e); + xfree (e); } /* Copy the environment given to this process into E. @@ -131,28 +57,30 @@ free_environ (e) that all strings in these environments are safe to free. */ void -init_environ (e) - register struct environ *e; +init_environ (struct gdb_environ *e) { extern char **environ; - register int i; + int i; + + if (environ == NULL) + return; - for (i = 0; environ[i]; i++); + for (i = 0; environ[i]; i++) /*EMPTY */ ; if (e->allocated < i) { e->allocated = max (i, e->allocated + 10); - e->vector = (char **) xrealloc (e->vector, + e->vector = (char **) xrealloc ((char *) e->vector, (e->allocated + 1) * sizeof (char *)); } - bcopy (environ, e->vector, (i + 1) * sizeof (char *)); + memcpy (e->vector, environ, (i + 1) * sizeof (char *)); while (--i >= 0) { - register int len = strlen (e->vector[i]); - register char *new = (char *) xmalloc (len + 1); - bcopy (e->vector[i], new, len); + int len = strlen (e->vector[i]); + char *new = (char *) xmalloc (len + 1); + memcpy (new, e->vector[i], len + 1); e->vector[i] = new; } } @@ -161,8 +89,7 @@ init_environ (e) This is used to get something to pass to execve. */ char ** -environ_vector (e) - struct environ *e; +environ_vector (struct gdb_environ *e) { return e->vector; } @@ -170,17 +97,14 @@ environ_vector (e) /* Return the value in environment E of variable VAR. */ char * -get_in_environ (e, var) - struct environ *e; - char *var; +get_in_environ (const struct gdb_environ *e, const char *var) { - register int len = strlen (var); - register char **vector = e->vector; - register char *s; + int len = strlen (var); + char **vector = e->vector; + char *s; - for (; s = *vector; vector++) - if (!strncmp (s, var, len) - && s[len] == '=') + for (; (s = *vector) != NULL; vector++) + if (strncmp (s, var, len) == 0 && s[len] == '=') return &s[len + 1]; return 0; @@ -189,19 +113,15 @@ get_in_environ (e, var) /* Store the value in E of VAR as VALUE. */ void -set_in_environ (e, var, value) - struct environ *e; - char *var; - char *value; +set_in_environ (struct gdb_environ *e, const char *var, const char *value) { - register int i; - register int len = strlen (var); - register char **vector = e->vector; - register char *s; - - for (i = 0; s = vector[i]; i++) - if (!strncmp (s, var, len) - && s[len] == '=') + int i; + int len = strlen (var); + char **vector = e->vector; + char *s; + + for (i = 0; (s = vector[i]) != NULL; i++) + if (strncmp (s, var, len) == 0 && s[len] == '=') break; if (s == 0) @@ -209,42 +129,56 @@ set_in_environ (e, var, value) if (i == e->allocated) { e->allocated += 10; - vector = (char **) xrealloc (vector, + vector = (char **) xrealloc ((char *) vector, (e->allocated + 1) * sizeof (char *)); e->vector = vector; } vector[i + 1] = 0; } else - free (s); + xfree (s); s = (char *) xmalloc (len + strlen (value) + 2); strcpy (s, var); strcat (s, "="); strcat (s, value); vector[i] = s; + + /* This used to handle setting the PATH and GNUTARGET variables + specially. The latter has been replaced by "set gnutarget" + (which has worked since GDB 4.11). The former affects searching + the PATH to find SHELL, and searching the PATH to find the + argument of "symbol-file" or "exec-file". Maybe we should have + some kind of "set exec-path" for that. But in any event, having + "set env" affect anything besides the inferior is a bad idea. + What if we want to change the environment we pass to the program + without afecting GDB's behavior? */ + return; } /* Remove the setting for variable VAR from environment E. */ void -unset_in_environ (e, var) - struct environ *e; - char *var; +unset_in_environ (struct gdb_environ *e, char *var) { - register int len = strlen (var); - register char **vector = e->vector; - register char *s; - - for (; s = *vector; vector++) - if (!strncmp (s, var, len) - && s[len] == '=') - { - free (s); - bcopy (vector + 1, vector, - (e->allocated - (vector - e->vector)) * sizeof (char *)); - e->vector[e->allocated - 1] = 0; - return; - } + int len = strlen (var); + char **vector = e->vector; + char *s; + + for (; (s = *vector) != NULL; vector++) + { + if (strncmp (s, var, len) == 0 && s[len] == '=') + { + xfree (s); + /* Walk through the vector, shuffling args down by one, including + the NULL terminator. Can't use memcpy() here since the regions + overlap, and memmove() might not be available. */ + while ((vector[0] = vector[1]) != NULL) + { + vector++; + } + break; + } + } }