mirror of
git://git.gnupg.org/gnupg.git
synced 2025-05-18 08:53:24 +02:00
Revert "w32: Change directory on daemon startup."
-- This reverts commit 78ebc62604d77600b9865950610717d28c6027a2. Gnupg-bug-id: 2670
This commit is contained in:
parent
166d0d7a24
commit
f2d2648a4d
@ -39,7 +39,6 @@
|
|||||||
# endif
|
# endif
|
||||||
# include <aclapi.h>
|
# include <aclapi.h>
|
||||||
# include <sddl.h>
|
# include <sddl.h>
|
||||||
# include <direct.h>
|
|
||||||
#else /*!HAVE_W32_SYSTEM*/
|
#else /*!HAVE_W32_SYSTEM*/
|
||||||
# include <sys/socket.h>
|
# include <sys/socket.h>
|
||||||
# include <sys/un.h>
|
# include <sys/un.h>
|
||||||
@ -1559,11 +1558,6 @@ main (int argc, char **argv )
|
|||||||
(void)csh_style;
|
(void)csh_style;
|
||||||
(void)nodetach;
|
(void)nodetach;
|
||||||
initialize_modules ();
|
initialize_modules ();
|
||||||
if (_chdir("\\"))
|
|
||||||
{
|
|
||||||
log_error ("chdir to / failed: %s\n", strerror (errno));
|
|
||||||
exit (1);
|
|
||||||
}
|
|
||||||
|
|
||||||
#else /*!HAVE_W32_SYSTEM*/
|
#else /*!HAVE_W32_SYSTEM*/
|
||||||
|
|
||||||
|
@ -30,11 +30,9 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#ifdef HAVE_W32_SYSTEM
|
#ifndef HAVE_W32_SYSTEM
|
||||||
# include <direct.h>
|
#include <sys/socket.h>
|
||||||
#else
|
#include <sys/un.h>
|
||||||
# include <sys/socket.h>
|
|
||||||
# include <sys/un.h>
|
|
||||||
#endif
|
#endif
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
@ -1270,11 +1268,6 @@ main (int argc, char **argv)
|
|||||||
#ifdef HAVE_W32_SYSTEM
|
#ifdef HAVE_W32_SYSTEM
|
||||||
(void)csh_style;
|
(void)csh_style;
|
||||||
(void)nodetach;
|
(void)nodetach;
|
||||||
if (_chdir("\\"))
|
|
||||||
{
|
|
||||||
log_error ("chdir to / failed: %s\n", strerror (errno));
|
|
||||||
exit (1);
|
|
||||||
}
|
|
||||||
|
|
||||||
pid = getpid ();
|
pid = getpid ();
|
||||||
es_printf ("set %s=%s;%lu;1\n",
|
es_printf ("set %s=%s;%lu;1\n",
|
||||||
|
@ -29,11 +29,9 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#ifdef HAVE_W32_SYSTEM
|
#ifndef HAVE_W32_SYSTEM
|
||||||
# include <direct.h>
|
#include <sys/socket.h>
|
||||||
#else
|
#include <sys/un.h>
|
||||||
# include <sys/socket.h>
|
|
||||||
# include <sys/un.h>
|
|
||||||
#endif /*HAVE_W32_SYSTEM*/
|
#endif /*HAVE_W32_SYSTEM*/
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
@ -813,11 +811,6 @@ main (int argc, char **argv )
|
|||||||
#ifdef HAVE_W32_SYSTEM
|
#ifdef HAVE_W32_SYSTEM
|
||||||
(void)csh_style;
|
(void)csh_style;
|
||||||
(void)nodetach;
|
(void)nodetach;
|
||||||
if (_chdir("\\"))
|
|
||||||
{
|
|
||||||
log_error ("chdir to / failed: %s\n", strerror (errno));
|
|
||||||
exit (1);
|
|
||||||
}
|
|
||||||
#else
|
#else
|
||||||
pid = fork ();
|
pid = fork ();
|
||||||
if (pid == (pid_t)-1)
|
if (pid == (pid_t)-1)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user