Miroirs/secret
1
0
Fork 0
mirror of https://github.com/angt/secret synced 2024-11-16 19:48:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup and remove uio deps

Browse source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët 2021-01-09 16:16:59 +00:00
parent 8ec757653b
commit 857715e146
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
secret.c
View file

@ -1,4 +1,5 @@
#define _GNU_SOURCE
#include "argz/argz.c"
#include "libhydrogen/hydrogen.c"
#include <errno.h>
#include <fcntl.h>
@ -10,14 +11,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/uio.h>
#include <sys/wait.h>
#include <termios.h>
#include <unistd.h>
#include "argz/argz.c"
#include "libhydrogen/hydrogen.c"
#define S_COUNT(x) (sizeof(x) / sizeof((x)[0]))
#define S_VER_MAJOR 0U
#define S_VER_MINOR 11U
@ -68,8 +65,9 @@ _Noreturn static void
s_fatal(const char *fmt, ...)
{
va_list ap;
char buf[256];
size_t size = sizeof(buf);
char tmp[256] = "Fatal: ";
char *buf = &tmp[7];
size_t size = sizeof(tmp) - 7;
va_start(ap, fmt);
int ret = vsnprintf(buf, size, fmt, ap);
@ -78,16 +76,11 @@ s_fatal(const char *fmt, ...)
if (ret <= 0) {
buf[0] = '?';
size = 1;
} else if (size > (size_t)ret) {
size = (size_t)ret + 1;
}
if (size > (size_t)ret)
size = (size_t)ret;
char hdr[] = "Fatal: ";
struct iovec iov[] = {
{hdr, sizeof(hdr) - 1},
{buf, size}, {"\n", 1},
};
writev(2, iov, 3);
buf[size - 1] = '\n';
write(2, tmp, size + 7);
s_exit(1);
}