xgiovio/MultiPar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve name checking of splited file

Browse Source
This commit is contained in:
Yutaka Sawada
2024-02-09 11:57:39 +09:00
committed by GitHub
parent 70fd411418
commit eb010ec7f5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/par2j/create.c
View File

@@ -1,5 +1,5 @@
// create.c // create.c
// Copyright : 2023-12-12 Yutaka Sawada // Copyright : 2024-02-09 Yutaka Sawada
// License : GPL // License : GPL
#ifndef _UNICODE #ifndef _UNICODE
@@ -1829,10 +1829,12 @@ int split_files(
} }
if (ext_len > 0){ // 全て数字の拡張子を持つソース・ファイルがあるなら if (ext_len > 0){ // 全て数字の拡張子を持つソース・ファイルがあるなら
//printf_cp("\n risky name = %s \n", file_name); //printf_cp("\n risky name = %s \n", file_name);
wcscpy(file_path, file_name); // 比較用に拡張子を取り除く
file_path[name_len] = 0;
for (num2 = 0; num2 < file_num; num2++){ for (num2 = 0; num2 < file_num; num2++){
if (num2 == num) if (num2 == num)
continue; continue;
if (_wcsnicmp(list_buf + files[num2].name, file_name, name_len) == 0){ if (_wcsicmp(list_buf + files[num2].name, file_path) == 0){
//printf_cp(" match name = %s \n", list_buf + files[num2].name); //printf_cp(" match name = %s \n", list_buf + files[num2].name);
num8 = (files[num2].size + (__int64)split_size - 1) / split_size; num8 = (files[num2].size + (__int64)split_size - 1) / split_size;
split_max = (int)num8; split_max = (int)num8;
@@ -1843,7 +1845,7 @@ int split_files(
if (((split_max < 1000) && (ext_len >= 5)) || ((split_max < 10000) && (ext_len >= 6))) if (((split_max < 1000) && (ext_len >= 5)) || ((split_max < 10000) && (ext_len >= 6)))
continue; // 拡張子の桁数が異なる continue; // 拡張子の桁数が異なる
// 上書きする危険性があるのでエラーにする // 上書きする危険性があるのでエラーにする
printf_cp("split bad file, %s\n", file_name); printf_cp("split bad file, %s\n", list_buf + files[num2].name);
*cur_num = -1; *cur_num = -1;
*cur_id = 0; *cur_id = 0;
return 1; return 1;