From 7c1290914960e89e2aba185e098eb36cc0d3ea42 Mon Sep 17 00:00:00 2001 From: midipix Date: Jul 15 2018 02:40:52 +0000 Subject: internals: added sfrt_dprintf(), a signal-resilient dprintf implementation. --- diff --git a/project/common.mk b/project/common.mk index a46a3b0..8850308 100644 --- a/project/common.mk +++ b/project/common.mk @@ -10,6 +10,7 @@ API_SRCS = \ src/skin/sfrt_skin_default.c \ INTERNAL_SRCS = \ + src/internal/$(PACKAGE)_dprintf_impl.c \ src/internal/$(PACKAGE)_errinfo_impl.c \ APP_SRCS = \ diff --git a/project/headers.mk b/project/headers.mk index 60a7eb3..2f2512a 100644 --- a/project/headers.mk +++ b/project/headers.mk @@ -4,6 +4,7 @@ API_HEADERS = \ INTERNAL_HEADERS = \ $(PROJECT_DIR)/src/internal/argv/argv.h \ + $(PROJECT_DIR)/src/internal/$(PACKAGE)_dprintf_impl.h \ $(PROJECT_DIR)/src/internal/$(PACKAGE)_driver_impl.h \ $(PROJECT_DIR)/src/internal/$(PACKAGE)_errinfo_impl.h \ diff --git a/src/internal/sofort_dprintf_impl.c b/src/internal/sofort_dprintf_impl.c new file mode 100644 index 0000000..01f1ee1 --- /dev/null +++ b/src/internal/sofort_dprintf_impl.c @@ -0,0 +1,56 @@ +#include +#include +#include +#include +#include + +int sfrt_dprintf(int fd, const char * fmt, ...) +{ + int ret; + int cnt; + int size; + va_list ap; + char * ch; + char * buf; + char chbuf[2048]; + + va_start(ap,fmt); + + size = sizeof(chbuf); + buf = ((cnt = vsnprintf(chbuf,size,fmt,ap)) < size) + ? chbuf : malloc(cnt + 1); + + va_end(ap); + + if (buf == chbuf) { + (void)0; + + } else if (buf) { + va_start(ap,fmt); + vsprintf(buf,fmt,ap); + va_end(ap); + + } else { + return -1; + } + + ret = 0; + ch = buf; + + for (; cnt && ret>=0; ) { + ret = write(fd,ch,cnt); + + while ((ret < 0) && (errno == EINTR)) + ret = write(fd,ch,cnt); + + ch += ret; + cnt -= ret; + } + + ret = (ret < 0) ? -1 : ch - buf; + + if (buf != chbuf) + free(buf); + + return ret; +} diff --git a/src/internal/sofort_dprintf_impl.h b/src/internal/sofort_dprintf_impl.h new file mode 100644 index 0000000..bfcc4ca --- /dev/null +++ b/src/internal/sofort_dprintf_impl.h @@ -0,0 +1,6 @@ +#ifndef SOFORT_DPRINTF_IMPL_H +#define SOFORT_DPRINTF_IMPL_H + +int sfrt_dprintf(int fd, const char * fmt, ...); + +#endif