From fb8565ddcd9beb6c62633c0c5c32637d5e96e95b Mon Sep 17 00:00:00 2001 From: Christopher Dykes Date: Fri, 6 May 2016 09:31:20 -0700 Subject: [PATCH] Create the stdio.h portability header Summary: Windows doesn't define a couple of functions. Reviewed By: yfeldblum Differential Revision: D2990676 fb-gh-sync-id: 1a1354bd7976cb8b4747436d6907d65210ba506c fbshipit-source-id: 1a1354bd7976cb8b4747436d6907d65210ba506c --- folly/Makefile.am | 2 ++ folly/portability/Stdio.cpp | 64 +++++++++++++++++++++++++++++++++++++ folly/portability/Stdio.h | 32 +++++++++++++++++++ 3 files changed, 98 insertions(+) create mode 100755 folly/portability/Stdio.cpp create mode 100755 folly/portability/Stdio.h diff --git a/folly/Makefile.am b/folly/Makefile.am index 70c2d31d..d6511ccd 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -286,6 +286,7 @@ nobase_follyinclude_HEADERS = \ portability/Memory.h \ portability/PThread.h \ portability/Sockets.h \ + portability/Stdio.h \ portability/Stdlib.h \ portability/String.h \ portability/Syslog.h \ @@ -434,6 +435,7 @@ libfolly_la_SOURCES = \ portability/Malloc.cpp \ portability/Memory.cpp \ portability/Sockets.cpp \ + portability/Stdio.cpp \ portability/Stdlib.cpp \ portability/String.cpp \ portability/SysFile.cpp \ diff --git a/folly/portability/Stdio.cpp b/folly/portability/Stdio.cpp new file mode 100755 index 00000000..d6fdd234 --- /dev/null +++ b/folly/portability/Stdio.cpp @@ -0,0 +1,64 @@ +/* + * Copyright 2016 Facebook, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#ifdef _WIN32 +#include +#include +#include + +extern "C" { +int dprintf(int fd, const char* fmt, ...) { + va_list args; + va_start(args, fmt); + SCOPE_EXIT { va_end(args); }; + + int len = vsnprintf(nullptr, 0, fmt, args); + if (len <= 0) { + return -1; + } + char* buf = new char[len + 1]; + SCOPE_EXIT { delete[] buf; }; + if (vsnprintf(buf, len + 1, fmt, args) == len && write(fd, buf, len) == len) { + return len; + } + + return -1; +} + +int pclose(FILE* f) { return _pclose(f); } + +FILE* popen(const char* name, const char* mode) { return _popen(name, mode); } + +void setbuffer(FILE* f, char* buf, size_t size) { + setvbuf(f, buf, _IOFBF, size); +} + +int vasprintf(char** dest, const char* format, va_list ap) { + int len = vsnprintf(nullptr, 0, format, ap); + if (len <= 0) { + return -1; + } + char* buf = *dest = (char*)malloc(len + 1); + if (vsnprintf(buf, len + 1, format, ap) == len) { + return len; + } + free(buf); + return -1; +} +} +#endif diff --git a/folly/portability/Stdio.h b/folly/portability/Stdio.h new file mode 100755 index 00000000..a30fa6d5 --- /dev/null +++ b/folly/portability/Stdio.h @@ -0,0 +1,32 @@ +/* + * Copyright 2016 Facebook, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once + +#include + +#ifdef _WIN32 +#include +#include + +extern "C" { +int dprintf(int fd, const char* fmt, ...); +int pclose(FILE* f); +FILE* popen(const char* name, const char* mode); +void setbuffer(FILE* f, char* buf, size_t size); +int vasprintf(char** dest, const char* format, va_list ap); +} +#endif -- 2.34.1