-/* -*- c-file-style: "linux" -*-
-
- Copyright (C) 1996-2000 by Andrew Tridgell
- Copyright (C) Paul Mackerras 1996
- Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
+/*
+ Copyright (C) Andrew Tridgell 1996
+ Copyright (C) Paul Mackerras 1996
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
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.
- */
-pid_t piped_child(char **command,int *f_in,int *f_out)
+/* this is taken from CVS */
+int piped_child(char **command,int *f_in,int *f_out)
{
- pid_t pid;
+ 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);
}
pid = do_fork();
- if (pid == -1) {
+ if (pid < 0) {
rprintf(FERROR,"fork: %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;
}
-pid_t local_child(int argc, char **argv,int *f_in,int *f_out)
+int local_child(int argc, char **argv,int *f_in,int *f_out)
{
- pid_t pid;
+ int pid;
int to_child_pipe[2];
int from_child_pipe[2];
- extern int read_batch; /* dw */
- 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);
}
pid = do_fork();
- if (pid == -1) {
+ if (pid < 0) {
rprintf(FERROR,"fork: %s\n",strerror(errno));
exit_cleanup(RERR_IPC);
}
extern int am_sender;
extern int am_server;
- if (read_batch)
- am_sender = 0;
- else
- am_sender = !am_sender;
+ am_sender = !am_sender;
am_server = 1;
if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
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);
}
s = strdup(s);
if (!s) out_of_memory("glob_expand");
- if (asprintf(&base," %s/", base1) <= 0) out_of_memory("glob_expand");
+ base = (char *)malloc(strlen(base1)+3);
+ if (!base) out_of_memory("glob_expand");
+
+ sprintf(base," %s/", base1);
q = s;
while ((p = strstr(q,base)) && ((*argc) < maxargs)) {
}
}
+/* this is like vsnprintf but it always null terminates, so you
+ can fit at most n-1 chars in */
+int vslprintf(char *str, int n, const char *format, va_list ap)
+{
+ int ret = vsnprintf(str, n, format, ap);
+ if (ret >= n || ret < 0) {
+ str[n-1] = 0;
+ return -1;
+ }
+ str[ret] = 0;
+ return ret;
+}
+
+
+/* like snprintf but always null terminates */
+int slprintf(char *str, int n, char *format, ...)
+{
+ va_list ap;
+ int ret;
+
+ va_start(ap, format);
+ ret = vslprintf(str,n,format,ap);
+ va_end(ap);
+ return ret;
+}
+
+
void *Realloc(void *p, int size)
{
if (!p) return (void *)malloc(size);
return (int)*s1 - (int)*s2;
}
-static OFF_T last_ofs;
-static struct timeval print_time;
-static struct timeval start_time;
-static OFF_T start_ofs;
-
-static unsigned long msdiff(struct timeval *t1, struct timeval *t2)
-{
- return (t2->tv_sec - t1->tv_sec) * 1000
- + (t2->tv_usec - t1->tv_usec) / 1000;
-}
-
-
-/**
- * @param ofs Current position in file
- * @param size Total size of file
- * @param is_last True if this is the last time progress will be
- * printed for this file, so we should output a newline. (Not
- * necessarily the same as all bytes being received.)
- **/
-static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
- int is_last)
-{
- int pct = (ofs == size) ? 100 : (int)((100.0*ofs)/size);
- unsigned long diff = msdiff(&start_time, now);
- double rate = diff ? (double) (ofs-start_ofs) * 1000.0 / diff / 1024.0 : 0;
- const char *units;
- double remain = rate ? (double) (size-ofs) / rate / 1000.0: 0.0;
- int remain_h, remain_m, remain_s;
-
- if (rate > 1024*1024) {
- rate /= 1024.0 * 1024.0;
- units = "GB/s";
- } else if (rate > 1024) {
- rate /= 1024.0;
- units = "MB/s";
- } else {
- units = "kB/s";
- }
-
- remain_s = (int) remain % 60;
- remain_m = (int) (remain / 60.0) % 60;
- remain_h = (int) (remain / 3600.0);
-
- rprintf(FINFO, "%12.0f %3d%% %7.2f%s %4d:%02d:%02d%s",
- (double) ofs, pct, rate, units,
- remain_h, remain_m, remain_s,
- is_last ? "\n" : "\r");
-}
+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) {
- struct timeval now;
- gettimeofday(&now, NULL);
- rprint_progress(size, size, &now, True);
+ rprintf(FINFO,"\n");
}
- last_ofs = 0;
- start_ofs = 0;
- print_time.tv_sec = print_time.tv_usec = 0;
- start_time.tv_sec = start_time.tv_usec = 0;
+ last_ofs = 0;
}
void show_progress(OFF_T ofs, OFF_T size)
{
extern int do_progress, am_server;
- struct timeval now;
-
- gettimeofday(&now, NULL);
-
- if (!start_time.tv_sec && !start_time.tv_usec) {
- start_time.tv_sec = now.tv_sec;
- start_time.tv_usec = now.tv_usec;
- start_ofs = ofs;
- }
-
- if (do_progress
- && !am_server
- && ofs > last_ofs + 1000
- && msdiff(&print_time, &now) > 250) {
- rprint_progress(ofs, size, &now, False);
- last_ofs = ofs;
- print_time.tv_sec = now.tv_sec;
- print_time.tv_usec = now.tv_usec;
+
+ if (do_progress && !am_server) {
+ if (ofs > last_ofs + 1000) {
+ int pct = (int)((100.0*ofs)/size);
+ rprintf(FINFO,"%.0f (%d%%)\r", (double)ofs, pct);
+ last_ofs = ofs;
+ }
}
}
return(TimeBuf);
}
-
-/**
- * Sleep for a specified number of milliseconds.
- *
- * Always returns TRUE. (In the future it might return FALSE if
- * interrupted.)
- **/
-int 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;
- }
-
- return True;
-}
-
-
-/*******************************************************************
- Determine if two file modification times are equivalent (either exact
- or in the modification timestamp window established by --modify-window)
- Returns 0 if the times should be treated as the same, 1 if the
- first is later and -1 if the 2nd is later
- *******************************************************************/
-int cmp_modtime(time_t file1, time_t file2)
-{
- extern int modify_window;
-
- if (file2 > file1) {
- if (file2 - file1 <= modify_window) return 0;
- return -1;
- }
- if (file1 - file2 <= modify_window) return 0;
- return 1;
-}
-
-
-#ifdef __INSURE__XX
-#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;
-
- asprintf(&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);
-
- free(cmd);
-
- return ret;
-}
-#endif
git.samba.org / rsync.git / blobdiff