forked from enlightenment/efl
* configure.ac:
define _WIN32_WCE with the cegcc compiler too useless EVIL_HAVE_WINCE define * src/bin/evil_test_memcpy.c: use _WIN32_WCE insead of EVIL_HAVE_WINCE * src/lib/Evil.h: try another definition of open(). Need feedback. * src/lib/evil_private.h: * src/lib/evil_util.c: add private error message when GetLastMessage must be called * src/lib/Makefile.am: * src/lib/evil_link_ce.c: * src/lib/evil_link_xp.cpp: * src/lib/evil_unistd.c: * src/lib/evil_unistd.cpp: move specific link code (readlink and symlink) outside evil_unistd to evil_link_ce.c for Windows CE and evil_link_xp.cpp for Windows XP. This allow the Windows CE code not depend on c++ code anymore and above all, not statically link libstdc++ on that platform. I need feedback on Windows XP, btw :) SVN revision: 37295
This commit is contained in:
parent
ff536078be
commit
52ea343c44
|
@ -1,3 +1,31 @@
|
|||
2008-10-29 Vincent Torri <doursse at users dot sf dot net>
|
||||
|
||||
* configure.ac:
|
||||
define _WIN32_WCE with the cegcc compiler too
|
||||
useless EVIL_HAVE_WINCE define
|
||||
|
||||
* src/bin/evil_test_memcpy.c:
|
||||
use _WIN32_WCE insead of EVIL_HAVE_WINCE
|
||||
|
||||
* src/lib/Evil.h:
|
||||
try another definition of open(). Need feedback.
|
||||
|
||||
* src/lib/evil_private.h:
|
||||
* src/lib/evil_util.c:
|
||||
add private error message when GetLastMessage must be called
|
||||
|
||||
* src/lib/Makefile.am:
|
||||
* src/lib/evil_link_ce.c:
|
||||
* src/lib/evil_link_xp.cpp:
|
||||
* src/lib/evil_unistd.c:
|
||||
* src/lib/evil_unistd.cpp:
|
||||
move specific link code (readlink and symlink) outside
|
||||
evil_unistd to evil_link_ce.c for Windows CE and
|
||||
evil_link_xp.cpp for Windows XP. This allow the Windows CE
|
||||
code not depend on c++ code anymore and above all, not
|
||||
statically link libstdc++ on that platform.
|
||||
I need feedback on Windows XP, btw :)
|
||||
|
||||
2008-10-28 Vincent Torri <doursse at users dot sf dot net>
|
||||
|
||||
* configure.ac:
|
||||
|
|
|
@ -82,6 +82,7 @@ case "$host_os" in
|
|||
cegcc*)
|
||||
have_wince="yes"
|
||||
win32_cflags="-mwin32"
|
||||
win32_cppflags="${win32_cppflags} -D_WIN32_WCE=0x0420"
|
||||
;;
|
||||
mingw32ce*)
|
||||
have_wince="yes"
|
||||
|
@ -96,10 +97,6 @@ esac
|
|||
AC_SUBST(win32_cppflags)
|
||||
AC_SUBST(win32_cflags)
|
||||
|
||||
if test "x${have_wince}" = "xyes" ; then
|
||||
AC_DEFINE(EVIL_HAVE_WINCE, 1, [Define to mention that Windows CE is the target])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(EVIL_HAVE_WINCE, test "x${have_wince}" = "xyes")
|
||||
AM_CONDITIONAL(EVIL_HAVE_MINGW32CE, test "x${have_mingw32ce}" = "xyes")
|
||||
|
||||
|
|
|
@ -80,9 +80,9 @@ test_memcpy_tests_run(suite *s, size_t align1, size_t align2, size_t len)
|
|||
printf ("length: %6d, align %2d/%2d:", (int)len, align1, align2);
|
||||
|
||||
test_memcpy_test_run(s, memcpy, s2, s1, len);
|
||||
#ifdef EVIL_HAVE_WINCE
|
||||
#ifdef _WIN32_WCE
|
||||
test_memcpy_test_run(s, memcpy_glibc, s2, s1, len);
|
||||
#endif /* EVIL_HAVE_WINCE */
|
||||
#endif /* _WIN32_WCE */
|
||||
|
||||
printf ("\n");
|
||||
}
|
||||
|
|
|
@ -134,7 +134,7 @@ typedef unsigned long gid_t;
|
|||
# define S_IXGRP S_IXUSR
|
||||
# define S_IXOTH S_IXUSR
|
||||
|
||||
# define open(path,...) _open((path),__VA_ARGS__)
|
||||
# define open(path, flag, ...) _open((path), _O_BINARY | (flag), ##args)
|
||||
# define close(fd) _close(fd)
|
||||
# define read(fd,buffer,count) _read((fd),(buffer),(count))
|
||||
# define write(fd,buffer,count) _write((fd),(buffer),(count))
|
||||
|
|
|
@ -35,10 +35,20 @@ evil_stdlib.c \
|
|||
evil_stdio.c \
|
||||
evil_string.c \
|
||||
evil_time.c \
|
||||
evil_unistd.cpp \
|
||||
evil_unistd.c \
|
||||
evil_util.c \
|
||||
evil_uuid.c
|
||||
|
||||
if EVIL_HAVE_WINCE
|
||||
|
||||
libevil_la_SOURCES += evil_link_ce.c
|
||||
|
||||
else
|
||||
|
||||
libevil_la_SOURCES += evil_link_xp.cpp
|
||||
|
||||
endif
|
||||
|
||||
libevil_la_CPPFLAGS = @win32_cppflags@
|
||||
libevil_la_CFLAGS = @win32_cflags@
|
||||
libevil_la_CXXFLAGS = -fno-exceptions
|
||||
|
|
|
@ -0,0 +1,86 @@
|
|||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif /* HAVE_CONFIG_H */
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#undef WIN32_LEAN_AND_MEAN
|
||||
|
||||
#include <shellapi.h>
|
||||
|
||||
#include "Evil.h"
|
||||
#include "evil_private.h"
|
||||
|
||||
|
||||
/*
|
||||
* Symbolic links and directory related functions
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
/* REMARK: Windows has no symbolic link. */
|
||||
/* Nevertheless, it can create and read .lnk files */
|
||||
|
||||
int
|
||||
symlink(const char *oldpath, const char *newpath)
|
||||
{
|
||||
wchar_t *w_oldpath;
|
||||
wchar_t *w_newpath;
|
||||
BOOL res;
|
||||
|
||||
w_oldpath = evil_char_to_wchar(oldpath);
|
||||
if (!w_oldpath)
|
||||
return -1;
|
||||
|
||||
w_newpath = evil_char_to_wchar(newpath);
|
||||
if (!w_newpath)
|
||||
{
|
||||
free(w_oldpath);
|
||||
return -1;
|
||||
}
|
||||
|
||||
res = SHCreateShortcutEx(w_newpath, w_oldpath, NULL, NULL);
|
||||
if (!res)
|
||||
_evil_last_error_display(__FUNCTION__);
|
||||
|
||||
free(w_oldpath);
|
||||
free(w_newpath);
|
||||
|
||||
return res ? 0 : -1;
|
||||
}
|
||||
|
||||
ssize_t
|
||||
readlink(const char *path, char *buf, size_t bufsiz)
|
||||
{
|
||||
wchar_t *w_path;
|
||||
wchar_t w_newpath[MB_CUR_MAX];
|
||||
char *newpath;
|
||||
size_t length;
|
||||
BOOL res;
|
||||
|
||||
w_path = evil_char_to_wchar(path);
|
||||
if (!w_path)
|
||||
return -1;
|
||||
|
||||
res = SHGetShortcutTarget(w_path, w_newpath, MB_CUR_MAX);
|
||||
|
||||
free(w_path);
|
||||
|
||||
if (!res)
|
||||
return -1;
|
||||
|
||||
newpath = evil_wchar_to_char(w_newpath);
|
||||
if (!newpath)
|
||||
return -1;
|
||||
|
||||
length = strlen(newpath);
|
||||
if (length > bufsiz)
|
||||
length = bufsiz;
|
||||
|
||||
memcpy(buf, newpath, length);
|
||||
|
||||
free(newpath);
|
||||
|
||||
return length;
|
||||
}
|
|
@ -0,0 +1,139 @@
|
|||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif /* HAVE_CONFIG_H */
|
||||
|
||||
#ifdef HAVE_ERRNO_H
|
||||
#include <errno.h>
|
||||
#endif /* HAVE_ERRNO_H */
|
||||
|
||||
# include <shlobj.h>
|
||||
# include <objidl.h>
|
||||
|
||||
#include "Evil.h"
|
||||
|
||||
|
||||
/*
|
||||
* Symbolic links and directory related functions
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
/* REMARK: Windows has no symbolic link. */
|
||||
/* Nevertheless, it can create and read .lnk files */
|
||||
int
|
||||
symlink(const char *oldpath, const char *newpath)
|
||||
{
|
||||
wchar_t new_path[MB_CUR_MAX];
|
||||
IShellLink *pISL;
|
||||
IShellLink **shell_link;
|
||||
IPersistFile *pIPF;
|
||||
IPersistFile **persit_file;
|
||||
HRESULT res;
|
||||
|
||||
res = CoInitialize(NULL);
|
||||
if (FAILED(res))
|
||||
{
|
||||
if (res == E_OUTOFMEMORY)
|
||||
errno = ENOMEM;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Hack to cleanly remove a warning */
|
||||
shell_link = &pISL;
|
||||
if (FAILED(CoCreateInstance(CLSID_ShellLink,
|
||||
NULL,
|
||||
CLSCTX_INPROC_SERVER,
|
||||
IID_IShellLink,
|
||||
(void **)shell_link)))
|
||||
goto no_instance;
|
||||
|
||||
if (FAILED(pISL->SetPath(oldpath)))
|
||||
goto no_setpath;
|
||||
|
||||
/* Hack to cleanly remove a warning */
|
||||
persit_file = &pIPF;
|
||||
if (FAILED(pISL->QueryInterface(IID_IPersistFile, (void **)persit_file)))
|
||||
goto no_queryinterface;
|
||||
|
||||
mbstowcs(new_path, newpath, MB_CUR_MAX);
|
||||
if (FAILED(pIPF->Save(new_path, FALSE)))
|
||||
goto no_save;
|
||||
|
||||
pIPF->Release();
|
||||
pISL->Release();
|
||||
CoUninitialize();
|
||||
|
||||
return 0;
|
||||
|
||||
no_save:
|
||||
pIPF->Release();
|
||||
no_queryinterface:
|
||||
no_setpath:
|
||||
pISL->Release();
|
||||
no_instance:
|
||||
CoUninitialize();
|
||||
return -1;
|
||||
}
|
||||
|
||||
ssize_t
|
||||
readlink(const char *path, char *buf, size_t bufsiz)
|
||||
{
|
||||
wchar_t old_path[MB_CUR_MAX];
|
||||
char new_path[PATH_MAX];
|
||||
IShellLink *pISL;
|
||||
IShellLink **shell_link;
|
||||
IPersistFile *pIPF;
|
||||
IPersistFile **persit_file;
|
||||
unsigned int length;
|
||||
HRESULT res;
|
||||
|
||||
res = CoInitialize(NULL);
|
||||
if (FAILED(res))
|
||||
{
|
||||
if (res == E_OUTOFMEMORY)
|
||||
errno = ENOMEM;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Hack to cleanly remove a warning */
|
||||
persit_file = &pIPF;
|
||||
if (FAILED(CoCreateInstance(CLSID_ShellLink,
|
||||
NULL,
|
||||
CLSCTX_INPROC_SERVER,
|
||||
IID_IPersistFile,
|
||||
(void **)persit_file)))
|
||||
goto no_instance;
|
||||
|
||||
mbstowcs(old_path, path, MB_CUR_MAX);
|
||||
if (FAILED(pIPF->Load(old_path, STGM_READWRITE)))
|
||||
goto no_load;
|
||||
|
||||
shell_link = &pISL;
|
||||
if (FAILED(pIPF->QueryInterface(IID_IShellLink, (void **)shell_link)))
|
||||
goto no_queryinterface;
|
||||
|
||||
if (FAILED(pISL->GetPath(new_path, PATH_MAX, NULL, 0)))
|
||||
goto no_getpath;
|
||||
|
||||
length = strlen(new_path);
|
||||
if (length > bufsiz)
|
||||
length = bufsiz;
|
||||
|
||||
memcpy(buf, new_path, length);
|
||||
|
||||
pISL->Release();
|
||||
pIPF->Release();
|
||||
CoUninitialize();
|
||||
|
||||
return length;
|
||||
|
||||
no_getpath:
|
||||
pISL->Release();
|
||||
no_queryinterface:
|
||||
no_load:
|
||||
pIPF->Release();
|
||||
no_instance:
|
||||
CoUninitialize();
|
||||
return -1;
|
||||
}
|
|
@ -8,6 +8,8 @@ extern "C" {
|
|||
|
||||
void _evil_error_display(const char *fct, LONG res);
|
||||
|
||||
void _evil_last_error_display(const char *fct);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -0,0 +1,224 @@
|
|||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif /* HAVE_CONFIG_H */
|
||||
|
||||
#ifdef HAVE_ERRNO_H
|
||||
#include <errno.h>
|
||||
#endif /* HAVE_ERRNO_H */
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <winsock2.h>
|
||||
#undef WIN32_LEAN_AND_MEAN
|
||||
|
||||
#include "Evil.h"
|
||||
#include "evil_private.h"
|
||||
|
||||
/*
|
||||
* Process identifer related functions
|
||||
*
|
||||
*/
|
||||
|
||||
pid_t
|
||||
getpid(void)
|
||||
{
|
||||
return (pid_t)GetCurrentProcessId();
|
||||
}
|
||||
|
||||
char *
|
||||
evil_getcwd(char *buffer, size_t size)
|
||||
{
|
||||
#if defined(__CEGCC__) || defined(__MINGW32CE__)
|
||||
wchar_t wpath[PATH_MAX];
|
||||
char *cpath;
|
||||
char *delim;
|
||||
DWORD ret = 0;
|
||||
|
||||
if (size <= 0)
|
||||
return NULL;
|
||||
|
||||
ret = GetModuleFileName(GetModuleHandle(NULL), (LPWSTR)&wpath, PATH_MAX);
|
||||
|
||||
if (!ret)
|
||||
{
|
||||
_evil_error_display(__FUNCTION__, ret);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
cpath = evil_wchar_to_char(wpath);
|
||||
if (!cpath)
|
||||
return NULL;
|
||||
|
||||
if (strlen(cpath) >= (size - 1))
|
||||
{
|
||||
free(cpath);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
delim = strrchr(cpath, '\\');
|
||||
if (delim)
|
||||
*delim = '\0';
|
||||
|
||||
if (!buffer)
|
||||
{
|
||||
buffer = (char *)malloc(sizeof(char) * size);
|
||||
if (!buffer)
|
||||
{
|
||||
free(cpath);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
strcpy(buffer, cpath);
|
||||
free(cpath);
|
||||
|
||||
return buffer;
|
||||
#else
|
||||
return _getcwd(buffer, size);
|
||||
#endif /* ! __CEGCC__ && ! __MINGW32CE__ */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Sockets and pipe related functions
|
||||
*
|
||||
*/
|
||||
|
||||
int
|
||||
evil_sockets_init(void)
|
||||
{
|
||||
WSADATA wsa_data;
|
||||
|
||||
return (WSAStartup(MAKEWORD(2, 2), &wsa_data) == 0) ? 1 : 0;
|
||||
}
|
||||
|
||||
void
|
||||
evil_sockets_shutdown(void)
|
||||
{
|
||||
WSACleanup();
|
||||
}
|
||||
|
||||
/*
|
||||
* The code of the following functions has been kindly offered
|
||||
* by Tor Lillqvist.
|
||||
*/
|
||||
int
|
||||
evil_pipe(int *fds)
|
||||
{
|
||||
struct sockaddr_in saddr;
|
||||
struct timeval tv;
|
||||
SOCKET temp;
|
||||
SOCKET socket1 = INVALID_SOCKET;
|
||||
SOCKET socket2 = INVALID_SOCKET;
|
||||
u_long arg;
|
||||
fd_set read_set;
|
||||
fd_set write_set;
|
||||
int len;
|
||||
|
||||
temp = socket (AF_INET, SOCK_STREAM, 0);
|
||||
|
||||
if (temp == INVALID_SOCKET)
|
||||
goto out0;
|
||||
|
||||
arg = 1;
|
||||
if (ioctlsocket (temp, FIONBIO, &arg) == SOCKET_ERROR)
|
||||
goto out0;
|
||||
|
||||
memset (&saddr, 0, sizeof (saddr));
|
||||
saddr.sin_family = AF_INET;
|
||||
saddr.sin_port = 0;
|
||||
saddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
|
||||
|
||||
if (bind (temp, (struct sockaddr *)&saddr, sizeof (saddr)))
|
||||
goto out0;
|
||||
|
||||
if (listen (temp, 1) == SOCKET_ERROR)
|
||||
goto out0;
|
||||
|
||||
len = sizeof (saddr);
|
||||
if (getsockname (temp, (struct sockaddr *)&saddr, &len))
|
||||
goto out0;
|
||||
|
||||
socket1 = socket (AF_INET, SOCK_STREAM, 0);
|
||||
|
||||
if (socket1 == INVALID_SOCKET)
|
||||
goto out0;
|
||||
|
||||
arg = 1;
|
||||
if (ioctlsocket (socket1, FIONBIO, &arg) == SOCKET_ERROR)
|
||||
goto out1;
|
||||
|
||||
if ((connect (socket1, (struct sockaddr *)&saddr, len) == SOCKET_ERROR) &&
|
||||
(WSAGetLastError () != WSAEWOULDBLOCK))
|
||||
goto out1;
|
||||
|
||||
FD_ZERO (&read_set);
|
||||
FD_SET (temp, &read_set);
|
||||
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 0;
|
||||
|
||||
if (select (0, &read_set, NULL, NULL, NULL) == SOCKET_ERROR)
|
||||
goto out1;
|
||||
|
||||
if (!FD_ISSET (temp, &read_set))
|
||||
goto out1;
|
||||
|
||||
socket2 = accept (temp, (struct sockaddr *) &saddr, &len);
|
||||
if (socket2 == INVALID_SOCKET)
|
||||
goto out1;
|
||||
|
||||
FD_ZERO (&write_set);
|
||||
FD_SET (socket1, &write_set);
|
||||
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 0;
|
||||
|
||||
if (select (0, NULL, &write_set, NULL, NULL) == SOCKET_ERROR)
|
||||
goto out2;
|
||||
|
||||
if (!FD_ISSET (socket1, &write_set))
|
||||
goto out2;
|
||||
|
||||
arg = 0;
|
||||
if (ioctlsocket (socket1, FIONBIO, &arg) == SOCKET_ERROR)
|
||||
goto out2;
|
||||
|
||||
arg = 0;
|
||||
if (ioctlsocket (socket2, FIONBIO, &arg) == SOCKET_ERROR)
|
||||
goto out2;
|
||||
|
||||
fds[0] = socket1;
|
||||
fds[1] = socket2;
|
||||
|
||||
closesocket (temp);
|
||||
|
||||
return 0;
|
||||
|
||||
out2:
|
||||
closesocket (socket2);
|
||||
out1:
|
||||
closesocket (socket1);
|
||||
out0:
|
||||
closesocket (temp);
|
||||
|
||||
fds[0] = INVALID_SOCKET;
|
||||
fds[1] = INVALID_SOCKET;
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Exec related functions
|
||||
*
|
||||
*/
|
||||
|
||||
#if defined (_WIN32_WCE) && ! defined (__CEGCC__)
|
||||
|
||||
int execvp( const char *file, char *const argv[])
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
#endif /* _WIN32_WCE && ! __CEGCC__ */
|
|
@ -1,421 +0,0 @@
|
|||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif /* HAVE_CONFIG_H */
|
||||
|
||||
#ifdef HAVE_ERRNO_H
|
||||
#include <errno.h>
|
||||
#endif /* HAVE_ERRNO_H */
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <winsock2.h>
|
||||
#undef WIN32_LEAN_AND_MEAN
|
||||
|
||||
#if defined(_MSC_VER) || \
|
||||
(defined(__MINGW32__) && ! defined(__MINGW32CE__))
|
||||
# include <shlobj.h>
|
||||
# include <objidl.h>
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32_WCE
|
||||
# include <shellapi.h>
|
||||
#endif
|
||||
|
||||
#include "Evil.h"
|
||||
#include "evil_private.h"
|
||||
|
||||
/*
|
||||
* Process identifer related functions
|
||||
*
|
||||
*/
|
||||
|
||||
pid_t
|
||||
getpid(void)
|
||||
{
|
||||
return (pid_t)GetCurrentProcessId();
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Symbolic links and directory related functions
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
/* REMARK: Windows has no symbolic link. */
|
||||
/* Nevertheless, it can create and read .lnk files */
|
||||
int
|
||||
symlink(const char *oldpath, const char *newpath)
|
||||
{
|
||||
#if defined(__CEGCC__) || defined(__MINGW32CE__)
|
||||
wchar_t *w_oldpath;
|
||||
wchar_t *w_newpath;
|
||||
BOOL res;
|
||||
|
||||
w_oldpath = evil_char_to_wchar(oldpath);
|
||||
if (!w_oldpath)
|
||||
return -1;
|
||||
|
||||
w_newpath = evil_char_to_wchar(newpath);
|
||||
if (!w_newpath)
|
||||
{
|
||||
free(w_oldpath);
|
||||
return -1;
|
||||
}
|
||||
|
||||
res = SHCreateShortcutEx(w_newpath, w_oldpath, NULL, NULL);
|
||||
|
||||
free(w_oldpath);
|
||||
free(w_newpath);
|
||||
|
||||
return res ? 0 : -1;
|
||||
#else
|
||||
wchar_t new_path[MB_CUR_MAX];
|
||||
IShellLink *pISL;
|
||||
IShellLink **shell_link;
|
||||
IPersistFile *pIPF;
|
||||
IPersistFile **persit_file;
|
||||
HRESULT res;
|
||||
|
||||
res = CoInitialize(NULL);
|
||||
if (FAILED(res))
|
||||
{
|
||||
if (res == E_OUTOFMEMORY)
|
||||
#ifdef HAVE_ERRNO_H
|
||||
errno = ENOMEM;
|
||||
#endif /* HAVE_ERRNO_H */
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Hack to cleanly remove a warning */
|
||||
shell_link = &pISL;
|
||||
if (FAILED(CoCreateInstance(CLSID_ShellLink,
|
||||
NULL,
|
||||
CLSCTX_INPROC_SERVER,
|
||||
IID_IShellLink,
|
||||
(void **)shell_link)))
|
||||
goto no_instance;
|
||||
|
||||
if (FAILED(pISL->SetPath(oldpath)))
|
||||
goto no_setpath;
|
||||
|
||||
/* Hack to cleanly remove a warning */
|
||||
persit_file = &pIPF;
|
||||
if (FAILED(pISL->QueryInterface(IID_IPersistFile, (void **)persit_file)))
|
||||
goto no_queryinterface;
|
||||
|
||||
mbstowcs(new_path, newpath, MB_CUR_MAX);
|
||||
if (FAILED(pIPF->Save(new_path, FALSE)))
|
||||
goto no_save;
|
||||
|
||||
pIPF->Release();
|
||||
pISL->Release();
|
||||
CoUninitialize();
|
||||
|
||||
return 0;
|
||||
|
||||
no_save:
|
||||
pIPF->Release();
|
||||
no_queryinterface:
|
||||
no_setpath:
|
||||
pISL->Release();
|
||||
no_instance:
|
||||
CoUninitialize();
|
||||
return -1;
|
||||
#endif /* ! __CEGCC__ && ! __MINGW32CE__ */
|
||||
}
|
||||
|
||||
ssize_t
|
||||
readlink(const char *path, char *buf, size_t bufsiz)
|
||||
{
|
||||
#if defined(__CEGCC__) || defined(__MINGW32CE__)
|
||||
wchar_t *w_path;
|
||||
wchar_t w_newpath[MB_CUR_MAX];
|
||||
char *newpath;
|
||||
size_t length;
|
||||
BOOL res;
|
||||
|
||||
w_path = evil_char_to_wchar(path);
|
||||
if (!w_path)
|
||||
return -1;
|
||||
|
||||
res = SHGetShortcutTarget(w_path, w_newpath, MB_CUR_MAX);
|
||||
|
||||
free(w_path);
|
||||
|
||||
if (!res)
|
||||
return -1;
|
||||
|
||||
newpath = evil_wchar_to_char(w_newpath);
|
||||
if (!newpath)
|
||||
return -1;
|
||||
|
||||
length = strlen(newpath);
|
||||
if (length > bufsiz)
|
||||
length = bufsiz;
|
||||
|
||||
memcpy(buf, newpath, length);
|
||||
|
||||
free(newpath);
|
||||
|
||||
return length;
|
||||
#else
|
||||
wchar_t old_path[MB_CUR_MAX];
|
||||
char new_path[PATH_MAX];
|
||||
IShellLink *pISL;
|
||||
IShellLink **shell_link;
|
||||
IPersistFile *pIPF;
|
||||
IPersistFile **persit_file;
|
||||
unsigned int length;
|
||||
HRESULT res;
|
||||
|
||||
res = CoInitialize(NULL);
|
||||
if (FAILED(res))
|
||||
{
|
||||
if (res == E_OUTOFMEMORY)
|
||||
#ifdef HAVE_ERRNO_H
|
||||
errno = ENOMEM;
|
||||
#endif /* HAVE_ERRNO_H */
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Hack to cleanly remove a warning */
|
||||
persit_file = &pIPF;
|
||||
if (FAILED(CoCreateInstance(CLSID_ShellLink,
|
||||
NULL,
|
||||
CLSCTX_INPROC_SERVER,
|
||||
IID_IPersistFile,
|
||||
(void **)persit_file)))
|
||||
goto no_instance;
|
||||
|
||||
mbstowcs(old_path, path, MB_CUR_MAX);
|
||||
if (FAILED(pIPF->Load(old_path, STGM_READWRITE)))
|
||||
goto no_load;
|
||||
|
||||
shell_link = &pISL;
|
||||
if (FAILED(pIPF->QueryInterface(IID_IShellLink, (void **)shell_link)))
|
||||
goto no_queryinterface;
|
||||
|
||||
if (FAILED(pISL->GetPath(new_path, PATH_MAX, NULL, 0)))
|
||||
goto no_getpath;
|
||||
|
||||
length = strlen(new_path);
|
||||
if (length > bufsiz)
|
||||
length = bufsiz;
|
||||
|
||||
memcpy(buf, new_path, length);
|
||||
|
||||
pISL->Release();
|
||||
pIPF->Release();
|
||||
CoUninitialize();
|
||||
|
||||
return length;
|
||||
|
||||
no_getpath:
|
||||
pISL->Release();
|
||||
no_queryinterface:
|
||||
no_load:
|
||||
pIPF->Release();
|
||||
no_instance:
|
||||
CoUninitialize();
|
||||
return -1;
|
||||
#endif /* ! __CEGCC__ && ! __MINGW32CE__ */
|
||||
}
|
||||
|
||||
char *
|
||||
evil_getcwd(char *buffer, size_t size)
|
||||
{
|
||||
#if defined(__CEGCC__) || defined(__MINGW32CE__)
|
||||
wchar_t wpath[PATH_MAX];
|
||||
char *cpath;
|
||||
char *delim;
|
||||
DWORD ret = 0;
|
||||
|
||||
if (size <= 0)
|
||||
return NULL;
|
||||
|
||||
ret = GetModuleFileName(GetModuleHandle(NULL), (LPWSTR)&wpath, PATH_MAX);
|
||||
|
||||
if (!ret)
|
||||
{
|
||||
_evil_error_display(__FUNCTION__, ret);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
cpath = evil_wchar_to_char(wpath);
|
||||
if (!cpath)
|
||||
return NULL;
|
||||
|
||||
if (strlen(cpath) >= (size - 1))
|
||||
{
|
||||
free(cpath);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
delim = strrchr(cpath, '\\');
|
||||
if (delim)
|
||||
*delim = '\0';
|
||||
|
||||
if (!buffer)
|
||||
{
|
||||
buffer = (char *)malloc(sizeof(char) * size);
|
||||
if (!buffer)
|
||||
{
|
||||
free(cpath);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
strcpy(buffer, cpath);
|
||||
free(cpath);
|
||||
|
||||
return buffer;
|
||||
#else
|
||||
return _getcwd(buffer, size);
|
||||
#endif /* ! __CEGCC__ && ! __MINGW32CE__ */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Sockets and pipe related functions
|
||||
*
|
||||
*/
|
||||
|
||||
int
|
||||
evil_sockets_init(void)
|
||||
{
|
||||
WSADATA wsa_data;
|
||||
|
||||
return (WSAStartup(MAKEWORD(2, 2), &wsa_data) == 0) ? 1 : 0;
|
||||
}
|
||||
|
||||
void
|
||||
evil_sockets_shutdown(void)
|
||||
{
|
||||
WSACleanup();
|
||||
}
|
||||
|
||||
/*
|
||||
* The code of the following functions has been kindly offered
|
||||
* by Tor Lillqvist.
|
||||
*/
|
||||
int
|
||||
evil_pipe(int *fds)
|
||||
{
|
||||
struct sockaddr_in saddr;
|
||||
struct timeval tv;
|
||||
SOCKET temp;
|
||||
SOCKET socket1 = INVALID_SOCKET;
|
||||
SOCKET socket2 = INVALID_SOCKET;
|
||||
u_long arg;
|
||||
fd_set read_set;
|
||||
fd_set write_set;
|
||||
int len;
|
||||
|
||||
temp = socket (AF_INET, SOCK_STREAM, 0);
|
||||
|
||||
if (temp == INVALID_SOCKET)
|
||||
goto out0;
|
||||
|
||||
arg = 1;
|
||||
if (ioctlsocket (temp, FIONBIO, &arg) == SOCKET_ERROR)
|
||||
goto out0;
|
||||
|
||||
memset (&saddr, 0, sizeof (saddr));
|
||||
saddr.sin_family = AF_INET;
|
||||
saddr.sin_port = 0;
|
||||
saddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
|
||||
|
||||
if (bind (temp, (struct sockaddr *)&saddr, sizeof (saddr)))
|
||||
goto out0;
|
||||
|
||||
if (listen (temp, 1) == SOCKET_ERROR)
|
||||
goto out0;
|
||||
|
||||
len = sizeof (saddr);
|
||||
if (getsockname (temp, (struct sockaddr *)&saddr, &len))
|
||||
goto out0;
|
||||
|
||||
socket1 = socket (AF_INET, SOCK_STREAM, 0);
|
||||
|
||||
if (socket1 == INVALID_SOCKET)
|
||||
goto out0;
|
||||
|
||||
arg = 1;
|
||||
if (ioctlsocket (socket1, FIONBIO, &arg) == SOCKET_ERROR)
|
||||
goto out1;
|
||||
|
||||
if ((connect (socket1, (struct sockaddr *)&saddr, len) == SOCKET_ERROR) &&
|
||||
(WSAGetLastError () != WSAEWOULDBLOCK))
|
||||
goto out1;
|
||||
|
||||
FD_ZERO (&read_set);
|
||||
FD_SET (temp, &read_set);
|
||||
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 0;
|
||||
|
||||
if (select (0, &read_set, NULL, NULL, NULL) == SOCKET_ERROR)
|
||||
goto out1;
|
||||
|
||||
if (!FD_ISSET (temp, &read_set))
|
||||
goto out1;
|
||||
|
||||
socket2 = accept (temp, (struct sockaddr *) &saddr, &len);
|
||||
if (socket2 == INVALID_SOCKET)
|
||||
goto out1;
|
||||
|
||||
FD_ZERO (&write_set);
|
||||
FD_SET (socket1, &write_set);
|
||||
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 0;
|
||||
|
||||
if (select (0, NULL, &write_set, NULL, NULL) == SOCKET_ERROR)
|
||||
goto out2;
|
||||
|
||||
if (!FD_ISSET (socket1, &write_set))
|
||||
goto out2;
|
||||
|
||||
arg = 0;
|
||||
if (ioctlsocket (socket1, FIONBIO, &arg) == SOCKET_ERROR)
|
||||
goto out2;
|
||||
|
||||
arg = 0;
|
||||
if (ioctlsocket (socket2, FIONBIO, &arg) == SOCKET_ERROR)
|
||||
goto out2;
|
||||
|
||||
fds[0] = socket1;
|
||||
fds[1] = socket2;
|
||||
|
||||
closesocket (temp);
|
||||
|
||||
return 0;
|
||||
|
||||
out2:
|
||||
closesocket (socket2);
|
||||
out1:
|
||||
closesocket (socket1);
|
||||
out0:
|
||||
closesocket (temp);
|
||||
|
||||
fds[0] = INVALID_SOCKET;
|
||||
fds[1] = INVALID_SOCKET;
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Exec related functions
|
||||
*
|
||||
*/
|
||||
|
||||
#if defined (_WIN32_WCE) && ! defined (__CEGCC__)
|
||||
|
||||
int execvp( const char *file, char *const argv[])
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
#endif /* _WIN32_WCE && ! __CEGCC__ */
|
|
@ -116,6 +116,16 @@ evil_last_error_get(void)
|
|||
return evil_format_message(err);
|
||||
}
|
||||
|
||||
void
|
||||
_evil_last_error_display(const char *fct)
|
||||
{
|
||||
char *error;
|
||||
|
||||
error = evil_last_error_get();
|
||||
fprintf(stderr, "[Evil] [%s] ERROR: %s\n", fct, error);
|
||||
free(error);
|
||||
}
|
||||
|
||||
|
||||
const char *
|
||||
evil_tmpdir_get(void)
|
||||
|
|
Loading…
Reference in New Issue