Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support for ": dirconf/per-dir-rules", in progress.
[rsync/rsync.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index
8d4a89d
..
0ad766d
100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-25,7
+25,7
@@
* emulate it using the KAME implementation. */
#include "rsync.h"
* emulate it using the KAME implementation. */
#include "rsync.h"
-#include "i
func
s.h"
+#include "i
type
s.h"
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
@@
-232,7
+232,7
@@
int open_socket_out(char *host, int port, const char *bind_addr,
}
*cp++ = '\0';
strlcpy(portbuf, cp, sizeof portbuf);
}
*cp++ = '\0';
strlcpy(portbuf, cp, sizeof portbuf);
- if (
verbose >= 2
) {
+ if (
DEBUG_GTE(CONNECT, 1)
) {
rprintf(FINFO, "connection via http proxy %s port %s\n",
h, portbuf);
}
rprintf(FINFO, "connection via http proxy %s port %s\n",
h, portbuf);
}
@@
-361,7
+361,7
@@
int open_socket_out_wrapped(char *host, int port, const char *bind_addr,
*t = '\0';
}
*t = '\0';
}
- if (
verbose >= 2
) {
+ if (
DEBUG_GTE(CONNECT, 1)
) {
rprintf(FINFO, "%sopening tcp connection to %s port %d\n",
prog ? "Using RSYNC_CONNECT_PROG instead of " : "",
host, port);
rprintf(FINFO, "%sopening tcp connection to %s port %d\n",
prog ? "Using RSYNC_CONNECT_PROG instead of " : "",
host, port);
@@
-473,7
+473,7
@@
static int *open_socket_in(int type, int port, const char *bind_addr,
/* Only output the socket()/bind() messages if we were totally
* unsuccessful, or if the daemon is being run with -vv. */
for (s = 0; s < ecnt; s++) {
/* Only output the socket()/bind() messages if we were totally
* unsuccessful, or if the daemon is being run with -vv. */
for (s = 0; s < ecnt; s++) {
- if (!i ||
verbose > 1
)
+ if (!i ||
DEBUG_GTE(BIND, 1)
)
rwrite(FLOG, errmsgs[s], strlen(errmsgs[s]), 0);
free(errmsgs[s]);
}
rwrite(FLOG, errmsgs[s], strlen(errmsgs[s]), 0);
free(errmsgs[s]);
}
@@
-823,22
+823,32
@@
static int socketpair_tcp(int fd[2])
**/
int sock_exec(const char *prog)
{
**/
int sock_exec(const char *prog)
{
+ pid_t pid;
int fd[2];
if (socketpair_tcp(fd) != 0) {
rsyserr(FERROR, errno, "socketpair_tcp failed");
return -1;
}
int fd[2];
if (socketpair_tcp(fd) != 0) {
rsyserr(FERROR, errno, "socketpair_tcp failed");
return -1;
}
- if (
verbose >= 2
)
+ if (
DEBUG_GTE(CMD, 1)
)
rprintf(FINFO, "Running socket program: \"%s\"\n", prog);
rprintf(FINFO, "Running socket program: \"%s\"\n", prog);
- if (fork() == 0) {
+
+ pid = fork();
+ if (pid < 0) {
+ rsyserr(FERROR, errno, "fork");
+ exit_cleanup(RERR_IPC);
+ }
+
+ if (pid == 0) {
close(fd[0]);
close(fd[0]);
- close(0);
- close(1);
- dup(fd[1]);
- dup(fd[1]);
+ if (dup2(fd[1], STDIN_FILENO) < 0
+ || dup2(fd[1], STDOUT_FILENO) < 0) {
+ fprintf(stderr, "Failed to run \"%s\"\n", prog);
+ exit(1);
+ }
exit(system(prog));
}
exit(system(prog));
}
+
close(fd[1]);
return fd[0];
}
close(fd[1]);
return fd[0];
}