Bugfix (tag v1.2), Linux version fix

BubblesInTheTub · Jun 18, 2020 · f0d21a0 · f0d21a0
1 parent c5998d7
commit f0d21a0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/linux_src/p7zip_4.65/torrent7z/.t7z.cpp.swp b/linux_src/p7zip_4.65/torrent7z/.t7z.cpp.swp
diff --git a/linux_src/p7zip_4.65/torrent7z/t7z.cpp b/linux_src/p7zip_4.65/torrent7z/t7z.cpp
@@ -682,30 +682,30 @@ int process_mask(const CSysString&base_path,file_proc fp,void*param=0,int split=
         }
     }
 
-    NWindows::NFile::NFind::CEnumerator match_dir(combine_path(path,text("*")));
+    NWindows::NFile::NFind::CEnumerator match_dir(u2a_(combine_path(path,(L"*"))) );
     while(match_dir.Next(fileInfo))
     {
 		bool dir_matched = false;
         if(fileInfo.IsDir())
         {
             if(fp)
             {
-                if(CompareWildCardWithName(a2u(mask),a2u(combine_path(local_path,fileInfo.Name)))||CompareWildCardWithName(a2u(mask),a2u(fileInfo.Name)))
+	        if(CompareWildCardWithName(a2u(mask),a2u(combine_path(local_path, a2u_(fileInfo.Name) )))||CompareWildCardWithName(a2u(mask),a2u_(fileInfo.Name)))
                 {
-                    EAX+=fp(fileInfo,combine_path(path,fileInfo.Name),combine_path(local_path,fileInfo.Name),param);
-					dir_matched = true;
+		    EAX+=fp(fileInfo,combine_path(path,a2u_(fileInfo.Name) ),combine_path(local_path,a2u_(fileInfo.Name) ),param);
+	            dir_matched = true;
                 }
             }
 
 			if(dir_matched || g_searchFilesRecursive[recursion_id]){
-				if(CompareWildCardWithName(a2u(mask),a2u(fileInfo.Name)))
-				{
-					EAX+=process_mask(base_path,fp,param,split,combine_path(local_path,fileInfo.Name),text("*"));
-				}
-				else
-				{
-					EAX+=process_mask(base_path,fp,param,split,combine_path(local_path,fileInfo.Name),mask);
-				}
+		            if(CompareWildCardWithName(a2u(mask),a2u_(fileInfo.Name)))
+		            {
+		                EAX+=process_mask(base_path,fp,param,split,combine_path(local_path,a2u_(fileInfo.Name) ),(L"*"));
+		            }
+		            else
+		            {
+		                EAX+=process_mask(base_path,fp,param,split,combine_path(local_path,a2u_(fileInfo.Name) ),mask);
+		            }
 			}
         }
     }

diff --git a/releases/torrent7z_v1.2/t7z b/releases/torrent7z_v1.2/t7z