mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00
Code Issues Releases Activity

- Re-enable "!"s in .cvsignore files

Browse Source 
- Fix an off-by-one error in the handling of --max-delete=N
This commit is contained in:
Oliver Eikemeier 2004-10-24 01:59:41 +00:00
parent 268a3a5edb
commit 24d242e01a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=120053
3 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/rsync/Makefile
View File

@ -7,9 +7,10 @@
PORTNAME= rsync
PORTVERSION= 2.6.3
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= net ipv6
MASTER_SITES= http://rsync.samba.org/ftp/%SUBDIR%/ \
ftp://ftp.samba.org//pub/%SUBDIR%/ \
ftp://sunsite.auc.dk/pub/unix/%SUBDIR%/ \
ftp://ftp.sunet.se/pub/unix/admin/%SUBDIR%/ \
ftp://ftp.fu-berlin.de/pub/unix/network/%SUBDIR%/ \

27
net/rsync/files/patch-exclude.c Normal file
View File

@ -0,0 +1,27 @@
#
# Re-enable "!"s in .cvsignore files
# https://bugzilla.samba.org/show_bug.cgi?id=1873
#
--- exclude.c.orig Wed Sep 22 06:11:15 2004
+++ exclude.c Wed Oct 6 19:04:55 2004
@@ -235,8 +235,9 @@
/* Get the next include/exclude arg from the string. The token will not
* be '\0' terminated, so use the returned length to limit the string.
* Also, be sure to add this length to the returned pointer before passing
- * it back to ask for the next token. This routine parses the +/- prefixes
- * and the "!" token unless xflags contains XFLG_WORDS_ONLY. The *flag_ptr
+ * it back to ask for the next token. This routine parses the "!" (list-
+ * clearing) token and (if xflags does NOT contain XFLG_WORDS_ONLY) the
+ * +/- prefixes for overriding the include/exclude mode. The *flag_ptr
* value will also be set to the MATCHFLG_* bits for the current token.
*/
static const char *get_exclude_tok(const char *p, unsigned int *len_ptr,
@@ -273,7 +274,7 @@
} else
len = strlen(s);
- if (*p == '!' && len == 1 && !(xflags & XFLG_WORDS_ONLY))
+ if (*p == '!' && len == 1)
mflags |= MATCHFLG_CLEAR_LIST;
*len_ptr = len;

15
net/rsync/files/patch-receiver.c Normal file
View File

@ -0,0 +1,15 @@
#
# Fix an off-by-one error in the handling of --max-delete=N
# http://lists.samba.org/archive/rsync/2004-October/010853.html
#
--- receiver.c.orig Tue Sep 21 11:24:06 2004
+++ receiver.c Wed Oct 20 08:12:19 2004
@@ -116,7 +116,7 @@
rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf));
for (i = local_file_list->count-1; i >= 0; i--) {
- if (max_delete && deletion_count > max_delete)
+ if (max_delete && deletion_count >= max_delete)
break;
if (!local_file_list->files[i]->basename)
continue;