nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move DLL support to lib/fs

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-28 13:37:51 -04:00
parent 8fc15e4861
commit 02bb701bba
5 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/util.c
View File

@ -134,18 +134,3 @@ ENABLE_GCC_WARNING(aggregate-return)
/* =====
* Time
* ===== */
#ifdef _WIN32
HANDLE
load_windows_system_library(const TCHAR *library_name)
{
TCHAR path[MAX_PATH];
unsigned n;
n = GetSystemDirectory(path, MAX_PATH);
if (n == 0 || n + _tcslen(library_name) + 2 >= MAX_PATH)
return 0;
_tcscat(path, TEXT("\\"));
_tcscat(path, library_name);
return LoadLibrary(path);
}
#endif /* defined(_WIN32) */

5
src/common/util.h
View File

@ -40,6 +40,7 @@
#include "lib/fs/path.h"
#include "lib/encoding/time_fmt.h"
#include "lib/encoding/cstring.h"
#include "lib/fs/winlib.h"
void tor_log_mallinfo(int severity);
@ -76,8 +77,4 @@ void tor_log_mallinfo(int severity);
((isSock) ? read_all_from_socket((fd), (buf), (count)) \
: read_all_from_fd((int)(fd), (buf), (count)))
#ifdef _WIN32
HANDLE load_windows_system_library(const TCHAR *library_name);
#endif
#endif /* !defined(TOR_UTIL_H) */

7
src/lib/fs/include.am
View File

@ -15,6 +15,10 @@ src_lib_libtor_fs_a_SOURCES = \
src/lib/fs/storagedir.c \
src/lib/fs/userdb.c
if WIN32
src_lib_libtor_fs_a_SOURCES += src/lib/fs/winlib.c
endif
src_lib_libtor_fs_testing_a_SOURCES = \
$(src_lib_libtor_fs_a_SOURCES)
src_lib_libtor_fs_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
@ -28,4 +32,5 @@ noinst_HEADERS += \
src/lib/fs/mmap.h \
src/lib/fs/path.h \
src/lib/fs/storagedir.h \
src/lib/fs/userdb.h
src/lib/fs/userdb.h \
src/lib/fs/winlib.h

21
src/lib/fs/winlib.c Normal file
View File

@ -0,0 +1,21 @@
/* Copyright (c) 2003, Roger Dingledine
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
* Copyright (c) 2007-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */
#ifdef _WIN32
#include "lib/fs/winlib.h"
HANDLE
load_windows_system_library(const TCHAR *library_name)
{
TCHAR path[MAX_PATH];
unsigned n;
n = GetSystemDirectory(path, MAX_PATH);
if (n == 0 || n + _tcslen(library_name) + 2 >= MAX_PATH)
return 0;
_tcscat(path, TEXT("\\"));
_tcscat(path, library_name);
return LoadLibrary(path);
}
#endif /* defined(_WIN32) */

16
src/lib/fs/winlib.h Normal file
View File

@ -0,0 +1,16 @@
/* Copyright (c) 2003, Roger Dingledine
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
* Copyright (c) 2007-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */
#ifndef TOR_WINLIB_H
#define TOR_WINLIB_H
#ifdef _WIN32
#include <windows.h>
#include <tchar.h>
HANDLE load_windows_system_library(const TCHAR *library_name);
#endif
#endif