diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-02-04 15:07:34 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-02-04 15:07:34 +0000 |
| commit | 411b75fbdfa56ff0a00aa9ce3c23e4674c30bcfd (patch) | |
| tree | b28e12816c4e0d77510c52ab19889c16ba4e0ecd /usr.bin/cvs/import.c | |
| parent | 78441b321b1022d3be5daeabc9c2234895287cee (diff) | |
Added -k flag support for all commands which support it.
OK joris@
Diffstat (limited to 'usr.bin/cvs/import.c')
| -rw-r--r-- | usr.bin/cvs/import.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c index 13cda70be9a..fe17c4dd71f 100644 --- a/usr.bin/cvs/import.c +++ b/usr.bin/cvs/import.c @@ -1,4 +1,4 @@ -/* $OpenBSD: import.c,v 1.81 2008/01/31 21:30:08 joris Exp $ */ +/* $OpenBSD: import.c,v 1.82 2008/02/04 15:07:33 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -40,7 +40,6 @@ static char *logmsg = NULL; static char *vendor_tag = NULL; static char *release_tag = NULL; static char *koptstr; -static int kflag = RCS_KWEXP_DEFAULT; static int dflag = 0; char *import_repository = NULL; @@ -111,7 +110,7 @@ cvs_import(int argc, char **argv) cvs_client_send_request("Argument -b%s", IMPORT_DEFAULT_BRANCH); - if (kflag != RCS_KWEXP_DEFAULT) + if (kflag) cvs_client_send_request("Argument -k%s", koptstr); cvs_client_send_logmsg(logmsg); @@ -273,7 +272,7 @@ import_new(struct cvs_file *cf) cf->file_rcs->rf_head, bp) == -1) fatal("import_new: failed to set deltatext"); - if (kflag != RCS_KWEXP_DEFAULT) + if (kflag) rcs_kwexp_set(cf->file_rcs, kflag); rcs_write(cf->file_rcs); @@ -337,7 +336,7 @@ import_update(struct cvs_file *cf) cvs_printf("U %s/%s\n", import_repository, cf->file_path); } - if (kflag != RCS_KWEXP_DEFAULT) + if (kflag) rcs_kwexp_set(cf->file_rcs, kflag); rcsnum_free(brev); |