See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch
[gnupg.git] / g10 / g10.c
index 0e0999f..02d7202 100644 (file)
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -174,6 +174,9 @@ enum cmd_and_opt_values { aNull = 0,
     oNoUtf8Strings,
     oDisableCipherAlgo,
     oDisablePubkeyAlgo,
+    oAllowNonSelfsignedUID,
+    oNoLiteral,
+    oSetFilesize,
 aTest };
 
 
@@ -332,6 +335,9 @@ static ARGPARSE_OPTS opts[] = {
     { oWithFingerprint, "with-fingerprint", 0, "@" },
     { oDisableCipherAlgo,  "disable-cipher-algo", 2, "@" },
     { oDisablePubkeyAlgo,  "disable-pubkey-algo", 2, "@" },
+    { oAllowNonSelfsignedUID, "allow-non-selfsigned-uid", 0, "@" },
+    { oNoLiteral, "no-literal", 0, "@" },
+    { oSetFilesize, "set-filesize", 20, "@" },
 {0} };
 
 
@@ -843,6 +849,15 @@ main( int argc, char **argv )
          case oDisablePubkeyAlgo:
                disable_pubkey_algo( string_to_pubkey_algo(pargs.r.ret_str) );
                break;
+         case oAllowNonSelfsignedUID:
+               opt.allow_non_selfsigned_uid = 1;
+               break;
+         case oNoLiteral:
+               opt.no_literal = 1;
+               break;
+         case oSetFilesize:
+               opt.set_filesize = pargs.r.ret_ulong;
+               break;
 
          default : pargs.err = configfp? 1:2; break;
        }
@@ -873,6 +888,17 @@ main( int argc, char **argv )
                 " the OpenPGP WG has not yet aggreed on MDCs\n");
        opt.force_mdc = 0;
     }
+    if (opt.no_literal) {
+       log_info(_("NOTE: %s is not for normal use!\n"), "--no-literal");
+       if (opt.textmode)
+           log_error(_("%s not allowed with %s!\n"),
+                      "--textmode", "--no-literal" );
+       if (opt.set_filename)
+           log_error(_("%s makes no sense with %s!\n"),
+                       "--set-filename", "--no-literal" );
+    }
+    if (opt.set_filesize)
+       log_info(_("NOTE: %s is not for normal use!\n"), "--set-filesize");
     if( opt.batch )
        tty_batchmode( 1 );
 
@@ -1153,7 +1179,7 @@ main( int argc, char **argv )
            }
        }
        else
-           wrong_args(_("-k[v][v][v][c] [userid] [keyring]") );
+           wrong_args(_("-k[v][v][v][c] [user-id] [keyring]") );
        break;
 
       case aKeygen: /* generate a key (interactive) */