16c16
< * $FreeBSD: head/contrib/cvs/src/client.c 102843 2002-09-02 05:57:14Z peter $
---
> * $FreeBSD: head/contrib/cvs/src/client.c 107487 2002-12-02 03:17:49Z peter $
254c254,255
< this_root = Name_Root ((char *) NULL, (char *) NULL);
---
> this_root = (CVSroot_cmdline ? xstrdup(CVSroot_cmdline)
> : Name_Root ((char *) NULL, (char *) NULL));
1326a1328,1330
> else if (strcmp (command_name, "export") == 0)
> /* Don't create CVSADM directories if this is export. */
> ;
3615a3620,3622
> buf_free (to_server);
> to_server = NULL;
>
3619,3620d3625
<
< buf_free (to_server);
3621a3627
> from_server = NULL;
3727c3733,3734
< * skip opening connections to the server (i.e. skip network operations entirely)
---
> * skip opening connections to the server (i.e. skip network operations
> * entirely)
3729c3736
< * and yes, I know none of the the commands do that now, but here's to planning
---
> * and yes, I know none of the commands do that now, but here's to planning
3734c3741,3744
< * functions
---
> * functions - REMOVE_FIXME? This may be unecessary. We're talking about,
> * what, usually one, sometimes two lookups of the port per invocation. I
> * think twice is by far the rarer of the two cases - only the login function
> * will need to do it to save the canonical CVSROOT. -DRP
3913a3924,3926
> buf_free (to_server);
> to_server = NULL;
>
3917,3918d3929
<
< buf_free (to_server);
3919a3931
> from_server = NULL;
3964c3976,3977
< int fd = (int) lto_server->closure;
---
> FILE *fp = stdio_buffer_get_file(lto_server);
> int fd = fp ? fileno(fp) : -1;
3967c3980
< if (fstat (fd, &s) < 0 || !S_ISSOCK(s.st_mode))
---
> if ((fd < 0) || (fstat (fd, &s) < 0) || !S_ISSOCK(s.st_mode))
5626c5639
< argc, argv, local, W_LOCAL, aflag, 0, (char *)NULL, 0);
---
> argc, argv, local, W_LOCAL, aflag, LOCK_NONE, (char *)NULL, 0);