From a1259acdcbfb368db72a37381f895b5a9e16b835 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 6 Aug 2002 13:29:27 +0000
Subject: [PATCH] * g10.c (main): Try to use "gpg.conf" as default option file.
 * openfile.c (copy_options_file): Changed name of created file.

---
 g10/ChangeLog  |  5 +++++
 g10/g10.c      | 17 +++++++++++++++--
 g10/openfile.c |  6 +++---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 52357d6c3..03daf0fd8 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-06  Werner Koch  <wk@gnupg.org>
+
+	* g10.c (main): Try to use "gpg.conf" as default option file.
+	* openfile.c (copy_options_file): Changed name of created file.
+
 2002-08-02  Werner Koch  <wk@gnupg.org>
 
 	* Makefile.am (LDFLAGS): Removed DYNLINK_LDFLAGS.
diff --git a/g10/g10.c b/g10/g10.c
index 7da518e25..e004015bd 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -979,8 +979,21 @@ main( int argc, char **argv )
     /* Okay, we are now working under our real uid */
 
     if( default_config )
-	configname = make_filename(opt.homedir, "options", NULL );
-
+      {
+	configname = make_filename(opt.homedir, "gpg.conf", NULL );
+        if (!access (configname, R_OK))
+          { /* Print a warning when both config files are present. */
+            char *p = make_filename(opt.homedir, "options", NULL );
+            if (!access (p, R_OK))
+              log_info (_("NOTE: old default options file `%s' ignored\n"), p);
+            m_free (p);
+          }
+        else
+          { /* Keep on using the old default one. */
+            m_free (configname);
+            configname = make_filename(opt.homedir, "options", NULL );
+          }
+      }
     argc = orig_argc;
     argv = orig_argv;
     pargs.argc = &argc;
diff --git a/g10/openfile.c b/g10/openfile.c
index 1bc4cf04c..84e600cbf 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -301,7 +301,7 @@ copy_options_file( const char *destdir )
 	m_free(fname);
 	return;
     }
-    strcpy(stpcpy(fname, destdir), DIRSEP_S "options" );
+    strcpy(stpcpy(fname, destdir), DIRSEP_S "gpg.conf" );
     dst = fopen( fname, "w" );
     if( !dst ) {
 	log_error(_("%s: can't create: %s\n"), fname, strerror(errno) );
@@ -320,7 +320,7 @@ copy_options_file( const char *destdir )
     }
     fclose( dst );
     fclose( src );
-    log_info(_("%s: new options file created\n"), fname );
+    log_info(_("new configuration file `%s' created\n"), fname );
     m_free(fname);
 }
 
@@ -353,7 +353,7 @@ try_make_homedir( const char *fname )
 	    log_info( _("%s: directory created\n"), fname );
 	copy_options_file( fname );
 	log_info(_("you have to start GnuPG again, "
-		   "so it can read the new options file\n") );
+		   "so it can read the new configuration file\n") );
 	g10_exit(1);
     }
 }