From bb3a5465800b93a7eba89ff663f5b7a1cecb1056 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:57:43 +0000
Subject: run-parts. Closes: #94286 Author: jgg Date: 2001-04-27 05:49:34 GMT
 run-parts. Closes: #94286

---
 apt-pkg/contrib/configuration.cc | 18 ++++++------------
 debian/changelog                 |  1 +
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 97d99210f..a8d0db71b 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: configuration.cc,v 1.19 2001/03/11 07:22:19 jgg Exp $
+// $Id: configuration.cc,v 1.20 2001/04/27 05:49:34 jgg Exp $
 /* ######################################################################
 
    Configuration Class
@@ -690,9 +690,6 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
 bool ReadConfigDir(Configuration &Conf,string Dir,bool AsSectional,
 		    unsigned Depth)
 {   
-   static const char *BadExts[] = {".disabled",".dpkg-old",".dpkg-dist",
-   				   ".rpmsave",".rpmorig","~",",v",0};
-   
    DIR *D = opendir(Dir.c_str());
    if (D == 0)
       return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
@@ -704,15 +701,12 @@ bool ReadConfigDir(Configuration &Conf,string Dir,bool AsSectional,
       if (Ent->d_name[0] == '.')
 	 continue;
       
-      // Skip bad extensions
-      const char **I;
-      for (I = BadExts; *I != 0; I++)
-      {
-	 if (strcmp(Ent->d_name + strlen(Ent->d_name) - strlen(*I),*I) == 0)
+      // Skip bad file names ala run-parts
+      const char *C = Ent->d_name;
+      for (; *C != 0; C++)
+	 if (isalpha(*C) == 0 && isdigit(*C) == 0 && *C != '_' && *C != '-')
 	    break;
-      }
-      
-      if (*I != 0)
+      if (*C != 0)
 	 continue;
       
       // Make sure it is a file and not something else
diff --git a/debian/changelog b/debian/changelog
index 58f1ce83b..8da6d2025 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ apt (0.5.4) unstable; urgency=low
   * apt-ftparchive copes with no uncompressed package files + contents.
   * French man pages from philippe batailler - well sort of. They 
     don't build yet..
+  * run-parts. Closes: #94286
   
  -- Jason Gunthorpe <jgg@debian.org>  Thu,  8 Mar 2001 22:48:06 -0700
 
-- 
cgit v1.2.3