From b617b9c581efbe6d89b5c494dac20d9c8471ae02 Mon Sep 17 00:00:00 2001 From: Keith Marshall Date: Sun, 9 Sep 2012 20:39:39 +0100 Subject: [PATCH] Fix typo, and update licensing terms for embedded getopt.c --- ChangeLog | 8 ++++++++ src/getopt.c | 34 +++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72ed472..7ebb5a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-09-09 Keith Marshall + + Fix typo, and update licensing terms for embedded getopt.c + + * src/getopt.c: Incorporate MIT/X style licence; update copyright + notice, to reflect chronology of publication; correct degenerate RCS + keyword usage in EOF marker comment. + 2012-09-03 Keith Marshall Correct omission from copyright notice. diff --git a/src/getopt.c b/src/getopt.c index e5bcbad..dc0637e 100644 --- a/src/getopt.c +++ b/src/getopt.c @@ -8,25 +8,33 @@ * * This file is part of the MinGW32 package set. * - * Contributed by Keith Marshall + * Written by Keith Marshall + * Copyright (C) 2008, 2009, 2011, 2012, MinGW.org Project. * + * --------------------------------------------------------------------------- * - * THIS SOFTWARE IS NOT COPYRIGHTED + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. + * The above copyright notice, this permission notice, and the following + * disclaimer shall be included in all copies or substantial portions of + * the Software. * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * - * $Revision$ - * $Author$ - * $Date$ + * --------------------------------------------------------------------------- * */ - #include #include #include @@ -781,4 +789,4 @@ __weak_alias( getopt_long, _getopt_long ) __weak_alias( getopt_long_only, _getopt_long_only ) #endif -/* $RCSfile$Revision: 1.9 $: end of file */ +/* $RCSfile$: end of file */ -- 2.11.0