Changed a lot of __MINGW32__ to _WIN32. This should help a bit in

building with native Windows compilers.  On request by Brian Gladman.

cipher/ChangeLog

@@ -1,3 +1,8 @@
+2003-07-30  Werner Koch  <wk@gnupg.org>
+
+	* idea-stub.c, random.c: Replaced some __MINGW32__ by _WIN32 and
+	added some _WIN32.
+
 2003-05-21  David Shaw  <dshaw@jabberwocky.com>
 
 	* bithelp.h, des.c, random.c, rndlinux.c, sha1.c, blowfish.c,

cipher/idea-stub.c

@@ -1,5 +1,5 @@
 /* idea-stub.c - Dummy module for the deprecated IDEA cipher.
- *	Copyright (C) 2002 Free Software Foundation, Inc.
+ *	Copyright (C) 2002, 2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -41,7 +41,7 @@
 #ifdef HAVE_DL_DLOPEN
 #include <dlfcn.h>
 #endif
-#ifdef __MINGW32__
+#ifdef _WIN32
 #include <windows.h>
 #endif
 #include "util.h"
@@ -52,7 +52,7 @@
 #endif
 
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 #define HAVE_DL_DLOPEN
 #define USE_DYNAMIC_LINKING
 
@@ -101,7 +101,7 @@ dlsym ( void *handle, const char *name )
     }
   return h;
 }
-#endif /*__MINGW32__*/
+#endif /*_WIN32*/
 
 /* We do only support dlopen and the Windows emulation of it. */
 #ifndef HAVE_DL_DLOPEN
@@ -117,7 +117,7 @@ load_module (const char *name)
   void *handle;
   void *sym;
 
-#ifndef __MINGW32__
+#ifndef _WIN32
   /* Make sure we are not setuid. */
   if (getuid() != geteuid())
     log_bug("trying to load an extension while still setuid\n");

cipher/random.c

@@ -1,5 +1,6 @@
 /* random.c  -	random number generator
- * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002,
+ *               2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -33,7 +34,9 @@
 #include <errno.h>
 #include <string.h>
 #include <time.h>
+#ifndef _WIN32
 #include <sys/time.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -50,7 +53,7 @@
 #ifdef HAVE_GETRUSAGE
 #include <sys/resource.h>
 #endif
-#ifdef __MINGW32__
+#ifdef _WIN32
 #include <process.h>
 #endif
 #include "util.h"

g10/ChangeLog

@@ -1,5 +1,8 @@
 2003-07-30  Werner Koch  <wk@gnupg.org>
 
+	* photoid.c, passphrase.c, g10.c, exec.c: Replaced some
+	__MINGW32__ by _WIN32.
+
 	* g10.c (main): Disable use-agent if passphrase-fd is given
 	later. Suggested by Kurt Garloff.
 

g10/exec.c

@@ -1,5 +1,5 @@
 /* exec.c - generic call-a-program code
- * Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -59,7 +59,7 @@ int set_exec_path(const char *path,int method) { return G10ERR_GENERAL; }
 char *mkdtemp(char *template);
 #endif
 
-#if defined (__MINGW32__)
+#if defined (_WIN32)
 /* This is a nicer system() for windows that waits for programs to
    return before returning control to the caller.  I hate helpful
    computers. */
@@ -139,7 +139,7 @@ static int make_tempdir(struct exec_info *info)
 
   if(tmp==NULL)
     {
-#if defined (__MINGW32__)
+#if defined (_WIN32)
       tmp=m_alloc(256);
       if(GetTempPath(256,tmp)==0)
 	strcpy(tmp,"c:\\windows\\temp");
@@ -176,7 +176,7 @@ static int make_tempdir(struct exec_info *info)
 
   sprintf(info->tempdir,"%s" DIRSEP_S "gpg-XXXXXX",tmp);
 
-#if defined (__MINGW32__)
+#if defined (_WIN32)
   m_free(tmp);
 #endif
 
@@ -502,7 +502,7 @@ int exec_read(struct exec_info *info)
       if(DBG_EXTPROG)
 	log_debug("system() command is %s\n",info->command);
 
-#if defined (__MINGW32__)
+#if defined (_WIN32)
       info->progreturn=win_system(info->command);
 #else
       info->progreturn=system(info->command);

g10/g10.c

@@ -1120,7 +1120,7 @@ main( int argc, char **argv )
     opt.keyserver_options.include_subkeys=1;
     opt.keyserver_options.include_revoked=1;
     opt.mangle_dos_filenames = 1;
-#if defined (__MINGW32__)
+#if defined (_WIN32)
     set_homedir ( read_w32_registry_string( NULL,
                                     "Software\\GNU\\GnuPG", "HomeDir" ));
 #else
@@ -1425,7 +1425,7 @@ main( int argc, char **argv )
 	    break;
 	  case oLoadExtension:
 #ifndef __riscos__
-#if defined(USE_DYNAMIC_LINKING) || defined(__MINGW32__)
+#if defined(USE_DYNAMIC_LINKING) || defined(_WIN32)
 	    if(check_permissions(pargs.r.ret_str,2))
 	      log_info(_("cipher extension \"%s\" not loaded due to "
 			 "unsafe permissions\n"),pargs.r.ret_str);

g10/passphrase.c

@@ -29,7 +29,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #endif
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
+#if defined (_WIN32) || defined (__CYGWIN32__)
 # include <windows.h>
 #endif
 #include <errno.h>
@@ -100,7 +100,7 @@ static char *fd_passwd = NULL;
 static char *next_pw = NULL;
 static char *last_pw = NULL;
 
-#if defined (__MINGW32__)
+#if defined (_WIN32)
 static int read_fd = 0;
 static int write_fd = 0;
 #endif
@@ -189,7 +189,7 @@ read_passphrase_from_fd( int fd )
 static int
 writen ( int fd, const void *buf, size_t nbytes )
 {
-#if defined (__MINGW32__)
+#if defined (_WIN32)
     DWORD nwritten, nleft = nbytes;
     
     while (nleft > 0) {
@@ -232,7 +232,7 @@ writen ( int fd, const void *buf, size_t nbytes )
 static int
 readn ( int fd, void *buf, size_t buflen, size_t *ret_nread )
 {
-#if defined (__MINGW32__)
+#if defined (_WIN32)
     DWORD nread, nleft = buflen;
     
     while (nleft > 0) {
@@ -326,7 +326,7 @@ readline (int fd, char *buf, size_t buflen)
 
 #if !defined (__riscos__)
 
-#if !defined (__MINGW32__)
+#if !defined (_WIN32)
 /* For the new Assuan protocol we may have to send options */
 static int
 agent_send_option (int fd, const char *name, const char *value)
@@ -431,7 +431,7 @@ agent_send_all_options (int fd)
 #endif
   return rc;
 }
-#endif /*!__MINGW32__*/
+#endif /*!_WIN32*/
 
 
 /*
@@ -442,7 +442,7 @@ agent_send_all_options (int fd)
 static int
 agent_open (int *ret_prot)
 {
-#if defined (__MINGW32__)
+#if defined (_WIN32)
     int fd;
     char *infostr, *p;
     HANDLE h;
@@ -587,7 +587,7 @@ agent_open (int *ret_prot)
 static void
 agent_close ( int fd )
 {
-#if defined (__MINGW32__)
+#if defined (_WIN32)
     HANDLE h = OpenEvent(EVENT_ALL_ACCESS, FALSE, "gpg_agent");
     ResetEvent(h);
 #else

g10/photoid.c

@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef __MINGW32__ 
+#ifdef _WIN32 
 # include <windows.h>
 # ifndef VER_PLATFORM_WIN32_WINDOWS
 #  define VER_PLATFORM_WIN32_WINDOWS 1
@@ -223,7 +223,7 @@ char *image_type_to_string(byte type,int style)
 #if !defined(FIXED_PHOTO_VIEWER) && !defined(DISABLE_PHOTO_VIEWER)
 static const char *get_default_photo_command(void)
 {
-#if defined(__MINGW32__)
+#if defined(_WIN32)
   OSVERSIONINFO osvi;
 
   memset(&osvi,0,sizeof(osvi));

include/ChangeLog

@@ -1,3 +1,7 @@
+2003-07-30  Werner Koch  <wk@gnupg.org>
+
+	* util.h: Replaced some __MINGW32__ by _WIN32.
+
 2003-06-26  David Shaw  <dshaw@jabberwocky.com>
 
 	* types.h: Prefer using uint64_t when creating a 64-bit unsigned

include/util.h

@@ -20,7 +20,7 @@
 #ifndef G10_UTIL_H
 #define G10_UTIL_H
 
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
+#if defined (_WIN32) || defined (__CYGWIN32__)
 #include <stdarg.h>
 #endif
 
@@ -229,7 +229,7 @@ int strncasecmp (const char *, const char *b, size_t n);
 #define memmove(d, s, n) bcopy((s), (d), (n))
 #endif
 
-#if defined (__MINGW32__)
+#if defined (_WIN32)
 /*-- w32reg.c --*/
 char *read_w32_registry_string( const char *root,
 				const char *dir, const char *name );

po/ca.po

@@ -26,7 +26,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-14 18:29+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -305,64 +305,64 @@ msgstr "... a
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "heu trobat un bug... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "no s'ha trobat cap mòdul d'acumulació d'entropia\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no es pot fer stat de «%s»: %s\n"
 
 # Descartar, deixar passar...  ignorar és un anglicisme.  ivb
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "«%s» no és un fitxer regular: es descarta\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fitxer random_seed és buit\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVÍS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no s'ha pogut llegir «%s»: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no s'ha pogut escriure «%s»: %s\n"
 
 # No em passe! ;)  ivb
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVÍS: esteu usant un generador de nombres aleatoris insegur!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/cs.po

@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-24 17:50+0200\n"
 "Last-Translator: Roman Pavlik <rp@tns.cz>\n"
 "Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -271,62 +271,62 @@ msgstr "... toto je chyba v programu (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "nalezena chyba v programu ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "nebyl detekován ¾ádný modul pro získání entropie\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otevøít `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nemohu pou¾ít pøíkaz stat na `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' není normální soubor - ignoruji\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "poznámka: soubor random_seed je prázdný\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "VAROVÁNÍ: neplatná velikost random_seed - soubor nepou¾it\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nemohu èíst `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "poznámka: soubor random_seed není aktualizován\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvoøit `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nemohu zapisovat do `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nemohu zavøít `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROVÁNÍ: pou¾itý generátor náhodných èísel není bezpeèný!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/da.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -278,62 +278,62 @@ msgstr "... dette er en fejl (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilfældig-nummer-generator!!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/de.po

@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-07-30 14:48+0200\n"
 "Last-Translator: Walter Koch <koch@u32.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -274,63 +274,63 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Status von '%s' ist nicht feststellbar: %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "WARNUNG: Falsche Größe der 'random_seed'-Datei - sie wird nicht verwendet\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "'%s' ist unlesbar: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unverändert\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kann '%s' nicht schreiben: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kann '%s' nicht schliessen: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/el.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-25 18:03+0200\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -272,64 +272,64 @@ msgstr "...
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "âñÞêáôå Ýíá bug ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "äåí åíôïðßóôçêå Üñèñùìá óõëëïãÞò åíôñïðßáò\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "áäõíáìßá ðñüóâáóçò óôï `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "áäõíáìßá ëÞøçò ðëçñïöïñéþí ãéá ôï `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' äåí åßíáé êáíïíéêü áñ÷åßï - áãíïÞèçêå\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "óçìåßùóç: ôï áñ÷åßï random_seed åßíáé Üäåéï\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç Ýãêõñï ìÝãåèïò áñ÷åßïõ random_seed - äåí\n"
 "÷ñçóéìïðïéåßôå\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "áäõíáìßá áíÜãíùóçò ôïõ `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "óçìåßùóç: äåí Ý÷åé áíáíåùèåß ôï áñ÷åßï random_seed\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "áäõíáìßá åããñáöÞò ôïõ `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "áäõíáìßá êëåéóßìáôïò ôïõ `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ÷ñÞóç ìç áóöáëïýò ãåííÞôñéáò ôõ÷áßùí áñéèìþí!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/eo.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -273,63 +273,63 @@ msgstr "...
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ne povas stat-i '%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ne estas normala dosiero - ignorita\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "noto: dosiero random_seed estas malplena\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "ne povas legi '%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "ne povas skribi '%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/es.po

@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-25 19:00+0100\n"
 "Last-Translator: Jaime Suárez <jsuarez@ono.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -302,16 +302,16 @@ msgstr "... esto es un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "ha encontrado un error... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "no se ha detectado módulo acumulador de entropía\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no se puede obtener información de `%s': %s\n"
@@ -321,49 +321,49 @@ msgstr "no se puede obtener informaci
 # Sugerencia a la sugerencia: ¿qué tal omitido? (pasar en silencio una
 # cosa; excluirla de lo que se habla o escribe) dice el diccionario.
 # Bien. También se puede poner "descartado".
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s` no es un fichero regular - omitido\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fichero de semillas aleatorias está vacío\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ATENCIÓN: tamaño incorrecto del fichero de semillas aleatorias - no se usa\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no se puede leer `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no se puede escribir `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no se puede cerrar `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ATENCIÓN: ¡usando un generador de números aleatorios inseguro!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/et.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-18 18:13+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -272,62 +272,62 @@ msgstr "... see on viga (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "entroopia kogumise moodul puudub\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei õnnestu avada: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ei õnnestu lugeda `%s' atribuute: %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "märkus: random_seed fail on tühi\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s' ei õnnestu lugeda: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "märkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "`%s' ei õnnestu kirjutada: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/fi.po

@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.1\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-30 18:37+0200\n"
 "Last-Translator: Jouni Hiltunen <jouni.hiltunen@kolumbus.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -271,64 +271,64 @@ msgstr "...t
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "olet löytänyt virheen ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "entropian keräysmodulia ei haittavissa\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "\"`%s': %s\" avaaminen ei onnistu\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s': %s ei voida lausua\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ei ole normaali tiedosto - jätetään huomiotta\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "huom: random_seed tiedosto on tyhjä\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "VAROITUS: random_seed tiedosto on väärän kokoinen\n"
 "- tiedostoa ei käytetä\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s': %s ei voida lukea\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "random_seed tiedostoa ei päivitetty\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s': %s ei voida luoda\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tiedostoon \"`%s': %s\" ei voida kirjoittaa.\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tiedostoa \"`%s': %s\" ei voida sulkea.\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROITUS: käytetty satunnaislukugeneraattori ei ole turvallinen.\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/fr.po

@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-28 18:48+0300\n"
 "Last-Translator: Gaël Quéri <gael@lautre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -279,65 +279,65 @@ msgstr "... c'est un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouvé un bug... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "aucun module de récupération d'entropie n'a été trouvé.\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossible d'accéder à `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n'est pas un fichier régulier - ignoré\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "note: le fichier `random_seed' est vide\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVERTISSEMENT: la taille du fichier `random_seed' est invalide.\n"
 "Celui-ci ne sera pas utilisé.\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossible de lire `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas été mis à jour\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de créer `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossible d'écrire `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossible de fermer `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENTION: utilisation d'un générateur de nombres aléatoires peu sûr !!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/gl.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-24 15:26+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -272,62 +272,62 @@ msgstr "... isto
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "atopou un erro ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "non se detectou un módulo de acumulación de entropía\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "non se puido facer stat sobre `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non é un ficheiro normal - ignórase\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: o ficheiro random_seed está baleiro\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: tamaño do ficheiro random_seed non válido - non se emprega\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "non se pode ler de `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "non se pode escribir en `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: ¡¡emprégase un xerador de números aleatorios inseguro!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/hu.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-24 23:12+0200\n"
 "Last-Translator: Nagy Ferenc László <nfl@nfllab.com>\n"
 "Language-Team: Nagy Ferenc László <nfl@nfllab.com>\n"
@@ -272,63 +272,63 @@ msgstr "Ez egy programhiba... (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Talált egy programhibát... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "Nem észleltem entrópiagyûjtõ modult.\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Nem tudom a stat mûveletet elvégezni a(z) \"%s\" állományon: %s.\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" nem szabályos állomány. Figyelmen kívül hagyom.\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr ""
 "Megjegyzés: random_seed állomány (véletlenszám-generátor állapota) üres.\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "FIGYELEM: Érvénytelen méretû random_seed állomány. Nem használom.\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "Nem tudom olvasni a(z) \"%s\" állományt: %s.\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "Megjegyzés: random_seed állományt nem frissítettem.\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "Nem tudom írni a(z) \"%s\" állományt: %s.\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "FIGYELEM: Nem biztonságos véletlenszám-generátort használok!!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/id.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-29 14:48GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -274,62 +274,62 @@ msgstr "... kesalahan (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "modul entropi gathering tidak terdeteksi\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tidak dapat melakukan statistik `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' bukan file reguler - diabaikan\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "catatan: file random_seed kosong\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tidak dapat membaca `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "catatan: file random_seed tidak diupdate\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tidak dapat menulis `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/it.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-28 02:34+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -273,64 +273,64 @@ msgstr "... questo
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "non è stato trovato il modulo per raccogliere l'entropia\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossibile eseguire stat su `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non è un file regolare - ignorato\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: il file random_seed è vuoto\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ATTENZIONE: le dimensioni del file random_seed non sono valide - non usato\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossibile leggere `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: il file random_seed non è stato aggiornato\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossibile scrivere su `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/ja.po

@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.1\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-07 22:57+0900\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -275,62 +275,62 @@ msgstr "...
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "バグを見つけたようです ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "エントロピー収集モジュールが、検出されていません\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "「%s」が開けません: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "「%s」を調べることができません: %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "「%s」は普通のファイルではありません - 無視\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "注意: random_seed ファイルは空です\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "警告: 無効なサイズの random_seed ファイル - 使いません\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "「%s」を読めません: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "注意: random_seed ファイルの更新をしません\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "「%s」ができません: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "「%s」に書けません: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "「%s」を閉じられません: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "警告: 剣呑な乱数生成子が使われています!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/nl.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -276,63 +276,63 @@ msgstr "... dit is een programmeerfout (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "LET OP: de willekeurige getallengenerator is niet veilig!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/pl.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-01-13 22:15+0100\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -282,65 +282,65 @@ msgstr "... to jest b
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz³e¶(a¶) b³±d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "modu³ gromadzenia entropii nie zosta³ wykryty\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nie mo¿na sprawdziæ %s: %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' nie jest zwyk³ym plikiem - zostaje pominiêty\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "uwaga: plik random_seed jest pusty\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "OSTRZE¯ENIE: niew³a¶ciwy rozmiar pliku random_seed - nie zostanie u¿yty\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nie mo¿na odczytaæ %s: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo¿na stworzyæ %s: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nie mo¿na zapisaæ %s: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nie mo¿na zamkn±æ %s: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "OSTRZE¯ENIE: u¿ywany generator liczb losowych\n"
 "nie jest kryptograficznie bezpieczny!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/pt.po

@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -275,63 +275,63 @@ msgstr "... isto
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "você encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "nenhum módulo de recolha de entropia detectado\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossível 'stat' a `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' não é um ficheiro normal - ignorado\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: random_seed está vazia\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVISO: o ficheiro random_seed tem um tamanho inválido - não utilizado\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossível ler `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed não actualizado\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossível escrever `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossível fechar `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de números aleatórios inseguro!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/pt_BR.po

@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -285,63 +285,63 @@ msgstr "... isto
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "você encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: dados de notação inválidos encontrados\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de números aleatórios inseguro!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/ro.po

@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-11 12:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <buzdugan@voyager.net>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -277,66 +277,66 @@ msgstr "... acesta este un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "aþi gãsit un bug ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "nu a fost gãsit nici un modul de adunare a entropiei\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nu pot obþine statistici `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nu este un fiºier normal - ignorat\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "notã: fiºier random_seed este gol\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVERTISMENT: dimensiune invalidã pentru fiºierul random_seed - nu va fi "
 "folositã\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nu pot citi `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "notã: fiºierul random_seed nu a fost actualizat\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nu pot scrie `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nu pot închide `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "AVERISMENT: este folosit un generator de numere aleatoare nesigur "
 "(insecure)!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/sk.po

@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-28 00:00+0200\n"
 "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -271,62 +271,62 @@ msgstr "... toto je chyba v programe (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "nájdená chyba v programe ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "nebol detekovaný ¾iadny modul na získanie entropie\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemô¾em otvori» `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nemô¾em pou¾i» príkaz stat na `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nie je normálny súbor - ignorované\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "poznámka: súbor random_seed je prázdny\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "varovanie: neplatná veµkos» random_seed - súbor nepou¾itý\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nemô¾em èíta» `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "poznámka: súbor random_seed nie je aktualizovaný\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemô¾em vytvori» `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nemô¾em zapisova» do `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nemô¾em zavrie» `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROVANIE: pou¾itý generátor náhodných èísel nie je bezpeèný!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/sv.po

@@ -20,7 +20,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.1\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-30 18:47+0200\n"
 "Last-Translator: Per Tunedal <info@clipanish.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -288,62 +288,62 @@ msgstr "... detta
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan inte ta status på \"%s\": %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" är inte än vanlig fil - ignorerad\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "notera: filen random_seed är tom\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "varning: slumpkärnan har en felaktig storlek och används därför inte\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan inte läsa \"%s\": %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "notera: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan inte skriva till \"%s\": %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan inte stänga \"%s\": %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: använder en osäker slumptalsgenerator!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/tr.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-21 11:08+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -275,62 +275,62 @@ msgstr "... bu bir yazılım hatası (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "rasgele bayt elde etme modülü bulunamadı\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s' durumlanamıyor: %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' düzenli bir dosya değil - görülmedi\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "not: \"random_seed\" dosyası boş\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "UYARI: random_seed dosyasının boyu hatalı - kullanılmadı\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "\"%s\" okunamıyor: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "\"%s\" yazılamıyor: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "\"%s\" kapatılamıyor: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "UYARI: kullanılan rasgele sayı üreteci güvenli değil!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

po/zh_TW.po

@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-13 15:48+0800\n"
 "Last-Translator: Jedi <Jedi@idej.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -275,62 +275,62 @@ msgstr "...
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "妳找到一個瑕疵了 ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "偵測不到亂數蒐集模組\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s' ： %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "無法取得檔案 `%s' 的資訊： %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' 不是一個標準的檔案 ─ 已略過\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "請注意： random_seed 檔案是空的\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "警告： random_seed 檔案大小無效 ─ 不予採用\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "無法讀取 `%s' ： %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "請注意： random_seed 檔案未被更新\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s' ： %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "無法寫入 `%s' ： %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "無法關閉 `%s' ： %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "警告：正在使用不安全的隨機數字產生器！！\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"

util/ChangeLog

@@ -1,3 +1,9 @@
+2003-07-30  Werner Koch  <wk@gnupg.org>
+
+	* dotlock.c [_WIN32]: Don't include sys/time.h 
+	* http.c, iobuf.c, simple-gettext.c: s/__MINGW32__/_WIN32/.
+	* strgutil.c, ttyio.c, w32reg.c: Ditto.
+	
 2003-06-07  Werner Koch  <wk@gnupg.org>
 
 	* iobuf.c (check_special_filename): Replaced is isdigit by digitp

util/dotlock.c

@@ -29,7 +29,9 @@
 #include <sys/utsname.h>
 #endif
 #include <sys/types.h>
+#ifndef _WIN32
 #include <sys/time.h>
+#endif
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>

util/http.c

@@ -1,5 +1,5 @@
 /* http.c  -  HTTP protocol handler
- *	Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+ *	Copyright (C) 1999, 2001, 2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -26,7 +26,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 #include <windows.h>
 #else
 #include <unistd.h>
@@ -53,7 +53,7 @@
 #define HTTP_PROXY_ENV_PRINTABLE "$http_proxy"
 #endif
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 #define sock_close(a)  closesocket(a)
 #else
 #define sock_close(a)  close(a)
@@ -83,7 +83,7 @@ static int parse_response( HTTP_HD hd );
 static int connect_server( const char *server, ushort port );
 static int write_server( int sock, const char *data, size_t length );
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 static void
 deinit_sockets (void)
 {
@@ -113,7 +113,7 @@ init_sockets (void)
     atexit ( deinit_sockets );
     initialized = 1;
 }
-#endif /*__MINGW32__*/
+#endif /*_WIN32*/
 
 
 int
@@ -712,7 +712,7 @@ static int
 connect_server( const char *server, ushort port )
 {
     int sd;
-#ifdef __MINGW32__
+#ifdef _WIN32
     struct hostent *hp;
     struct sockaddr_in ad;
     unsigned long l;
@@ -785,7 +785,7 @@ write_server( int sock, const char *data, size_t length )
 
     nleft = length;
     while( nleft > 0 ) {
-#ifdef __MINGW32__  
+#ifdef _WIN32  
         int nwritten;
 
         nwritten = send (sock, data, nleft, 0);

util/iobuf.c

@@ -1,5 +1,5 @@
 /* iobuf.c  -  file handling
- *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -96,7 +96,7 @@ typedef struct {
  static CLOSE_CACHE close_cache;
 #endif
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 typedef struct {
     int sock;
     int keep_open;
@@ -105,7 +105,7 @@ typedef struct {
     int  print_only_name; /* flags indicating that fname is not a real file*/
     char fname[1]; /* name of the file */
 } sock_filter_ctx_t ;
-#endif /*__MINGW32__*/
+#endif /*_WIN32*/
 
 /* The first partial length header block must be of size 512
  * to make it easier (and efficienter) we use a min. block size of 512
@@ -515,7 +515,7 @@ file_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
     return rc;
 }
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 /* Becuase sockets are an special object under Lose32 we have to
  * use a special filter */
 static int
@@ -587,7 +587,7 @@ sock_filter (void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
     }
     return rc;
 }
-#endif /*__MINGW32__*/
+#endif /*_WIN32*/
 
 /****************
  * This is used to implement the block write mode.
@@ -1122,7 +1122,7 @@ IOBUF
 iobuf_sockopen ( int fd, const char *mode )
 {
     IOBUF a;
-#ifdef __MINGW32__
+#ifdef _WIN32
     sock_filter_ctx_t *scx;
     size_t len;
 
@@ -1261,7 +1261,7 @@ iobuf_ioctl ( IOBUF a, int cmd, int intval, void *ptrval )
                 b->keep_open = intval;
                 return 0;
             }
-#ifdef __MINGW32__
+#ifdef _WIN32
             else if( !a->chain && a->filter == sock_filter ) {
                 sock_filter_ctx_t *b = a->filter_ov;
                 b->keep_open = intval;
@@ -1290,7 +1290,7 @@ iobuf_ioctl ( IOBUF a, int cmd, int intval, void *ptrval )
                 b->no_cache = intval;
                 return 0;
             }
-#ifdef __MINGW32__
+#ifdef _WIN32
             else if( !a->chain && a->filter == sock_filter ) {
                 sock_filter_ctx_t *b = a->filter_ov;
                 b->no_cache = intval;
@@ -2141,7 +2141,7 @@ iobuf_read_line( IOBUF a, byte **addr_of_buffer,
 int
 iobuf_translate_file_handle ( int fd, int for_write )
 {
-#ifdef __MINGW32__
+#ifdef _WIN32
     {
         int x;
             
@@ -2164,7 +2164,7 @@ iobuf_translate_file_handle ( int fd, int for_write )
 static int
 translate_file_handle ( int fd, int for_write )
 {
-#ifdef __MINGW32__
+#ifdef _WIN32
 #ifdef FILE_FILTER_USES_STDIO  
     fd = iobuf_translate_file_handle (fd, for_write);
 #else

util/simple-gettext.c

@@ -27,8 +27,8 @@
 
 #include <config.h>
 #ifdef USE_SIMPLE_GETTEXT
-#if !defined (__MINGW32__) && !defined (__CYGWIN32__)
+#if !defined (_WIN32) && !defined (__CYGWIN32__)
-#error This file can only be used with MingW32 or Cygwin32
+#error This file can only be used udner Windows or Cygwin32
 #endif
 
 #include <stdio.h>

util/strgutil.c

@@ -860,7 +860,7 @@ strncasecmp( const char *a, const char *b, size_t n )
 #endif
 
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 /* 
  * Like vsprintf but provides a pointer to malloc'd storage, which
  * must be freed by the caller (m_free).  Taken from libiberty as
@@ -954,5 +954,4 @@ vasprintf ( char **result, const char *format, va_list args)
     return 0;
 }
 
-#endif /*__MINGW32__*/
+#endif /*_WIN32*/
-

util/ttyio.c

@@ -37,10 +37,10 @@
 #define HAVE_TCGETATTR
 #endif
 #endif
-#ifdef __MINGW32__ /* use the odd Win32 functions */
+#ifdef _WIN32 /* use the odd Win32 functions */
 #include <windows.h>
 #ifdef HAVE_TCGETATTR
-#error mingw32 and termios
+#error windows and termios
 #endif
 #endif
 #include <errno.h>
@@ -51,7 +51,7 @@
 
 #define CONTROL_D ('D' - 'A' + 1)
 
-#ifdef __MINGW32__ /* use the odd Win32 functions */
+#ifdef _WIN32 /* use the odd Win32 functions */
 static struct {
     HANDLE in, out;
 } con;
@@ -124,7 +124,7 @@ init_ttyfp(void)
     if( initialized )
 	return;
 
-#if defined(__MINGW32__)
+#if defined(_WIN32)
     {
 	SECURITY_ATTRIBUTES sa;
 
@@ -194,7 +194,7 @@ tty_printf( const char *fmt, ... )
 	init_ttyfp();
 
     va_start( arg_ptr, fmt ) ;
-#ifdef __MINGW32__
+#ifdef _WIN32
     {   
         char *buf = NULL;
         int n;
@@ -231,7 +231,7 @@ tty_print_string( byte *p, size_t n )
     if( !initialized )
 	init_ttyfp();
 
-#ifdef __MINGW32__
+#ifdef _WIN32
     /* not so effective, change it if you want */
     for( ; n; n--, p++ )
 	if( iscntrl( *p ) ) {
@@ -325,7 +325,7 @@ do_get( const char *prompt, int hidden )
     buf = m_alloc(n=50);
     i = 0;
 
-#ifdef __MINGW32__ /* windoze version */
+#ifdef _WIN32 /* windoze version */
     if( hidden )
 	SetConsoleMode(con.in, HID_INPMODE );
 
@@ -480,7 +480,7 @@ tty_kill_prompt()
 	last_prompt_len = 0;
     if( !last_prompt_len )
 	return;
-#ifdef __MINGW32__
+#ifdef _WIN32
     tty_printf("\r%*s\r", last_prompt_len, "");
 #else
     {

util/w32reg.c

@@ -19,7 +19,7 @@
  */
 
 #include <config.h>
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
+#if defined (_WIN32) || defined (__CYGWIN32__)
  /* This module is only used in this environment */
 
 #include <stdio.h>