aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/cvs/src/client.c
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2003-01-21 21:53:03 +0000
committerPeter Wemm <peter@FreeBSD.org>2003-01-21 21:53:03 +0000
commit10582a5671d84ecea7f66b6c735eaad03bb8d8ef (patch)
treeac24d0bf3321edf74c485789b0a58c0ac84bb5fb /contrib/cvs/src/client.c
parent6361f125fbebb7b3fba759b74fe02de24f44ebf6 (diff)
downloadsrc-10582a5671d84ecea7f66b6c735eaad03bb8d8ef.tar.gz
src-10582a5671d84ecea7f66b6c735eaad03bb8d8ef.zip
Import cvs-1.11.5 onto vendor branch
Notes
Notes: svn path=/vendor/cvs/dist/; revision=109655
Diffstat (limited to 'contrib/cvs/src/client.c')
-rw-r--r--contrib/cvs/src/client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/cvs/src/client.c b/contrib/cvs/src/client.c
index a5a15e1470f3..94e902afb601 100644
--- a/contrib/cvs/src/client.c
+++ b/contrib/cvs/src/client.c
@@ -2175,7 +2175,7 @@ update_entries (data_arg, ent_list, short_pathname, filename)
* date. Create a dummy timestamp which will never compare
* equal to the timestamp of the file.
*/
- if (vn[0] == '\0' || vn[0] == '0' || vn[0] == '-')
+ if (vn[0] == '\0' || strcmp (vn, "0") == 0 || vn[0] == '-')
local_timestamp = "dummy timestamp";
else if (local_timestamp == NULL)
{
@@ -3001,7 +3001,7 @@ send_a_repository (dir, repository, update_dir)
&& (strcmp (repository + repository_len - update_dir_len,
update_dir) == 0)
/* TOPLEVEL_REPOS shouldn't be above current_parsed_root->directory */
- && ((repository_len - update_dir_len)
+ && ((size_t)(repository_len - update_dir_len)
> strlen (current_parsed_root->directory)))
{
/* The repository name contains UPDATE_DIR. Set
@@ -5631,7 +5631,7 @@ send_files (argc, argv, local, aflag, flags)
err = start_recursion
(send_fileproc, send_filesdoneproc,
send_dirent_proc, send_dirleave_proc, (void *) &args,
- argc, argv, local, W_LOCAL, aflag, LOCK_NONE, (char *)NULL, 0);
+ argc, argv, local, W_LOCAL, aflag, CVS_LOCK_NONE, (char *)NULL, 0);
if (err)
error_exit ();
if (toplevel_repos == NULL)