diff options
author | Damien Miller <djm@mindrot.org> | 2003-06-03 12:12:50 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-06-03 12:12:50 +1000 |
commit | 329638e49c00639d6616b58cda234ba2b3059022 (patch) | |
tree | 9b94f324c167827db854a98475a428346e65bbd6 /openbsd-compat/glob.c | |
parent | 4636d93c0c772e63ea1c97d40467569f8658e8aa (diff) |
- (djm) Sync openbsd-compat with OpenBSD CVS.
- No more 4-term BSD licenses in our tree
Diffstat (limited to 'openbsd-compat/glob.c')
-rw-r--r-- | openbsd-compat/glob.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index e928a2272..2ba56e003 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c | |||
@@ -13,11 +13,7 @@ | |||
13 | * 2. Redistributions in binary form must reproduce the above copyright | 13 | * 2. Redistributions in binary form must reproduce the above copyright |
14 | * notice, this list of conditions and the following disclaimer in the | 14 | * notice, this list of conditions and the following disclaimer in the |
15 | * documentation and/or other materials provided with the distribution. | 15 | * documentation and/or other materials provided with the distribution. |
16 | * 3. All advertising materials mentioning features or use of this software | 16 | * 3. Neither the name of the University nor the names of its contributors |
17 | * must display the following acknowledgement: | ||
18 | * This product includes software developed by the University of | ||
19 | * California, Berkeley and its contributors. | ||
20 | * 4. Neither the name of the University nor the names of its contributors | ||
21 | * may be used to endorse or promote products derived from this software | 17 | * may be used to endorse or promote products derived from this software |
22 | * without specific prior written permission. | 18 | * without specific prior written permission. |
23 | * | 19 | * |
@@ -56,7 +52,7 @@ get_arg_max(void) | |||
56 | #if 0 | 52 | #if 0 |
57 | static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; | 53 | static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; |
58 | #else | 54 | #else |
59 | static char rcsid[] = "$OpenBSD: glob.c,v 1.20 2002/06/14 21:34:58 todd Exp $"; | 55 | static char rcsid[] = "$OpenBSD: glob.c,v 1.21 2003/06/02 20:18:34 millert Exp $"; |
60 | #endif | 56 | #endif |
61 | #endif /* LIBC_SCCS and not lint */ | 57 | #endif /* LIBC_SCCS and not lint */ |
62 | 58 | ||