diff options
| author | David Shaw <[email protected]> | 2004-04-01 04:02:27 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-04-01 04:02:27 +0000 |
| commit | 7ac574aeea6fca8a94e844824dcea55ca7ba29a8 (patch) | |
| tree | 080e8738b81986794713f8a8b365de9a36920cfb | |
| parent | Time for a new release candidate (diff) | |
| download | gnupg-7ac574aeea6fca8a94e844824dcea55ca7ba29a8.tar.gz gnupg-7ac574aeea6fca8a94e844824dcea55ca7ba29a8.zip | |
* g10.c (main): --no-use-embedded-filename.
* plaintext.c (handle_plaintext): Accept 'u' as a plaintext mode that
requires end of line conversion. This is being considered for a UTF8 text
packet. If this doesn't take place, no major harm done. If it does take
place, we'll get a jump on starting the changeover.
| -rw-r--r-- | g10/ChangeLog | 10 | ||||
| -rw-r--r-- | g10/g10.c | 3 | ||||
| -rw-r--r-- | g10/plaintext.c | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index d75de0f45..39dfa1844 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,13 @@ +2004-03-31 David Shaw <[email protected]> + + * g10.c (main): --no-use-embedded-filename. + + * plaintext.c (handle_plaintext): Accept 'u' as a plaintext mode + that requires end of line conversion. This is being considered + for a UTF8 text packet. If this doesn't take place, no major harm + done. If it does take place, we'll get a jump on starting the + changeover. + 2004-03-29 Werner Koch <[email protected]> * g10.c: New command --gpgconf-list. @@ -221,6 +221,7 @@ enum cmd_and_opt_values oShowPolicyURL, oNoShowPolicyURL, oUseEmbeddedFilename, + oNoUseEmbeddedFilename, oComment, oDefaultComment, oThrowKeyid, @@ -573,6 +574,7 @@ static ARGPARSE_OPTS opts[] = { { oLoggerFile, "logger-file",2, "@" }, #endif /* __riscos__ */ { oUseEmbeddedFilename, "use-embedded-filename", 0, "@" }, + { oNoUseEmbeddedFilename, "no-use-embedded-filename", 0, "@" }, { oUtf8Strings, "utf8-strings", 0, "@" }, { oNoUtf8Strings, "no-utf8-strings", 0, "@" }, { oWithFingerprint, "with-fingerprint", 0, "@" }, @@ -1753,6 +1755,7 @@ main( int argc, char **argv ) case oShowPolicyURL: opt.show_policy_url=1; break; case oNoShowPolicyURL: opt.show_policy_url=0; break; case oUseEmbeddedFilename: opt.use_embedded_filename = 1; break; + case oNoUseEmbeddedFilename: opt.use_embedded_filename = 0; break; case oComment: opt.comment_string = pargs.r.ret_str; break; case oDefaultComment: opt.comment_string = NULL; break; case oThrowKeyid: opt.throw_keyid = 1; break; diff --git a/g10/plaintext.c b/g10/plaintext.c index 35ad3dbc1..3f946c1d3 100644 --- a/g10/plaintext.c +++ b/g10/plaintext.c @@ -56,7 +56,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx, static off_t count=0; int rc = 0; int c; - int convert = pt->mode == 't'; + int convert = (pt->mode == 't' || pt->mode == 'u'); /* create the filename as C string */ if( nooutput ) |