See ChangeLog: Mon Sep 6 19:59:08 CEST 1999 Werner Koch

6 files changed, 25 insertions, 39 deletions

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 30d2c6b5e..6e00c6126 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep  6 19:59:08 CEST 1999  Werner Koch  <[email protected]>
+
+
+	* tdbio.c (tdbio_set_dbname): Use mkdir macro
+	* ringedit.c (add_keyblock_resource): Ditto.
+
 Fri Sep  3 10:04:45 CEST 1999  Werner Koch  <[email protected]>
 
 
diff --git a/g10/OPTIONS b/g10/OPTIONS
index 1132a846f..96290f6cf 100644
--- a/g10/OPTIONS
+++ b/g10/OPTIONS
@@ -1,23 +1,5 @@
-# This is a sample option file
-#
-# Unless you you specify which option file to use with the
-# commandline option "--options filename", gpg uses the
-# file ~/.gnupg/options by default.
-#
-# An option file can contain all long options which are
-# available in GNUPG. If the first non white space character of
-# a line is a '#', this line is ignored.  Empty lines are also
-# ignored.
-#
-# Here is a list of all possible options. Not of all them make
-# sense in an option file; consider this as a complete option
-# reference. Before the options you find a list of commands.
-
-
-#-----------------------------------------------
-#------------------- Commands ------------------
-#-----------------------------------------------
-# With some exceptions, these cannot be combined
+# Some notes used by the maintainers
+
 
 store
 # simply packs the input data into a rfc1991 packet format
@@ -25,11 +7,6 @@ store
 check-trustdb
 
 
-
-#-----------------------------------------------
-#--- options
-#-----------------------------------------------
-
 compress-keys
 # compress exported key, compress level is still set with "-z" and
 # algorithm with --compress-algo" - Default is to not compress keys, as
diff --git a/g10/helptext.c b/g10/helptext.c
index 2136bbbcc..e81154784 100644
--- a/g10/helptext.c
+++ b/g10/helptext.c
@@ -182,7 +182,7 @@ static struct helptexts { const char *key; const char *help; } helptexts[] = {
 { "keyedit.delsig.unknown", N_(
  "This signature can't be checked because you don't have the\n"
  "corresponding key.  You should postpone its deletion until you\n"
- "know which key was used because this signing key might establish"
+ "know which key was used because this signing key might establish\n"
  "a trust connection through another already certified key."
 )},
 { "keyedit.delsig.invalid", N_(
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 1528cbaa9..8daa7c4f5 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1737,7 +1737,7 @@ menu_revsig( KBNODE keyblock )
     int rc, any;
 
     /* FIXME: detect duplicates here  */
-    tty_printf("You have signed these user IDs:\n");
+    tty_printf(_("You have signed these user IDs:\n"));
     for( node = keyblock; node; node = node->next ) {
 	node->flag &= ~(NODFLG_SELSIG | NODFLG_MARK_A);
 	if( node->pkt->pkttype == PKT_USER_ID ) {
@@ -1751,12 +1751,12 @@ menu_revsig( KBNODE keyblock )
 		&& ((sig = node->pkt->pkt.signature),
 		     !seckey_available( sig->keyid )  ) ) {
 	    if( (sig->sig_class&~3) == 0x10 ) {
-		tty_printf("   signed by %08lX at %s\n",
+		tty_printf(_("   signed by %08lX at %s\n"),
 			    sig->keyid[1], datestr_from_sig(sig) );
 		node->flag |= NODFLG_SELSIG;
 	    }
 	    else if( sig->sig_class == 0x30 ) {
-		tty_printf("   revoked by %08lX at %s\n",
+		tty_printf(_("   revoked by %08lX at %s\n"),
 			    sig->keyid[1], datestr_from_sig(sig) );
 	    }
 	}
@@ -1776,7 +1776,7 @@ menu_revsig( KBNODE keyblock )
 	    continue;
 	if( !any ) {
 	    any = 1;
-	    tty_printf("You are about to revoke these signatures:\n");
+	    tty_printf(_("You are about to revoke these signatures:\n"));
 	}
 	if( node->pkt->pkttype == PKT_USER_ID ) {
 	    PKT_user_id *uid = node->pkt->pkt.user_id;
@@ -1786,7 +1786,7 @@ menu_revsig( KBNODE keyblock )
 	}
 	else if( node->pkt->pkttype == PKT_SIGNATURE ) {
 	    sig = node->pkt->pkt.signature;
-	    tty_printf("   signed by %08lX at %s\n",
+	    tty_printf(_("   signed by %08lX at %s\n"),
 			    sig->keyid[1], datestr_from_sig(sig) );
 	}
     }
diff --git a/g10/ringedit.c b/g10/ringedit.c
index 3db60f245..04d6753de 100644
--- a/g10/ringedit.c
+++ b/g10/ringedit.c
@@ -63,6 +63,12 @@
 #include "i18n.h"
 
 
+#ifdef MKDIR_TAKES_ONE_ARG
+# undef mkdir
+# define mkdir(a,b) mkdir(a)
+#endif
+
+
 struct resource_table_struct {
     int used;
     int secret; /* this is a secret keyring */
@@ -287,11 +293,7 @@ add_keyblock_resource( const char *url, int force, int secret )
 	    if( access(filename, F_OK) ) {
 		if( strlen(filename) >= 7
 		    && !strcmp(filename+strlen(filename)-7, "/.gnupg") ) {
-		  #ifdef HAVE_DOSISH_SYSTEM
-		    if( mkdir(filename) )
-		  #else
 		    if( mkdir(filename, S_IRUSR|S_IWUSR|S_IXUSR) )
-		  #endif
 		    {
 			log_error( _("%s: can't create directory: %s\n"),
 				  filename, strerror(errno));
diff --git a/g10/tdbio.c b/g10/tdbio.c
index 0abfcb1da..b840d723a 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -40,6 +40,11 @@
 #include "tdbio.h"
 
 
+#ifdef MKDIR_TAKES_ONE_ARG
+# undef mkdir
+# define mkdir(a,b) mkdir(a)
+#endif
+
 /****************
  * Yes, this is a very simple implementation. We should really
  * use a page aligned buffer and read complete pages.
@@ -436,11 +441,7 @@ tdbio_set_dbname( const char *new_dbname, int create )
 	    if( access( fname, F_OK ) ) {
 		if( strlen(fname) >= 7
 		    && !strcmp(fname+strlen(fname)-7, "/.gnupg" ) ) {
-		  #if HAVE_DOSISH_SYSTEM
-		    if( mkdir( fname ) )
-		  #else
 		    if( mkdir( fname, S_IRUSR|S_IWUSR|S_IXUSR ) )
-		  #endif
 			log_fatal( _("%s: can't create directory: %s\n"),
 						    fname,  strerror(errno) );
 		    else if( !opt.quiet )