diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-06-30 16:47:20 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-06-30 16:47:20 +0000 |
| commit | 684e3413fcdac5b7899b78631f55beaa4ee786de (patch) | |
| tree | b3fb24384f4a1254d5a46023125c10732952cc00 /usr.bin/cvs/update.c | |
| parent | e9f5e17f9f537f96f78fba8594079d35d781fe4a (diff) | |
remove CF_KNOWN flag and move the CVS_FST_UNKNOWN check above the
one that looks if CVSFILE is a directory, so we get a correct output
of unknown files in server mode.
discussed with and ok xsa@
Diffstat (limited to 'usr.bin/cvs/update.c')
| -rw-r--r-- | usr.bin/cvs/update.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index 0328709d17f..3f2826c05bc 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.36 2005/06/30 16:37:29 joris Exp $ */ +/* $OpenBSD: update.c,v 1.37 2005/06/30 16:47:19 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -53,7 +53,7 @@ struct cvs_cmd cvs_cmd_update = { "[-t id] ...", "ACD:dfI:j:k:lPpQqRr:t:", NULL, - CF_SORT | CF_RECURSE | CF_IGNORE | CF_KNOWN | CF_NOSYMS, + CF_SORT | CF_RECURSE | CF_IGNORE | CF_NOSYMS, cvs_update_init, cvs_update_pre_exec, cvs_update_remote, @@ -231,14 +231,14 @@ cvs_update_local(CVSFILE *cf, void *arg) cvs_file_getpath(cf, fpath, sizeof(fpath)); - if (cf->cf_type == DT_DIR) { - cvs_log(LP_INFO, "Updating %s", fpath); + if (cf->cf_cvstat == CVS_FST_UNKNOWN) { + cvs_printf("? %s\n", fpath); return (CVS_EX_OK); } - if (cf->cf_cvstat == CVS_FST_UNKNOWN) { - cvs_printf("? %s\n", fpath); - return (0); + if (cf->cf_type == DT_DIR) { + cvs_log(LP_INFO, "Updating %s", fpath); + return (CVS_EX_OK); } l = snprintf(rcspath, sizeof(rcspath), "%s/%s/%s%s", |