fumiama/simple-kanban
1
0
Fork 0
mirror of https://github.com/fumiama/simple-kanban.git synced 2026-06-23 12:00:44 +08:00
Code Activity

优化代码架构

Browse Source
This commit is contained in:
fumiama
2021-05-18 13:01:59 +08:00
parent 42993de040
commit a402230dc5
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server.c
View File

@@ -13,18 +13,13 @@
#include <unistd.h>
#include <pthread.h>
#include <time.h>
#include "config.h"
#include "simple-protobuf/simple_protobuf.h"
#if !__APPLE__
#include <sys/sendfile.h>
#endif
struct CONFIG {
char pwd[64]; //password
char sps[64]; //set password
};
typedef struct CONFIG CONFIG;
CONFIG* cfg;
int fd;
@@ -250,16 +245,17 @@ int s3_set_data(THREADTIMER *timer) {
printf("Get data size: %tu\n", timer->numbytes);
}
}
if(file_size <= BUFSIZ - (is_first_data?0:sizeof(uint32_t))) {
while(timer->numbytes != file_size - (is_first_data?0:sizeof(uint32_t))) {
timer->numbytes += recv(timer->accept_fd, timer->data + timer->numbytes + (is_first_data?0:sizeof(uint32_t)), BUFSIZ - timer->numbytes - (is_first_data?0:sizeof(uint32_t)), 0);
size_t offset = (is_first_data?0:sizeof(uint32_t));
if(file_size <= BUFSIZ - offset) {
while(timer->numbytes != file_size - offset) {
timer->numbytes += recv(timer->accept_fd, timer->data + timer->numbytes + offset, BUFSIZ - timer->numbytes - offset, 0);
}
if(fwrite(timer->data + (is_first_data?0:sizeof(uint32_t)), file_size, 1, timer->fp) != 1) {
if(fwrite(timer->data + offset, file_size, 1, timer->fp) != 1) {
puts("Set data error.");
return close_file_and_send(timer, "erro", 4);
} else return close_file_and_send(timer, "succ", 4);
} else {
if(fwrite(timer->data + (is_first_data?0:sizeof(uint32_t)), timer->numbytes - (is_first_data?0:sizeof(uint32_t)), 1, timer->fp) != 1) {
if(fwrite(timer->data + offset, timer->numbytes - offset, 1, timer->fp) != 1) {
puts("Set data error.");
return close_file_and_send(timer, "erro", 4);
}