aboutsummaryrefslogtreecommitdiffstats
path: root/scd/scdaemon.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-07-25 10:19:08 +0000
committerWerner Koch <[email protected]>2017-07-25 10:19:08 +0000
commitf2d2648a4deb205c26ac869c857c000a95d3ff0c (patch)
treec2079e0af064a7a54d3fd5520e4d0832fdd66bb4 /scd/scdaemon.c
parentgpg: Update key origin info during import merge. (diff)
downloadgnupg-f2d2648a4deb205c26ac869c857c000a95d3ff0c.tar.gz
gnupg-f2d2648a4deb205c26ac869c857c000a95d3ff0c.zip
Revert "w32: Change directory on daemon startup."
-- This reverts commit 78ebc62604d77600b9865950610717d28c6027a2. Gnupg-bug-id: 2670
Diffstat (limited to 'scd/scdaemon.c')
-rw-r--r--scd/scdaemon.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index bbb043334..26e89dd8d 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -29,11 +29,9 @@
#include <assert.h>
#include <time.h>
#include <fcntl.h>
-#ifdef HAVE_W32_SYSTEM
-# include <direct.h>
-#else
-# include <sys/socket.h>
-# include <sys/un.h>
+#ifndef HAVE_W32_SYSTEM
+#include <sys/socket.h>
+#include <sys/un.h>
#endif /*HAVE_W32_SYSTEM*/
#include <unistd.h>
#include <signal.h>
@@ -813,11 +811,6 @@ main (int argc, char **argv )
#ifdef HAVE_W32_SYSTEM
(void)csh_style;
(void)nodetach;
- if (_chdir("\\"))
- {
- log_error ("chdir to / failed: %s\n", strerror (errno));
- exit (1);
- }
#else
pid = fork ();
if (pid == (pid_t)-1)