nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

exe: split into platform units

Browse Source
This commit is contained in:
Danny Robson 2016-10-10 16:23:07 +11:00
parent e80c3c959c
commit 254a63ca90
6 changed files with 108 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -71,7 +71,6 @@ UTIL_FILES = \
endian.hpp \ endian.hpp \
except.cpp \ except.cpp \
except.hpp \ except.hpp \
exe.cpp \
exe.hpp \ exe.hpp \
extent.cpp \ extent.cpp \
extent.hpp \ extent.hpp \
@ -298,16 +297,17 @@ POSIX_FILES = \
if PLATFORM_LINUX if PLATFORM_LINUX
UTIL_FILES += $(POSIX_FILES) UTIL_FILES += $(POSIX_FILES) exe_linux.cpp
endif endif
if PLATFORM_FREEBSD if PLATFORM_FREEBSD
UTIL_FILES += $(POSIX_FILES) UTIL_FILES += $(POSIX_FILES) exe_freebsd.cpp
endif endif
if PLATFORM_WIN32 if PLATFORM_WIN32
UTIL_FILES += \ UTIL_FILES += \
debug_win32.cpp \ debug_win32.cpp \
exe_win32.cpp \
io_win32.cpp \ io_win32.cpp \
io_win32.hpp \ io_win32.hpp \
io_win32.ipp \ io_win32.ipp \

116
exe.cpp
View File

@ -1,116 +0,0 @@
/*
* 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.
*
* Copyright 2010-2012 Danny Robson <danny@nerdcruft.net>
*/
#include "exe.hpp"
#include "platform.hpp"
#if defined(PLATFORM_LINUX)
#include "except.hpp"
#include "cast.hpp"
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <unistd.h>
#include <stdexcept>
#include <vector>
std::experimental::filesystem::path
util::image_path (void) {
static const char PROC_SELF[] = "/proc/self/exe";
// We can't use lstat to check the size of the link in proc, as Linux
// will return 0 for most entries under proc. Instead we've got to
// iterate for a correct size.
std::vector<char> resolved (256);
retry:
const auto written = readlink (PROC_SELF, resolved.data (), resolved.size ());
if (written < 0)
errno_error::throw_code ();
if (sign_cast<size_t> (written) == resolved.size ()) {
resolved.resize (resolved.size () * 2);
goto retry;
}
return std::experimental::filesystem::path (resolved.data (), resolved.data () + written);
}
#elif defined(PLATFORM_FREEBSD)
#include "types.hpp"
#include "except.hpp"
#include <sys/types.h>
#include <sys/sysctl.h>
std::experimental::filesystem::path
util::image_path (void)
{
int name[] = {
CTL_KERN,
KERN_PROC,
KERN_PROC_PATHNAME,
-1
};
char data[1024];
size_t len = sizeof (data);
auto err = sysctl (name, elems (name), data, &len, nullptr, 0);
errno_error::try_code (err);
return std::experimental::filesystem::path (std::cbegin (data), std::cbegin (data) + len);
}
#elif defined(PLATFORM_WIN32)
#include "except.hpp"
#include <windows.h>
std::experimental::filesystem::path
util::image_path (void) {
std::vector<char> resolved (256);
retry:
const auto written = GetModuleFileName (nullptr, resolved.data (), resolved.size ());
if (written == 0)
win32_error::throw_code ();
if (written == resolved.size ()) {
resolved.resize (resolved.size () * 2);
goto retry;
}
return std::experimental::filesystem::path (resolved.data (), resolved.data () + written);
}
#else
#error "Unknown platform"
// Mac OS X: _NSGetExecutablePath() (man 3 dyld)
// Linux: readlink /proc/self/exe
// Solaris: getexecname()
// FreeBSD: sysctl CTL_KERN KERN_PROC KERN_PROC_PATHNAME -1
// BSD with procfs: readlink /proc/curproc/file
// Windows: GetModuleFileName() with hModule = NULL
#endif

25
exe_freebsd.cpp Normal file
View File

@ -0,0 +1,25 @@
#include "types.hpp"
#include "except.hpp"
#include <sys/types.h>
#include <sys/sysctl.h>
std::experimental::filesystem::path
util::image_path (void)
{
int name[] = {
CTL_KERN,
KERN_PROC,
KERN_PROC_PATHNAME,
-1
};
char data[1024];
size_t len = sizeof (data);
auto err = sysctl (name, elems (name), data, &len, nullptr, 0);
errno_error::try_code (err);
return std::experimental::filesystem::path (std::cbegin (data), std::cbegin (data) + len);
}

51
exe_linux.cpp Normal file
View File

@ -0,0 +1,51 @@
/*
* 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.
*
* Copyright 2010-2016 Danny Robson <danny@nerdcruft.net>
*/
#include "./exe.hpp"
#include "./except.hpp"
#include "./cast.hpp"
#include <vector>
#include <experimental/filesystem>
#include <unistd.h>
///////////////////////////////////////////////////////////////////////////////
std::experimental::filesystem::path
util::image_path (void)
{
static const char PROC_SELF[] = "/proc/self/exe";
// We can't use lstat to check the size of the link in proc, as Linux
// will return 0 for most entries under proc. Instead we've got to
// iterate for a correct size.
std::vector<char> resolved (256);
retry:
const auto written = readlink (PROC_SELF, resolved.data (), resolved.size ());
if (written < 0)
errno_error::throw_code ();
if (sign_cast<size_t> (written) == resolved.size ()) {
resolved.resize (resolved.size () * 2);
goto retry;
}
return std::experimental::filesystem::path (resolved.data (), resolved.data () + written);
}

21
exe_win32.cpp Normal file
View File

@ -0,0 +1,21 @@
#include "except.hpp"
#include <windows.h>
std::experimental::filesystem::path
util::image_path (void) {
std::vector<char> resolved (256);
retry:
const auto written = GetModuleFileName (nullptr, resolved.data (), resolved.size ());
if (written == 0)
win32_error::throw_code ();
if (written == resolved.size ()) {
resolved.resize (resolved.size () * 2);
goto retry;
}
return std::experimental::filesystem::path (resolved.data (), resolved.data () + written);
}

7
test/exe.cpp
View File

@ -1,10 +1,13 @@
#include "./exe.hpp"
#include "./tap.hpp" #include "./tap.hpp"
#include "./exe.hpp"
#include <iostream> #include <iostream>
///////////////////////////////////////////////////////////////////////////////
int int
main (void) main (int, char**)
{ {
util::TAP::logger tap; util::TAP::logger tap;
tap.expect_eq (util::image_path ().stem (), "exe", "identify executable path"); tap.expect_eq (util::image_path ().stem (), "exe", "identify executable path");