diff options
| -rw-r--r-- | usr.bin/compress/compress.h | 4 | ||||
| -rw-r--r-- | usr.bin/compress/gzip.1 | 10 | ||||
| -rw-r--r-- | usr.bin/compress/gzopen.c | 7 | ||||
| -rw-r--r-- | usr.bin/compress/main.c | 79 | ||||
| -rw-r--r-- | usr.bin/compress/nullopen.c | 5 | ||||
| -rw-r--r-- | usr.bin/compress/zopen.c | 9 |
6 files changed, 39 insertions, 75 deletions
diff --git a/usr.bin/compress/compress.h b/usr.bin/compress/compress.h index 7b4c067c393..ba96eca75d7 100644 --- a/usr.bin/compress/compress.h +++ b/usr.bin/compress/compress.h @@ -1,4 +1,4 @@ -/* $OpenBSD: compress.h,v 1.11 2008/08/07 17:37:37 sobrado Exp $ */ +/* $OpenBSD: compress.h,v 1.12 2011/09/22 10:41:04 deraadt Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -56,8 +56,6 @@ enum program_mode { #define FAILURE 1 #define WARNING 2 -extern const char main_rcsid[], z_rcsid[], gz_rcsid[], pkzip_rcsid[], - pack_rcsid[], lzh_rcsid[], null_rcsid[]; extern char null_magic[]; extern void *z_open(int, const char *, char *, int, u_int32_t, int); diff --git a/usr.bin/compress/gzip.1 b/usr.bin/compress/gzip.1 index 47e1347f682..b71e9c8ff06 100644 --- a/usr.bin/compress/gzip.1 +++ b/usr.bin/compress/gzip.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: gzip.1,v 1.6 2009/04/18 18:21:54 naddy Exp $ +.\" $OpenBSD: gzip.1,v 1.7 2011/09/22 10:41:04 deraadt Exp $ .\" .\" Copyright (c) 1986, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ .\" .\" @(#)compress.1 8.2 (Berkeley) 4/18/94 .\" -.Dd $Mdocdate: April 18 2009 $ +.Dd $Mdocdate: September 22 2011 $ .Dt GZIP 1 .Os .Sh NAME @@ -189,7 +189,7 @@ Use the deflate scheme, which reportedly provides better compression rates .It Fl h Print a short help message. .It Fl L -Print the license. +In other compatible programs, this displays program license. .It Fl l List information for the specified compressed files. The following information is listed: @@ -248,9 +248,7 @@ Set the suffix for compressed files. .It Fl t Test the integrity of each file leaving any files intact. .It Fl V -Display the program version -.Pq RCS IDs of the source files -and exit. +In other compatible programs, this displays version information. .It Fl v Print the percentage reduction of each file and other information. .El diff --git a/usr.bin/compress/gzopen.c b/usr.bin/compress/gzopen.c index dd6b7d20905..2fe33b55db3 100644 --- a/usr.bin/compress/gzopen.c +++ b/usr.bin/compress/gzopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gzopen.c,v 1.26 2009/11/11 18:04:35 deraadt Exp $ */ +/* $OpenBSD: gzopen.c,v 1.27 2011/09/22 10:41:04 deraadt Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -58,11 +58,6 @@ (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). */ -#ifndef SMALL -const char gz_rcsid[] = - "$OpenBSD: gzopen.c,v 1.26 2009/11/11 18:04:35 deraadt Exp $"; -#endif - #include <sys/param.h> #include <sys/stat.h> #include <sys/uio.h> diff --git a/usr.bin/compress/main.c b/usr.bin/compress/main.c index a0d5ce6ab28..490f60224f5 100644 --- a/usr.bin/compress/main.c +++ b/usr.bin/compress/main.c @@ -1,43 +1,34 @@ -/* $OpenBSD: main.c,v 1.77 2011/03/05 20:12:42 millert Exp $ */ +/* $OpenBSD: main.c,v 1.78 2011/09/22 10:41:04 deraadt Exp $ */ -#ifndef SMALL -static const char copyright[] = -"@(#) Copyright (c) 1992, 1993\n\ - The Regents of the University of California. All rights reserved.\n" -"Copyright (c) 1997-2002 Michael Shalayeff\n"; -#endif - -#ifndef SMALL -static const char license[] = -"\n" -" Redistribution and use in source and binary forms, with or without\n" -" modification, are permitted provided that the following conditions\n" -" are met:\n" -" 1. Redistributions of source code must retain the above copyright\n" -" notice, this list of conditions and the following disclaimer.\n" -" 2. Redistributions in binary form must reproduce the above copyright\n" -" notice, this list of conditions and the following disclaimer in the\n" -" documentation and/or other materials provided with the distribution.\n" -" 3. Neither the name of the University nor the names of its contributors\n" -" may be used to endorse or promote products derived from this software\n" -" without specific prior written permission.\n" -"\n" -" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\n" -" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n" -" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n" -" IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT,\n" -" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n" -" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n" -" SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n" -" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n" -" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING\n" -" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF\n" -" THE POSSIBILITY OF SUCH DAMAGE.\n"; -#endif /* SMALL */ - -#ifndef SMALL -static const char main_rcsid[] = "$OpenBSD: main.c,v 1.77 2011/03/05 20:12:42 millert Exp $"; -#endif +/* + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * Copyright (c) 1997-2002 Michael Shalayeff + * + * 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 AUTHOR ``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 AUTHOR OR HIS RELATIVES 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 MIND, 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. + */ #include <sys/param.h> #include <sys/time.h> @@ -206,7 +197,7 @@ main(int argc, char *argv[]) } while ((ch = getopt_long(argc, argv, optstr[pmode], longopts, NULL)) != -1) - switch(ch) { + switch (ch) { case '1': case '2': case '3': @@ -284,20 +275,12 @@ main(int argc, char *argv[]) testmode = 1; decomp++; break; -#ifndef SMALL case 'V': - printf("%s\n%s\n", main_rcsid, gz_rcsid); - printf("%s\n%s\n", z_rcsid, null_rcsid); -#endif exit (0); case 'v': verbose++; break; -#ifndef SMALL case 'L': - fputs(copyright, stderr); - fputs(license, stderr); -#endif exit (0); case 'r': recurse++; diff --git a/usr.bin/compress/nullopen.c b/usr.bin/compress/nullopen.c index f30e7d5a579..95467a4599c 100644 --- a/usr.bin/compress/nullopen.c +++ b/usr.bin/compress/nullopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nullopen.c,v 1.3 2005/06/26 18:20:26 otto Exp $ */ +/* $OpenBSD: nullopen.c,v 1.4 2011/09/22 10:41:04 deraadt Exp $ */ /* * Copyright (c) 2003 Can Erkin Acar @@ -28,9 +28,6 @@ * */ -const char null_rcsid[] = - "$OpenBSD: nullopen.c,v 1.3 2005/06/26 18:20:26 otto Exp $"; - #include <sys/types.h> #include <stdio.h> #include <stdlib.h> diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c index 0392d11d2e3..12de049e712 100644 --- a/usr.bin/compress/zopen.c +++ b/usr.bin/compress/zopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zopen.c,v 1.17 2005/08/25 17:07:56 millert Exp $ */ +/* $OpenBSD: zopen.c,v 1.18 2011/09/22 10:41:04 deraadt Exp $ */ /* $NetBSD: zopen.c,v 1.5 1995/03/26 09:44:53 glass Exp $ */ /*- @@ -36,13 +36,6 @@ * From: @(#)zopen.c 8.1 (Berkeley) 6/27/93 */ -#if 0 -static char sccsid[] = "@(#)zopen.c 8.1 (Berkeley) 6/27/93"; -#else -const char z_rcsid[] = - "$OpenBSD: zopen.c,v 1.17 2005/08/25 17:07:56 millert Exp $"; -#endif - /*- * fcompress.c - File compression ala IEEE Computer, June 1984. * |