Merge branch 'nstool-1.0' of https://github.com/jakcron/NXTools into nstool-1.0

This commit is contained in:
jakcron 2018-09-22 22:31:59 +08:00
commit eb2a38f09f
18 changed files with 24 additions and 22 deletions

View file

@ -6,7 +6,7 @@
#include "NacpProcess.h" #include "NacpProcess.h"
#include "RomfsProcess.h" #include "RomfsProcess.h"
#include "nstool.h" #include "common.h"
class AssetProcess class AssetProcess
{ {

View file

@ -4,7 +4,7 @@
#include <fnd/IFile.h> #include <fnd/IFile.h>
#include <nn/hac/ContentMetaBinary.h> #include <nn/hac/ContentMetaBinary.h>
#include "nstool.h" #include "common.h"
class CnmtProcess class CnmtProcess
{ {

View file

@ -7,7 +7,7 @@
#include <nn/pki/CertificateBody.h> #include <nn/pki/CertificateBody.h>
#include <nn/es/TicketBody_V2.h> #include <nn/es/TicketBody_V2.h>
#include "KeyConfiguration.h" #include "KeyConfiguration.h"
#include "nstool.h" #include "common.h"
class EsTikProcess class EsTikProcess
{ {

View file

@ -1,4 +1,4 @@
#include "nstool.h" #include "common.h"
#include "HashTreeWrappedIFile.h" #include "HashTreeWrappedIFile.h"
#include "OffsetAdjustedIFile.h" #include "OffsetAdjustedIFile.h"

View file

@ -4,7 +4,7 @@
#include <fnd/IFile.h> #include <fnd/IFile.h>
#include <nn/hac/ApplicationControlPropertyBinary.h> #include <nn/hac/ApplicationControlPropertyBinary.h>
#include "nstool.h" #include "common.h"
class NacpProcess class NacpProcess
{ {

View file

@ -7,7 +7,7 @@
#include "KeyConfiguration.h" #include "KeyConfiguration.h"
#include "nstool.h" #include "common.h"
class NcaProcess class NcaProcess
{ {

View file

@ -5,7 +5,7 @@
#include <nn/hac/NpdmBinary.h> #include <nn/hac/NpdmBinary.h>
#include "KeyConfiguration.h" #include "KeyConfiguration.h"
#include "nstool.h" #include "common.h"
class NpdmProcess class NpdmProcess
{ {

View file

@ -7,7 +7,7 @@
#include <nn/hac/NroHeader.h> #include <nn/hac/NroHeader.h>
#include "AssetProcess.h" #include "AssetProcess.h"
#include "nstool.h" #include "common.h"
#include "RoMetadataProcess.h" #include "RoMetadataProcess.h"
class NroProcess class NroProcess

View file

@ -6,7 +6,7 @@
#include <nn/hac/npdm.h> #include <nn/hac/npdm.h>
#include <nn/hac/NsoHeader.h> #include <nn/hac/NsoHeader.h>
#include "nstool.h" #include "common.h"
#include "RoMetadataProcess.h" #include "RoMetadataProcess.h"
class NsoProcess class NsoProcess

View file

@ -4,7 +4,7 @@
#include <fnd/IFile.h> #include <fnd/IFile.h>
#include <nn/hac/PfsHeader.h> #include <nn/hac/PfsHeader.h>
#include "nstool.h" #include "common.h"
class PfsProcess class PfsProcess
{ {

View file

@ -7,7 +7,7 @@
#include <nn/pki/SignedData.h> #include <nn/pki/SignedData.h>
#include <nn/pki/CertificateBody.h> #include <nn/pki/CertificateBody.h>
#include "KeyConfiguration.h" #include "KeyConfiguration.h"
#include "nstool.h" #include "common.h"
class PkiCertProcess class PkiCertProcess
{ {

View file

@ -6,7 +6,7 @@
#include <nn/hac/npdm.h> #include <nn/hac/npdm.h>
#include "nstool.h" #include "common.h"
#include "SdkApiString.h" #include "SdkApiString.h"
#include "ElfSymbolParser.h" #include "ElfSymbolParser.h"

View file

@ -6,7 +6,7 @@
#include <fnd/List.h> #include <fnd/List.h>
#include <nn/hac/romfs.h> #include <nn/hac/romfs.h>
#include "nstool.h" #include "common.h"
class RomfsProcess class RomfsProcess
{ {

View file

@ -45,10 +45,10 @@ void UserSettings::parseCmdArgs(const std::vector<std::string>& arg_list)
void UserSettings::showHelp() void UserSettings::showHelp()
{ {
printf("NSTool v%d.%d.%d (C) %s\n", VER_MAJOR, VER_MINOR, VER_PATCH, AUTHORS); printf("%s v%d.%d.%d (C) %s\n", APP_NAME, VER_MAJOR, VER_MINOR, VER_PATCH, AUTHORS);
printf("Built: %s %s\n\n", __TIME__, __DATE__); printf("Built: %s %s\n\n", __TIME__, __DATE__);
printf("Usage: nstool [options... ] <file>\n"); printf("Usage: %s [options... ] <file>\n", BIN_NAME);
printf("\n General Options:\n"); printf("\n General Options:\n");
printf(" -d, --dev Use devkit keyset.\n"); printf(" -d, --dev Use devkit keyset.\n");
printf(" -k, --keyset Specify keyset file.\n"); printf(" -k, --keyset Specify keyset file.\n");
@ -59,18 +59,18 @@ void UserSettings::showHelp()
printf(" --showlayout Show layout metadata.\n"); printf(" --showlayout Show layout metadata.\n");
printf(" -v, --verbose Verbose output.\n"); printf(" -v, --verbose Verbose output.\n");
printf("\n XCI (GameCard Image)\n"); printf("\n XCI (GameCard Image)\n");
printf(" nstool [--listfs] [--update <dir> --logo <dir> --normal <dir> --secure <dir>] <.xci file>\n"); printf(" %s [--listfs] [--update <dir> --logo <dir> --normal <dir> --secure <dir>] <.xci file>\n", BIN_NAME);
printf(" --listfs Print file system in embedded partitions.\n"); printf(" --listfs Print file system in embedded partitions.\n");
printf(" --update Extract \"update\" partition to directory.\n"); printf(" --update Extract \"update\" partition to directory.\n");
printf(" --logo Extract \"logo\" partition to directory.\n"); printf(" --logo Extract \"logo\" partition to directory.\n");
printf(" --normal Extract \"normal\" partition to directory.\n"); printf(" --normal Extract \"normal\" partition to directory.\n");
printf(" --secure Extract \"secure\" partition to directory.\n"); printf(" --secure Extract \"secure\" partition to directory.\n");
printf("\n PFS0/HFS0 (PartitionFs), RomFs, NSP (Ninendo Submission Package)\n"); printf("\n PFS0/HFS0 (PartitionFs), RomFs, NSP (Ninendo Submission Package)\n");
printf(" nstool [--listfs] [--fsdir <dir>] <file>\n"); printf(" %s [--listfs] [--fsdir <dir>] <file>\n", BIN_NAME);
printf(" --listfs Print file system.\n"); printf(" --listfs Print file system.\n");
printf(" --fsdir Extract file system to directory.\n"); printf(" --fsdir Extract file system to directory.\n");
printf("\n NCA (Nintendo Content Archive)\n"); printf("\n NCA (Nintendo Content Archive)\n");
printf(" nstool [--listfs] [--bodykey <key> --titlekey <key>] [--part0 <dir> ...] <.nca file>\n"); printf(" %s [--listfs] [--bodykey <key> --titlekey <key>] [--part0 <dir> ...] <.nca file>\n", BIN_NAME);
printf(" --listfs Print file system in embedded partitions.\n"); printf(" --listfs Print file system in embedded partitions.\n");
printf(" --titlekey Specify title key extracted from ticket.\n"); printf(" --titlekey Specify title key extracted from ticket.\n");
printf(" --bodykey Specify body encryption key.\n"); printf(" --bodykey Specify body encryption key.\n");
@ -81,12 +81,12 @@ void UserSettings::showHelp()
printf(" --part2 Extract \"partition 2\" to directory.\n"); printf(" --part2 Extract \"partition 2\" to directory.\n");
printf(" --part3 Extract \"partition 3\" to directory.\n"); printf(" --part3 Extract \"partition 3\" to directory.\n");
printf("\n NSO (Nintendo Software Object), NRO (Nintendo Relocatable Object)\n"); printf("\n NSO (Nintendo Software Object), NRO (Nintendo Relocatable Object)\n");
printf(" nstool [--listapi --listsym] [--insttype <inst. type>] <file>\n"); printf(" %s [--listapi --listsym] [--insttype <inst. type>] <file>\n", BIN_NAME);
printf(" --listapi Print SDK API List.\n"); printf(" --listapi Print SDK API List.\n");
printf(" --listsym Print Code Symbols.\n"); printf(" --listsym Print Code Symbols.\n");
printf(" --insttype Specify instruction type [64bit|32bit] (64bit is assumed).\n"); printf(" --insttype Specify instruction type [64bit|32bit] (64bit is assumed).\n");
printf("\n ASET (Homebrew Asset Blob)\n"); printf("\n ASET (Homebrew Asset Blob)\n");
printf(" nstool [--listfs] [--icon <file> --nacp <file> --fsdir <dir>] <file>\n"); printf(" %s [--listfs] [--icon <file> --nacp <file> --fsdir <dir>] <file>\n", BIN_NAME);
printf(" --listfs Print filesystem in embedded RomFS partition.\n"); printf(" --listfs Print filesystem in embedded RomFS partition.\n");
printf(" --icon Extract icon partition to file.\n"); printf(" --icon Extract icon partition to file.\n");
printf(" --nacp Extract NACP partition to file.\n"); printf(" --nacp Extract NACP partition to file.\n");

View file

@ -7,7 +7,7 @@
#include <nn/pki/SignedData.h> #include <nn/pki/SignedData.h>
#include <nn/pki/CertificateBody.h> #include <nn/pki/CertificateBody.h>
#include <nn/hac/npdm.h> #include <nn/hac/npdm.h>
#include "nstool.h" #include "common.h"
#include "KeyConfiguration.h" #include "KeyConfiguration.h"
class UserSettings class UserSettings

View file

@ -7,7 +7,7 @@
#include "KeyConfiguration.h" #include "KeyConfiguration.h"
#include "PfsProcess.h" #include "PfsProcess.h"
#include "nstool.h" #include "common.h"
class XciProcess class XciProcess
{ {

View file

@ -1,4 +1,6 @@
#pragma once #pragma once
#define APP_NAME "NSTool"
#define BIN_NAME "nstool"
#define VER_MAJOR 1 #define VER_MAJOR 1
#define VER_MINOR 0 #define VER_MINOR 0
#define VER_PATCH 3 #define VER_PATCH 3