diff options
| author | mycroft <mycroft@NetBSD.org> | 1993-08-02 17:48:44 +0000 |
|---|---|---|
| committer | mycroft <mycroft@NetBSD.org> | 1993-08-02 17:48:44 +0000 |
| commit | aee4b07b8a049bdc57cefcbb82bebeb6f341859a (patch) | |
| tree | d2baf06176c4135542f5717a0fa9b45752f77e4f /usr.bin/patch | |
| parent | c8194f0876b272d70833a6b91ec566314a02050a (diff) | |
Add RCS identifiers, remove some completely useless RCS logs and patchkit
headers, and a few other insignificant changes.
Diffstat (limited to 'usr.bin/patch')
| -rw-r--r-- | usr.bin/patch/EXTERN.h | 11 | ||||
| -rw-r--r-- | usr.bin/patch/INTERN.h | 11 | ||||
| -rw-r--r-- | usr.bin/patch/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/patch/backupfile.c | 4 | ||||
| -rw-r--r-- | usr.bin/patch/backupfile.h | 5 | ||||
| -rw-r--r-- | usr.bin/patch/common.h | 17 | ||||
| -rw-r--r-- | usr.bin/patch/config.h | 2 | ||||
| -rw-r--r-- | usr.bin/patch/inp.c | 16 | ||||
| -rw-r--r-- | usr.bin/patch/inp.h | 11 | ||||
| -rw-r--r-- | usr.bin/patch/patch.1 | 39 | ||||
| -rw-r--r-- | usr.bin/patch/patch.c | 91 | ||||
| -rw-r--r-- | usr.bin/patch/patchlevel.h | 2 | ||||
| -rw-r--r-- | usr.bin/patch/pch.c | 39 | ||||
| -rw-r--r-- | usr.bin/patch/pch.h | 14 | ||||
| -rw-r--r-- | usr.bin/patch/util.c | 4 | ||||
| -rw-r--r-- | usr.bin/patch/util.h | 11 | ||||
| -rw-r--r-- | usr.bin/patch/version.c | 13 | ||||
| -rw-r--r-- | usr.bin/patch/version.h | 11 |
18 files changed, 38 insertions, 265 deletions
diff --git a/usr.bin/patch/EXTERN.h b/usr.bin/patch/EXTERN.h index bc69310ac5e..509123f085b 100644 --- a/usr.bin/patch/EXTERN.h +++ b/usr.bin/patch/EXTERN.h @@ -1,13 +1,4 @@ -/* $Header: /cvsroot/src/usr.bin/patch/Attic/EXTERN.h,v 1.1 1993/04/09 11:33:51 cgd Exp $ - * - * $Log: EXTERN.h,v $ - * Revision 1.1 1993/04/09 11:33:51 cgd - * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL. - * - * Revision 2.0 86/09/17 15:35:37 lwall - * Baseline for netwide release. - * - */ +/* $Id: EXTERN.h,v 1.2 1993/08/02 17:55:10 mycroft Exp $ */ #ifdef EXT #undef EXT diff --git a/usr.bin/patch/INTERN.h b/usr.bin/patch/INTERN.h index 36c33bc27c3..cf287bdb7cd 100644 --- a/usr.bin/patch/INTERN.h +++ b/usr.bin/patch/INTERN.h @@ -1,13 +1,4 @@ -/* $Header: /cvsroot/src/usr.bin/patch/Attic/INTERN.h,v 1.1 1993/04/09 11:33:52 cgd Exp $ - * - * $Log: INTERN.h,v $ - * Revision 1.1 1993/04/09 11:33:52 cgd - * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL. - * - * Revision 2.0 86/09/17 15:35:58 lwall - * Baseline for netwide release. - * - */ +/* $Id: INTERN.h,v 1.2 1993/08/02 17:55:11 mycroft Exp $ */ #ifdef EXT #undef EXT diff --git a/usr.bin/patch/Makefile b/usr.bin/patch/Makefile index 4af63082dea..ded3785db0a 100644 --- a/usr.bin/patch/Makefile +++ b/usr.bin/patch/Makefile @@ -1,4 +1,4 @@ -# $Header: /cvsroot/src/usr.bin/patch/Makefile,v 1.1 1993/04/09 11:33:53 cgd Exp $ +# $Id: Makefile,v 1.2 1993/08/02 17:55:12 mycroft Exp $ PROG= patch SRCS= patch.c pch.c inp.c version.c util.c backupfile.c diff --git a/usr.bin/patch/backupfile.c b/usr.bin/patch/backupfile.c index 6a384f9f182..cd8dc781a7d 100644 --- a/usr.bin/patch/backupfile.c +++ b/usr.bin/patch/backupfile.c @@ -11,6 +11,10 @@ /* David MacKenzie <djm@ai.mit.edu>. Some algorithms adapted from GNU Emacs. */ +#ifndef lint +static char rcsid[] = "$Id: backupfile.c,v 1.2 1993/08/02 17:55:13 mycroft Exp $"; +#endif /* not lint */ + #include <stdio.h> #include <ctype.h> #include <sys/types.h> diff --git a/usr.bin/patch/backupfile.h b/usr.bin/patch/backupfile.h index 43240a13037..3a2d5bc96ef 100644 --- a/usr.bin/patch/backupfile.h +++ b/usr.bin/patch/backupfile.h @@ -6,7 +6,10 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + $Id: backupfile.h,v 1.2 1993/08/02 17:55:14 mycroft Exp $ +*/ /* When to make backup files. */ enum backup_type diff --git a/usr.bin/patch/common.h b/usr.bin/patch/common.h index d2b02755902..27a90fbcda2 100644 --- a/usr.bin/patch/common.h +++ b/usr.bin/patch/common.h @@ -1,19 +1,4 @@ -/* $Header: /cvsroot/src/usr.bin/patch/common.h,v 1.1 1993/04/09 11:33:58 cgd Exp $ - * - * $Log: common.h,v $ - * Revision 1.1 1993/04/09 11:33:58 cgd - * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL. - * - * Revision 2.0.1.2 88/06/22 20:44:53 lwall - * patch12: sprintf was declared wrong - * - * Revision 2.0.1.1 88/06/03 15:01:56 lwall - * patch10: support for shorter extensions. - * - * Revision 2.0 86/09/17 15:36:39 lwall - * Baseline for netwide release. - * - */ +/* $Id: common.h,v 1.2 1993/08/02 17:55:15 mycroft Exp $ */ #define DEBUGGING diff --git a/usr.bin/patch/config.h b/usr.bin/patch/config.h index dadba562cc4..d047d94957f 100644 --- a/usr.bin/patch/config.h +++ b/usr.bin/patch/config.h @@ -6,6 +6,8 @@ * Feel free to modify any of this as the need arises. Note, however, * that running config.h.SH again will wipe out any changes you've made. * For a more permanent change edit config.sh and rerun config.h.SH. + * + * $Id: config.h,v 1.2 1993/08/02 17:55:15 mycroft Exp $ */ diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c index c42a2ac3248..d9c45efcaf4 100644 --- a/usr.bin/patch/inp.c +++ b/usr.bin/patch/inp.c @@ -1,16 +1,6 @@ -/* $Header: /cvsroot/src/usr.bin/patch/inp.c,v 1.1 1993/04/09 11:34:00 cgd Exp $ - * - * $Log: inp.c,v $ - * Revision 1.1 1993/04/09 11:34:00 cgd - * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL. - * - * Revision 2.0.1.1 88/06/03 15:06:13 lwall - * patch10: made a little smarter about sccs files - * - * Revision 2.0 86/09/17 15:37:02 lwall - * Baseline for netwide release. - * - */ +#ifndef lint +static char rcsid[] = "$Id: inp.c,v 1.2 1993/08/02 17:55:16 mycroft Exp $"; +#endif /* not lint */ #include "EXTERN.h" #include "common.h" diff --git a/usr.bin/patch/inp.h b/usr.bin/patch/inp.h index 1d7e6b5d238..d0eabe4fb6b 100644 --- a/usr.bin/patch/inp.h +++ b/usr.bin/patch/inp.h @@ -1,13 +1,4 @@ -/* $Header: /cvsroot/src/usr.bin/patch/inp.h,v 1.1 1993/04/09 11:34:01 cgd Exp $ - * - * $Log: inp.h,v $ - * Revision 1.1 1993/04/09 11:34:01 cgd - * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL. - * - * Revision 2.0 86/09/17 15:37:25 lwall - * Baseline for netwide release. - * - */ +/* $Id: inp.h,v 1.2 1993/08/02 17:55:17 mycroft Exp $ */ EXT LINENUM input_lines INIT(0); /* how long is input file in lines */ EXT LINENUM last_frozen_line INIT(0); /* how many input lines have been */ diff --git a/usr.bin/patch/patch.1 b/usr.bin/patch/patch.1 index aa6c9e29fe2..cff4ebbf8cf 100644 --- a/usr.bin/patch/patch.1 +++ b/usr.bin/patch/patch.1 @@ -1,42 +1,5 @@ -.\" -*- nroff -*- +.\" $Id: patch.1,v 1.2 1993/08/02 17:55:18 mycroft Exp $ -*- nroff -*- .rn '' }` -'\" $Header: /cvsroot/src/usr.bin/patch/patch.1,v 1.1 1993/04/09 11:34:04 cgd Exp $ -'\" -'\" $Log: patch.1,v $ -'\" Revision 1.1 1993/04/09 11:34:04 cgd -'\" patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL. -'\" -'\" Revision 2.0.1.2 88/06/22 20:47:18 lwall -'\" patch12: now avoids Bell System Logo -'\" -'\" Revision 2.0.1.1 88/06/03 15:12:51 lwall -'\" patch10: -B switch was contributed. -'\" -'\" Revision 2.0 86/09/17 15:39:09 lwall -'\" Baseline for netwide release. -'\" -'\" Revision 1.4 86/08/01 19:23:22 lwall -'\" Documented -v, -p, -F. -'\" Added notes to patch senders. -'\" -'\" Revision 1.3 85/03/26 15:11:06 lwall -'\" Frozen. -'\" -'\" Revision 1.2.1.4 85/03/12 16:14:27 lwall -'\" Documented -p. -'\" -'\" Revision 1.2.1.3 85/03/12 16:09:41 lwall -'\" Documented -D. -'\" -'\" Revision 1.2.1.2 84/12/05 11:06:55 lwall -'\" Added -l switch, and noted bistability bug. -'\" -'\" Revision 1.2.1.1 84/12/04 17:23:39 lwall -'\" Branch for sdcrdcf changes. -'\" -'\" Revision 1.2 84/12/04 17:22:02 lwall -'\" Baseline version. -'\" .de Sh .br .ne 5 diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c index f94608fa7a2..89f911512d2 100644 --- a/usr.bin/patch/patch.c +++ b/usr.bin/patch/patch.c @@ -1,98 +1,15 @@ -char rcsid[] = - "$Header: /cvsroot/src/usr.bin/patch/patch.c,v 1.1 1993/04/09 11:34:05 cgd Exp $"; - /* patch - a program to apply diffs to original files * * Copyright 1986, Larry Wall * * This program may be copied as long as you don't try to make any * money off of it, or pretend that you wrote it. - * - * $Log: patch.c,v $ - * Revision 1.1 1993/04/09 11:34:05 cgd - * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL. - * - * Revision 2.0.2.0 90/05/01 22:17:50 davison - * patch12u: unidiff support added - * - * Revision 2.0.1.6 88/06/22 20:46:39 lwall - * patch12: rindex() wasn't declared - * - * Revision 2.0.1.5 88/06/03 15:09:37 lwall - * patch10: exit code improved. - * patch10: better support for non-flexfilenames. - * - * Revision 2.0.1.4 87/02/16 14:00:04 lwall - * Short replacement caused spurious "Out of sync" message. - * - * Revision 2.0.1.3 87/01/30 22:45:50 lwall - * Improved diagnostic on sync error. - * Moved do_ed_script() to pch.c. - * - * Revision 2.0.1.2 86/11/21 09:39:15 lwall - * Fuzz factor caused offset of installed lines. - * - * Revision 2.0.1.1 86/10/29 13:10:22 lwall - * Backwards search could terminate prematurely. - * - * Revision 2.0 86/09/17 15:37:32 lwall - * Baseline for netwide release. - * - * Revision 1.5 86/08/01 20:53:24 lwall - * Changed some %d's to %ld's. - * Linted. - * - * Revision 1.4 86/08/01 19:17:29 lwall - * Fixes for machines that can't vararg. - * Added fuzz factor. - * Generalized -p. - * General cleanup. - * - * 85/08/15 van%ucbmonet@berkeley - * Changes for 4.3bsd diff -c. - * - * Revision 1.3 85/03/26 15:07:43 lwall - * Frozen. - * - * Revision 1.2.1.9 85/03/12 17:03:35 lwall - * Changed pfp->_file to fileno(pfp). - * - * Revision 1.2.1.8 85/03/12 16:30:43 lwall - * Check i_ptr and i_womp to make sure they aren't null before freeing. - * Also allow ed output to be suppressed. - * - * Revision 1.2.1.7 85/03/12 15:56:13 lwall - * Added -p option from jromine@uci-750a. - * - * Revision 1.2.1.6 85/03/12 12:12:51 lwall - * Now checks for normalness of file to patch. - * - * Revision 1.2.1.5 85/03/12 11:52:12 lwall - * Added -D (#ifdef) option from joe@fluke. - * - * Revision 1.2.1.4 84/12/06 11:14:15 lwall - * Made smarter about SCCS subdirectories. - * - * Revision 1.2.1.3 84/12/05 11:18:43 lwall - * Added -l switch to do loose string comparison. - * - * Revision 1.2.1.2 84/12/04 09:47:13 lwall - * Failed hunk count not reset on multiple patch file. - * - * Revision 1.2.1.1 84/12/04 09:42:37 lwall - * Branch for sdcrdcf changes. - * - * Revision 1.2 84/11/29 13:29:51 lwall - * Linted. Identifiers uniqified. Fixed i_ptr malloc() bug. Fixed - * multiple calls to mktemp(). Will now work on machines that can only - * read 32767 chars. Added -R option for diffs with new and old swapped. - * Various cosmetic changes. - * - * Revision 1.1 84/11/09 17:03:58 lwall - * Initial revision - * */ +#ifndef lint +static char rcsid[] = "$Id: patch.c,v 1.2 1993/08/02 17:55:19 mycroft Exp $"; +#endif /* not lint */ + #include "INTERN.h" #include "common.h" #include "EXTERN.h" diff --git a/usr.bin/patch/patchlevel.h b/usr.bin/patch/patchlevel.h index 4dc77e8668b..510e6fb892f 100644 --- a/usr.bin/patch/patchlevel.h +++ b/usr.bin/patch/patchlevel.h @@ -1 +1,3 @@ +/* $Id: patchlevel.h,v 1.2 1993/08/02 17:55:20 mycroft Exp $ */ + #define PATCHLEVEL "12u8" diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c index 480e490fd2f..3062588e3e6 100644 --- a/usr.bin/patch/pch.c +++ b/usr.bin/patch/pch.c @@ -1,39 +1,6 @@ -/* $Header: /cvsroot/src/usr.bin/patch/pch.c,v 1.1 1993/04/09 11:34:07 cgd Exp $ - * - * $Log: pch.c,v $ - * Revision 1.1 1993/04/09 11:34:07 cgd - * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL. - * - * Revision 2.0.2.0 90/05/01 22:17:51 davison - * patch12u: unidiff support added - * - * Revision 2.0.1.7 88/06/03 15:13:28 lwall - * patch10: Can now find patches in shar scripts. - * patch10: Hunks that swapped and then swapped back could core dump. - * - * Revision 2.0.1.6 87/06/04 16:18:13 lwall - * pch_swap didn't swap p_bfake and p_efake. - * - * Revision 2.0.1.5 87/01/30 22:47:42 lwall - * Improved responses to mangled patches. - * - * Revision 2.0.1.4 87/01/05 16:59:53 lwall - * New-style context diffs caused double call to free(). - * - * Revision 2.0.1.3 86/11/14 10:08:33 lwall - * Fixed problem where a long pattern wouldn't grow the hunk. - * Also restored p_input_line when backtracking so error messages are right. - * - * Revision 2.0.1.2 86/11/03 17:49:52 lwall - * New-style delete triggers spurious assertion error. - * - * Revision 2.0.1.1 86/10/29 15:52:08 lwall - * Could falsely report new-style context diff. - * - * Revision 2.0 86/09/17 15:39:37 lwall - * Baseline for netwide release. - * - */ +#ifndef lint +static char rcsid[] = "$Id: pch.c,v 1.2 1993/08/02 17:55:21 mycroft Exp $"; +#endif /* not lint */ #include "EXTERN.h" #include "common.h" diff --git a/usr.bin/patch/pch.h b/usr.bin/patch/pch.h index 32e50165e1e..f892fc3b7c1 100644 --- a/usr.bin/patch/pch.h +++ b/usr.bin/patch/pch.h @@ -1,16 +1,4 @@ -/* $Header: /cvsroot/src/usr.bin/patch/pch.h,v 1.1 1993/04/09 11:34:09 cgd Exp $ - * - * $Log: pch.h,v $ - * Revision 1.1 1993/04/09 11:34:09 cgd - * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL. - * - * Revision 2.0.1.1 87/01/30 22:47:16 lwall - * Added do_ed_script(). - * - * Revision 2.0 86/09/17 15:39:57 lwall - * Baseline for netwide release. - * - */ +/* $Id: pch.h,v 1.2 1993/08/02 17:55:22 mycroft Exp $ */ EXT FILE *pfp INIT(Nullfp); /* patch file pointer */ diff --git a/usr.bin/patch/util.c b/usr.bin/patch/util.c index e33f21ddbda..848cf2d8b18 100644 --- a/usr.bin/patch/util.c +++ b/usr.bin/patch/util.c @@ -1,3 +1,7 @@ +#ifndef lint +static char rcsid[] = "$Id: util.c,v 1.2 1993/08/02 17:55:23 mycroft Exp $"; +#endif /* not lint */ + #include "EXTERN.h" #include "common.h" #include "INTERN.h" diff --git a/usr.bin/patch/util.h b/usr.bin/patch/util.h index 80c8279e69b..75ede69ce4f 100644 --- a/usr.bin/patch/util.h +++ b/usr.bin/patch/util.h @@ -1,13 +1,4 @@ -/* $Header: /cvsroot/src/usr.bin/patch/util.h,v 1.1 1993/04/09 11:34:11 cgd Exp $ - * - * $Log: util.h,v $ - * Revision 1.1 1993/04/09 11:34:11 cgd - * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL. - * - * Revision 2.0 86/09/17 15:40:06 lwall - * Baseline for netwide release. - * - */ +/* $Id: util.h,v 1.2 1993/08/02 17:55:25 mycroft Exp $ */ /* and for those machine that can't handle a variable argument list */ diff --git a/usr.bin/patch/version.c b/usr.bin/patch/version.c index 2a6503d33bb..a4d4f8746e8 100644 --- a/usr.bin/patch/version.c +++ b/usr.bin/patch/version.c @@ -1,13 +1,6 @@ -/* $Header: /cvsroot/src/usr.bin/patch/Attic/version.c,v 1.1 1993/04/09 11:34:12 cgd Exp $ - * - * $Log: version.c,v $ - * Revision 1.1 1993/04/09 11:34:12 cgd - * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL. - * - * Revision 2.0 86/09/17 15:40:11 lwall - * Baseline for netwide release. - * - */ +#ifndef lint +static char rcsid[] = "$Id: version.c,v 1.2 1993/08/02 17:55:25 mycroft Exp $"; +#endif /* not lint */ #include "EXTERN.h" #include "common.h" diff --git a/usr.bin/patch/version.h b/usr.bin/patch/version.h index 74aa17f17bb..39e2e8d91bd 100644 --- a/usr.bin/patch/version.h +++ b/usr.bin/patch/version.h @@ -1,12 +1,3 @@ -/* $Header: /cvsroot/src/usr.bin/patch/Attic/version.h,v 1.1 1993/04/09 11:34:13 cgd Exp $ - * - * $Log: version.h,v $ - * Revision 1.1 1993/04/09 11:34:13 cgd - * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL. - * - * Revision 2.0 86/09/17 15:40:14 lwall - * Baseline for netwide release. - * - */ +/* $Id: version.h,v 1.2 1993/08/02 17:55:26 mycroft Exp $ */ void version(); |
