fumiama/base16384
1
0
Fork 0
mirror of https://github.com/fumiama/base16384.git synced 2026-06-07 11:10:29 +08:00
Code Activity

sync (#22)

Browse Source 
* fix typo

* fix: 32bit be decoding

* chore: add Rust alternative (#18)

* Update C# Link (#20)

* 尝试修复#19

- 移除未使用的参数 int blen
- 完善文档、注释
- 完善文件名错误检测
- 修复 encbuf, decbuf 处理逻辑

* fix: disable mmap in windows

* fix: encode bufsz (#19)

* v2.2.5

* Update Swift Link (#21)

---------

Co-authored-by: 忘忧北萱草 <wybxc@qq.com>
Co-authored-by: LC <64722907+lc6464@users.noreply.github.com>
Co-authored-by: oboard <oboard@outlook.com>
This commit is contained in:
源文雨
2024-03-26 01:52:27 +09:00
committed by GitHub
parent d2e6426c58
commit 65512e2dcd
8 changed files with 82 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
file.c
View File

@@ -1,6 +1,6 @@
/* file.c
* This file is part of the base16384 distribution (https://github.com/fumiama/base16384).
* Copyright (c) 2022 Fumiama Minamoto.
* Copyright (c) 2022-2023 Fumiama Minamoto.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <fcntl.h>
#ifdef _WIN32
@@ -48,6 +49,7 @@ base16384_err_t base16384_encode_file(const char* input, const char* output, cha
off_t inputsize;
FILE* fp = NULL;
FILE* fpo;
if(!input || !output || strlen(input) <= 0 || strlen(output) <= 0) return base16384_err_invalid_file_name;
if(is_standard_io(input)) { // read from stdin
inputsize = 0;
fp = stdin;
@@ -59,9 +61,9 @@ base16384_err_t base16384_encode_file(const char* input, const char* output, cha
if(!fpo) {
return base16384_err_fopen_output_file;
}
if(!inputsize || inputsize > BUFSIZ*1024) { // stdin or big file, use encbuf & fread
inputsize = BUFSIZ*1024/7*7;
#ifdef _WIN32
if(!inputsize || inputsize > BASE16384_ENCBUFSZ) { // stdin or big file, use encbuf & fread
inputsize = BASE16384_ENCBUFSZ-7;
#if defined _WIN32 || defined __cosmopolitan
}
#endif
if(!fp) fp = fopen(input, "rb");
@@ -69,32 +71,30 @@ base16384_err_t base16384_encode_file(const char* input, const char* output, cha
return base16384_err_fopen_input_file;
}
int outputsize = base16384_encode_len(inputsize)+16;
size_t cnt = 0;
fputc(0xFE, fpo);
fputc(0xFF, fpo);
while((cnt = fread(encbuf, sizeof(char), inputsize, fp)) > 0) {
int n = base16384_encode(encbuf, cnt, decbuf, outputsize);
int n = base16384_encode(encbuf, cnt, decbuf);
if(fwrite(decbuf, n, 1, fpo) <= 0) {
return base16384_err_write_file;
}
}
if(!is_standard_io(output)) fclose(fpo);
if(!is_standard_io(input)) fclose(fp);
#ifndef _WIN32
#if !defined _WIN32 && !defined __cosmopolitan
} else { // small file, use mmap & fwrite
int fd = open(input, O_RDONLY);
if(fd < 0) {
return base16384_err_open_input_file;
}
char *input_file = mmap(NULL, (size_t)inputsize, PROT_READ, MAP_PRIVATE, fd, 0);
char *input_file = mmap(NULL, (size_t)inputsize+16, PROT_READ, MAP_PRIVATE, fd, 0);
if(input_file == MAP_FAILED) {
return base16384_err_map_input_file;
}
int outputsize = base16384_encode_len(inputsize)+16;
fputc(0xFE, fpo);
fputc(0xFF, fpo);
int n = base16384_encode(input_file, (int)inputsize, decbuf, outputsize);
int n = base16384_encode(input_file, (int)inputsize, decbuf);
if(fwrite(decbuf, n, 1, fpo) <= 0) {
return base16384_err_write_file;
}
@@ -113,13 +113,12 @@ base16384_err_t base16384_encode_fp(FILE* input, FILE* output, char* encbuf, cha
if(!output) {
return base16384_err_fopen_output_file;
}
off_t inputsize = BUFSIZ*1024/7*7;
int outputsize = base16384_encode_len(inputsize)+16;
off_t inputsize = BASE16384_ENCBUFSZ-7;
size_t cnt = 0;
fputc(0xFE, output);
fputc(0xFF, output);
while((cnt = fread(encbuf, sizeof(char), inputsize, input)) > 0) {
int n = base16384_encode(encbuf, cnt, decbuf, outputsize);
int n = base16384_encode(encbuf, cnt, decbuf);
if(fwrite(decbuf, n, 1, output) <= 0) {
return base16384_err_write_file;
}
@@ -134,12 +133,11 @@ base16384_err_t base16384_encode_fd(int input, int output, char* encbuf, char* d
if(output < 0) {
return base16384_err_fopen_output_file;
}
off_t inputsize = BUFSIZ*1024/7*7;
int outputsize = base16384_encode_len(inputsize)+16;
off_t inputsize = BASE16384_ENCBUFSZ-7;
size_t cnt = 0;
write(output, "\xfe\xff", 2);
while((cnt = read(input, encbuf, inputsize)) > 0) {
int n = base16384_encode(encbuf, cnt, decbuf, outputsize);
int n = base16384_encode(encbuf, cnt, decbuf);
if(write(output, decbuf, n) < n) {
return base16384_err_write_file;
}
@@ -167,6 +165,7 @@ base16384_err_t base16384_decode_file(const char* input, const char* output, cha
off_t inputsize;
FILE* fp = NULL;
FILE* fpo;
if(!input || !output || strlen(input) <= 0 || strlen(output) <= 0) return base16384_err_invalid_file_name;
if(is_standard_io(input)) { // read from stdin
inputsize = 0;
fp = stdin;
@@ -178,16 +177,15 @@ base16384_err_t base16384_decode_file(const char* input, const char* output, cha
if(!fpo) {
return base16384_err_fopen_output_file;
}
if(!inputsize || inputsize > BUFSIZ*1024) { // stdin or big file, use decbuf & fread
inputsize = BUFSIZ*1024/8*8;
#ifdef _WIN32
if(!inputsize || inputsize > BASE16384_DECBUFSZ) { // stdin or big file, use decbuf & fread
inputsize = BASE16384_DECBUFSZ/8*8;
#if defined _WIN32 || defined __cosmopolitan
}
#endif
if(!fp) fp = fopen(input, "rb");
if(!fp) {
return base16384_err_fopen_input_file;
}
int outputsize = base16384_decode_len(inputsize, 0)+16;
int cnt = 0;
int end = 0;
rm_head(fp);
@@ -196,25 +194,24 @@ base16384_err_t base16384_decode_file(const char* input, const char* output, cha
decbuf[cnt++] = '=';
decbuf[cnt++] = end;
}
if(fwrite(encbuf, base16384_decode(decbuf, cnt, encbuf, outputsize), 1, fpo) <= 0) {
if(fwrite(encbuf, base16384_decode(decbuf, cnt, encbuf), 1, fpo) <= 0) {
return base16384_err_write_file;
}
}
if(!is_standard_io(output)) fclose(fpo);
if(!is_standard_io(input)) fclose(fp);
#ifndef _WIN32
#if !defined _WIN32 && !defined __cosmopolitan
} else { // small file, use mmap & fwrite
int fd = open(input, O_RDONLY);
if(fd < 0) {
return base16384_err_open_input_file;
}
char *input_file = mmap(NULL, (size_t)inputsize, PROT_READ, MAP_PRIVATE, fd, 0);
char *input_file = mmap(NULL, (size_t)inputsize+16, PROT_READ, MAP_PRIVATE, fd, 0);
if(input_file == MAP_FAILED) {
return base16384_err_map_input_file;
}
int outputsize = base16384_decode_len(inputsize, 0)+16;
int off = skip_offset(input_file);
if(fwrite(encbuf, base16384_decode(input_file+off, inputsize-off, encbuf, outputsize), 1, fpo) <= 0) {
if(fwrite(encbuf, base16384_decode(input_file+off, inputsize-off, encbuf), 1, fpo) <= 0) {
return base16384_err_write_file;
}
munmap(input_file, (size_t)inputsize);
@@ -232,8 +229,7 @@ base16384_err_t base16384_decode_fp(FILE* input, FILE* output, char* encbuf, cha
if(!output) {
return base16384_err_fopen_output_file;
}
off_t inputsize = BUFSIZ*1024/8*8;
int outputsize = base16384_decode_len(inputsize, 0)+16;
off_t inputsize = BASE16384_DECBUFSZ/8*8;
int cnt = 0;
int end = 0;
rm_head(input);
@@ -242,7 +238,7 @@ base16384_err_t base16384_decode_fp(FILE* input, FILE* output, char* encbuf, cha
decbuf[cnt++] = '=';
decbuf[cnt++] = end;
}
if(fwrite(encbuf, base16384_decode(decbuf, cnt, encbuf, outputsize), 1, output) <= 0) {
if(fwrite(encbuf, base16384_decode(decbuf, cnt, encbuf), 1, output) <= 0) {
return base16384_err_write_file;
}
}
@@ -265,8 +261,7 @@ base16384_err_t base16384_decode_fd(int input, int output, char* encbuf, char* d
if(output < 0) {
return base16384_err_fopen_output_file;
}
off_t inputsize = BUFSIZ*1024/8*8;
int outputsize = base16384_decode_len(inputsize, 0)+16;
off_t inputsize = BASE16384_DECBUFSZ/8*8;
int cnt = 0;
int end = 0;
decbuf[0] = 0;
@@ -283,7 +278,7 @@ base16384_err_t base16384_decode_fd(int input, int output, char* encbuf, char* d
end = 0;
} else end = 1;
} else end = 0;
cnt = base16384_decode(decbuf, cnt, encbuf, outputsize);
cnt = base16384_decode(decbuf, cnt, encbuf);
if(write(output, encbuf, cnt) < cnt) {
return base16384_err_write_file;
}