Skip to content
Snippets Groups Projects
Commit 16399b90 authored by Herbert Xu's avatar Herbert Xu
Browse files

Copyright/licence updates and remove all traces of sys/cdefs.h 

This change updates the BSD licence to the three-clause version since
NetBSD has already done so.  This makes dash GPL-compatible.

It also adds Christos Zoulas (NetBSD ash maintainer) to the COPYING file.
I've added "copyright by Herbert Xu" to most files.

Finally all CVS IDs and inclusion of sys/cdefs.h have been removed.
The latter is needed for support of klibc.
parent fc31133e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 43 additions and 151 deletions
COPYING
+ 2
− 3
View file @ 16399b90
Copyright (c) 1989-1994
The Regents of the University of California. All rights reserved.
Copyright (c) 1997-2004
Copyright (c) 1997 Christos Zoulas. All rights reserved.
Copyright (c) 1997-2005
Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved.
 
This code is derived from software contributed to Berkeley by Kenneth Almquist.
@@ -53,5 +54,3 @@ your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with the
Debian GNU/Linux hello source package as the file COPYING. If not,
write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111 USA.
$Id$
ChangeLog
+ 6
− 0
View file @ 16399b90
2005-10-29 Herbert Xu <herbert@gondor.apana.org.au>
* Updated BSD licence to 3-clause version per NetBSD.
* Updated copyright.
* Removed CVS IDs and inclusion of sys/cdefs.h.
2005-10-26 Herbert Xu <herbert@gondor.apana.org.au>
 
* Size optimisations in preadbuffer().
Makefile.am
+ 0
− 2
View file @ 16399b90
# $Id$
SUBDIRS = src
configure.ac
+ 0
− 1
View file @ 16399b90
dnl $Id$
AC_INIT(dash, 0.5.2)
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([src/main.c])
src/Makefile.am
+ 1
− 4
View file @ 16399b90
# $Id$
AM_YFLAGS = -d
 
COMMON_CFLAGS = -Wall
COMMON_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DBSD=1 -DSMALL -DSHELL \
-DGLOB_BROKEN -DFNMATCH_BROKEN -DIFS_BROKEN \
-D__COPYRIGHT\(x\)= -D__RCSID\(x\)= -D_DIAGASSERT\(x\)=
-DGLOB_BROKEN -DFNMATCH_BROKEN -DIFS_BROKEN
 
AM_CFLAGS = $(COMMON_CFLAGS)
AM_CPPFLAGS = $(COMMON_CPPFLAGS)
src/TOUR
+ 0
− 1
View file @ 16399b90
# $NetBSD: TOUR,v 1.8 1996/10/16 14:24:56 christos Exp $
# @(#)TOUR 8.1 (Berkeley) 5/31/93
 
NOTE -- This is the original TOUR paper distributed with ash and
src/alias.c
+ 3
− 16
View file @ 16399b90
/* $NetBSD: alias.c,v 1.11 2002/11/24 22:35:38 christos Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1997-2005
* Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Kenneth Almquist.
@@ -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.
*
@@ -36,15 +32,6 @@
* SUCH DAMAGE.
*/
 
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)alias.c 8.3 (Berkeley) 5/4/95";
#else
__RCSID("$NetBSD: alias.c,v 1.11 2002/11/24 22:35:38 christos Exp $");
#endif
#endif /* not lint */
#include <stdlib.h>
#include "shell.h"
#include "input.h"
src/alias.h
+ 3
− 7
View file @ 16399b90
/* $NetBSD: alias.h,v 1.5 2002/11/24 22:35:38 christos Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1997-2005
* Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Kenneth Almquist.
@@ -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.
*
src/arith.y
+ 3
− 16
View file @ 16399b90
%{
/* $NetBSD: arith.y,v 1.15 2002/11/24 22:35:39 christos Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1997-2005
* Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Kenneth Almquist.
@@ -16,11 +16,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.
*
@@ -37,15 +33,6 @@
* SUCH DAMAGE.
*/
 
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)arith.y 8.3 (Berkeley) 5/4/95";
#else
__RCSID("$NetBSD: arith.y,v 1.15 2002/11/24 22:35:39 christos Exp $");
#endif
#endif /* not lint */
#include <stdlib.h>
#include "expand.h"
#include "shell.h"
src/arith_lex.l
+ 3
− 16
View file @ 16399b90
%{
/* $NetBSD: arith_lex.l,v 1.10 1999/02/05 07:52:52 christos Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1997-2005
* Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Kenneth Almquist.
@@ -16,11 +16,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.
*
@@ -37,15 +33,6 @@
* SUCH DAMAGE.
*/
 
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)arith_lex.l 8.3 (Berkeley) 5/4/95";
#else
__RCSID("$NetBSD: arith_lex.l,v 1.10 1999/02/05 07:52:52 christos Exp $");
#endif
#endif /* not lint */
#include <stdlib.h>
#include <unistd.h>
#include "arith.h"
src/arith_yylex.c
+ 0
− 2
View file @ 16399b90
/* $Id$ */
/*-
* Copyright (c) 2002
* Herbert Xu.
src/bltin/bltin.h
+ 3
− 7
View file @ 16399b90
/* $NetBSD: bltin.h,v 1.10 2002/11/24 22:35:43 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1997-2005
* Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Kenneth Almquist.
@@ -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.
*
src/bltin/echo.1
+ 3
− 7
View file @ 16399b90
.\" $NetBSD: echo.1,v 1.12 2002/02/08 01:22:00 ross Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\" Copyright (c) 1997-2005
.\" Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved.
.\"
.\" This code is derived from software contributed to Berkeley by
.\" Kenneth Almquist.
@@ -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.
.\"
src/bltin/printf.1
+ 3
− 7
View file @ 16399b90
.\" $NetBSD: printf.1,v 1.17 2002/11/24 22:35:45 christos Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\" Copyright (c) 1997-2005
.\" Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved.
.\"
.\" This code is derived from software contributed to Berkeley by
.\" the Institute of Electrical and Electronics Engineers, Inc.
@@ -14,11 +14,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.
.\"
src/bltin/printf.c
+ 3
− 23
View file @ 16399b90
/* $NetBSD: printf.c,v 1.25 2002/11/24 22:35:45 christos Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1997-2005
* Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -12,11 +12,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.
*
@@ -33,22 +29,6 @@
* SUCH DAMAGE.
*/
 
#include <sys/cdefs.h>
#ifndef lint
#if !defined(BUILTIN) && !defined(SHELL)
__COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
The Regents of the University of California. All rights reserved.\n");
#endif
#endif
#ifndef lint
#if 0
static char sccsid[] = "@(#)printf.c 8.2 (Berkeley) 3/22/95";
#else
__RCSID("$NetBSD: printf.c,v 1.25 2002/11/24 22:35:45 christos Exp $");
#endif
#endif /* not lint */
#include <sys/types.h>
 
#include <ctype.h>
src/bltin/test.1
+ 3
− 7
View file @ 16399b90
.\" $NetBSD: test.1,v 1.18 2002/09/25 15:18:44 wiz Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\" Copyright (c) 1997-2005
.\" Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved.
.\"
.\" This code is derived from software contributed to Berkeley by
.\" the Institute of Electrical and Electronics Engineers, Inc.
@@ -14,11 +14,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.
.\"
src/bltin/test.c
+ 0
− 7
View file @ 16399b90
/* $NetBSD: test.c,v 1.25 2002/05/25 23:12:16 wiz Exp $ */
/*
* test(1); version 7-like -- author Erik Baalbergen
* modified by Eric Gisin to be used as built-in.
@@ -10,11 +8,6 @@
* This program is in the Public Domain.
*/
 
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: test.c,v 1.25 2002/05/25 23:12:16 wiz Exp $");
#endif
#include <sys/stat.h>
#include <sys/types.h>
 
src/bltin/times.c
+ 1
− 2
View file @ 16399b90
/*
* Copyright (c) 1999 Herbert Xu <herbert@debian.org>
* Copyright (c) 1999 Herbert Xu <herbert@gondor.apana.org.au>
* This file contains code for the times builtin.
* $Id$
*/
 
#include <sys/times.h>
src/builtins.def
+ 3
− 7
View file @ 16399b90
#!/bin/sh -
# $NetBSD: builtins.def,v 1.16 2002/11/24 22:35:39 christos Exp $
#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
# Copyright (c) 1997-2005
# Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved.
#
# This code is derived from software contributed to Berkeley by
# Kenneth Almquist.
@@ -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.
#
src/cd.c
+ 3
− 16
View file @ 16399b90
/* $NetBSD: cd.c,v 1.30 2003/01/22 20:36:03 dsl Exp $ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1997-2005
* Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Kenneth Almquist.
@@ -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.
*
@@ -36,15 +32,6 @@
* SUCH DAMAGE.
*/
 
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)cd.c 8.2 (Berkeley) 5/4/95";
#else
__RCSID("$NetBSD: cd.c,v 1.30 2003/01/22 20:36:03 dsl Exp $");
#endif
#endif /* not lint */
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment