search for: signal_cast

..., len, Index: main.c =================================================================== RCS file: /cvsroot/rsync/main.c,v retrieving revision 1.135 diff -u -u -r1.135 main.c --- main.c 11 Jan 2002 07:16:11 -0000 1.135 +++ main.c 11 Jan 2002 07:23:18 -0000 @@ -821,9 +821,11 @@ } signal(SIGINT,SIGNAL_CAST sig_int); - signal(SIGPIPE,SIGNAL_CAST sig_int); signal(SIGHUP,SIGNAL_CAST sig_int); signal(SIGTERM,SIGNAL_CAST sig_int); + + /* Ignore SIGPIPE; we check error codes consistently. */ + signal(SIGPIPE,SIG_IGN); /* Initialize push_dir here because on some old systems getcwd (implemented...

I've been running rsync-2.4.2 with an old patch of mine for some time for backup purposes. Due to the recent remote bug, I thought it was time to upgrade, even if the host was behind a firewall. So I dug up the old patch (2.5.2 version attached), that I think I sent ages ago to this list as well. It does the following: (1) Firstly, the only sensible way to run something as

...this problem: ----cut here---- *** includes.h.orig Sun Feb 23 04:26:40 1997 --- includes.h Mon Jun 30 16:18:27 1997 *************** *** 668,692 **** #include <prot.h> #define crypt bigcrypt #endif - #ifndef EVEREST - #define ftruncate(f,l) syscall(0x0a28,f,l) - #endif #define SIGNAL_CAST (void (*)(int)) #define USE_WAITPID #define USE_GETCWD #define USE_SETSID #ifdef SCO3_2_2 ! #define NO_EID #else #ifndef EVEREST #define USE_IFREQ #endif #endif #define STATFS4 #define NO_FSYNC - #ifndef EVEREST - #define NO_INITGROUPS - #endif #define HAVE_PATHCONF #defin...

...) > { > BlockSignals( True, SIGPIPE ); > > DEBUG( 0, ("Got SIGPIPE\n") ); > if ( !is_daemon ) > exit(1); > BlockSignals( False, SIGPIPE ); > #ifndef DONT_REINSTALL_SIG > signal(SIGHUP,SIGNAL_CAST sig_pipe); > WOW!!! -------------^^^ > #endif > return(0); > } /* sig_pipe */ > > I'm speechless... Guilty as charged I'm afraid. I screwed that up - I don't know how - just a 'cut-n-paste' bug I'm afraid. Of course once I'...

...child processes, @@ -1000,6 +1001,14 @@ * code here, rather than relying on getopt. */ option_error(); exit_cleanup(RERR_SYNTAX); + } + + if (!lp_load(config_file, 1)) { + exit_cleanup(RERR_SYNTAX); + } + + if(lp_rsync_port() != 0) { + rsync_port = lp_rsync_port(); } signal(SIGINT,SIGNAL_CAST sig_int); Only in rsync-dmn/popt: dummy Only in rsync-dmn/zlib: dummy

...all %d restarted\n",scp->sc_syscall)); + } +#endif /* * Turns out it's *really* important not to * restore the signal handler here if we have real POSIX @@ -134,5 +147,5 @@ void CatchChildLeaveStatus(void) { - CatchSignal(SIGCLD, sig_cld_leave_status); + CatchSignal(SIGCLD, SIGNAL_CAST sig_cld_leave_status); } diff -u --recursive --new-file source/smbd/open.c source.new/smbd/open.c --- source/smbd/open.c Thu Dec 31 03:37:01 1998 +++ source.new/smbd/open.c Sun Jan 24 23:32:32 1999 @@ -225,8 +225,10 @@ */ pid_t wpid; int status_code; - if ((wpid = sys_waitpid(ch...

...optind; argv += optind; optind = 0; + + if (source_list && + ((argc != 2) || + !(src_list_fp = (strcmp(argv[0],"-") ? + fopen(argv[0],"r") : stdin)))) { + usage(FERROR); + exit_cleanup(RERR_SYNTAX); + } signal(SIGCHLD,SIG_IGN); signal(SIGINT,SIGNAL_CAST sig_int); --- options.c.orig Tue Sep 5 22:46:43 2000 +++ options.c Fri Nov 9 12:03:39 2001 @@ -53,6 +53,10 @@ int module_id = -1; int am_server = 0; int am_sender=0; +int source_list=0; +int list_rs='\n'; +int send_dirs=0; +int implicit_dirs=1; int recurse = 0; int am_daemon=0; int...

...ll)); >+ } >+#endif > /* > * Turns out it's *really* important not to > * restore the signal handler here if we have real POSIX >@@ -134,5 +147,5 @@ > > void CatchChildLeaveStatus(void) > { >- CatchSignal(SIGCLD, sig_cld_leave_status); >+ CatchSignal(SIGCLD, SIGNAL_CAST sig_cld_leave_status); > } >diff -u --recursive --new-file source/smbd/open.c source.new/smbd/open.c >--- source/smbd/open.c Thu Dec 31 03:37:01 1998 >+++ source.new/smbd/open.c Sun Jan 24 23:32:32 1999 >@@ -225,8 +225,10 @@ > */ > pid_t wpid; > int status_code;...

> Just curious: what about the rsync+ patch? Thanks for the reminder. I've just committed Jos's rsync+ patch onto the "branch_mbp_rsyncplus_merge" branch. If it works OK and nobody screams I will move it across onto the main tree tomorrow or Wednesday. I see the patch doesn't add documentation about the new options to the man page, so we should fix that in the future.