--- /dev/null Mon Sep 21 16:48:45 2015 +++ new/src/java.base/share/native/libjava/jdk_strerror.c Mon Sep 21 16:48:45 2015 @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#include +#include +#include +#include + +#include "jdk_strerror.h" + +int +jdk_strerror(int err, char *buf, size_t len) +{ + int ret = 0; + + if (err == 0 || len < 1) return 0; + +#if defined(__linux__) && (defined(_GNU_SOURCE) || \ + (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE < 200112L \ + && defined(_XOPEN_SOURCE) && _XOPEN_SOURCE < 600)) + + const char *msg; + char tmpbuf[1024]; + msg = strerror_r (errno, tmpbuf, (size_t) 1024); + + size_t n = strlen(msg); + if (n >= len) { + n = len - 1; + ret = ERANGE; + } + + strncpy(buf, msg, n); + buf[n] = '\0'; + + if (strncmp(msg, "Unknown error", 13) == 0) + ret = EINVAL; + +#elif _WIN32 + ret = strerror_s(buf, len, err); +#else + ret = strerror_r (err, buf, len); +#endif + + return ret; +}