| commit | 0f0b2e66b8b0c439dbed63e54b29bbf81dc8fba3 | [log] [tgz] |
|---|---|---|
| author | Wayne Davison <wayned@samba.org> | Fri May 27 18:15:18 2005 +0000 |
| committer | Wayne Davison <wayned@samba.org> | Fri May 27 18:15:18 2005 +0000 |
| tree | a0e57842620b38df881031fdd1f7a039328f4c18 | |
| parent | 5d24ee71ad855c73fe4d86a2721b342abdd8f149 [diff] |
Simplified the last change a bit.
diff --git a/flist.c b/flist.c index c342539..5526e20 100644 --- a/flist.c +++ b/flist.c
@@ -1524,9 +1524,8 @@ } /* Make sure that if we unduplicate '.', that we don't * lose track of a user-specified top directory. */ - j = flist->files[drop]->flags & (FLAG_TOP_DIR|FLAG_DEL_HERE); - if (j) - flist->files[keep]->flags |= j; + flist->files[keep]->flags |= flist->files[drop]->flags + & (FLAG_TOP_DIR|FLAG_DEL_HERE); clear_file(drop, flist);