X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/374c3e1278e1e5e14e218c3149e5d633f7e044b6..0f78b81511be65d8fe21af1e6ac674f9e80ac29d:/clientserver.c diff --git a/clientserver.c b/clientserver.c index a922a8f5..c370e213 100644 --- a/clientserver.c +++ b/clientserver.c @@ -1,7 +1,9 @@ -/* -*- c-file-style: "linux"; -*- +/* + * The socket based protocol for setting up a connection with rsyncd. * - * Copyright (C) 1998-2001 by Andrew Tridgell - * Copyright (C) 2001-2002 by Martin Pool + * Copyright (C) 1998-2001 Andrew Tridgell + * Copyright (C) 2001-2002 Martin Pool + * Copyright (C) 2002, 2003, 2004, 2005, 2006 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,16 +17,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/** - * @file - * - * The socket based protocol for setting up a connection with - * rsyncd. - **/ - #include "rsync.h" extern int verbose; @@ -113,7 +108,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) return ret ? ret : client_run(fd, fd, -1, argc, argv); } -int start_inband_exchange(char *user, char *path, int f_in, int f_out, +int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) { int i; @@ -736,7 +731,7 @@ int start_daemon(int f_in, int f_out) /* We must load the config file before calling any function that * might cause log-file output to occur. This ensures that the * "log file" param gets honored for the 2 non-forked use-cases - * (called by init and called by remote shell). */ + * (when rsync is run by init and run by a remote shell). */ if (!lp_load(config_file, 0)) exit_cleanup(RERR_SYNTAX);