1c1
< /* rcsclean - clean up working files */
---
> /* Clean up working files. */
3c3
< /* Copyright 1991 by Paul Eggert
---
> /* Copyright 1991, 1992, 1993, 1994, 1995 Paul Eggert
19,20c19,21
< along with RCS; see the file COPYING. If not, write to
< the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
---
> along with RCS; see the file COPYING.
> If not, write to the Free Software Foundation,
> 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
40c41
< mainProg(rcscleanId, "rcsclean", "$Id: rcsclean.c,v 5.1 1991/11/03 01:11:44 eggert Exp $")
---
> mainProg(rcscleanId, "rcsclean", "$Id: rcsclean.c,v 5.9 1995/06/16 06:19:24 eggert Exp $")
43c44
< "\nrcsclean: usage: rcsclean [-ksubst] [-{nqru}[rev]] [-Vn] [-xsuffixes] [file ...]";
---
> "\nrcsclean: usage: rcsclean -ksubst -{nqru}[rev] -T -Vn -xsuff -zzone file ...";
49c50,51
< int changelock, expmode, perform, unlocked, unlockflag, waslocked;
---
> int dounlock, expmode, perform, unlocked, unlockflag, waslocked;
> int Ttimeflag;
57c59
< rev = nil;
---
> rev = 0;
60a63
> Ttimeflag = false;
65c68
< if (--argc <= 0) {
---
> if (--argc < 1) {
71c74
< faterror("no file names specified");
---
> faterror("no pathnames specified");
75c78
< if (*a++ != '-')
---
> if (!*a || *a++ != '-')
100a104,109
> case 'T':
> if (*a)
> goto unknown;
> Ttimeflag = true;
> break;
>
112a122,125
> case 'z':
> zone_set(a);
> break;
>
115c128
< faterror("unknown option: %s%s", *argv, usage);
---
> error("unknown option: %s%s", *argv, usage);
119c132,138
< do {
---
> dounlock = perform & unlockflag;
>
> if (nerror)
> cleanup();
> else
> for (; 0 < argc; cleanup(), ++argv, --argc) {
>
123c142
< 0 < pairfilenames(
---
> 0 < pairnames(
125c144
< unlockflag&perform ? rcswriteopen : rcsreadopen,
---
> dounlock ? rcswriteopen : rcsreadopen,
128c147
< (workptr = Iopen(workfilename,FOPEN_R_WORK,&workstat))
---
> (workptr = Iopen(workname, FOPEN_R_WORK, &workstat))
131a151,157
> if (same_file(RCSstat, workstat, 0)) {
> rcserror("RCS file is the same as working file %s.",
> workname
> );
> continue;
> }
>
158d183
< changelock = unlocked & perform;
162c187
< if (!dorewrite(unlockflag, changelock))
---
> if (unlocked && !checkaccesslist())
164a190,192
> if (dorewrite(dounlock, unlocked) != 0)
> continue;
>
177c205
< !delta ? workstat.st_size!=0 :
---
> !delta ? workstat.st_size!=0 :
179,181c207,209
< workptr, &workstat,
< buildrevision(deltas, delta, (FILE*)0, false),
< delta
---
> workptr, &workstat,
> buildrevision(deltas, delta, (FILE*)0, false),
> delta
187c215
< aprintf(stdout, "rcs -u%s %s\n", delta->num, RCSfilename);
---
> aprintf(stdout, "rcs -u%s %s\n", delta->num, RCSname);
189,193c217,223
< if_advise_access(changelock && deltas->first != delta,
< finptr, MADV_SEQUENTIAL
< );
< if (!donerewrite(changelock))
< continue;
---
> if (perform & unlocked) {
> if_advise_access(deltas->first != delta, finptr, MADV_SEQUENTIAL);
> if (donerewrite(true,
> Ttimeflag ? RCSstat.st_mtime : (time_t)-1
> ) != 0)
> continue;
> }
196c226
< aprintf(stdout, "rm -f %s\n", workfilename);
---
> aprintf(stdout, "rm -f %s\n", workname);
198,199c228,229
< if (perform && un_link(workfilename) != 0)
< eerror(workfilename);
---
> if (perform && un_link(workname) != 0)
> eerror(workname);
201c231
< } while (cleanup(), ++argv, 0 < --argc);
---
> }
216c246
< Ozclose(&frewrite);
---
> ORCSclose();
220,221c250,251
< #if lint
< # define exiterr rcscleanExit
---
> #if RCS_lint
> # define exiterr rcscleanExit
223c253
< exiting void
---
> void
225a256
> ORCSerror();
235c266
< register struct lock **al, *l;
---
> register struct rcslock **al, *l;
272c303
< if (en[0]=='.' && (!en[1] || en[1]=='.' && !en[2]))
---
> if (en[0]=='.' && (!en[1] || (en[1]=='.' && !en[2])))
284c315,320
< if (errno || closedir(d) != 0)
---
> # if void_closedir
> # define close_directory(d) (closedir(d), 0)
> # else
> # define close_directory(d) closedir(d)
> # endif
> if (errno || close_directory(d) != 0)