summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/remote.c
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2007-01-26 11:19:45 +0000
committerJoris Vink <joris@cvs.openbsd.org>2007-01-26 11:19:45 +0000
commit1a021ee8e2e3af50c1309ca1a10e7c21f6fecb21 (patch)
treedcefc84c1e112d415f48248594059823dc404b10 /usr.bin/cvs/remote.c
parent793debffbb0046c0a6a428b9732013b47618b284 (diff)
Handle CVS/Entries and file timestamp correctly so we do
not mistakenly see a file as Modified while it is not. As a result, we can remove the very hackish cvs_hack_time() and GNU cvs and opencvs should almost get along now. lotsa help and okay The otto@
Diffstat (limited to 'usr.bin/cvs/remote.c')
-rw-r--r--usr.bin/cvs/remote.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/cvs/remote.c b/usr.bin/cvs/remote.c
index d8dd0333bd2..e03a8d55afb 100644
--- a/usr.bin/cvs/remote.c
+++ b/usr.bin/cvs/remote.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: remote.c,v 1.11 2007/01/26 08:35:23 otto Exp $ */
+/* $OpenBSD: remote.c,v 1.12 2007/01/26 11:19:44 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -202,7 +202,6 @@ cvs_remote_send_file(const char *path)
void
cvs_remote_classify_file(struct cvs_file *cf)
{
- time_t mtime;
struct stat st;
CVSENTRIES *entlist;
@@ -230,8 +229,7 @@ cvs_remote_classify_file(struct cvs_file *cf)
fatal("cvs_remote_classify_file(%s): %s", cf->file_path,
strerror(errno));
- mtime = cvs_hack_time(st.st_mtime, 1);
- if (mtime != cf->file_ent->ce_mtime)
+ if (st.st_mtime != cf->file_ent->ce_mtime)
cf->file_status = FILE_MODIFIED;
else
cf->file_status = FILE_UPTODATE;