diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2006-04-01 05:58:18 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2006-04-01 05:58:18 +0000 |
| commit | 143730248bf47be98ceed1603bed218d2e51e045 (patch) | |
| tree | 41769859d92f44d1e04220f61a22a3580bd22988 | |
| parent | a82452c39b21a9c02aad75021d2295506484d1fe (diff) | |
Keep cvs flags in `flags', rcs flags in `rcsflags' in rcsprog.h.
Prevents bitfield pollution between the two.
``This is how it should be.'' niallo@
| -rw-r--r-- | usr.bin/rcs/rcsprog.c | 8 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsprog.h | 15 |
2 files changed, 12 insertions, 11 deletions
diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c index 97568f280a6..9dbcd9b44f5 100644 --- a/usr.bin/rcs/rcsprog.c +++ b/usr.bin/rcs/rcsprog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.c,v 1.90 2006/03/28 09:51:09 xsa Exp $ */ +/* $OpenBSD: rcsprog.c,v 1.91 2006/04/01 05:58:17 ray Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -39,12 +39,8 @@ const char rcs_version[] = "OpenCVS RCS version 3.6"; int verbose = 1; int pipeout = 0; -#define RCSPROG_EFLAG (1<<0) -#define RCSPROG_NFLAG (1<<1) -#define RCSPROG_TFLAG (1<<2) -static int rcsflags = 0; - int flags; +int rcsflags; int rcs_optind; char *rcs_optarg; char *rcs_suffixes; diff --git a/usr.bin/rcs/rcsprog.h b/usr.bin/rcs/rcsprog.h index 672a19fa61c..276ef4d0d43 100644 --- a/usr.bin/rcs/rcsprog.h +++ b/usr.bin/rcs/rcsprog.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.h,v 1.39 2006/03/15 19:59:37 niallo Exp $ */ +/* $OpenBSD: rcsprog.h,v 1.40 2006/04/01 05:58:17 ray Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -50,11 +50,16 @@ #define CO_STATE (1<<8) #define CO_UNLOCK (1<<9) +/* flags specific to rcsprog.c */ +#define RCSPROG_EFLAG (1<<10) +#define RCSPROG_NFLAG (1<<11) +#define RCSPROG_TFLAG (1<<12) + /* shared flags */ -#define FORCE (1<<10) -#define INTERACTIVE (1<<11) -#define NEWFILE (1<<12) -#define PRESERVETIME (1<<13) +#define FORCE (1<<13) +#define INTERACTIVE (1<<14) +#define NEWFILE (1<<15) +#define PRESERVETIME (1<<16) extern char *__progname; extern const char rcs_version[]; |