RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 08-Feb-2008 02:18:38
Branch: HEAD Handle: 2008020801183800
Modified files:
rpm CHANGES
rpm/lib rpminstall.c
Log:
- jbj: "+bing": fix: check for glob'd directory roots before
traversing.
Summary:
Revision Changes Path
1.2147 +1 -0 rpm/CHANGES
1.198 +3 -1 rpm/lib/rpminstall.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2146 -r1.2147 CHANGES
--- rpm/CHANGES 8 Feb 2008 00:02:48 -0000 1.2146
+++ rpm/CHANGES 8 Feb 2008 01:18:38 -0000 1.2147
@@ -1,4 +1,5 @@
5.0.0 -> 5.1a1:
+ - jbj: "+bing": fix: check for glob'd directory roots before traversing.
- jbj: rpmio: rescuscitate tglob.c.
- jbj: rpmio: rescuscitate tdir.c.
- jbj: rpmio: fix: cvtfmode access beyond end-of-string with "r" fmode.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
============================================================================
$ cvs diff -u -r1.197 -r1.198 rpminstall.c
--- rpm/lib/rpminstall.c 4 Feb 2008 18:33:29 -0000 1.197
+++ rpm/lib/rpminstall.c 8 Feb 2008 01:18:38 -0000 1.198
@@ -337,12 +337,14 @@
/* XXX use global ftsOpts? */
/* XXX changing FTS_LOGICAL to FTS_PHYSICAL prevents symlink follow. */
int _ftsOpts = (FTS_COMFOLLOW | FTS_LOGICAL | FTS_NOSTAT | FTS_NOCHDIR);
- FTS * ftsp = Fts_open((char *const *)av, _ftsOpts, NULL);
+ FTS * ftsp = NULL;
FTSENT * fts;
const char * fn = NULL;
int fts_level = 1;
int xx;
+ if (av != NULL && av[0] != NULL)
+ ftsp = Fts_open((char *const *)av, _ftsOpts, NULL);
if (ftsp != NULL)
while((fts = Fts_read(ftsp)) != NULL) {
switch (fts->fts_info) {
@@ .
Received on Fri Feb 8 02:18:38 2008