Use good names in CIA builder and NCCH cryptor

This commit is contained in:
d0k3 2017-05-16 16:08:38 +02:00
parent 51a262db73
commit d7e2f45256

View File

@ -981,7 +981,7 @@ u32 CryptGameFile(const char* path, bool inplace, bool encrypt) {
// build output name // build output name
snprintf(dest, 256, OUTPUT_PATH "/"); snprintf(dest, 256, OUTPUT_PATH "/");
char* dname = dest + strnlen(dest, 256); char* dname = dest + strnlen(dest, 256);
if ((strncmp(path + 1, ":/title/", 8) != 0) || (GetGoodName(dname, path, true) != 0)) { if ((strncmp(path + 1, ":/title/", 8) != 0) || (GetGoodName(dname, path, false) != 0)) {
char* name = strrchr(path, '/'); char* name = strrchr(path, '/');
if (!name) return 1; if (!name) return 1;
snprintf(dest, 256, "%s/%s", OUTPUT_PATH, ++name); snprintf(dest, 256, "%s/%s", OUTPUT_PATH, ++name);
@ -1341,7 +1341,7 @@ u32 BuildCiaFromGameFile(const char* path, bool force_legit) {
snprintf(dest, 256, OUTPUT_PATH "/"); snprintf(dest, 256, OUTPUT_PATH "/");
char* dname = dest + strnlen(dest, 256); char* dname = dest + strnlen(dest, 256);
if (!((filetype & GAME_TMD) || (strncmp(path + 1, ":/title/", 8) == 0)) || if (!((filetype & GAME_TMD) || (strncmp(path + 1, ":/title/", 8) == 0)) ||
(GetGoodName(dname, path, true) != 0)) { (GetGoodName(dname, path, false) != 0)) {
char* name = strrchr(path, '/'); char* name = strrchr(path, '/');
if (!name) return 1; if (!name) return 1;
snprintf(dest, 256, "%s/%s", OUTPUT_PATH, ++name); snprintf(dest, 256, "%s/%s", OUTPUT_PATH, ++name);