extern int verbose;
-
/****************************************************************************
-Set a fd into nonblocking mode
+Set a fd into nonblocking mode. Uses POSIX O_NONBLOCK if available,
+else
+if SYSV use O_NDELAY
+if BSD use FNDELAY
****************************************************************************/
-void set_nonblocking(int fd)
+int set_nonblocking(int fd)
{
int val;
-
- if((val = fcntl(fd, F_GETFL, 0)) == -1)
- return;
- if (!(val & NONBLOCK_FLAG)) {
- val |= NONBLOCK_FLAG;
- fcntl(fd, F_SETFL, val);
- }
-}
-
-/****************************************************************************
-Set a fd into blocking mode
-****************************************************************************/
-void set_blocking(int fd)
-{
- int val;
-
- if((val = fcntl(fd, F_GETFL, 0)) == -1)
- return;
- if (val & NONBLOCK_FLAG) {
- val &= ~NONBLOCK_FLAG;
- fcntl(fd, F_SETFL, val);
- }
-}
-
-
-/* create a file descriptor pair - like pipe() but use socketpair if
- possible (because of blocking issues on pipes)
-
- always set non-blocking
- */
-int fd_pair(int fd[2])
-{
- int ret;
-
-#if HAVE_SOCKETPAIR
- ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fd);
+#ifdef O_NONBLOCK
+#define FLAG_TO_SET O_NONBLOCK
#else
- ret = pipe(fd);
+#ifdef SYSV
+#define FLAG_TO_SET O_NDELAY
+#else /* BSD */
+#define FLAG_TO_SET FNDELAY
+#endif
#endif
-
- if (ret == 0) {
- set_nonblocking(fd[0]);
- set_nonblocking(fd[1]);
- }
- return ret;
+ if((val = fcntl(fd, F_GETFL, 0)) == -1)
+ return -1;
+ val |= FLAG_TO_SET;
+ return fcntl( fd, F_SETFL, val);
+#undef FLAG_TO_SET
}
-/* this is derived from CVS code
-
- note that in the child STDIN is set to blocking and STDOUT
- is set to non-blocking. This is necessary as rsh relies on stdin being blocking
- and ssh relies on stdout being non-blocking
-
- if blocking_io is set then use blocking io on both fds. That can be
- used to cope with badly broken rsh implementations like the one on
- solaris.
- */
+/* this is taken from CVS */
int piped_child(char **command,int *f_in,int *f_out)
{
int pid;
int to_child_pipe[2];
int from_child_pipe[2];
- extern int blocking_io;
- if (fd_pair(to_child_pipe) < 0 ||
- fd_pair(from_child_pipe) < 0) {
+ if (pipe(to_child_pipe) < 0 ||
+ pipe(from_child_pipe) < 0) {
rprintf(FERROR,"pipe: %s\n",strerror(errno));
exit_cleanup(RERR_IPC);
}
if (to_child_pipe[0] != STDIN_FILENO) close(to_child_pipe[0]);
if (from_child_pipe[1] != STDOUT_FILENO) close(from_child_pipe[1]);
umask(orig_umask);
- set_blocking(STDIN_FILENO);
- if (blocking_io) {
- set_blocking(STDOUT_FILENO);
- }
execvp(command[0], command);
rprintf(FERROR,"Failed to exec %s : %s\n",
command[0],strerror(errno));
*f_in = from_child_pipe[0];
*f_out = to_child_pipe[1];
+ set_nonblocking(*f_in);
+ set_nonblocking(*f_out);
+
return pid;
}
int to_child_pipe[2];
int from_child_pipe[2];
- if (fd_pair(to_child_pipe) < 0 ||
- fd_pair(from_child_pipe) < 0) {
+ if (pipe(to_child_pipe) < 0 ||
+ pipe(from_child_pipe) < 0) {
rprintf(FERROR,"pipe: %s\n",strerror(errno));
exit_cleanup(RERR_IPC);
}
derived from GNU C's cccp.c.
*/
-static int full_write(int desc, char *ptr, int len)
+static int full_write(int desc, char *ptr, size_t len)
{
int total_written;
for an error.
derived from GNU C's cccp.c. */
-static int safe_read(int desc, char *ptr, int len)
+static int safe_read(int desc, char *ptr, size_t len)
{
int n_chars;
- if (len <= 0)
+ if (len == 0)
return len;
#ifdef EINTR
return -1;
return do_rename(from, to);
#endif
+ }
+
+
+/* sleep for a while via select */
+void u_sleep(int usec)
+{
+ struct timeval tv;
+
+ tv.tv_sec = 0;
+ tv.tv_usec = usec;
+ select(0, NULL, NULL, NULL, &tv);
}
static OFF_T last_ofs;
-void end_progress(OFF_T size)
+void end_progress(void)
{
extern int do_progress, am_server;
if (do_progress && !am_server) {
- rprintf(FINFO,"%.0f (100%%)\n", (double)size);
+ rprintf(FINFO,"\n");
}
last_ofs = 0;
}
return(TimeBuf);
}
-
-/*******************************************************************
-sleep for a specified number of milliseconds
-********************************************************************/
-void msleep(int t)
-{
- int tdiff=0;
- struct timeval tval,t1,t2;
-
- gettimeofday(&t1, NULL);
- gettimeofday(&t2, NULL);
-
- while (tdiff < t) {
- tval.tv_sec = (t-tdiff)/1000;
- tval.tv_usec = 1000*((t-tdiff)%1000);
-
- errno = 0;
- select(0,NULL,NULL, NULL, &tval);
-
- gettimeofday(&t2, NULL);
- tdiff = (t2.tv_sec - t1.tv_sec)*1000 +
- (t2.tv_usec - t1.tv_usec)/1000;
- }
-}
-
-
-#ifdef __INSURE__
-#include <dlfcn.h>
-
-/*******************************************************************
-This routine is a trick to immediately catch errors when debugging
-with insure. A xterm with a gdb is popped up when insure catches
-a error. It is Linux specific.
-********************************************************************/
-int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6)
-{
- static int (*fn)();
- int ret;
- char cmd[1024];
-
- sprintf(cmd, "/usr/X11R6/bin/xterm -display :0 -T Panic -n Panic -e /bin/sh -c 'cat /tmp/ierrs.*.%d ; gdb /proc/%d/exe %d'",
- getpid(), getpid(), getpid());
-
- if (!fn) {
- static void *h;
- h = dlopen("/usr/local/parasoft/insure++lite/lib.linux2/libinsure.so", RTLD_LAZY);
- fn = dlsym(h, "_Insure_trap_error");
- }
-
- ret = fn(a1, a2, a3, a4, a5, a6);
-
- system(cmd);
-
- return ret;
-}
-#endif
git.samba.org / rsync.git / blobdiff