Merge remote-tracking branch 'origin/fix/quality-v2' into integration/all-fixes-v2
This commit is contained in:
+2
-1
@@ -35,7 +35,8 @@ File* file_create(const char* path) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
strcpy(file->path, path);
|
memcpy(file->path, path, path_len);
|
||||||
|
file->path[path_len] = '\0';
|
||||||
file->data = data_create_reserve(0);
|
file->data = data_create_reserve(0);
|
||||||
if (file->data == NULL) {
|
if (file->data == NULL) {
|
||||||
free(file->path);
|
free(file->path);
|
||||||
|
|||||||
+12
-8
@@ -13,7 +13,7 @@ bool mkdir_r(const char* path) {
|
|||||||
char* path_duplicate = malloc(strlen(path) + 1);
|
char* path_duplicate = malloc(strlen(path) + 1);
|
||||||
if (!path_duplicate)
|
if (!path_duplicate)
|
||||||
return false;
|
return false;
|
||||||
strcpy(path_duplicate, path);
|
memcpy(path_duplicate, path, strlen(path) + 1);
|
||||||
char* path_current = (char*)malloc((strlen(path) + 2) * sizeof(char));
|
char* path_current = (char*)malloc((strlen(path) + 2) * sizeof(char));
|
||||||
if (!path_current) {
|
if (!path_current) {
|
||||||
free(path_duplicate);
|
free(path_duplicate);
|
||||||
@@ -21,7 +21,8 @@ bool mkdir_r(const char* path) {
|
|||||||
}
|
}
|
||||||
char* path_current_position = path_current;
|
char* path_current_position = path_current;
|
||||||
if (path[0] == '/') {
|
if (path[0] == '/') {
|
||||||
strcpy(path_current, "/");
|
path_current[0] = '/';
|
||||||
|
path_current[1] = '\0';
|
||||||
path_current_position += 1;
|
path_current_position += 1;
|
||||||
} else {
|
} else {
|
||||||
path_current[0] = '\0';
|
path_current[0] = '\0';
|
||||||
@@ -31,10 +32,12 @@ bool mkdir_r(const char* path) {
|
|||||||
const char* part = strtok_r(path_duplicate, delimiter, &saveptr);
|
const char* part = strtok_r(path_duplicate, delimiter, &saveptr);
|
||||||
bool ok = true;
|
bool ok = true;
|
||||||
while (part != NULL) {
|
while (part != NULL) {
|
||||||
strcpy(path_current_position, part);
|
size_t part_len = strlen(part);
|
||||||
path_current_position += strlen(part) * sizeof(char);
|
memcpy(path_current_position, part, part_len);
|
||||||
strcpy(path_current_position, "/");
|
path_current_position += part_len;
|
||||||
path_current_position += sizeof(char);
|
path_current_position[0] = '/';
|
||||||
|
path_current_position[1] = '\0';
|
||||||
|
path_current_position++;
|
||||||
struct stat st;
|
struct stat st;
|
||||||
if (stat(path_current, &st) != 0) {
|
if (stat(path_current, &st) != 0) {
|
||||||
if (mkdir(path_current, 0755) != 0) {
|
if (mkdir(path_current, 0755) != 0) {
|
||||||
@@ -53,8 +56,9 @@ bool mkdir_r(const char* path) {
|
|||||||
char* str_dup(const char* string) {
|
char* str_dup(const char* string) {
|
||||||
if (string == NULL)
|
if (string == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
char* new_string = (char*)malloc(strlen(string) + 1);
|
size_t str_len = strlen(string);
|
||||||
strcpy(new_string, string);
|
char* new_string = (char*)malloc(str_len + 1);
|
||||||
|
memcpy(new_string, string, str_len + 1);
|
||||||
return new_string;
|
return new_string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user