[patch] par2cmdline-0.4-wildcard-fix-2.patch

par2cmdline-0.4-wildcard-fix.patch (text/plain), 1.84 KB, created by Bardur Arantsson on 2004-05-24 00:07:08 UTC

diff -ur par2cmdline-0.4/diskfile.cpp par2cmdline-0.4.patched/diskfile.cpp
--- par2cmdline-0.4/diskfile.cpp	2004-04-12 13:25:37.000000000 +0200
+++ par2cmdline-0.4.patched/diskfile.cpp	2004-05-24 08:56:45.219368207 +0200
@@ -618,6 +618,12 @@
   return result;
 }
 
+bool is_regular_file(const string &p)
+{
+  struct stat st;
+  return (stat(p.c_str(), &st) == 0 && S_ISREG(st.st_mode));
+}
+
 list<string>* DiskFile::FindFiles(string path, string wildcard)
 {
   list<string> *matches = new list<string>;
@@ -648,7 +654,15 @@
               name.substr(0, where) == front &&
               name.substr(name.size()-back.size()) == back)
           {
-            matches->push_back(path + name);
+            if (is_regular_file(path + name))
+            {
+              matches->push_back(path + name);
+            }
+            else
+            {
+              cerr << "Warning: '" << (path + name) 
+                   << "' ignored; not a regular file" << endl;
+            }
           }
         }
         else
@@ -667,7 +681,15 @@
 
             if (pw == wildcard.end())
             {
-              matches->push_back(path + name);
+              if (is_regular_file(path + name)) 
+              {
+                matches->push_back(path + name);
+              }
+              else
+              {
+                cerr << "Warning: '" << (path + name) 
+                     << "' ignored; not a regular file" << endl;
+              }
             }
           }
         }
@@ -678,12 +700,15 @@
   }
   else
   {
-    struct stat st;
-    string fn = path + wildcard;
-    if (stat(fn.c_str(), &st) == 0)
+    if (is_regular_file(path + wildcard))
     {
       matches->push_back(path + wildcard);
     }
+    else
+    {
+      cerr << "Warning: '" << (path + wildcard) 
+           << "' ignored; not a regular file" << endl;
+    }
   }
 
   return matches;