blackteay/fbi-i18n-zh
1
0
Fork 0
mirror of https://gitlab.com/Theopse/fbi-i18n-zh.git synced 2025-04-05 19:41:43 +08:00
Code Issues Projects Releases Wiki Activity

Update stb_image, fix compiler warnings.

Browse Source
This commit is contained in:
Steveice10 2018-05-15 18:15:57 -07:00
parent 9025a49a27
commit 8ad4fc4be5
29 changed files with 1632 additions and 822 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
Makefile
View File

@ -1,15 +1,4 @@
# TARGET #
TARGET := 3DS
LIBRARY := 0
ifeq ($(TARGET),$(filter $(TARGET),3DS WIIU))
ifeq ($(strip $(DEVKITPRO)),)
$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro")
endif
endif
# COMMON CONFIGURATION #
NAME := FBI
@ -17,16 +6,14 @@ BUILD_DIR := build
OUTPUT_DIR := output
INCLUDE_DIRS := include
SOURCE_DIRS := source
ROMFS_DIR := romfs
LIBRARY_DIRS += $(DEVKITPRO)/libctru $(DEVKITPRO)/portlibs/armv6k $(DEVKITPRO)/portlibs/3ds
LIBRARIES += jansson z citro3d ctru
EXTRA_OUTPUT_FILES := servefiles
LIBRARY_DIRS :=
LIBRARIES :=
BUILD_FLAGS := -Wno-misleading-indentation -Wno-strict-aliasing
BUILD_FLAGS_CC :=
BUILD_FLAGS_CXX :=
RUN_FLAGS :=
BUILD_FLAGS := -Wno-format-truncation
VERSION_PARTS := $(subst ., ,$(shell git describe --tags --abbrev=0))
@ -34,50 +21,18 @@ VERSION_MAJOR := $(word 1, $(VERSION_PARTS))
VERSION_MINOR := $(word 2, $(VERSION_PARTS))
VERSION_MICRO := $(word 3, $(VERSION_PARTS))
# 3DS/Wii U CONFIGURATION #
DESCRIPTION := Open source title manager.
AUTHOR := Steveice10
ifeq ($(TARGET),$(filter $(TARGET),3DS WIIU))
TITLE := $(NAME)
DESCRIPTION := Open source CIA installer.
AUTHOR := Steveice10
endif
PRODUCT_CODE := CTR-P-CFBI
UNIQUE_ID := 0xF8001
# 3DS CONFIGURATION #
ICON_FLAGS := --flags visible,ratingrequired,recordusage --cero 153 --esrb 153 --usk 153 --pegigen 153 --pegiptr 153 --pegibbfc 153 --cob 153 --grb 153 --cgsrr 153
ifeq ($(TARGET),3DS)
LIBRARY_DIRS += $(DEVKITPRO)/libctru $(DEVKITPRO)/portlibs/armv6k $(DEVKITPRO)/portlibs/3ds
LIBRARIES += jansson z citro3d ctru
PRODUCT_CODE := CTR-P-CFBI
UNIQUE_ID := 0xF8001
CATEGORY := Application
USE_ON_SD := true
MEMORY_TYPE := Application
SYSTEM_MODE := 64MB
SYSTEM_MODE_EXT := Legacy
CPU_SPEED := 268MHz
ENABLE_L2_CACHE := true
ICON_FLAGS := --flags visible,ratingrequired,recordusage --cero 153 --esrb 153 --usk 153 --pegigen 153 --pegiptr 153 --pegibbfc 153 --cob 153 --grb 153 --cgsrr 153
ROMFS_DIR := romfs
BANNER_AUDIO := meta/audio_3ds.wav
BANNER_IMAGE := meta/banner_3ds.cgfx
ICON := meta/icon_3ds.png
LOGO := meta/logo_3ds.bcma.lz
endif
# Wii U CONFIGURATION #
ifeq ($(TARGET),WIIU)
LIBRARY_DIRS +=
LIBRARIES +=
LONG_DESCRIPTION := Open source CIA installer.
ICON := meta/icon_wiiu.png
endif
BANNER_AUDIO := meta/audio_3ds.wav
BANNER_IMAGE := meta/banner_3ds.cgfx
ICON := meta/icon_3ds.png
LOGO := meta/logo_3ds.bcma.lz
# INTERNAL #

2
buildtools

@ -1 +1 @@
Subproject commit bc0e4023c7b583e46b20745e796e4a8fe1a144de
Subproject commit e76c10e126b797a5a3b58c1ef857688c73ab61fa

3
source/core/clipboard.c
View File

@ -5,6 +5,7 @@
#include "clipboard.h"
#include "fs.h"
#include "stringutil.h"
static bool clipboard_has = false;
static bool clipboard_contents_only;
@ -37,7 +38,7 @@ Result clipboard_set_contents(FS_Archive archive, const char* path, bool content
clipboard_contents_only = contentsOnly;
clipboard_archive = archive;
strncpy(clipboard_path, path, FILE_PATH_MAX);
string_copy(clipboard_path, path, FILE_PATH_MAX);
}
return res;

6
source/core/fs.c
View File

@ -155,7 +155,7 @@ Result fs_close_archive(FS_Archive archive) {
return FSUSER_CloseArchive(archive);
}
static char path_3dsx[FILE_PATH_MAX] = {'\0'};
static char path_3dsx[FILE_PATH_MAX] = "";
const char* fs_get_3dsx_path() {
if(strlen(path_3dsx) == 0) {
@ -167,9 +167,9 @@ const char* fs_get_3dsx_path() {
void fs_set_3dsx_path(const char* path) {
if(strlen(path) >= 5 && strncmp(path, "sdmc:", 5) == 0) {
strncpy(path_3dsx, path + 5, FILE_PATH_MAX);
string_copy(path_3dsx, path + 5, FILE_PATH_MAX);
} else {
strncpy(path_3dsx, path, FILE_PATH_MAX);
string_copy(path_3dsx, path, FILE_PATH_MAX);
}
}

2
source/core/fs.h
View File

@ -1,6 +1,6 @@
#pragma once
#define FILE_NAME_MAX 512
#define FILE_NAME_MAX 256
#define FILE_PATH_MAX 512
bool fs_is_dir(FS_Archive archive, const char* path);

3
source/core/http.c
View File

@ -9,6 +9,7 @@
#include "fs.h"
#include "error.h"
#include "http.h"
#include "stringutil.h"
#define MAKE_HTTP_USER_AGENT_(major, minor, micro) ("Mozilla/5.0 (Nintendo 3DS; Mobile; rv:10.0) Gecko/20100101 FBI/" #major "." #minor "." #micro)
#define MAKE_HTTP_USER_AGENT(major, minor, micro) MAKE_HTTP_USER_AGENT_(major, minor, micro)
@ -39,7 +40,7 @@ Result http_open_ranged(http_context* context, const char* url, bool userAgent,
http_context ctx = (http_context) calloc(1, sizeof(struct http_context_s));
if(ctx != NULL) {
char currUrl[1024];
strncpy(currUrl, url, sizeof(currUrl));
string_copy(currUrl, url, sizeof(currUrl));
char range[64];
if(rangeEnd > rangeStart) {

2
source/core/screen.c
View File

@ -350,7 +350,7 @@ void screen_load_texture_file(u32 id, FILE* fd, bool linearFilter) {
int depth;
u8* image = stbi_load_from_file(fd, &width, &height, &depth, STBI_rgb_alpha);
if(image == NULL || depth != STBI_rgb_alpha) {
if(image == NULL) {
error_panic("Failed to load PNG file to texture ID \"%lu\".", id);
return;
}

5
source/core/stringutil.c
View File

@ -21,6 +21,11 @@ bool string_is_empty(const char* str) {
return true;
}
void string_copy(char* dst, const char* src, size_t size) {
strncpy(dst, src, size - 1);
dst[size - 1] = '\0';
}
void string_get_file_name(char* out, const char* file, u32 size) {
const char* end = file + strlen(file);
const char* curr = file - 1;

1
source/core/stringutil.h
View File

@ -1,6 +1,7 @@
#pragma once
bool string_is_empty(const char* str);
void string_copy(char* dst, const char* src, size_t size);
void string_get_file_name(char* out, const char* file, u32 size);
void string_escape_file_name(char* out, const char* file, size_t size);

3
source/core/ui/prompt.c
View File

@ -8,6 +8,7 @@
#include "prompt.h"
#include "ui.h"
#include "../screen.h"
#include "../stringutil.h"
#include "../../fbi/resources.h"
typedef struct {
@ -166,7 +167,7 @@ ui_view* prompt_display_multi_choice(const char* name, const char* text, u32 col
promptData->color = color;
for(u32 i = 0; i < numOptions && i < PROMPT_OPTIONS_MAX; i++) {
strncpy(promptData->options[i], options[i], PROMPT_OPTION_TEXT_MAX);
string_copy(promptData->options[i], options[i], PROMPT_OPTION_TEXT_MAX);
promptData->optionButtons[i] = optionButtons[i];
}

2
source/fbi/action/deletecontents.c
View File

@ -228,7 +228,7 @@ static void action_delete_internal(linked_list* items, list_item* selected, cons
loadingData->popData.items = &data->contents;
loadingData->popData.archive = data->target->archive;
strncpy(loadingData->popData.path, data->target->path, FILE_PATH_MAX);
string_copy(loadingData->popData.path, data->target->path, FILE_PATH_MAX);
loadingData->popData.recursive = recursive;
loadingData->popData.includeBase = includeBase;
loadingData->popData.meta = false;

2
source/fbi/action/installcdn.c
View File

@ -262,7 +262,7 @@ static void action_install_cdn_version_onresponse(ui_view* view, void* data, Swk
install_cdn_data* installData = (install_cdn_data*) data;
if(button == SWKBD_BUTTON_CONFIRM) {
strncpy(installData->tmdVersion, response, sizeof(installData->tmdVersion));
string_copy(installData->tmdVersion, response, sizeof(installData->tmdVersion));
bool n3ds = false;
if(R_SUCCEEDED(APT_CheckNew3DS(&n3ds)) && !n3ds && ((installData->ticket->titleId >> 28) & 0xF) == 2) {

2
source/fbi/action/installcias.c
View File

@ -367,7 +367,7 @@ static void action_install_cias_internal(linked_list* items, list_item* selected
loadingData->popData.items = &data->contents;
loadingData->popData.archive = data->target->archive;
strncpy(loadingData->popData.path, data->target->path, FILE_PATH_MAX);
string_copy(loadingData->popData.path, data->target->path, FILE_PATH_MAX);
loadingData->popData.recursive = false;
loadingData->popData.includeBase = !(data->target->attributes & FS_ATTRIBUTE_DIRECTORY);
loadingData->popData.meta = true;

2
source/fbi/action/installtickets.c
View File

@ -341,7 +341,7 @@ static void action_install_tickets_internal(linked_list* items, list_item* selec
loadingData->popData.items = &data->contents;
loadingData->popData.archive = data->target->archive;
strncpy(loadingData->popData.path, data->target->path, FILE_PATH_MAX);
string_copy(loadingData->popData.path, data->target->path, FILE_PATH_MAX);
loadingData->popData.recursive = false;
loadingData->popData.includeBase = !(data->target->attributes & FS_ATTRIBUTE_DIRECTORY);
loadingData->popData.meta = true;

8
source/fbi/action/installtitledb.c
View File

@ -31,12 +31,12 @@ static void action_install_titledb_finished_url(void* data, u32 index) {
titledb_cache_entry entry;
if(installData->cia) {
entry.id = info->cia.id;
strncpy(entry.mtime, info->cia.mtime, sizeof(entry.mtime));
strncpy(entry.version, info->cia.version, sizeof(entry.version));
string_copy(entry.mtime, info->cia.mtime, sizeof(entry.mtime));
string_copy(entry.version, info->cia.version, sizeof(entry.version));
} else {
entry.id = info->tdsx.id;
strncpy(entry.mtime, info->tdsx.mtime, sizeof(entry.mtime));
strncpy(entry.version, info->tdsx.version, sizeof(entry.version));
string_copy(entry.mtime, info->tdsx.mtime, sizeof(entry.mtime));
string_copy(entry.version, info->tdsx.version, sizeof(entry.version));
}
task_populate_titledb_cache_set(info->id, installData->cia, &entry);

10
source/fbi/action/installurl.c
View File

@ -205,7 +205,7 @@ static Result action_install_url_open_dst(void* data, u32 index, void* initialRe
char dir[FILE_PATH_MAX];
if(strlen(installData->paths[index]) > 0) {
string_get_parent_path(dir, installData->paths[index], FILE_PATH_MAX);
strncpy(installData->currPath, installData->paths[index], FILE_PATH_MAX);
string_copy(installData->currPath, installData->paths[index], FILE_PATH_MAX);
} else {
char filename[FILE_NAME_MAX];
if(R_FAILED(http_get_file_name(installData->currContext, filename, FILE_NAME_MAX))) {
@ -406,14 +406,14 @@ void action_install_url(const char* confirmMessage, const char* urls, const char
len = DOWNLOAD_URL_MAX - 7;
}
strncpy(data->urls[data->installInfo.total], "http://", 7);
strncpy(&data->urls[data->installInfo.total][7], currStart, len);
string_copy(data->urls[data->installInfo.total], "http://", 7);
string_copy(&data->urls[data->installInfo.total][7], currStart, len);
} else {
if(len > DOWNLOAD_URL_MAX) {
len = DOWNLOAD_URL_MAX;
}
strncpy(data->urls[data->installInfo.total], currStart, len);
string_copy(data->urls[data->installInfo.total], currStart, len);
}
data->installInfo.total++;
@ -436,7 +436,7 @@ void action_install_url(const char* confirmMessage, const char* urls, const char
len = FILE_PATH_MAX;
}
strncpy(data->paths[i], currStart, len);
string_copy(data->paths[i], currStart, len);
currStart = currEnd + 1;
}

8
source/fbi/action/marktitledbupdated.c
View File

@ -13,12 +13,12 @@ void action_mark_titledb_updated(linked_list* items, list_item* selected, bool c
titledb_cache_entry entry;
if(cia) {
entry.id = info->cia.id;
strncpy(entry.mtime, info->cia.mtime, sizeof(entry.mtime));
strncpy(entry.version, info->cia.version, sizeof(entry.version));
string_copy(entry.mtime, info->cia.mtime, sizeof(entry.mtime));
string_copy(entry.version, info->cia.version, sizeof(entry.version));
} else {
entry.id = info->tdsx.id;
strncpy(entry.mtime, info->tdsx.mtime, sizeof(entry.mtime));
strncpy(entry.version, info->tdsx.version, sizeof(entry.version));
string_copy(entry.mtime, info->tdsx.mtime, sizeof(entry.mtime));
string_copy(entry.version, info->tdsx.version, sizeof(entry.version));
}
task_populate_titledb_cache_set(info->id, cia, &entry);

10
source/fbi/action/pastecontents.c
View File

@ -34,14 +34,14 @@ static void action_paste_contents_draw_top(ui_view* view, void* data, float x1,
static void action_paste_contents_get_dst_path(paste_contents_data* data, u32 index, char* dstPath) {
char baseSrcPath[FILE_PATH_MAX];
if(clipboard_is_contents_only()) {
strncpy(baseSrcPath, clipboard_get_path(), FILE_PATH_MAX);
string_copy(baseSrcPath, clipboard_get_path(), FILE_PATH_MAX);
} else {
string_get_parent_path(baseSrcPath, clipboard_get_path(), FILE_PATH_MAX);
}
char baseDstPath[FILE_PATH_MAX];
if(data->target->attributes & FS_ATTRIBUTE_DIRECTORY) {
strncpy(baseDstPath, data->target->path, FILE_PATH_MAX);
string_copy(baseDstPath, data->target->path, FILE_PATH_MAX);
} else {
string_get_parent_path(baseDstPath, data->target->path, FILE_PATH_MAX);
}
@ -77,7 +77,7 @@ static Result action_paste_contents_make_dst_directory(void* data, u32 index) {
char baseDstPath[FILE_PATH_MAX];
if(pasteData->target->attributes & FS_ATTRIBUTE_DIRECTORY) {
strncpy(baseDstPath, pasteData->target->path, FILE_PATH_MAX);
string_copy(baseDstPath, pasteData->target->path, FILE_PATH_MAX);
} else {
string_get_parent_path(baseDstPath, pasteData->target->path, FILE_PATH_MAX);
}
@ -182,7 +182,7 @@ static Result action_paste_contents_close_dst(void* data, u32 index, bool succee
char baseDstPath[FILE_PATH_MAX];
if(pasteData->target->attributes & FS_ATTRIBUTE_DIRECTORY) {
strncpy(baseDstPath, pasteData->target->path, FILE_PATH_MAX);
string_copy(baseDstPath, pasteData->target->path, FILE_PATH_MAX);
} else {
string_get_parent_path(baseDstPath, pasteData->target->path, FILE_PATH_MAX);
}
@ -395,7 +395,7 @@ void action_paste_contents(linked_list* items, list_item* selected) {
loadingData->popData.items = &data->contents;
loadingData->popData.archive = clipboard_get_archive();
strncpy(loadingData->popData.path, clipboard_get_path(), FILE_PATH_MAX);
string_copy(loadingData->popData.path, clipboard_get_path(), FILE_PATH_MAX);
loadingData->popData.recursive = true;
loadingData->popData.includeBase = !clipboard_is_contents_only() || !fs_is_dir(clipboard_get_archive(), clipboard_get_path());
loadingData->popData.meta = false;

6
source/fbi/action/rename.c
View File

@ -58,11 +58,11 @@ static void action_rename_onresponse(ui_view* view, void* data, SwkbdButton butt
if(R_SUCCEEDED(res)) {
if(strncmp(selected->name, "<current directory>", LIST_ITEM_NAME_MAX) != 0 && strncmp(selected->name, "<current file>", LIST_ITEM_NAME_MAX) != 0) {
strncpy(selected->name, fileName, LIST_ITEM_NAME_MAX);
string_copy(selected->name, fileName, LIST_ITEM_NAME_MAX);
}
strncpy(targetInfo->name, fileName, FILE_NAME_MAX);
strncpy(targetInfo->path, dstPath, FILE_PATH_MAX);
string_copy(targetInfo->name, fileName, FILE_NAME_MAX);
string_copy(targetInfo->path, dstPath, FILE_PATH_MAX);
linked_list_sort(renameData->items, NULL, task_compare_files);

8
source/fbi/action/updatetitledb.c
View File

@ -36,12 +36,12 @@ static void action_update_titledb_finished_url(void* data, u32 index) {
titledb_cache_entry entry;
if(updateData->cia[index]) {
entry.id = info->cia.id;
strncpy(entry.mtime, info->cia.mtime, sizeof(entry.mtime));
strncpy(entry.version, info->cia.version, sizeof(entry.version));
string_copy(entry.mtime, info->cia.mtime, sizeof(entry.mtime));
string_copy(entry.version, info->cia.version, sizeof(entry.version));
} else {
entry.id = info->tdsx.id;
strncpy(entry.mtime, info->tdsx.mtime, sizeof(entry.mtime));
strncpy(entry.version, info->tdsx.version, sizeof(entry.version));
string_copy(entry.mtime, info->tdsx.mtime, sizeof(entry.mtime));
string_copy(entry.version, info->tdsx.version, sizeof(entry.version));
}
task_populate_titledb_cache_set(info->id, updateData->cia[index], &entry);

6
source/fbi/files.c
View File

@ -242,7 +242,7 @@ static void files_repopulate(files_data* listData, linked_list* items) {
listData->populateData.items = items;
listData->populateData.archive = listData->archive;
strncpy(listData->populateData.path, listData->currDir, FILE_PATH_MAX);
string_copy(listData->populateData.path, listData->currDir, FILE_PATH_MAX);
Result res = task_populate_files(&listData->populateData);
if(R_FAILED(res)) {
@ -253,7 +253,7 @@ static void files_repopulate(files_data* listData, linked_list* items) {
}
static void files_navigate(files_data* listData, linked_list* items, const char* path) {
strncpy(listData->currDir, path, FILE_PATH_MAX);
string_copy(listData->currDir, path, FILE_PATH_MAX);
listData->populated = false;
}
@ -286,7 +286,7 @@ static void files_update(ui_view* view, void* data, linked_list* items, list_ite
// Detect whether the current directory was renamed by an action.
list_item* currDirItem = linked_list_get(items, 0);
if(currDirItem != NULL && strncmp(listData->currDir, ((file_info*) currDirItem->data)->path, FILE_PATH_MAX) != 0) {
strncpy(listData->currDir, ((file_info*) currDirItem->data)->path, FILE_PATH_MAX);
string_copy(listData->currDir, ((file_info*) currDirItem->data)->path, FILE_PATH_MAX);
}
}

10
source/fbi/task/listfiles.c
View File

@ -133,7 +133,7 @@ Result task_create_file_item(list_item** out, FS_Archive archive, const char* pa
if(len == 0 || path[len - 1] != '/') {
snprintf(fileInfo->path, FILE_PATH_MAX, "%s/", path);
} else {
strncpy(fileInfo->path, path, FILE_PATH_MAX);
string_copy(fileInfo->path, path, FILE_PATH_MAX);
}
if(attributes == 0) {
@ -142,7 +142,7 @@ Result task_create_file_item(list_item** out, FS_Archive archive, const char* pa
} else {
item->color = COLOR_FILE;
strncpy(fileInfo->path, path, FILE_PATH_MAX);
string_copy(fileInfo->path, path, FILE_PATH_MAX);
if(fs_filter_cias(NULL, fileInfo->path, fileInfo->attributes)) {
fileInfo->isCia = true;
@ -155,7 +155,7 @@ Result task_create_file_item(list_item** out, FS_Archive archive, const char* pa
}
}
strncpy(item->name, fileInfo->name, LIST_ITEM_NAME_MAX);
string_copy(item->name, fileInfo->name, LIST_ITEM_NAME_MAX);
item->data = fileInfo;
*out = item;
@ -199,9 +199,9 @@ static void task_populate_files_thread(void* arg) {
if(R_SUCCEEDED(res = task_create_file_item(&baseItem, data->archive, data->path, 0, false))) {
file_info* baseInfo = (file_info*) baseItem->data;
if(baseInfo->attributes & FS_ATTRIBUTE_DIRECTORY) {
strncpy(baseItem->name, "<current directory>", LIST_ITEM_NAME_MAX);
string_copy(baseItem->name, "<current directory>", LIST_ITEM_NAME_MAX);
} else {
strncpy(baseItem->name, "<current file>", LIST_ITEM_NAME_MAX);
string_copy(baseItem->name, "<current file>", LIST_ITEM_NAME_MAX);
}
linked_list queue;

2
source/fbi/task/listfiles.h
View File

@ -1,7 +1,7 @@
#pragma once
#ifndef FILE_NAME_MAX
#define FILE_NAME_MAX 512
#define FILE_NAME_MAX 256
#define FILE_PATH_MAX 512
#endif

25
source/fbi/task/listtitledb.c
View File

@ -12,7 +12,6 @@
#include "../resources.h"
#include "../../core/core.h"
#include "../../core/task/dataop.h"
#include "../../libs/stb_image/stb_image.h"
#define json_object_get_string(obj, name, def) (json_is_string(json_object_get(obj, name)) ? json_string_value(json_object_get(obj, name)) : def)
#define json_object_get_integer(obj, name, def) (json_is_integer(json_object_get(obj, name)) ? json_integer_value(json_object_get(obj, name)) : def)
@ -111,8 +110,8 @@ static bool task_populate_titledb_cache_get(u32 id, bool cia, titledb_cache_entr
json_t* idJson = json_object_get(obj, "id");
if(json_is_integer(idJson)) {
entry->id = (u32) json_integer_value(idJson);
strncpy(entry->mtime, json_object_get_string(obj, "mtime", "Unknown"), sizeof(entry->mtime));
strncpy(entry->version, json_object_get_string(obj, "version", "Unknown"), sizeof(entry->version));
string_copy(entry->mtime, json_object_get_string(obj, "mtime", "Unknown"), sizeof(entry->mtime));
string_copy(entry->version, json_object_get_string(obj, "version", "Unknown"), sizeof(entry->version));
return true;
}
@ -213,9 +212,9 @@ static void task_populate_titledb_thread(void* arg) {
titledb_info* titledbInfo = (titledb_info*) calloc(1, sizeof(titledb_info));
if(titledbInfo != NULL) {
titledbInfo->id = (u32) json_object_get_integer(entry, "id", 0);
strncpy(titledbInfo->category, json_object_get_string(entry, "category", "Unknown"), sizeof(titledbInfo->category));
strncpy(titledbInfo->meta.shortDescription, json_object_get_string(entry, "name", ""), sizeof(titledbInfo->meta.shortDescription));
strncpy(titledbInfo->meta.publisher, json_object_get_string(entry, "author", ""), sizeof(titledbInfo->meta.publisher));
string_copy(titledbInfo->category, json_object_get_string(entry, "category", "Unknown"), sizeof(titledbInfo->category));
string_copy(titledbInfo->meta.shortDescription, json_object_get_string(entry, "name", ""), sizeof(titledbInfo->meta.shortDescription));
string_copy(titledbInfo->meta.publisher, json_object_get_string(entry, "author", ""), sizeof(titledbInfo->meta.publisher));
json_t* headline = json_object_get(entry, "headline");
if(json_is_string(headline)) {
@ -224,7 +223,7 @@ static void task_populate_titledb_thread(void* arg) {
if(json_string_length(headline) > sizeof(titledbInfo->headline) - 1) {
snprintf(titledbInfo->headline, sizeof(titledbInfo->headline), "%.508s...", val);
} else {
strncpy(titledbInfo->headline, val, sizeof(titledbInfo->headline));
string_copy(titledbInfo->headline, val, sizeof(titledbInfo->headline));
}
} else {
titledbInfo->headline[0] = '\0';
@ -240,8 +239,8 @@ static void task_populate_titledb_thread(void* arg) {
titledbInfo->cia.exists = true;
titledbInfo->cia.id = (u32) json_object_get_integer(cia, "id", 0);
strncpy(titledbInfo->cia.mtime, mtime, sizeof(titledbInfo->cia.mtime));
strncpy(titledbInfo->cia.version, json_object_get_string(cia, "version", "Unknown"), sizeof(titledbInfo->cia.version));
string_copy(titledbInfo->cia.mtime, mtime, sizeof(titledbInfo->cia.mtime));
string_copy(titledbInfo->cia.version, json_object_get_string(cia, "version", "Unknown"), sizeof(titledbInfo->cia.version));
titledbInfo->cia.size = (u32) json_object_get_integer(cia, "size", 0);
titledbInfo->cia.titleId = strtoull(json_object_get_string(cia, "titleid", "0"), NULL, 16);
}
@ -259,8 +258,8 @@ static void task_populate_titledb_thread(void* arg) {
titledbInfo->tdsx.exists = true;
titledbInfo->tdsx.id = (u32) json_object_get_integer(tdsx, "id", 0);
strncpy(titledbInfo->tdsx.mtime, mtime, sizeof(titledbInfo->tdsx.mtime));
strncpy(titledbInfo->tdsx.version, json_object_get_string(tdsx, "version", "Unknown"), sizeof(titledbInfo->tdsx.version));
string_copy(titledbInfo->tdsx.mtime, mtime, sizeof(titledbInfo->tdsx.mtime));
string_copy(titledbInfo->tdsx.version, json_object_get_string(tdsx, "version", "Unknown"), sizeof(titledbInfo->tdsx.version));
titledbInfo->tdsx.size = (u32) json_object_get_integer(tdsx, "size", 0);
json_t* smdh = json_object_get(tdsx, "smdh");
@ -287,10 +286,10 @@ static void task_populate_titledb_thread(void* arg) {
latestTime = titledbInfo->tdsx.mtime;
}
strncpy(titledbInfo->mtime, latestTime, sizeof(titledbInfo->mtime));
string_copy(titledbInfo->mtime, latestTime, sizeof(titledbInfo->mtime));
if((titledbInfo->cia.exists || titledbInfo->tdsx.exists) && (data->filter == NULL || data->filter(data->userData, titledbInfo))) {
strncpy(item->name, titledbInfo->meta.shortDescription, LIST_ITEM_NAME_MAX);
string_copy(item->name, titledbInfo->meta.shortDescription, LIST_ITEM_NAME_MAX);
item->data = titledbInfo;
task_populate_titledb_update_status(item);

12
source/fbi/task/listtitles.c
View File

@ -127,7 +127,7 @@ static Result task_populate_titles_add_twl(populate_titles_data* data, FS_MediaT
if(titleInfo != NULL) {
titleInfo->mediaType = mediaType;
titleInfo->titleId = realTitleId;
strncpy(titleInfo->productCode, productCode, 12);
string_copy(titleInfo->productCode, productCode, 12);
titleInfo->version = version;
titleInfo->installedSize = installedSize;
titleInfo->twl = true;
@ -143,8 +143,8 @@ static Result task_populate_titles_add_twl(populate_titles_data* data, FS_MediaT
if(strchr(title, '\n') == NULL) {
size_t len = strlen(title);
strncpy(item->name, title, len);
strncpy(titleInfo->meta.shortDescription, title, len);
string_copy(item->name, title, len);
string_copy(titleInfo->meta.shortDescription, title, len);
} else {
char* destinations[] = {titleInfo->meta.shortDescription, titleInfo->meta.longDescription, titleInfo->meta.publisher};
int currDest = 0;
@ -153,14 +153,14 @@ static Result task_populate_titles_add_twl(populate_titles_data* data, FS_MediaT
char* curr = NULL;
while(currDest < 3 && (curr = strchr(last, '\n')) != NULL) {
strncpy(destinations[currDest++], last, curr - last);
string_copy(destinations[currDest++], last, curr - last);
last = curr + 1;
*curr = ' ';
}
strncpy(item->name, title, last - title);
string_copy(item->name, title, last - title);
if(currDest < 3) {
strncpy(destinations[currDest], last, strlen(title) - (last - title));
string_copy(destinations[currDest], last, strlen(title) - (last - title));
}
}

6
source/fbi/task/uitask.c
View File

@ -264,10 +264,10 @@ void task_draw_title_info(ui_view* view, void* data, float x1, float y1, float x
static void task_format_date(char* out, const char* date, size_t size) {
if(strncmp(date, "Unknown", size) == 0) {
strncpy(out, date, size);
string_copy(out, date, size);
} else {
char updatedDate[32] = "";
char updatedTime[32] = "";
char updatedDate[16] = "";
char updatedTime[16] = "";
sscanf(date, "%31[^T]T%31[^Z]Z", updatedDate, updatedTime);
snprintf(out, size, "%s %s", updatedDate, updatedTime);

4
source/fbi/titledb.c
View File

@ -139,7 +139,7 @@ static void titledb_entry_update(ui_view* view, void* data, linked_list* items,
if(info->cia.exists) {
list_item* item = (list_item*) calloc(1, sizeof(list_item));
if(item != NULL) {
strncpy(item->name, "CIA", sizeof(item->name));
string_copy(item->name, "CIA", sizeof(item->name));
item->data = (void*) true;
item->color = info->cia.installed ? info->cia.installedInfo.id != info->cia.id ? COLOR_TITLEDB_OUTDATED : COLOR_TITLEDB_INSTALLED : COLOR_TITLEDB_NOT_INSTALLED;
@ -150,7 +150,7 @@ static void titledb_entry_update(ui_view* view, void* data, linked_list* items,
if(info->tdsx.exists) {
list_item* item = (list_item*) calloc(1, sizeof(list_item));
if(item != NULL) {
strncpy(item->name, "3DSX", sizeof(item->name));
string_copy(item->name, "3DSX", sizeof(item->name));
item->data = (void*) false;
item->color = info->tdsx.installed ? info->tdsx.installedInfo.id != info->tdsx.id ? COLOR_TITLEDB_OUTDATED : COLOR_TITLEDB_INSTALLED : COLOR_TITLEDB_NOT_INSTALLED;

4
source/fbi/update.c
View File

@ -77,8 +77,8 @@ static void update_check_update(ui_view* view, void* data, float* progress, char
|| (major == latestMajor && minor > latestMinor)
|| (major == latestMajor && minor == latestMinor && micro > latestMicro)) {
updateData->data.id = subId;
strncpy(updateData->data.mtime, updatedAt, sizeof(updateData->data.mtime));
strncpy(updateData->data.version, version, sizeof(updateData->data.version));
string_copy(updateData->data.mtime, updatedAt, sizeof(updateData->data.mtime));
string_copy(updateData->data.version, version, sizeof(updateData->data.version));
latestMajor = major;
latestMinor = minor;

2227
source/libs/stb_image/stb_image.h
View File

File diff suppressed because it is too large Load Diff