mirror of
https://github.com/DarkStore-3DS/Project_CTR.git
synced 2026-07-04 00:39:03 +00:00
big update
lots cleaned, added cia to cci conv, it 's called a block, separated reading from building, improved ncch keyx stuff, and basic verbose for keys, elf checking and romfs
This commit is contained in:
applestash
+41
-48
@@ -1,73 +1,66 @@
|
||||
#include "lib.h"
|
||||
#include "ncch.h"
|
||||
#include "ncsd.h"
|
||||
#include "cia.h"
|
||||
#include "ncch_build.h"
|
||||
#include "ncsd_build.h"
|
||||
#include "cia_build.h"
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
// Setting up user settings
|
||||
user_settings *usrset = calloc(1,sizeof(user_settings));
|
||||
if(usrset == NULL) {
|
||||
user_settings *set = calloc(1,sizeof(user_settings));
|
||||
if(set == NULL) {
|
||||
fprintf(stderr,"[!] Not enough memory\n");
|
||||
return -1;
|
||||
}
|
||||
init_UserSettings(usrset);
|
||||
init_UserSettings(set);
|
||||
initRand();
|
||||
|
||||
int result;
|
||||
|
||||
#ifdef DEBUG
|
||||
printf("[DEBUG] Parseing Args\n");
|
||||
#endif
|
||||
|
||||
// Parsing command args
|
||||
result = ParseArgs(argc,argv,usrset);
|
||||
if(result < 0) goto finish;
|
||||
if((result = ParseArgs(argc,argv,set)) < 0)
|
||||
goto finish;
|
||||
|
||||
#ifdef DEBUG
|
||||
printf("[DEBUG] Importing Yaml Settings\n");
|
||||
#endif
|
||||
|
||||
// Import RSF Settings if present
|
||||
result = GetYamlSettings(usrset);
|
||||
if(result < 0) goto finish;
|
||||
if((result = GetRsfSettings(set)) < 0)
|
||||
goto finish;
|
||||
|
||||
// Setup Content 0
|
||||
if(!usrset->ncch.buildNcch0){ // Import Content
|
||||
if(usrset->common.workingFileType == infile_ncch){
|
||||
if(!AssertFile(usrset->common.contentPath[0])){
|
||||
fprintf(stderr,"[MAKEROM ERROR] Failed to open Content 0: %s\n",usrset->common.contentPath[0]);
|
||||
if(!set->ncch.buildNcch0){ // Import Content
|
||||
if(set->common.workingFileType == infile_ncch){
|
||||
if(!AssertFile(set->common.contentPath[0])){
|
||||
fprintf(stderr,"[MAKEROM ERROR] Failed to open Content 0: %s\n",set->common.contentPath[0]);
|
||||
goto finish;
|
||||
}
|
||||
u64 fileSize = GetFileSize_u64(usrset->common.contentPath[0]);
|
||||
u64 fileSize = GetFileSize64(set->common.contentPath[0]);
|
||||
u64 calcSize = 0;
|
||||
|
||||
FILE *ncch0 = fopen(usrset->common.contentPath[0],"rb");
|
||||
FILE *ncch0 = fopen(set->common.contentPath[0],"rb");
|
||||
|
||||
ncch_hdr hdr;
|
||||
GetNCCH_CommonHDR(&hdr,ncch0,NULL);
|
||||
calcSize = GetNCCH_MediaSize(&hdr) * GetNCCH_MediaUnitSize(&hdr);
|
||||
ReadNcchHdr(&hdr,ncch0);
|
||||
calcSize = GetNcchSize(&hdr);
|
||||
if(calcSize != fileSize){
|
||||
fprintf(stderr,"[MAKEROM ERROR] Content 0 is corrupt\n");
|
||||
fclose(ncch0);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
usrset->common.workingFile.size = fileSize;
|
||||
usrset->common.workingFile.buffer = malloc(fileSize);
|
||||
ReadFile_64(usrset->common.workingFile.buffer, usrset->common.workingFile.size,0,ncch0);
|
||||
set->common.workingFile.size = fileSize;
|
||||
set->common.workingFile.buffer = malloc(fileSize);
|
||||
ReadFile64(set->common.workingFile.buffer, set->common.workingFile.size,0,ncch0);
|
||||
fclose(ncch0);
|
||||
}
|
||||
else if(usrset->common.workingFileType == infile_srl || usrset->common.workingFileType == infile_ncsd){
|
||||
if(!AssertFile(usrset->common.workingFilePath)) {
|
||||
fprintf(stderr,"[MAKEROM ERROR] Failed to open %s: %s\n",usrset->common.workingFileType == infile_srl? "SRL":"CCI",usrset->common.workingFilePath);
|
||||
else{
|
||||
if(!AssertFile(set->common.workingFilePath)) {
|
||||
fprintf(stderr,"[MAKEROM ERROR] Failed to open: %s\n",set->common.workingFilePath);
|
||||
goto finish;
|
||||
}
|
||||
u64 size = GetFileSize_u64(usrset->common.workingFilePath);
|
||||
usrset->common.workingFile.size = align(size,0x10);
|
||||
usrset->common.workingFile.buffer = malloc(usrset->common.workingFile.size);
|
||||
FILE *fp = fopen(usrset->common.workingFilePath,"rb");
|
||||
ReadFile_64(usrset->common.workingFile.buffer,size,0,fp);
|
||||
u64 size = GetFileSize64(set->common.workingFilePath);
|
||||
set->common.workingFile.size = align(size,0x10);
|
||||
set->common.workingFile.buffer = malloc(set->common.workingFile.size);
|
||||
FILE *fp = fopen(set->common.workingFilePath,"rb");
|
||||
ReadFile64(set->common.workingFile.buffer,size,0,fp);
|
||||
fclose(fp);
|
||||
}
|
||||
}
|
||||
@@ -75,48 +68,48 @@ int main(int argc, char *argv[])
|
||||
#ifdef DEBUG
|
||||
printf("[DEBUG] Build NCCH0\n");
|
||||
#endif
|
||||
result = build_NCCH(usrset);
|
||||
result = build_NCCH(set);
|
||||
if(result < 0) {
|
||||
//fprintf(stderr,"[ERROR] %s generation failed\n",usrset->build_ncch_type == CXI? "CXI" : "CFA");
|
||||
//fprintf(stderr,"[ERROR] %s generation failed\n",set->build_ncch_type == CXI? "CXI" : "CFA");
|
||||
fprintf(stderr,"[RESULT] Failed to build outfile\n");
|
||||
goto finish;
|
||||
}
|
||||
}
|
||||
// Make CCI
|
||||
if(usrset->common.outFormat == CCI){
|
||||
if(set->common.outFormat == CCI){
|
||||
#ifdef DEBUG
|
||||
printf("[DEBUG] Building CCI\n");
|
||||
#endif
|
||||
result = build_CCI(usrset);
|
||||
result = build_CCI(set);
|
||||
if(result < 0) {
|
||||
fprintf(stderr,"[RESULT] Failed to build CCI\n");
|
||||
goto finish;
|
||||
}
|
||||
}
|
||||
// Make CIA
|
||||
else if(usrset->common.outFormat == CIA){
|
||||
else if(set->common.outFormat == CIA){
|
||||
#ifdef DEBUG
|
||||
printf("[DEBUG] Building CIA\n");
|
||||
#endif
|
||||
result = build_CIA(usrset);
|
||||
result = build_CIA(set);
|
||||
if(result < 0) {
|
||||
fprintf(stderr,"[RESULT] Failed to build CIA\n");
|
||||
goto finish;
|
||||
}
|
||||
}
|
||||
// No Container Raw CXI/CFA
|
||||
else if(usrset->common.outFormat == CXI || usrset->common.outFormat == CFA){
|
||||
else if(set->common.outFormat == CXI || set->common.outFormat == CFA){
|
||||
#ifdef DEBUG
|
||||
printf("[DEBUG] Outputting NCCH, because No Container\n");
|
||||
#endif
|
||||
FILE *ncch_out = fopen(usrset->common.outFileName,"wb");
|
||||
FILE *ncch_out = fopen(set->common.outFileName,"wb");
|
||||
if(!ncch_out) {
|
||||
fprintf(stderr,"[MAKEROM ERROR] Failed to create '%s'\n",usrset->common.outFileName);
|
||||
fprintf(stderr,"[RESULT] Failed to build '%s'\n",usrset->common.outFormat == CXI? "CXI" : "CFA");
|
||||
fprintf(stderr,"[MAKEROM ERROR] Failed to create '%s'\n",set->common.outFileName);
|
||||
fprintf(stderr,"[RESULT] Failed to build '%s'\n",set->common.outFormat == CXI? "CXI" : "CFA");
|
||||
result = FAILED_TO_CREATE_OUTFILE;
|
||||
goto finish;
|
||||
}
|
||||
WriteBuffer(usrset->common.workingFile.buffer,usrset->common.workingFile.size,0,ncch_out);
|
||||
WriteBuffer(set->common.workingFile.buffer,set->common.workingFile.size,0,ncch_out);
|
||||
fclose(ncch_out);
|
||||
}
|
||||
|
||||
@@ -124,7 +117,7 @@ finish:
|
||||
#ifdef DEBUG
|
||||
printf("[DEBUG] Free Context\n");
|
||||
#endif
|
||||
free_UserSettings(usrset);
|
||||
free_UserSettings(set);
|
||||
#ifdef DEBUG
|
||||
printf("[DEBUG] Finished returning (result=%d)\n",result);
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user