Deleted Added
sdiff udiff text old ( 11894 ) new ( 11927 )
full compact
rcsedit.c (11894) rcsedit.c (11927)
1/* RCS stream editor */
2
3/******************************************************************************
4 * edits the input file according to a
5 * script from stdin, generated by diff -n
6 * performs keyword expansion
7 ******************************************************************************
8 */

--- 22 unchanged lines hidden (view full) ---

31Report problems and direct all questions to:
32
33 rcs-bugs@cs.purdue.edu
34
35*/
36
37/*
38 * $Log: rcsedit.c,v $
1/* RCS stream editor */
2
3/******************************************************************************
4 * edits the input file according to a
5 * script from stdin, generated by diff -n
6 * performs keyword expansion
7 ******************************************************************************
8 */

--- 22 unchanged lines hidden (view full) ---

31Report problems and direct all questions to:
32
33 rcs-bugs@cs.purdue.edu
34
35*/
36
37/*
38 * $Log: rcsedit.c,v $
39 * Revision 1.4 1995/10/28 21:49:36 peter
40 * First part of import conflict merge from rcs-5.7 import.
41 *
42 * All those $Log$ entries, combined with the whitespace changes are a real
43 * pain.
44 *
45 * I'm committing this now, before it's completely finished to get it compiling
46 * and working again ASAP. Some of the FreeBSD specific features are not working
47 * in this commit yet (mainly rlog stuff and $FreeBSD: head/gnu/usr.bin/rcs/lib/rcsedit.c 11927 1995-10-29 19:31:11Z peter $ support)
48 *
39 * Revision 5.19 1995/06/16 06:19:24 eggert
40 * Update FSF address.
41 *
42 * Revision 5.18 1995/06/01 16:23:43 eggert
43 * (dirtpname): No longer external.
44 * (do_link): Simplify logic.
45 * (finisheditline, finishedit): Replace Iseek/Itell with what they stand for.
46 * (fopen_update_truncate): Replace `#if' with `if'.

--- 150 unchanged lines hidden (view full) ---

197 * changed type of result of getc() from char to int.
198 * made keyword expansion loop in expandline() portable to machines
199 * without sign-extension.
200 */
201
202
203#include "rcsbase.h"
204
49 * Revision 5.19 1995/06/16 06:19:24 eggert
50 * Update FSF address.
51 *
52 * Revision 5.18 1995/06/01 16:23:43 eggert
53 * (dirtpname): No longer external.
54 * (do_link): Simplify logic.
55 * (finisheditline, finishedit): Replace Iseek/Itell with what they stand for.
56 * (fopen_update_truncate): Replace `#if' with `if'.

--- 150 unchanged lines hidden (view full) ---

207 * changed type of result of getc() from char to int.
208 * made keyword expansion loop in expandline() portable to machines
209 * without sign-extension.
210 */
211
212
213#include "rcsbase.h"
214
205libId(editId, "$Id: rcsedit.c,v 5.19 1995/06/16 06:19:24 eggert Exp $")
215libId(editId, "$Id: rcsedit.c,v 1.4 1995/10/28 21:49:36 peter Exp $")
206
207static void editEndsPrematurely P((void)) exiting;
208static void editLineNumberOverflow P((void)) exiting;
209static void escape_string P((FILE*,char const*));
210static void keyreplace P((enum markers,struct hshentry const*,int,RILE*,FILE*,int));
211
212FILE *fcopy; /* result file descriptor */
213char const *resultname; /* result pathname */

--- 830 unchanged lines hidden (view full) ---

1044
1045 switch (marker) {
1046 case Author:
1047 aputs(delta->author, out);
1048 break;
1049 case Date:
1050 aputs(date2str(date,datebuf), out);
1051 break;
216
217static void editEndsPrematurely P((void)) exiting;
218static void editLineNumberOverflow P((void)) exiting;
219static void escape_string P((FILE*,char const*));
220static void keyreplace P((enum markers,struct hshentry const*,int,RILE*,FILE*,int));
221
222FILE *fcopy; /* result file descriptor */
223char const *resultname; /* result pathname */

--- 830 unchanged lines hidden (view full) ---

1054
1055 switch (marker) {
1056 case Author:
1057 aputs(delta->author, out);
1058 break;
1059 case Date:
1060 aputs(date2str(date,datebuf), out);
1061 break;
1062 case FreeBSD:
1052 case Id:
1053 case Header:
1054 escape_string(out,
1063 case Id:
1064 case Header:
1065 escape_string(out,
1055 marker==Id || RCSv1066 marker==Id || marker==FreeBSD || RCSv<VERSION(4)
1056 ? basefilename(RCSname)
1057 : getfullRCSname()
1058 );
1059 aprintf(out, " %s %s %s %s",
1060 delta->num,
1061 date2str(date, datebuf),
1062 delta->author,
1063 RCSv==VERSION(3) && delta->lockedby ? "Locked"

--- 886 unchanged lines hidden --- 		1067 ? basefilename(RCSname)
1068 : getfullRCSname()
1069 );
1070 aprintf(out, " %s %s %s %s",
1071 delta->num,
1072 date2str(date, datebuf),
1073 delta->author,
1074 RCSv==VERSION(3) && delta->lockedby ? "Locked"

--- 886 unchanged lines hidden ---