[PATCH:twm] Remove unused fallback implementation of putenv()

[Matthieu Herrb]

On Mon, May 09, 2011 at 10:51:36PM -0700, Alan Coopersmith wrote:
> NOPUTENV was never defined in a modular build, probably because putenv()
> is a standard function in Unix98 / SUSv2.
> 
> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

Reviewed-by: Matthieu Herrb <matthieu.herrb at laas.fr>
> ---
>  src/util.c |   66 ------------------------------------------------------------
>  1 files changed, 0 insertions(+), 66 deletions(-)
> 
> diff --git a/src/util.c b/src/util.c
> index 812886d..83f3257 100644
> --- a/src/util.c
> +++ b/src/util.c
> @@ -771,72 +771,6 @@ SetFocus (TwmWindow *tmp_win, Time time)
>      XSetInputFocus (dpy, w, RevertToPointerRoot, time);
>  }
>  
> -
> -#ifdef NOPUTENV
> -/**
> - * define our own putenv() if the system doesn't have one.
> - * putenv(s): place s (a string of the form "NAME=value") in
> - * the environment; replacing any existing NAME.  s is placed in
> - * environment, so if you change s, the environment changes (like
> - * putenv on a sun).  Binding removed if you putenv something else
> - * called NAME.
> - */
> -int
> -putenv(char *s)
> -{
> -    char *v;
> -    int varlen, idx;
> -    extern char **environ;
> -    char **newenv;
> -    static int virgin = 1; /* true while "environ" is a virgin */
> -
> -    v = index(s, '=');
> -    if(v == 0)
> -	return 0; /* punt if it's not of the right form */
> -    varlen = (v + 1) - s;
> -
> -    for (idx = 0; environ[idx] != 0; idx++) {
> -	if (strncmp(environ[idx], s, varlen) == 0) {
> -	    if(v[1] != 0) { /* true if there's a value */
> -		environ[idx] = s;
> -		return 0;
> -	    } else {
> -		do {
> -		    environ[idx] = environ[idx+1];
> -		} while(environ[++idx] != 0);
> -		return 0;
> -	    }
> -	}
> -    }
> -    
> -    /* add to environment (unless no value; then just return) */
> -    if(v[1] == 0)
> -	return 0;
> -    if(virgin) {
> -	register i;
> -
> -	newenv = (char **) malloc((unsigned) ((idx + 2) * sizeof(char*)));
> -	if(newenv == 0)
> -	    return -1;
> -	for(i = idx-1; i >= 0; --i)
> -	    newenv[i] = environ[i];
> -	virgin = 0;     /* you're not a virgin anymore, sweety */
> -    } else {
> -	newenv = (char **) realloc((char *) environ,
> -				   (unsigned) ((idx + 2) * sizeof(char*)));
> -	if (newenv == 0)
> -	    return -1;
> -    }
> -
> -    environ = newenv;
> -    environ[idx] = s;
> -    environ[idx+1] = 0;
> -    
> -    return 0;
> -}
> -#endif /* NOPUTENV */
> -
> -
>  static Pixmap 
>  CreateXLogoPixmap (unsigned *widthp, unsigned *heightp)
>  {
> -- 
> 1.7.3.2
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel

-- 
Matthieu Herrb