search for: rerr_syntax

...==================================================== RCS file: /cvsroot/rsync/rsync.yo,v retrieving revision 1.128 diff -u -r1.128 rsync.yo --- rsync.yo 7 Oct 2003 20:33:08 -0000 1.128 +++ rsync.yo 24 Oct 2003 19:33:09 -0000 @@ -1109,15 +1109,17 @@ manpagesection(EXIT VALUES) startdit() -dit(bf(RERR_SYNTAX 1)) Syntax or usage error -dit(bf(RERR_PROTOCOL 2)) Protocol incompatibility -dit(bf(RERR_FILESELECT 3)) Errors selecting input/output files, dirs +dit(bf(RERR_SYNTAX 1)) Syntax or usage error +dit(bf(RERR_PROTOCOL 2)) Protocol incompatibility +dit(bf(RER...

...remote */ if (remote_filesfrom_file && remote_filesfrom_file != files_from + 1 && strncmp(files_from, argv[0], p-argv[0]+1) != 0) { *************** *** 755,761 **** daemon_over_rsh = 1; } ! if (argc < 1) { usage(FERROR); exit_cleanup(RERR_SYNTAX); } --- 755,761 ---- daemon_over_rsh = 1; } ! if (argc < 1) { /* destination required */ usage(FERROR); exit_cleanup(RERR_SYNTAX); } *************** *** 764,772 **** *p = 0; shell_machine = argv[0]; shell_path = p+1; - argc--; argv...

...gv[]) { struct file_list *flist; char *dir = argv[0]; if (verbose > 2) { rprintf(FINFO, "server_sender starting pid=%ld\n", (long)getpid()); } if (am_daemon && lp_write_only(module_id)) { rprintf(FERROR, "ERROR: module is write only\n"); exit_cleanup(RERR_SYNTAX); return; } if (am_daemon && lp_read_only(module_id) && remove_sent_files) { rprintf(FERROR, "ERROR: --remove-sent-files cannot be used with a read-only module\n"); exit_cleanup(RERR_SYNTAX); return; } if (!relative_paths && !push_dir(dir)) {...

...ar *rsync_path; extern char *shell_cmd; extern struct file_list *batch_flist; +extern char* config_file; /* there's probably never more than at most 2 outstanding 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

...st,'/'); @@ -695,6 +697,8 @@ if (p) { if (p[1] == ':') { /* double colon */ + /* First parameter is HOST::MODULE. + * Receive from remote rsyncd server. */ *p = 0; return start_socket_client(argv[0], p+2, argc-1, argv+1); } @@ -704,6 +708,8 @@ exit_cleanup(RERR_SYNTAX); } + /* First parameter is HOST:MODULE. + * Receive from remote shell. */ am_sender = 0; *p = 0; shell_machine = argv[0]; @@ -713,10 +719,34 @@ } else { am_sender = 1; + if (strncasecmp(URL_PREFIX, argv[argc-1], strlen(URL_PREFIX)) == 0) { + char *host, *path; + /* Las...

...xtern int module_id; + extern int am_sender; if (verbose > 2) rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid()); + if (am_daemon && lp_write_only(module_id) && am_sender) { + rprintf(FERROR,"ERROR: module is write only\n"); + exit_cleanup(RERR_SYNTAX); + return; + } + if (!relative_paths && !push_dir(dir, 0)) { rprintf(FERROR,"push_dir %s: %s (3)\n",dir,strerror(errno)); exit_cleanup(RERR_FILESELECT); diff -urN rsync-2.5.2.orig/proto.h rsync-2.5.2/proto.h --- rsync-2.5.2.orig/proto.h Sat Jan 26 00:07:33 2002 +++ rsync...

...t_time; + char *valid_time = NULL; + + assert(stopat != NULL); + + if( 0 == stop_time_secs ) { + valid_time = strptime(stopat, "%y%m%d%H%M%S", &stopat_time); + if( NULL == valid_time ) { + rprintf(FERROR, "ERROR: invalid --stopat format: %s\n", stopat ); + exit_cleanup(RERR_SYNTAX); + } + stop_time_secs = mktime( &stopat_time ); + } + + if( -1 == stop_time_secs ) { + rprintf(FERROR, "ERROR: mktime() returned -1\n" ); + exit_cleanup(RERR_SYNTAX); + } + + now = time(NULL); + + return ( now > stop_time_secs ) ? 1 : 0; +} /** * Write len bytes to the fi...

...ad_only = 0; int module_id = -1; int am_server = 0; int am_sender = 0; +char *who_am_i = "receiver"; char *files_from = NULL; int filesfrom_fd = -1; char *remote_filesfrom_file = NULL; @@ -554,6 +555,7 @@ int parse_arguments(int *argc, const cha usage(FERROR); exit_cleanup(RERR_SYNTAX); } + who_am_i = "sender"; am_sender = 1; break;

Here a bug report about "!" not working properly in 2.6.4 and above, paraphrased... > Ok, see attachment. I've tested it right now between two hosts > running rsync 2.6.3-2 and 2.6.6-1. It works in the forward direction, > backwards it gives > > '!' rule has trailing characters: ! > rsync error: syntax or usage error (code 1) at

Using rsync 2.6.0 on both ends, I ran rsync -v --files-from files andrew@pimlott.net: . and got an error from the remote rsync. The reason is that the remote rsync is run as rsync --server --sender -vvR --files-from=- --from0 . which conflicts with a check in options.c that rsync must have two non-option arguments when --files-from is used. I tried again with the latest nightly

...a85c1bfa4b1487122377a Signed-off-by: Vitezslav Cizek <vcizek at suse.cz> --- slp.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slp.diff b/slp.diff index a9703f1..953b400 100644 --- a/slp.diff +++ b/slp.diff @@ -479,7 +479,7 @@ new file mode 100644 + exit_cleanup(RERR_SYNTAX); + } + -+ n = lp_numservices(); ++ n = lp_num_modules(); + + if (0 == lp_slp_refresh()) + timeout = SLP_LIFETIME_MAXIMUM; /* don't expire, ever */ -- 1.8.4 -- Vita Cizek -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: applicatio...

...ot;; + int i; + for (p = strtok(dest_filter, sep), i = 0; + p && i < MAX_FILTER_ARGS; + p = strtok(0, sep)) { + filter_argv[i++] = p; + } + filter_argv[i] = 0; + if (p) { + rprintf(FERROR,"Too many arguments to dest-filter (> %d)\n", i); + exit_cleanup(RERR_SYNTAX); + } + } + while (1) { cleanup_disable(); @@ -448,16 +469,34 @@ log_transfer(file, fname); } + if (dest_filter) { + pid = run_filter(filter_argv, fd2, &fd2); + } + /* recv file data */ recv_ok = receive_data(f_in,buf,fd2,fname,file->length); + if (dest_fi...

...(verbose > 2) rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid()); + if (am_daemon && lp_write_only(module_id) && !am_sender) { + rprintf(FERROR,"ERROR: module is write only\n"); + exit_cleanup(RERR_SYNTAX); + return; + } + if (!relative_paths && !push_dir(dir, 0)) { rprintf(FERROR, "push_dir %s failed: %s (3)\n", full_fname(dir), strerror(errno)); --- rsync-2.6.0/loadparm.c.orig Thu Feb 12 11:47:17 2004 +++ rsync...

...*** *** 808,816 **** } argc--; } ! } else { am_sender = 1; ! local_server = 1; shell_path = argv[argc-1]; } --- 811,857 ---- } argc--; } ! } else { /* read_batch */ am_sender = 1; ! ! if (argc > 1) { ! usage(FERROR); ! exit_cleanup(RERR_SYNTAX); ! } ! ! if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) { ! char *host, *path; ! ! host = argv[0] + strlen(URL_PREFIX); ! p = strchr(host,'/'); ! if (p) { ! *p = 0; ! path = p+1; ! } else { ! path = ""; ! } ! p = strchr(host,...

...memory while parsing filename filter %s\n", cmd); + exit_cleanup(RERR_MALLOC); + } + + for (tok=strtok(cmd2," ");tok;tok=strtok(NULL," ")) { + if (nparts>=MAX_ARGS) { + rprintf(FERROR, "Filename conversion command is too long: %s\n", cmd); + exit_cleanup(RERR_SYNTAX); + } + parts[nparts++] = tok; + } + parts[nparts] = NULL; +} + + +/** + * Runs the filename converter process. Should be called before filename + * conversion begins (actually it's not necessarh, but it keeps the proress report + * nice and clean. + **/ +void init_fname_convert() +{ + if (fn...

...aemon; extern int am_server; + extern int source_list; int ret; extern int write_batch; int orig_argc; @@ -872,6 +877,14 @@ /* FIXME: We ought to call the same error-handling * code here, rather than relying on getopt. */ option_error(); + exit_cleanup(RERR_SYNTAX); + } + + if (source_list && + ((argc != 2) || + !(src_list_fp = (strcmp(argv[0],"/dev/stdin") ? + fopen(argv[0],"r") : stdin)))) { + usage(FERROR); exit_cleanup(RERR_SYNTAX); } --- options.c.orig Tue Mar 19 15:16:42 2002 +++ options.c Fri Jan 10...

...default: /* FIXME: If --daemon is specified, then errors for later @@ -644,6 +652,12 @@ if (do_progress && !verbose) verbose = 1; + if (backup_only && !backup_dir) { + rprintf(FERROR, + "--backup-dir must be specified with --backup-only\n"); + exit_cleanup(RERR_SYNTAX); + } + *argv = poptGetArgs(pc); if (*argv) *argc = count_args(*argv); @@ -879,6 +893,9 @@ args[ac++] = tmpdir; } + if (backup_only && am_sender) + args[ac++] = "--backup-only"; + if (compare_dest && am_sender) { /* the server only needs this option if...

...d to a client and we want to start talking. The setup of the system is done from here */ ! static int start_daemon(int fd) { char line[200]; char *motd; int i = -1; extern char *config_file; extern int remote_version; if (!lp_load(config_file, 0)) { exit_cleanup(RERR_SYNTAX); } ! set_socket_options(fd,"SO_KEEPALIVE"); ! set_socket_options(fd,lp_socket_options()); ! set_nonblocking(fd); ! io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION); motd = lp_motd_file(); if (motd && *motd) { --- 394,422 ---- io_printf(fd, &...

...ignal(SIGUSR2, sigusr2_handler); @@ -702,6 +707,14 @@ argc -= 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;...

...FLG_CLEAR_LIST) { - if (!(xflags & (XFLG_DEF_INCLUDE | XFLG_DEF_EXCLUDE)) && len) { + if (!(xflags & (XFLG_DEF_INCLUDE | XFLG_DEF_EXCLUDE | XFLG_DEF_IGNORE)) && len) { rprintf(FERROR, "'!' rule has trailing characters: %s\n", p); exit_cleanup(RERR_SYNTAX); @@ -794,6 +803,8 @@ continue; if (mflags & MATCHFLG_INCLUDE) flgs |= XFLG_DEF_INCLUDE; + else if (mflags & MATCHFLG_IGNORE) + flgs |= XFLG_DEF_IGNORE; else if (mflags & MATCHFLG_NO_PREFIXES) flgs |= XFLG_DEF_EXCLUDE; add_filter_file(listp, p, fl...