diff options
Diffstat (limited to 'usr.sbin')
32 files changed, 97 insertions, 120 deletions
diff --git a/usr.sbin/pkg_install/add/extract.c b/usr.sbin/pkg_install/add/extract.c index b1ae460..1574f0e 100644 --- a/usr.sbin/pkg_install/add/extract.c +++ b/usr.sbin/pkg_install/add/extract.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <err.h> #include "lib.h" #include "add.h" diff --git a/usr.sbin/pkg_install/add/futil.c b/usr.sbin/pkg_install/add/futil.c index 8f9e1a3..66ff738 100644 --- a/usr.sbin/pkg_install/add/futil.c +++ b/usr.sbin/pkg_install/add/futil.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <err.h> #include "lib.h" #include "add.h" diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c index 9323038..2ebf912 100644 --- a/usr.sbin/pkg_install/add/main.c +++ b/usr.sbin/pkg_install/add/main.c @@ -18,10 +18,8 @@ * This is the add module. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <sys/param.h> diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index 890a996..6c83620 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <err.h> #include <paths.h> #include "lib.h" diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c index 395eb4a..7b1248a 100644 --- a/usr.sbin/pkg_install/create/main.c +++ b/usr.sbin/pkg_install/create/main.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -14,6 +9,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <err.h> #include "lib.h" #include "create.h" diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c index 2aa7e85..bc2a391 100644 --- a/usr.sbin/pkg_install/create/perform.c +++ b/usr.sbin/pkg_install/create/perform.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" #include "create.h" diff --git a/usr.sbin/pkg_install/create/pl.c b/usr.sbin/pkg_install/create/pl.c index a12ce62..eb4076b 100644 --- a/usr.sbin/pkg_install/create/pl.c +++ b/usr.sbin/pkg_install/create/pl.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" #include "create.h" #include <errno.h> diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c index b537ebd..dcac1d6 100644 --- a/usr.sbin/pkg_install/delete/main.c +++ b/usr.sbin/pkg_install/delete/main.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * * FreeBSD install - a package for the installation and maintainance @@ -24,6 +19,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/stat.h> #include <err.h> diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c index dfe7c91..77635ef 100644 --- a/usr.sbin/pkg_install/delete/perform.c +++ b/usr.sbin/pkg_install/delete/perform.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <err.h> #include "lib.h" #include "delete.h" diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c index 36c4935..ae62a38 100644 --- a/usr.sbin/pkg_install/info/main.c +++ b/usr.sbin/pkg_install/info/main.c @@ -19,15 +19,13 @@ * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" #include "info.h" #include <err.h> -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - static char Options[] = "acdDe:fgGhiIkl:LmopqrRst:vVW:x"; int Flags = 0; diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c index 9c5c927..d06f5e6 100644 --- a/usr.sbin/pkg_install/info/perform.c +++ b/usr.sbin/pkg_install/info/perform.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" #include "info.h" #include <err.h> diff --git a/usr.sbin/pkg_install/info/show.c b/usr.sbin/pkg_install/info/show.c index 03b1a53..fb896ed 100644 --- a/usr.sbin/pkg_install/info/show.c +++ b/usr.sbin/pkg_install/info/show.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" #include "info.h" #include <err.h> diff --git a/usr.sbin/pkg_install/lib/deps.c b/usr.sbin/pkg_install/lib/deps.c index 04f42b3..2bda517 100644 --- a/usr.sbin/pkg_install/lib/deps.c +++ b/usr.sbin/pkg_install/lib/deps.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -24,6 +19,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" #include <err.h> #include <stdio.h> diff --git a/usr.sbin/pkg_install/lib/exec.c b/usr.sbin/pkg_install/lib/exec.c index e4b477a..86285fb 100644 --- a/usr.sbin/pkg_install/lib/exec.c +++ b/usr.sbin/pkg_install/lib/exec.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" #include <err.h> diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c index 26b1f37..fabbc15 100644 --- a/usr.sbin/pkg_install/lib/file.c +++ b/usr.sbin/pkg_install/lib/file.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" #include <err.h> #include <fetch.h> diff --git a/usr.sbin/pkg_install/lib/global.c b/usr.sbin/pkg_install/lib/global.c index 513cf41..291f48b 100644 --- a/usr.sbin/pkg_install/lib/global.c +++ b/usr.sbin/pkg_install/lib/global.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -24,6 +19,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" /* These are global for all utils */ diff --git a/usr.sbin/pkg_install/lib/match.c b/usr.sbin/pkg_install/lib/match.c index 7a273e0..90b6979 100644 --- a/usr.sbin/pkg_install/lib/match.c +++ b/usr.sbin/pkg_install/lib/match.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" #include <err.h> #include <fnmatch.h> diff --git a/usr.sbin/pkg_install/lib/msg.c b/usr.sbin/pkg_install/lib/msg.c index adff123..5b17624 100644 --- a/usr.sbin/pkg_install/lib/msg.c +++ b/usr.sbin/pkg_install/lib/msg.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -17,13 +12,15 @@ static const char rcsid[] = * documentation and/or other materials provided with the distribution. * * Jordan K. Hubbard - * 18 July 1993 * * Miscellaneous message routines. * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" #include <err.h> #include <paths.h> diff --git a/usr.sbin/pkg_install/lib/pen.c b/usr.sbin/pkg_install/lib/pen.c index eae54ea..b76b4a6 100644 --- a/usr.sbin/pkg_install/lib/pen.c +++ b/usr.sbin/pkg_install/lib/pen.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" #include <err.h> #include <libgen.h> diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c index 4e3fd46..c60e589 100644 --- a/usr.sbin/pkg_install/lib/plist.c +++ b/usr.sbin/pkg_install/lib/plist.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" #include <err.h> #include <md5.h> diff --git a/usr.sbin/pkg_install/lib/str.c b/usr.sbin/pkg_install/lib/str.c index c674e1f..8f6aec3 100644 --- a/usr.sbin/pkg_install/lib/str.c +++ b/usr.sbin/pkg_install/lib/str.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -23,6 +18,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" char * diff --git a/usr.sbin/pkg_install/lib/version.c b/usr.sbin/pkg_install/lib/version.c index 1348fe8..dca95cc 100644 --- a/usr.sbin/pkg_install/lib/version.c +++ b/usr.sbin/pkg_install/lib/version.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - /* * FreeBSD install - a package for the installation and maintainance * of non-core utilities. @@ -29,6 +24,9 @@ static const char rcsid[] = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "lib.h" #include <err.h> diff --git a/usr.sbin/pkg_install/sign/check.c b/usr.sbin/pkg_install/sign/check.c index d923538..cfc3bfa 100644 --- a/usr.sbin/pkg_install/sign/check.c +++ b/usr.sbin/pkg_install/sign/check.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $OpenBSD: check.c,v 1.2 1999/10/04 21:46:27 espie Exp $ */ /*- * Copyright (c) 1999 Marc Espie. @@ -29,6 +28,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* Simple code for a stand-alone package checker */ #include <sys/types.h> #include <sys/wait.h> diff --git a/usr.sbin/pkg_install/sign/common.c b/usr.sbin/pkg_install/sign/common.c index 8b41bcd..ec32357 100644 --- a/usr.sbin/pkg_install/sign/common.c +++ b/usr.sbin/pkg_install/sign/common.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $OpenBSD: common.c,v 1.3 1999/10/07 16:30:32 espie Exp $ */ /*- * Copyright (c) 1999 Marc Espie. @@ -29,6 +28,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/wait.h> #include <sys/stat.h> diff --git a/usr.sbin/pkg_install/sign/gzip.c b/usr.sbin/pkg_install/sign/gzip.c index 89cdb9c..33d9bae 100644 --- a/usr.sbin/pkg_install/sign/gzip.c +++ b/usr.sbin/pkg_install/sign/gzip.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $OpenBSD: gzip.c,v 1.3 1999/10/04 21:46:28 espie Exp $ */ /*- * Copyright (c) 1999 Marc Espie. @@ -28,6 +27,10 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/wait.h> #include <stdio.h> diff --git a/usr.sbin/pkg_install/sign/main.c b/usr.sbin/pkg_install/sign/main.c index 09df2d1..c5068b7 100644 --- a/usr.sbin/pkg_install/sign/main.c +++ b/usr.sbin/pkg_install/sign/main.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $OpenBSD: main.c,v 1.2 1999/10/04 21:46:28 espie Exp $ */ /*- * Copyright (c) 1999 Marc Espie. @@ -29,6 +28,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/wait.h> #include <stdio.h> diff --git a/usr.sbin/pkg_install/sign/pgp_check.c b/usr.sbin/pkg_install/sign/pgp_check.c index d1fef13..52b0345 100644 --- a/usr.sbin/pkg_install/sign/pgp_check.c +++ b/usr.sbin/pkg_install/sign/pgp_check.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $OpenBSD: pgp_check.c,v 1.2 1999/10/07 16:30:32 espie Exp $ */ /*- * Copyright (c) 1999 Marc Espie. @@ -29,6 +28,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stdio.h> #include <errno.h> #include <assert.h> diff --git a/usr.sbin/pkg_install/sign/pgp_sign.c b/usr.sbin/pkg_install/sign/pgp_sign.c index a9bd795..a3d9cf1 100644 --- a/usr.sbin/pkg_install/sign/pgp_sign.c +++ b/usr.sbin/pkg_install/sign/pgp_sign.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $OpenBSD: pgp_sign.c,v 1.1 1999/10/04 21:46:29 espie Exp $ */ /*- * Copyright (c) 1999 Marc Espie. @@ -28,6 +27,10 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <stdlib.h> #include <unistd.h> diff --git a/usr.sbin/pkg_install/sign/sha1.c b/usr.sbin/pkg_install/sign/sha1.c index a8a23ce..24ca997 100644 --- a/usr.sbin/pkg_install/sign/sha1.c +++ b/usr.sbin/pkg_install/sign/sha1.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $OpenBSD: sha1.c,v 1.1 1999/10/04 21:46:29 espie Exp $ */ /*- * Copyright (c) 1999 Marc Espie. @@ -29,6 +28,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/wait.h> #include <stdlib.h> diff --git a/usr.sbin/pkg_install/sign/sign.c b/usr.sbin/pkg_install/sign/sign.c index 1bcbcf5..56572d8 100644 --- a/usr.sbin/pkg_install/sign/sign.c +++ b/usr.sbin/pkg_install/sign/sign.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $OpenBSD: sign.c,v 1.3 1999/10/04 21:46:29 espie Exp $ */ /*- * Copyright (c) 1999 Marc Espie. @@ -28,6 +27,10 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <stdlib.h> #include <unistd.h> diff --git a/usr.sbin/pkg_install/sign/stand.c b/usr.sbin/pkg_install/sign/stand.c index 7fa84d2..703c58d 100644 --- a/usr.sbin/pkg_install/sign/stand.c +++ b/usr.sbin/pkg_install/sign/stand.c @@ -1,4 +1,5 @@ -/* $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "stand.h" diff --git a/usr.sbin/pkg_install/sign/x509.c b/usr.sbin/pkg_install/sign/x509.c index 27ab10a..5917734 100644 --- a/usr.sbin/pkg_install/sign/x509.c +++ b/usr.sbin/pkg_install/sign/x509.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /*- * Copyright (c) 2000 Softweyr LLC, South Jordan, Utah, USA. * @@ -25,6 +24,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/wait.h> |