diff options
| author |   zinovik <zinovik@openbsd.org> | 2010-07-09 18:42:14 +0000 |
|---|---|---|
| committer | zinovik <zinovik@openbsd.org> | 2010-07-09 18:42:14 +0000 |
| commit | 78cab6d51c0dc09336a9ef5895a27fd03f66ea45 (patch) | |
| tree | 0374ac5f3e6ed99d3d6a3a72eea8c65234e37e36 /usr.bin/cvs/edit.c | |
| parent | un-terminated string found when comparing to i386 boot code. These (diff) | |
| download | wireguard-openbsd-78cab6d51c0dc09336a9ef5895a27fd03f66ea45.tar.xz wireguard-openbsd-78cab6d51c0dc09336a9ef5895a27fd03f66ea45.zip | |
when opencvs is started with trace option `-t' it must print function it
enters, even if it was executed simultaneously with `-n' (no exec option).
cvs_unedit_local() does not conform that behaviour, so lets make it behave
like all other functions.
ok xsa@, stsp@
Diffstat (limited to 'usr.bin/cvs/edit.c')
| -rw-r--r-- | usr.bin/cvs/edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/cvs/edit.c b/usr.bin/cvs/edit.c index c4e6802bd07..8031b7000d0 100644 --- a/usr.bin/cvs/edit.c +++ b/usr.bin/cvs/edit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: edit.c,v 1.48 2008/06/23 20:51:08 ragge Exp $ */ +/* $OpenBSD: edit.c,v 1.49 2010/07/09 18:42:14 zinovik Exp $ */ /* * Copyright (c) 2006, 2007 Xavier Santolaria <xsa@openbsd.org> * @@ -331,11 +331,11 @@ cvs_unedit_local(struct cvs_file *cf) char wdir[MAXPATHLEN], sticky[CVS_ENT_MAXLINELEN]; RCSNUM *ba_rev; + cvs_log(LP_TRACE, "cvs_unedit_local(%s)", cf->file_path); + if (cvs_noexec == 1) return; - cvs_log(LP_TRACE, "cvs_unedit_local(%s)", cf->file_path); - cvs_file_classify(cf, cvs_directory_tag); (void)xsnprintf(bfpath, MAXPATHLEN, "%s/%s", |