Ticket #7269: stricmp-define.patch

commandline.cpp

@@ -27 +27 @@
 #endif
 #endif
 
+#define stricmp(s1,s2) strcasecmp(s1,s2)
+
 CommandLine::ExtraFile::ExtraFile(void)
 : filename()
 , filesize(0)

par2repairer.cpp

@@ -27 +27 @@
 #endif
 #endif
 
+#define stricmp(s1,s2) strcasecmp(s1,s2)
+
 Par2Repairer::Par2Repairer(void)
 {
   firstpacket = true;

.cpp

@@ -51 +51 @@
   }
 }
 
-bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
+template <> bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
 {
   inputcount = (u32)present.size();
 
@@ -80 +80 @@
   return true;
 }
 
-bool ReedSolomon<Galois8>::SetInput(u32 count)
+template <> bool ReedSolomon<Galois8>::SetInput(u32 count)
 {
   inputcount = count;
 
@@ -101 +101 @@
   return true;
 }
 
-bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
+template <> bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
 {
   // Look up the appropriate element in the RS matrix
   Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex];
@@ -189 +189 @@
 
 // Set which of the source files are present and which are missing
 // and compute the base values to use for the vandermonde matrix.
-bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
+template <> bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
 {
   inputcount = (u32)present.size();
 
@@ -233 +233 @@
 
 // Record that the specified number of source files are all present
 // and compute the base values to use for the vandermonde matrix.
-bool ReedSolomon<Galois16>::SetInput(u32 count)
+template <> bool ReedSolomon<Galois16>::SetInput(u32 count)
 {
   inputcount = count;
 
@@ -267 +267 @@
   return true;
 }
 
-bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
+template <> bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
 {
   // Look up the appropriate element in the RS matrix
 

diskfile.cpp

@@ -618 +618 @@
   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 +654 @@
               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 +681 @@
 
             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 +700 @@
   }
   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;