Moved inline functions from rsync.h into ifuncs.h.

[rsync/rsync.git] / socket.c

diff --git a/socket.c b/socket.c
index 823452f..ca8c561 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -6,8 +6,9 @@
  * 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
@@ -15,8 +16,7 @@
  * 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()
@@ -25,6 +25,7 @@
  * emulate it using the KAME implementation. */
 
 #include "rsync.h"
+#include "ifuncs.h"
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
@@ -300,6 +301,42 @@ int open_socket_out_wrapped(char *host, int port, const char *bind_addr,
 {
        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 " : "",