* Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* GNU General Public License for more details.
*
* 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.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
/* This file is now converted to use the new-style getaddrinfo()
{
char *prog = getenv("RSYNC_CONNECT_PROG");
+ if (prog && strchr(prog, '%')) {
+ int hlen = strlen(host);
+ int len = strlen(prog) + 1;
+ char *f, *t;
+ for (f = prog; *f; f++) {
+ if (*f != '%')
+ continue;
+ /* Compute more than enough room. */
+ if (f[1] == '%')
+ f++;
+ else
+ len += hlen;
+ }
+ f = prog;
+ if (!(prog = new_array(char, len)))
+ out_of_memory("open_socket_out_wrapped");
+ for (t = prog; *f; f++) {
+ if (*f == '%') {
+ switch (*++f) {
+ case '%':
+ /* Just skips the extra '%'. */
+ break;
+ case 'H':
+ memcpy(t, host, hlen);
+ t += hlen;
+ continue;
+ default:
+ f--; /* pass % through */
+ break;
+ }
+ }
+ *t++ = *f;
+ }
+ *t = '\0';
+ }
+
if (verbose >= 2) {
rprintf(FINFO, "%sopening tcp connection to %s port %d\n",
prog ? "Using RSYNC_CONNECT_PROG instead of " : "",
* unsuccessful, or if the daemon is being run with -vv. */
for (s = 0; s < ecnt; s++) {
if (!i || verbose > 1)
- rwrite(FLOG, errmsgs[s], strlen(errmsgs[s]));
+ rwrite(FLOG, errmsgs[s], strlen(errmsgs[s]), 0);
free(errmsgs[s]);
}
free(errmsgs);