Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/bin/sh Move 4 more files from UCB 4 clause to 3 clause licence.



details:   https://anonhg.NetBSD.org/src/rev/3de254a85517
branches:  trunk
changeset: 550830:3de254a85517
user:      agc <agc%NetBSD.org@localhost>
date:      Fri Aug 22 11:22:23 2003 +0000

description:
Move 4 more files from UCB 4 clause to 3 clause licence.

Thanks to Julio Merino for pointing them out.

diffstat:

 bin/sh/builtins.def |  182 +++++++++++++++++++++++++--------------------------
 bin/sh/mkbuiltins   |    8 +-
 bin/sh/mktokens     |    8 +-
 bin/sh/nodetypes    |    8 +-
 4 files changed, 95 insertions(+), 111 deletions(-)

diffs (254 lines):

diff -r 6caf62adf265 -r 3de254a85517 bin/sh/builtins.def
--- a/bin/sh/builtins.def       Fri Aug 22 09:46:57 2003 +0000
+++ b/bin/sh/builtins.def       Fri Aug 22 11:22:23 2003 +0000
@@ -1,93 +1,89 @@
-#!/bin/sh -
-#      $NetBSD: builtins.def,v 1.17 2003/05/04 01:05:24 gmcgarry Exp $
-#
-# Copyright (c) 1991, 1993
-#      The Regents of the University of California.  All rights reserved.
-#
-# This code is derived from software contributed to Berkeley by
-# Kenneth Almquist.
-#
-# 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. 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.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
-#
-#      @(#)builtins.def        8.4 (Berkeley) 5/4/95
-
-#
-# This file lists all the builtin commands.  The first column is the name
-# of a C routine.
-# The -j flag specifies that this command is to be excluded from systems
-# without job control.
-# The -h flag specifies that this command is to be excluded from systems
-# based on the SMALL compile-time symbol.
-# The -s flag specifies that this is a posix 'special builtin' command.
-# The -u flag specifies that this is a posix 'standard utility'.
-# The rest of the line specifies the command name or names used to run
-# the command.
-
-bltincmd       -u command
-bgcmd -j       -u bg
-breakcmd       -s break -s continue
-cdcmd          -u cd chdir
-dotcmd         -s .
-echocmd                echo
-evalcmd                -s eval
-execcmd                -s exec
-exitcmd                -s exit
-expcmd         exp let
-exportcmd      -s export -s readonly
-falsecmd       -u false
-histcmd -h     -u fc
-inputrc                inputrc
-fgcmd -j       -u fg
-getoptscmd     -u getopts
-hashcmd                hash
-jobidcmd       jobid
-jobscmd                -u jobs
-localcmd       local
-printfcmd      printf
-pwdcmd         -u pwd
-readcmd                -u read
-returncmd      -s return
-setcmd         -s set
-setvarcmd      setvar
-shiftcmd       -s shift
-timescmd       -s times
-trapcmd                -s trap
-truecmd                -s : -u true
-typecmd                type
-umaskcmd       -u umask
-unaliascmd     -u unalias
-unsetcmd       -s unset
-waitcmd                -u wait
-aliascmd       -u alias
-ulimitcmd      ulimit
-testcmd                test [
-killcmd                -u kill         # mandated by posix for 'kill %job'
-#newgrp                -u newgrp       # optional command in posix
-
-#exprcmd       expr
+#!/bin/sh -
+#      $NetBSD: builtins.def,v 1.18 2003/08/22 11:22:23 agc Exp $
+#
+# Copyright (c) 1991, 1993
+#      The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Kenneth Almquist.
+#
+# 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. 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
+#
+#      @(#)builtins.def        8.4 (Berkeley) 5/4/95
+
+#
+# This file lists all the builtin commands.  The first column is the name
+# of a C routine.
+# The -j flag specifies that this command is to be excluded from systems
+# without job control.
+# The -h flag specifies that this command is to be excluded from systems
+# based on the SMALL compile-time symbol.
+# The -s flag specifies that this is a posix 'special builtin' command.
+# The -u flag specifies that this is a posix 'standard utility'.
+# The rest of the line specifies the command name or names used to run
+# the command.
+
+bltincmd       -u command
+bgcmd -j       -u bg
+breakcmd       -s break -s continue
+cdcmd          -u cd chdir
+dotcmd         -s .
+echocmd                echo
+evalcmd                -s eval
+execcmd                -s exec
+exitcmd                -s exit
+expcmd         exp let
+exportcmd      -s export -s readonly
+falsecmd       -u false
+histcmd -h     -u fc
+inputrc                inputrc
+fgcmd -j       -u fg
+getoptscmd     -u getopts
+hashcmd                hash
+jobidcmd       jobid
+jobscmd                -u jobs
+localcmd       local
+printfcmd      printf
+pwdcmd         -u pwd
+readcmd                -u read
+returncmd      -s return
+setcmd         -s set
+setvarcmd      setvar
+shiftcmd       -s shift
+timescmd       -s times
+trapcmd                -s trap
+truecmd                -s : -u true
+typecmd                type
+umaskcmd       -u umask
+unaliascmd     -u unalias
+unsetcmd       -s unset
+waitcmd                -u wait
+aliascmd       -u alias
+ulimitcmd      ulimit
+testcmd                test [
+killcmd                -u kill         # mandated by posix for 'kill %job'
+#newgrp                -u newgrp       # optional command in posix
+
+#exprcmd       expr
diff -r 6caf62adf265 -r 3de254a85517 bin/sh/mkbuiltins
--- a/bin/sh/mkbuiltins Fri Aug 22 09:46:57 2003 +0000
+++ b/bin/sh/mkbuiltins Fri Aug 22 11:22:23 2003 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#      $NetBSD: mkbuiltins,v 1.19 2003/05/15 10:11:01 dsl Exp $
+#      $NetBSD: mkbuiltins,v 1.20 2003/08/22 11:22:23 agc Exp $
 #
 # Copyright (c) 1991, 1993
 #      The Regents of the University of California.  All rights reserved.
@@ -15,11 +15,7 @@
 # 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
+# 3. 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.
 #
diff -r 6caf62adf265 -r 3de254a85517 bin/sh/mktokens
--- a/bin/sh/mktokens   Fri Aug 22 09:46:57 2003 +0000
+++ b/bin/sh/mktokens   Fri Aug 22 11:22:23 2003 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#      $NetBSD: mktokens,v 1.9 1999/07/09 03:05:50 christos Exp $
+#      $NetBSD: mktokens,v 1.10 2003/08/22 11:22:23 agc Exp $
 #
 # Copyright (c) 1991, 1993
 #      The Regents of the University of California.  All rights reserved.
@@ -15,11 +15,7 @@
 # 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
+# 3. 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.
 #
diff -r 6caf62adf265 -r 3de254a85517 bin/sh/nodetypes
--- a/bin/sh/nodetypes  Fri Aug 22 09:46:57 2003 +0000
+++ b/bin/sh/nodetypes  Fri Aug 22 11:22:23 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: nodetypes,v 1.11 2002/11/24 22:35:42 christos Exp $
+#      $NetBSD: nodetypes,v 1.12 2003/08/22 11:22:23 agc Exp $
 # Copyright (c) 1991, 1993
 #      The Regents of the University of California.  All rights reserved.
 #
@@ -13,11 +13,7 @@
 # 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
+# 3. 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.
 #



Home | Main Index | Thread Index | Old Index