From: Christopher Dykes Date: Wed, 4 May 2016 23:45:56 +0000 (-0700) Subject: Create the stdlib.h portability header X-Git-Tag: 2016.07.26~277 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2d9694873889d9d668d4d0a4238738c8a1ef5a68;p=folly.git Create the stdlib.h portability header Summary: Windows doesn't have these functions under these names, so be nice to the code using it. Reviewed By: yfeldblum Differential Revision: D3003641 fb-gh-sync-id: 1657545af6975c96aea4a48c359250828b5921e0 fbshipit-source-id: 1657545af6975c96aea4a48c359250828b5921e0 --- diff --git a/folly/Makefile.am b/folly/Makefile.am index 69887388..912e117b 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/Stdlib.h \ portability/String.h \ portability/Syslog.h \ portability/SysFile.h \ @@ -432,6 +433,7 @@ libfolly_la_SOURCES = \ portability/Malloc.cpp \ portability/Memory.cpp \ portability/Sockets.cpp \ + portability/Stdlib.cpp \ portability/String.cpp \ portability/SysFile.cpp \ portability/SysMman.cpp \ diff --git a/folly/portability/Stdlib.cpp b/folly/portability/Stdlib.cpp new file mode 100644 index 00000000..049443a2 --- /dev/null +++ b/folly/portability/Stdlib.cpp @@ -0,0 +1,73 @@ +/* + * 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 +#include +#include + +extern "C" { +char* mktemp(char* tn) { return _mktemp(tn); } + +// While yes, this is for a directory, due to this being windows, +// a file and directory can't have the same name, resulting in this +// still working just fine. +char* mkdtemp(char* tn) { + char* ptr = nullptr; + auto len = strlen(ptr); + int ret = 0; + do { + strcpy(tn + len - 6, "XXXXXX"); + ptr = mktemp(tn); + if (ptr == nullptr || *ptr == '\0') { + return nullptr; + } + ret = mkdir(ptr, 0700); + if (ret != 0 && errno != EEXIST) { + return nullptr; + } + } while (ret != 0); + return tn; +} + +int mkstemp(char* tn) { + char* ptr = nullptr; + auto len = strlen(ptr); + int ret = 0; + do { + strcpy(tn + len - 6, "XXXXXX"); + ptr = mktemp(tn); + if (ptr == nullptr || *ptr == '\0') { + return -1; + } + ret = open(ptr, O_RDWR | O_EXCL | O_CREAT, S_IRUSR | S_IWUSR); + if (ret == -1 && errno != EEXIST) { + return -1; + } + } while (ret == -1); + return ret; +} + +char* realpath(const char* path, char* resolved_path) { + // I sure hope the caller gave us _MAX_PATH space in the buffer.... + return _fullpath(resolved_path, path, _MAX_PATH); +} +} +#endif diff --git a/folly/portability/Stdlib.h b/folly/portability/Stdlib.h new file mode 100644 index 00000000..4008c088 --- /dev/null +++ b/folly/portability/Stdlib.h @@ -0,0 +1,36 @@ +/* + * 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 +// These are technically supposed to be defined linux/limits.h and +// sys/param.h respectively, but Windows defines _MAX_PATH in stdlib.h, +// so, instead of creating two headers for a single define each, we put +// them here, where they are likely to already have been included in the +// code that needs them. +#define PATH_MAX _MAX_PATH +#define MAXPATHLEN _MAX_PATH + +extern "C" { +char* mktemp(char* tn); +char* mkdtemp(char* tn); +int mkstemp(char* tn); +char* realpath(const char* path, char* resolved_path); +} +#endif