* glob.cc: Update copyright notice with latest from FreeBSD.

	(glob0): Use correct type for c variable to propagate previously
	detected protection.

2 files changed, 8 insertions, 6 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 75ee363..56ce925 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-13  Christopher Faylor  <me@cgf.cx>
+
+	* glob.cc: Update copyright notice with latest from FreeBSD.
+	(glob0): Use correct type for c variable to propagate previously
+	detected protection.
+
 2007-01-12  Corinna Vinschen  <corinna@vinschen.de>
 
 	* cygheap.cc (_csbrk): Fix off-by-one error.
diff --git a/winsup/cygwin/glob.cc b/winsup/cygwin/glob.cc
index 916f997..6a0d4e6 100644
--- a/winsup/cygwin/glob.cc
+++ b/winsup/cygwin/glob.cc
@@ -13,10 +13,6 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -460,9 +456,9 @@ static int
 glob0(const Char *pattern, glob_t *pglob, size_t *limit)
 {
 	const Char *qpatnext;
-	int c, err;
+	int err;
 	size_t oldpathc;
-	Char *bufnext, patbuf[MAXPATHLEN];
+	Char c, *bufnext, patbuf[MAXPATHLEN];
 
 	qpatnext = globtilde(pattern, patbuf, MAXPATHLEN, pglob);
 	oldpathc = pglob->gl_pathc;