diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 20 | ||||
| -rw-r--r-- | tools/gpg-connect-agent.c | 15 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 7 |
3 files changed, 9 insertions, 33 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 9e9e13eda..a6979ebf1 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -66,37 +66,19 @@ endif libexec_PROGRAMS = gpg-check-pattern gpg-pair-tool -if !HAVE_W32CE_SYSTEM noinst_PROGRAMS = clean-sat make-dns-cert -endif -if !HAVE_W32CE_SYSTEM if BUILD_GPGTAR bin_PROGRAMS += gpgtar else noinst_PROGRAMS += gpgtar endif -endif common_libs = $(libcommon) commonpth_libs = $(libcommonpth) -# Some modules require PTH under W32CE. -if HAVE_W32CE_SYSTEM -maybe_commonpth_libs = $(commonpth_libs) -else -maybe_commonpth_libs = $(common_libs) -endif - -if HAVE_W32CE_SYSTEM -pwquery_libs = -else pwquery_libs = ../common/libsimple-pwquery.a -endif -if HAVE_W32CE_SYSTEM -opt_libassuan_libs = $(LIBASSUAN_LIBS) -endif regexp_libs = ../regexp/libregexp.a @@ -109,7 +91,7 @@ gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c # common sucks in gpg-error, will they, nil they (some compilers # do not eliminate the supposed-to-be-unused-inline-functions). -gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \ +gpgconf_LDADD = $(common_libs) \ $(LIBINTL) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \ $(LIBICONV) $(W32SOCKLIBS) \ $(gpgconf_rc_objs) diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c index 6bbdc816b..dff367050 100644 --- a/tools/gpg-connect-agent.c +++ b/tools/gpg-connect-agent.c @@ -1008,10 +1008,7 @@ do_open (char *line) if (fd >= 0 && fd < DIM (open_fd_table)) { open_fd_table[fd].inuse = 1; -#ifdef HAVE_W32CE_SYSTEM -# warning fixme: implement our pipe emulation. -#endif -#if defined(HAVE_W32_SYSTEM) && !defined(HAVE_W32CE_SYSTEM) +#if defined(HAVE_W32_SYSTEM) { HANDLE prochandle, handle, newhandle; @@ -1041,12 +1038,12 @@ do_open (char *line) log_info ("file '%s' opened in \"%s\" mode, fd=%d (libc=%d)\n", name, mode, (int)open_fd_table[fd].handle, fd); set_int_var (varname, (int)open_fd_table[fd].handle); -#else +#else /* Unix */ if (opt.verbose) log_info ("file '%s' opened in \"%s\" mode, fd=%d\n", name, mode, fd); set_int_var (varname, fd); -#endif +#endif /* Unix */ } else { @@ -2023,11 +2020,7 @@ handle_inquire (assuan_context_t ctx, char *line) { if (d->is_prog) { -#ifdef HAVE_W32CE_SYSTEM - fp = NULL; -#else fp = popen (d->file, "r"); -#endif if (!fp) log_error ("error executing '%s': %s\n", d->file, strerror (errno)); @@ -2064,10 +2057,8 @@ handle_inquire (assuan_context_t ctx, char *line) ; else if (d->is_prog) { -#ifndef HAVE_W32CE_SYSTEM if (pclose (fp)) cancelled = 1; -#endif } else fclose (fp); diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 704bdca16..7cd45c7e9 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -2974,7 +2974,7 @@ key_matches_user_or_group (char *user) /* Under Windows we don't support groups. */ if (group && *group) gc_error (0, 0, _("Note that group specifications are ignored\n")); -#ifndef HAVE_W32CE_SYSTEM + if (*user) { static char *my_name; @@ -2994,8 +2994,9 @@ key_matches_user_or_group (char *user) if (!strcmp (user, my_name)) return 1; /* Found. */ } -#endif /*HAVE_W32CE_SYSTEM*/ + #else /*!HAVE_W32_SYSTEM*/ + /* First check whether the user matches. */ if (*user) { @@ -3054,7 +3055,9 @@ key_matches_user_or_group (char *user) if (!strcmp (group, my_supgroups[n])) return 1; /* Found. */ } + #endif /*!HAVE_W32_SYSTEM*/ + return 0; /* No match. */ } |