diff options
Diffstat (limited to 'contrib/cvs/src/watch.c')
| -rw-r--r-- | contrib/cvs/src/watch.c | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/contrib/cvs/src/watch.c b/contrib/cvs/src/watch.c index d86968b..96d6b04 100644 --- a/contrib/cvs/src/watch.c +++ b/contrib/cvs/src/watch.c @@ -318,25 +318,14 @@ watch_addremove (argc, argv) /* FIXME: copes poorly with "all" if server is extended to have new watch types and client is still running an old version. */ if (the_args.edit) - { - send_arg ("-a"); - send_arg ("edit"); - } + option_with_arg ("-a", "edit"); if (the_args.unedit) - { - send_arg ("-a"); - send_arg ("unedit"); - } + option_with_arg ("-a", "unedit"); if (the_args.commit) - { - send_arg ("-a"); - send_arg ("commit"); - } + option_with_arg ("-a", "commit"); if (!the_args.edit && !the_args.unedit && !the_args.commit) - { - send_arg ("-a"); - send_arg ("none"); - } + option_with_arg ("-a", "none"); + send_arg ("--"); send_files (argc, argv, local, 0, SEND_NO_CONTENTS); send_file_names (argc, argv, SEND_EXPAND_WILD); send_to_server (the_args.adding ? @@ -352,8 +341,8 @@ watch_addremove (argc, argv) err = start_recursion (addremove_fileproc, addremove_filesdoneproc, (DIRENTPROC) NULL, (DIRLEAVEPROC) NULL, NULL, - argc, argv, local, W_LOCAL, 0, 0, (char *)NULL, - 1); + argc, argv, local, W_LOCAL, 0, LOCK_NONE, + (char *)NULL, 1); Lock_Cleanup (); return err; @@ -516,6 +505,7 @@ watchers (argc, argv) if (local) send_arg ("-l"); + send_arg ("--"); send_files (argc, argv, local, 0, SEND_NO_CONTENTS); send_file_names (argc, argv, SEND_EXPAND_WILD); send_to_server ("watchers\012", 0); @@ -525,6 +515,6 @@ watchers (argc, argv) return start_recursion (watchers_fileproc, (FILESDONEPROC) NULL, (DIRENTPROC) NULL, (DIRLEAVEPROC) NULL, NULL, - argc, argv, local, W_LOCAL, 0, 1, (char *)NULL, - 1); + argc, argv, local, W_LOCAL, 0, LOCK_READ, + (char *)NULL, 1); } |
