Add "help" sub option to --*-options.

4 files changed, 22 insertions, 1 deletions

diff --git a/g10/ChangeLog b/g10/ChangeLog
index e98bca4bc..1f75baea5 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-07  Werner Koch  <[email protected]>
+
+	* misc.c (parse_options): Allow meta option "help" to list all
+	options and to exit the program.
+
 2005-09-02  David Shaw  <[email protected]>
 
 	* parse-packet.c (enum_sig_subpkt, parse_signature,
@@ -18,6 +23,11 @@
 	* photoid.c (generate_photo_id): Enable readline completion and
 	tilde expansion for the JPEG prompt.
 
+2005-08-30  Werner Koch  <[email protected]>
+
+	* passphrase.c (agent_open): Print a warning and not an error in
+	case of a missing agent.  Should fix Debian bug #325578.
+
 2005-08-26  David Shaw  <[email protected]>
 
 	* misc.c (openpgp_pk_algo_usage): Default to allowing CERT for
@@ -79,6 +89,7 @@
 	--passphrase command line option.  Only useful in very special
 	circumstances.
 
+>>>>>>> .r3884
 2005-08-05  Werner Koch  <[email protected]>
 
 	* gpgv.c (keyserver_import_fprint): New stub.
diff --git a/g10/card-util.c b/g10/card-util.c
index 3517a74f3..6159512c1 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -156,6 +156,7 @@ get_manufacturer (unsigned int no)
     case 0:
     case 0xffff: return "test card";
     case 0x0001: return "PPC Card Systems";
+    case 0x0002: return "Prism";
     default: return "unknown";
     }
 }
diff --git a/g10/misc.c b/g10/misc.c
index 9ccc841e9..8d7b6804a 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -966,6 +966,15 @@ parse_options(char *str,unsigned int *options,
 {
   char *tok;
 
+  if (str && !strcmp (str, "help"))
+    {
+      int i;
+
+      for(i=0;opts[i].name;i++)
+        printf ("%s\n", opts[i].name);
+      g10_exit (0);
+    }
+
   while((tok=optsep(&str)))
     {
       int i,rev=0;
diff --git a/g10/passphrase.c b/g10/passphrase.c
index fa10eccec..d0a19d25d 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -314,7 +314,7 @@ agent_open (int try, const char *orig_codeset)
               if (orig_codeset)
                 bind_textdomain_codeset (PACKAGE, orig_codeset);
 #endif /*ENABLE_NLS*/
-              log_error (_("gpg-agent is not available in this session\n"));
+              log_info (_("gpg-agent is not available in this session\n"));
               opt.use_agent = 0;
             }
           return NULL;