| co.c (11894) | co.c (11927) |
|---|---|
| 1/* Check out working files from revisions of RCS files. */ 2 3/* Copyright 1982, 1988, 1989 Walter Tichy 4 Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert 5 Distributed under license by the Free Software Foundation, Inc. 6 7This file is part of RCS. 8 --- 15 unchanged lines hidden (view full) --- 24Report problems and direct all questions to: 25 26 rcs-bugs@cs.purdue.edu 27 28*/ 29 30/* 31 * $Log: co.c,v $ | 1/* Check out working files from revisions of RCS files. */ 2 3/* Copyright 1982, 1988, 1989 Walter Tichy 4 Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert 5 Distributed under license by the Free Software Foundation, Inc. 6 7This file is part of RCS. 8 --- 15 unchanged lines hidden (view full) --- 24Report problems and direct all questions to: 25 26 rcs-bugs@cs.purdue.edu 27 28*/ 29 30/* 31 * $Log: co.c,v $ |
| 32 * Revision 1.4 1995/10/28 21:49:12 peter 33 * First part of import conflict merge from rcs-5.7 import. 34 * 35 * All those $Log$ entries, combined with the whitespace changes are a real 36 * pain. 37 * 38 * I'm committing this now, before it's completely finished to get it compiling 39 * and working again ASAP. Some of the FreeBSD specific features are not working 40 * in this commit yet (mainly rlog stuff and $FreeBSD: head/gnu/usr.bin/rcs/co/co.c 11927 1995-10-29 19:31:11Z peter $ support) 41 * |
|
| 32 * Revision 5.18 1995/06/16 06:19:24 eggert 33 * Update FSF address. 34 * 35 * Revision 5.17 1995/06/01 16:23:43 eggert 36 * (main, preparejoin): Pass argument instead of using `join' static variable. 37 * (main): Add -kb. 38 * 39 * Revision 5.16 1994/03/17 14:05:48 eggert --- 134 unchanged lines hidden (view full) --- 174static int buildjoin P((char const*)); 175static int preparejoin P((char*)); 176static int rmlock P((struct hshentry const*)); 177static int rmworkfile P((void)); 178static void cleanup P((void)); 179 180static char const quietarg[] = "-q"; 181 | 42 * Revision 5.18 1995/06/16 06:19:24 eggert 43 * Update FSF address. 44 * 45 * Revision 5.17 1995/06/01 16:23:43 eggert 46 * (main, preparejoin): Pass argument instead of using `join' static variable. 47 * (main): Add -kb. 48 * 49 * Revision 5.16 1994/03/17 14:05:48 eggert --- 134 unchanged lines hidden (view full) --- 184static int buildjoin P((char const*)); 185static int preparejoin P((char*)); 186static int rmlock P((struct hshentry const*)); 187static int rmworkfile P((void)); 188static void cleanup P((void)); 189 190static char const quietarg[] = "-q"; 191 |
| 182static char const *expandarg, *suffixarg, *versionarg, *zonearg; | 192static char const *expandarg, *suffixarg, *versionarg, *zonearg, *incexcarg; |
| 183static char const **joinlist; /* revisions to be joined */ 184static int joinlength; 185static FILE *neworkptr; 186static int exitstatus; 187static int forceflag; 188static int lastjoin; /* index of last element in joinlist */ 189static int lockflag; /* -1 -> unlock, 0 -> do nothing, 1 -> lock */ 190static int mtimeflag; 191static struct hshentries *gendeltas; /* deltas to be generated */ 192static struct hshentry *targetdelta; /* final delta to be generated */ 193static struct stat workstat; 194 | 193static char const **joinlist; /* revisions to be joined */ 194static int joinlength; 195static FILE *neworkptr; 196static int exitstatus; 197static int forceflag; 198static int lastjoin; /* index of last element in joinlist */ 199static int lockflag; /* -1 -> unlock, 0 -> do nothing, 1 -> lock */ 200static int mtimeflag; 201static struct hshentries *gendeltas; /* deltas to be generated */ 202static struct hshentry *targetdelta; /* final delta to be generated */ 203static struct stat workstat; 204 |
| 195mainProg(coId, "co", "$Id: co.c,v 5.18 1995/06/16 06:19:24 eggert Exp $") | 205mainProg(coId, "co", "$Id: co.c,v 1.4 1995/10/28 21:49:12 peter Exp $") |
| 196{ 197 static char const cmdusage[] = 198 "\nco usage: co -{fIlMpqru}[rev] -ddate -jjoins -ksubst -sstate -T -w[who] -Vn -xsuff -zzone file ..."; 199 200 char *a, *joinflag, **newargv; 201 char const *author, *date, *rev, *state; 202 char const *joinname, *newdate, *neworkname; 203 int changelock; /* 1 if a lock has been changed, -1 if error */ --- 106 unchanged lines hidden (view full) --- 310 setRCSversion(versionarg); 311 break; 312 313 case 'z': 314 zonearg = *argv; 315 zone_set(a); 316 break; 317 | 206{ 207 static char const cmdusage[] = 208 "\nco usage: co -{fIlMpqru}[rev] -ddate -jjoins -ksubst -sstate -T -w[who] -Vn -xsuff -zzone file ..."; 209 210 char *a, *joinflag, **newargv; 211 char const *author, *date, *rev, *state; 212 char const *joinname, *newdate, *neworkname; 213 int changelock; /* 1 if a lock has been changed, -1 if error */ --- 106 unchanged lines hidden (view full) --- 320 setRCSversion(versionarg); 321 break; 322 323 case 'z': 324 zonearg = *argv; 325 zone_set(a); 326 break; 327 |
| 328 case 'K': /* set keyword inclusions/exclusions */ 329 incexcarg = *argv; 330 setIncExc(incexcarg); 331 break; 332 |
|
| 318 case 'k': /* set keyword expand mode */ 319 expandarg = *argv; 320 if (0 <= expmode) redefined('k'); 321 if (0 <= (expmode = str2expmode(a))) 322 break; 323 /* fall into */ 324 default: 325 unknown: --- 502 unchanged lines hidden --- | 333 case 'k': /* set keyword expand mode */ 334 expandarg = *argv; 335 if (0 <= expmode) redefined('k'); 336 if (0 <= (expmode = str2expmode(a))) 337 break; 338 /* fall into */ 339 default: 340 unknown: --- 502 unchanged lines hidden --- |