diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2016-11-03 20:13:42 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2016-11-03 20:13:42 +0000 |
| commit | 8f590197552ad5692ae7758a5e1b1be677c65582 (patch) | |
| tree | b6803e16f88512d8bc161e0b3a4401913c5e6981 /usr.bin | |
| parent | db0143943b8f507d71ab8382ccb3d557bb2b28f4 (diff) | |
Don't use ce_time if we are running as a server, it won't be present.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/status.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.bin/cvs/status.c b/usr.bin/cvs/status.c index 3aa0ff44b20..52d4c37a73c 100644 --- a/usr.bin/cvs/status.c +++ b/usr.bin/cvs/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.97 2016/10/18 17:11:43 joris Exp $ */ +/* $OpenBSD: status.c,v 1.98 2016/11/03 20:13:41 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2005-2008 Xavier Santolaria <xsa@openbsd.org> @@ -178,8 +178,12 @@ cvs_status_local(struct cvs_file *cf) rcsnum_tostr(cf->file_ent->ce_rev, revbuf, sizeof(revbuf)); if (cf->file_ent->ce_conflict == NULL) { - (void)strlcpy(timebuf, cf->file_ent->ce_time, - sizeof(timebuf)); + if (cvs_server_active == 0) { + (void)strlcpy(timebuf, cf->file_ent->ce_time, + sizeof(timebuf)); + } else { + timebuf[0] = '\0'; + } } else { len = strlcpy(timebuf, cf->file_ent->ce_conflict, sizeof(timebuf)); |