diff options
author | Aaron Marcher <me@drkhsh.at> | 2017-09-17 16:18:17 +0200 |
---|---|---|
committer | Aaron Marcher <me@drkhsh.at> | 2017-09-17 17:26:45 +0200 |
commit | 6820631175868c277effa7cc05f9cb3197b72654 (patch) | |
tree | 22707fe4a93e8357c7944087315a70d402fd418d /util.c | |
parent | 8e25af7dc33bdcc0df6f4f173da7a2f883141d70 (diff) |
Split into multiple files
For multiple reasons the program is now split:
- Make future porting to OpenBSD easier
- Assign header includes to individiual functions
- Make future program extensions easier
- Recompile only changed parts
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 42 |
1 files changed, 42 insertions, 0 deletions
@@ -0,0 +1,42 @@ +#include <err.h> +#include <errno.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> + +#include "util.h" + +const char * +bprintf(const char *fmt, ...) +{ + va_list ap; + size_t len; + + va_start(ap, fmt); + len = vsnprintf(buf, sizeof(buf) - 1, fmt, ap); + va_end(ap); + + if (len >= sizeof(buf)) + buf[sizeof(buf)-1] = '\0'; + + return buf; +} + +int +pscanf(const char *path, const char *fmt, ...) +{ + FILE *fp; + va_list ap; + int n; + + if (!(fp = fopen(path, "r"))) { + warn("fopen %s: %s\n", path, strerror(errno)); + return -1; + } + va_start(ap, fmt); + n = vfscanf(fp, fmt, ap); + va_end(ap); + fclose(fp); + + return (n == EOF) ? -1 : n; +} |