womax/cgit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change objects dir structure to be compatible with git; Normally should be able to sync with a git server

Browse Source
This commit is contained in:
womax
2024-06-08 03:24:46 +02:00
parent c60f7377f8
commit f39a817466
1 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/fs.c
View File

@@ -7,6 +7,7 @@
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h>
#include <zlib.h> #include <zlib.h>
#include "fs.h" #include "fs.h"
@@ -115,10 +116,21 @@ int write_object(struct object *obj)
DIR *objects_dir = opendir(OBJECTS_DIR); DIR *objects_dir = opendir(OBJECTS_DIR);
int objects_dir_fd = dirfd(objects_dir); int objects_dir_fd = dirfd(objects_dir);
char checksum[DIGEST_LENGTH * 2]; char checksum[DIGEST_LENGTH * 2 + 1];
hash_object_str(obj, checksum); hash_object_str(obj, checksum);
int save_file_fd = openat(objects_dir_fd, checksum, O_CREAT | O_WRONLY | O_TRUNC, DEFAULT_FILE_MODE); char tmp = checksum[2];
checksum[2] = '\0';
if (mkdirat(objects_dir_fd, checksum, DEFAULT_DIR_MODE) != 0 && errno != EEXIST)
{
defer(FS_ERROR);
}
int subdir_fd = openat(objects_dir_fd, checksum, O_RDONLY | __O_CLOEXEC | __O_DIRECTORY | O_NOCTTY | O_NONBLOCK);
checksum[2] = tmp;
int save_file_fd = openat(subdir_fd, checksum + 2, O_CREAT | O_WRONLY | O_TRUNC, DEFAULT_FILE_MODE);
if(save_file_fd == -1) { if(save_file_fd == -1) {
if (errno == EACCES) if (errno == EACCES)
{ {
@@ -144,6 +156,7 @@ int write_object(struct object *obj)
defer: defer:
closedir(objects_dir); closedir(objects_dir);
close(subdir_fd);
return result; return result;
} }
@@ -165,9 +178,23 @@ int read_object(char *checksum, struct object *obj)
DIR *objects_dir = opendir(OBJECTS_DIR); DIR *objects_dir = opendir(OBJECTS_DIR);
int objects_dir_fd = dirfd(objects_dir); int objects_dir_fd = dirfd(objects_dir);
fstatat(objects_dir_fd, checksum, &buffer, 0); char tmp = checksum[2];
checksum[2] = '\0';
int subdir_fd = openat(objects_dir_fd, checksum, O_RDONLY | __O_CLOEXEC | __O_DIRECTORY | O_NOCTTY | O_NONBLOCK);
if(subdir_fd == -1)
{
closedir(objects_dir);
if(errno == EACCES)
return FILE_NOT_FOUND;
return FS_ERROR;
}
checksum[2] = tmp;
fstatat(subdir_fd, checksum + 2, &buffer, 0);
char file_content[buffer.st_size]; char file_content[buffer.st_size];
int save_file_fd = openat(objects_dir_fd, checksum, O_RDONLY, DEFAULT_FILE_MODE); int save_file_fd = openat(subdir_fd, checksum + 2, O_RDONLY, DEFAULT_FILE_MODE);
if (save_file_fd == -1) if (save_file_fd == -1)
{ {
if(errno == EACCES) if(errno == EACCES)