webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

installer: Replace all uses of strncpy with snprintf

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Michael Tremer
2024-04-05 12:59:39 +00:00
committed by Arne Fitzenreiter
parent 1415e83a34
commit 874ec4b049
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/installer/hw.c
View File

@@ -324,6 +324,7 @@ static unsigned long long hw_block_device_get_size(const char* dev) {
struct hw_disk** hw_find_disks(struct hw* hw, const char* sourcedrive) {
struct hw_disk** ret = hw_create_disks();
struct hw_disk** disks = ret;
char size_str[32];
// Determine the disk device of source if it is a partition
const char* sourcedisk = NULL;
@@ -388,7 +389,7 @@ struct hw_disk** hw_find_disks(struct hw* hw, const char* sourcedrive) {
disk->ref = 1;
strncpy(disk->path, dev_path, sizeof(disk->path));
snprintf(disk->path, sizeof(disk->path), "%s", dev_path);
const char* p = disk->path + 5;
disk->size = size;
@@ -401,7 +402,7 @@ struct hw_disk** hw_find_disks(struct hw* hw, const char* sourcedrive) {
vendor = udev_device_get_sysattr_value(dev, "manufacturer");
if (vendor)
strncpy(disk->vendor, vendor, sizeof(disk->vendor));
snprintf(disk->vendor, sizeof(disk->vendor), "%s", vendor);
else
*disk->vendor = '\0';
@@ -413,12 +414,11 @@ struct hw_disk** hw_find_disks(struct hw* hw, const char* sourcedrive) {
model = udev_device_get_sysattr_value(dev, "product");
if (model)
strncpy(disk->model, model, sizeof(disk->model));
snprintf(disk->model, sizeof(disk->model), "%s", model);
else
*disk->model = '\0';
// Format description
char size_str[STRING_SIZE];
snprintf(size_str, sizeof(size_str), "%4.1fGB", (double)disk->size / pow(1024, 3));
if (*disk->vendor && *disk->model) {

7
src/installer/main.c
View File

@@ -310,7 +310,8 @@ static void parse_command_line(FILE* flog, struct config* c) {
char* token = strtok(cmdline, " ");
while (token) {
strncpy(buffer, token, sizeof(buffer));
snprintf(buffer, sizeof(buffer), "%s", token);
char* val = buffer;
char* key = strsep(&val, "=");
@@ -336,7 +337,7 @@ static void parse_command_line(FILE* flog, struct config* c) {
// download url
else if (strcmp(key, "installer.download-url") == 0) {
strncpy(c->download_url, val, sizeof(c->download_url));
snprintf(c->download_url, sizeof(c->download_url), "%s", val);
c->perform_download = 1;
// Require networking for the download
@@ -344,7 +345,7 @@ static void parse_command_line(FILE* flog, struct config* c) {
// postinstall script
} else if (strcmp(key, "installer.postinstall") == 0) {
strncpy(c->postinstall, val, sizeof(c->postinstall));
snprintf(c->postinstall, sizeof(c->postinstall), "%s", val);
// Require networking for the download
c->require_networking = 1;