BSD-style copyright, cosmetic changes

diff --git a/putenv.c b/putenv.c
index aa8a5c6a919ae7ef01ac5f30befa6c21e0086ec6..a3b742627d1941ae3b28eb9000a20c83a91241dc 100644 (file)
--- a/putenv.c
+++ b/putenv.c
@@ -1,28 +1,28 @@
 /*
- *  CU sudo version 1.6
- *  Copyright (c) 1996, 1998, 1999 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1996, 1998, 1999 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
  *
- *  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 1, or (at your option)
- *  any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
  *
- *  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, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Please send bugs, changes, problems to sudo-bugs@courtesan.com
- *
- *******************************************************************
- *
- *  This module contains putenv(3) for those systems that lack it.
- *
- *  Todd C. Miller <Todd.Miller@courtesan.com> Sun Aug  7 20:30:17 MDT 1994
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
@@ -52,14 +52,10 @@ static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 
-/******************************************************************
- *
- *  putenv()
- *
- *  putenv(3) places a string of the for "name=value" into the environment.
- *  Note that this string becomes a part of the environment.
+/*
+ * putenv() places a string of the for "name=value" into the environment.
+ * Note that this string becomes a part of the environment.
  */
-
 int
 putenv(str)
     const char *str;
@@ -72,7 +68,7 @@ putenv(str)
     extern char ** environ;
 
     /*
-     * find out how much of str to match when searching
+     * Find out how much of str to match when searching
      * for a string to replace.
      */
     if ((tmp = strchr(str, '=')) == NULL || tmp == str)
@@ -112,7 +108,7 @@ putenv(str)
            return(-1);
     }
 
-    /* actually add in the new entry */
+    /* Actually add in the new entry... */
     environ = newenv;
     environ[envlen] = (char *)str;
     environ[envlen+1] = NULL;