--- lbbs/src/file_loader.c 2025/11/19 03:12:58 1.22 +++ lbbs/src/file_loader.c 2025/12/19 06:16:27 1.26 @@ -32,6 +32,7 @@ struct shm_header_t int load_file(const char *filename) { char filepath[FILE_PATH_LEN]; + char shm_name[FILE_NAME_LEN]; int fd; struct stat sb; void *p_data; @@ -44,19 +45,19 @@ int load_file(const char *filename) if (filename == NULL) { - log_error("NULL pointer error\n"); + log_error("NULL pointer error"); return -1; } if ((fd = open(filename, O_RDONLY)) < 0) { - log_error("open(%s) error (%d)\n", filename, errno); + log_error("open(%s) error (%d)", filename, errno); return -1; } if (fstat(fd, &sb) < 0) { - log_error("fstat(fd) error (%d)\n", errno); + log_error("fstat(fd) error (%d)", errno); close(fd); return -1; } @@ -65,14 +66,14 @@ int load_file(const char *filename) p_data = mmap(NULL, data_len, PROT_READ, MAP_SHARED, fd, 0L); if (p_data == MAP_FAILED) { - log_error("mmap() error (%d)\n", errno); + log_error("mmap() error (%d)", errno); close(fd); return -2; } if (close(fd) < 0) { - log_error("close(fd) error (%d)\n", errno); + log_error("close(fd) error (%d)", errno); return -1; } @@ -81,22 +82,24 @@ int load_file(const char *filename) // Allocate shared memory size = sizeof(struct shm_header_t) + data_len + 1 + sizeof(long) * (size_t)(line_total + 1); - if (unload_file(filename) < 0) + strncpy(filepath, filename, sizeof(filepath) - 1); + filepath[sizeof(filepath) - 1] = '\0'; + snprintf(shm_name, sizeof(shm_name), "/FILE_SHM_%s", basename(filepath)); + + if (shm_unlink(shm_name) == -1 && errno != ENOENT) { + log_error("shm_unlink(%s) error (%d)", shm_name, errno); return -2; } - strncpy(filepath, filename, sizeof(filepath) - 1); - filepath[sizeof(filepath) - 1] = '\0'; - - if ((fd = shm_open(basename(filepath), O_CREAT | O_EXCL | O_RDWR, 0600)) == -1) + if ((fd = shm_open(shm_name, O_CREAT | O_EXCL | O_RDWR, 0600)) == -1) { - log_error("shm_open(%s) error (%d)\n", basename(filepath), errno); + log_error("shm_open(%s) error (%d)", shm_name, errno); return -2; } if (ftruncate(fd, (off_t)size) == -1) { - log_error("ftruncate(size=%d) error (%d)\n", size, errno); + log_error("ftruncate(size=%d) error (%d)", size, errno); close(fd); return -2; } @@ -104,14 +107,14 @@ int load_file(const char *filename) p_shm = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0L); if (p_shm == MAP_FAILED) { - log_error("mmap() error (%d)\n", errno); + log_error("mmap() error (%d)", errno); close(fd); return -2; } if (close(fd) < 0) { - log_error("close(fd) error (%d)\n", errno); + log_error("close(fd) error (%d)", errno); return -1; } @@ -122,7 +125,7 @@ int load_file(const char *filename) if (munmap(p_data, data_len) < 0) { - log_error("munmap() error (%d)\n", errno); + log_error("munmap() error (%d)", errno); munmap(p_shm, size); return -2; } @@ -133,7 +136,7 @@ int load_file(const char *filename) if (munmap(p_shm, size) < 0) { - log_error("munmap() error (%d)\n", errno); + log_error("munmap() error (%d)", errno); return -2; } @@ -143,19 +146,21 @@ int load_file(const char *filename) int unload_file(const char *filename) { char filepath[FILE_PATH_LEN]; + char shm_name[FILE_NAME_LEN]; if (filename == NULL) { - log_error("NULL pointer error\n"); + log_error("NULL pointer error"); return -1; } strncpy(filepath, filename, sizeof(filepath) - 1); filepath[sizeof(filepath) - 1] = '\0'; + snprintf(shm_name, sizeof(shm_name), "/FILE_SHM_%s", basename(filepath)); - if (shm_unlink(basename(filepath)) == -1 && errno != ENOENT) + if (shm_unlink(shm_name) == -1 && errno != ENOENT) { - log_error("shm_unlink(%s) error (%d)\n", basename(filepath), errno); + log_error("shm_unlink(%s) error (%d)", shm_name, errno); return -2; } @@ -165,6 +170,7 @@ int unload_file(const char *filename) void *get_file_shm_readonly(const char *filename, size_t *p_data_len, long *p_line_total, const void **pp_data, const long **pp_line_offsets) { char filepath[FILE_PATH_LEN]; + char shm_name[FILE_NAME_LEN]; int fd; void *p_shm = NULL; struct stat sb; @@ -172,22 +178,23 @@ void *get_file_shm_readonly(const char * if (filename == NULL || p_data_len == NULL || p_line_total == NULL || pp_data == NULL || pp_line_offsets == NULL) { - log_error("NULL pointer error\n"); + log_error("NULL pointer error"); return NULL; } strncpy(filepath, filename, sizeof(filepath) - 1); filepath[sizeof(filepath) - 1] = '\0'; + snprintf(shm_name, sizeof(shm_name), "/FILE_SHM_%s", basename(filepath)); - if ((fd = shm_open(basename(filepath), O_RDONLY, 0600)) == -1) + if ((fd = shm_open(shm_name, O_RDONLY, 0600)) == -1) { - log_error("shm_open(%s) error (%d)\n", basename(filepath), errno); + log_error("shm_open(%s) error (%d)", shm_name, errno); return NULL; } if (fstat(fd, &sb) < 0) { - log_error("fstat(fd) error (%d)\n", errno); + log_error("fstat(fd) error (%d)", errno); close(fd); return NULL; } @@ -197,20 +204,20 @@ void *get_file_shm_readonly(const char * p_shm = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0L); if (p_shm == MAP_FAILED) { - log_error("mmap() error (%d)\n", errno); + log_error("mmap() error (%d)", errno); close(fd); return NULL; } if (close(fd) < 0) { - log_error("close(fd) error (%d)\n", errno); + log_error("close(fd) error (%d)", errno); return NULL; } if (((struct shm_header_t *)p_shm)->shm_size != size) { - log_error("Shared memory size mismatch (%ld != %ld)\n", ((struct shm_header_t *)p_shm)->shm_size, size); + log_error("Shared memory size mismatch (%ld != %ld)", ((struct shm_header_t *)p_shm)->shm_size, size); munmap(p_shm, size); return NULL; } @@ -236,7 +243,7 @@ int detach_file_shm(void *p_shm) if (munmap(p_shm, size) < 0) { - log_error("munmap() error (%d)\n", errno); + log_error("munmap() error (%d)", errno); return -2; }