| 1 |
vapier 09/03/04 07:15:24 |
| 2 |
|
| 3 |
Added: findutils-4.5.3-curdepth.patch |
| 4 |
findutils-4.5.3-fts-assert.patch |
| 5 |
Log: |
| 6 |
Add fix from upstream for #253119 by Gilles Dartiguelongue and a change to hopefully fix #253570 by Barbu Eros Iulian. |
| 7 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-apps/findutils/files/findutils-4.5.3-curdepth.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/findutils/files/findutils-4.5.3-curdepth.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/findutils/files/findutils-4.5.3-curdepth.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: findutils-4.5.3-curdepth.patch |
| 16 |
=================================================================== |
| 17 |
http://bugs.gentoo.org/253119 |
| 18 |
http://savannah.gnu.org/bugs/index.php?25359 |
| 19 |
http://git.savannah.gnu.org/cgit/findutils.git/commit/?id=b445af98c22cd2d13673e2699a77ab728a7073b0 |
| 20 |
|
| 21 |
--- a/find/ftsfind.c |
| 22 |
+++ b/find/ftsfind.c |
| 23 |
@@ -227,7 +227,6 @@ visit(FTS *p, FTSENT *ent, struct stat *pstat) |
| 24 |
{ |
| 25 |
struct predicate *eval_tree; |
| 26 |
|
| 27 |
- state.curdepth = ent->fts_level; |
| 28 |
state.have_stat = (ent->fts_info != FTS_NS) && (ent->fts_info != FTS_NSOK); |
| 29 |
state.rel_pathname = ent->fts_accpath; |
| 30 |
state.cwd_dir_fd = p->fts_cwd_fd; |
| 31 |
@@ -490,6 +489,10 @@ consider_visiting(FTS *p, FTSENT *ent) |
| 32 |
} |
| 33 |
} |
| 34 |
|
| 35 |
+ /* update state.curdepth before calling digest_mode(), because digest_mode |
| 36 |
+ * may call following_links(). |
| 37 |
+ */ |
| 38 |
+ state.curdepth = ent->fts_level; |
| 39 |
if (mode) |
| 40 |
{ |
| 41 |
if (!digest_mode(mode, ent->fts_path, ent->fts_name, &statbuf, 0)) |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.1 sys-apps/findutils/files/findutils-4.5.3-fts-assert.patch |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/findutils/files/findutils-4.5.3-fts-assert.patch?rev=1.1&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/findutils/files/findutils-4.5.3-fts-assert.patch?rev=1.1&content-type=text/plain |
| 49 |
|
| 50 |
Index: findutils-4.5.3-fts-assert.patch |
| 51 |
=================================================================== |
| 52 |
hopefully address: |
| 53 |
http://bugs.gentoo.org/253570 |
| 54 |
http://savannah.gnu.org/bugs/?25294 |
| 55 |
|
| 56 |
upstream commit e3bcac430a07a05ba2ac66587d168a842ba8c0ea which was done for |
| 57 |
unrelated reasons ... |
| 58 |
|
| 59 |
diff --git a/find/ftsfind.c b/find/ftsfind.c |
| 60 |
index 4a33059..765221b 100644 |
| 61 |
--- a/find/ftsfind.c |
| 62 |
+++ b/find/ftsfind.c |
| 63 |
@@ -472,7 +472,7 @@ consider_visiting(FTS *p, FTSENT *ent) |
| 64 |
|| ent->fts_info == FTS_NS /* e.g. symlink loop */) |
| 65 |
{ |
| 66 |
assert (!state.have_stat); |
| 67 |
- assert (state.type != 0); |
| 68 |
+ assert (ent->fts_info == FTS_NSOK || state.type != 0); |
| 69 |
mode = state.type; |
| 70 |
} |
| 71 |
else |
Archives