Commit 5288be3a authored by Wayne Davison's avatar Wayne Davison

Some minor tweaks:

- Improved some comments in hlink.c.
- Changed "the" to "a" in rsyncd.conf.yo.
- Improved the PATCH.name filtering loop in patch-update.
parent 83235dbc
...@@ -143,7 +143,7 @@ static void match_gnums(int32 *ndx_list, int ndx_count) ...@@ -143,7 +143,7 @@ static void match_gnums(int32 *ndx_list, int ndx_count)
if (gnum != gnum_next) if (gnum != gnum_next)
break; break;
F_HL_PREV(file) = prev; F_HL_PREV(file) = prev;
/* The linked list must use raw ndx values. */ /* The linked list uses over-the-wire ndx values. */
if (unsort_ndx) if (unsort_ndx)
prev = F_NDX(file); prev = F_NDX(file);
else else
...@@ -275,13 +275,13 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname, ...@@ -275,13 +275,13 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname,
if (!prev_name) { if (!prev_name) {
struct file_struct *prev_file = flist->files[prev_ndx - flist->ndx_start]; struct file_struct *prev_file = flist->files[prev_ndx - flist->ndx_start];
/* Is the previous link is not complete yet? */ /* Is the previous link not complete yet? */
if (!(prev_file->flags & FLAG_HLINK_DONE)) { if (!(prev_file->flags & FLAG_HLINK_DONE)) {
/* Is the previous link being transferred? */ /* Is the previous link being transferred? */
if (prev_file->flags & FLAG_FILE_SENT) { if (prev_file->flags & FLAG_FILE_SENT) {
/* Add ourselves to the list of files that will be /* Add ourselves to the list of files that will
* updated when the transfer completes, and mark * be updated when the transfer completes, and
* ourself as waiting for the transfer. */ * mark ourself as waiting for the transfer. */
F_HL_PREV(file) = F_HL_PREV(prev_file); F_HL_PREV(file) = F_HL_PREV(prev_file);
F_HL_PREV(prev_file) = ndx; F_HL_PREV(prev_file) = ndx;
file->flags |= FLAG_FILE_SENT; file->flags |= FLAG_FILE_SENT;
......
...@@ -180,7 +180,7 @@ as long as that directory does not exist. When this option is enabled, ...@@ -180,7 +180,7 @@ as long as that directory does not exist. When this option is enabled,
rsync will refuse to run if that path is a directory or a symlink to rsync will refuse to run if that path is a directory or a symlink to
a directory. When using the "munge symlinks" option in a chroot area, a directory. When using the "munge symlinks" option in a chroot area,
you should add this path to the exclude setting for the module so that you should add this path to the exclude setting for the module so that
the user can't try to create it. a user can't try to create it.
Note: rsync makes no attempt to verify that any pre-existing symlinks in Note: rsync makes no attempt to verify that any pre-existing symlinks in
the hierarchy are as safe as you want them to be. If you setup an rsync the hierarchy are as safe as you want them to be. If you setup an rsync
......
...@@ -59,7 +59,9 @@ foreach my $patch (@patches) { ...@@ -59,7 +59,9 @@ foreach my $patch (@patches) {
my $desc = ''; my $desc = '';
open(PIPE, '-|', 'git', 'diff', '-U1000', "master...$branch", '--', "PATCH.$patch") or die $!; open(PIPE, '-|', 'git', 'diff', '-U1000', "master...$branch", '--', "PATCH.$patch") or die $!;
while (<PIPE>) { while (<PIPE>) {
next if m{^\Q+++\E b/PATCH}; last if /^@@ /;
}
while (<PIPE>) {
next unless s/^[ +]//; next unless s/^[ +]//;
if (m#patch -p1 <patches/(\S+)\.diff# && $1 ne $patch) { if (m#patch -p1 <patches/(\S+)\.diff# && $1 ne $patch) {
$parent{$patch} = $1; $parent{$patch} = $1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment