diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/cpr.c | 2 | ||||
| -rw-r--r-- | g10/decrypt.c | 5 | ||||
| -rw-r--r-- | g10/exec.c | 4 | ||||
| -rw-r--r-- | g10/tdbio.c | 32 |
4 files changed, 1 insertions, 42 deletions
@@ -465,9 +465,7 @@ myread(int fd, void *buf, size_t count) else /* Ctrl-D not caught - do something reasonable */ { #ifdef HAVE_DOSISH_SYSTEM -#ifndef HAVE_W32CE_SYSTEM raise (SIGINT); /* Nothing to hangup under DOS. */ -#endif #else raise (SIGHUP); /* No more input data. */ #endif diff --git a/g10/decrypt.c b/g10/decrypt.c index 9589aff58..065601b7b 100644 --- a/g10/decrypt.c +++ b/g10/decrypt.c @@ -138,12 +138,7 @@ decrypt_message_fd (ctrl_t ctrl, int input_fd, int output_fd) return err; } -#ifdef HAVE_W32CE_SYSTEM -#warning Need to fix this if we want to use g13 - opt.outfp = NULL; -#else opt.outfp = es_fdopen_nc (output_fd, "wb"); -#endif if (!opt.outfp) { char xname[64]; diff --git a/g10/exec.c b/g10/exec.c index f612c850a..75b39e0fe 100644 --- a/g10/exec.c +++ b/g10/exec.c @@ -148,9 +148,6 @@ w32_system(const char *command) int set_exec_path(const char *path) { -#ifdef HAVE_W32CE_SYSTEM -#warning Change this code to use common/exechelp.c -#else char *p; p=xmalloc(5+strlen(path)+1); @@ -168,6 +165,5 @@ set_exec_path(const char *path) return GPG_ERR_GENERAL; else return 0; -#endif } #endif /* ! NO_EXEC */ diff --git a/g10/tdbio.c b/g10/tdbio.c index a6ce5ce00..50dccca05 100644 --- a/g10/tdbio.c +++ b/g10/tdbio.c @@ -48,13 +48,6 @@ #define MY_O_BINARY 0 #endif -/* We use ERRNO despite that the cegcc provided open/read/write - functions don't set ERRNO - at least show that ERRNO does not make - sense. */ -#ifdef HAVE_W32CE_SYSTEM -#undef strerror -#define strerror(a) ("[errno not available]") -#endif /* * Yes, this is a very simple implementation. We should really @@ -730,13 +723,6 @@ tdbio_set_dbname (ctrl_t ctrl, const char *new_dbname, int rc; mode_t oldmask; -#ifdef HAVE_W32CE_SYSTEM - /* We know how the cegcc implementation of access works ;-). */ - if (GetLastError () == ERROR_FILE_NOT_FOUND) - gpg_err_set_errno (ENOENT); - else - gpg_err_set_errno (EIO); -#endif /*HAVE_W32CE_SYSTEM*/ if (errno && errno != ENOENT) log_fatal ( _("can't access '%s': %s\n"), fname, strerror (errno)); @@ -797,22 +783,6 @@ open_db () log_assert( db_fd == -1 ); -#ifdef HAVE_W32CE_SYSTEM - { - DWORD prevrc = 0; - wchar_t *wname = utf8_to_wchar (db_name); - if (wname) - { - db_fd = (int)CreateFile (wname, GENERIC_READ|GENERIC_WRITE, - FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, NULL); - xfree (wname); - } - if (db_fd == -1) - log_fatal ("can't open '%s': %d, %d\n", db_name, - (int)prevrc, (int)GetLastError ()); - } -#else /*!HAVE_W32CE_SYSTEM*/ db_fd = gnupg_open (db_name, O_RDWR | MY_O_BINARY, 0); if (db_fd == -1 && (errno == EACCES #ifdef EROFS @@ -827,7 +797,7 @@ open_db () } if ( db_fd == -1 ) log_fatal( _("can't open '%s': %s\n"), db_name, strerror(errno) ); -#endif /*!HAVE_W32CE_SYSTEM*/ + register_secured_file (db_name); /* Read the version record. */ |