security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

no RISC OS filetype needed for nooutput

Browse Source
This commit is contained in:
Stefan Bellon 2002-11-25 13:30:34 +00:00
parent 0819797911
commit 1289ab78e1
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2002-11-25 Stefan Bellon <sbellon@sbellon.de>
* plaintext.c (handle_plaintext) [__riscos__]: If nooutput is set,
no filetype is needed obviously.
2002-11-24 David Shaw <dshaw@jabberwocky.com> 2002-11-24 David Shaw <dshaw@jabberwocky.com>
* main.h, misc.c (default_cipher_algo, default_compress_algo): * main.h, misc.c (default_cipher_algo, default_compress_algo):

35
g10/plaintext.c
View File

@ -121,22 +121,27 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
if( fp || nooutput ) if( fp || nooutput )
; ;
else if( !(fp = fopen(fname,"wb")) ) { else {
log_error(_("error creating `%s': %s\n"), fname, strerror(errno) ); fp = fopen(fname,"wb");
rc = G10ERR_CREATE_FILE; if( !fp ) {
if (errno == 106) log_error(_("error creating `%s': %s\n"), fname, strerror(errno) );
log_info("Do output file and input file have the same name?\n"); rc = G10ERR_CREATE_FILE;
goto leave; if (errno == 106)
} log_info("Do output file and input file have the same name?\n");
goto leave;
}
/* If there's a ,xxx extension in the embedded filename, /* If there's a ,xxx extension in the embedded filename,
use that, else check whether the user input (in fname) use that, else check whether the user input (in fname)
has a ,xxx appended, then use that in preference */ has a ,xxx appended, then use that in preference */
if( (c = riscos_get_filetype_from_string( pt->name, pt->namelen )) != -1 ) if( (c = riscos_get_filetype_from_string( pt->name,
filetype = c; pt->namelen )) != -1 )
if( (c = riscos_get_filetype_from_string( fname, strlen(fname) )) != -1 ) filetype = c;
filetype = c; if( (c = riscos_get_filetype_from_string( fname,
riscos_set_filetype_by_number(fname, filetype); strlen(fname) )) != -1 )
filetype = c;
riscos_set_filetype_by_number(fname, filetype);
}
#endif /* __riscos__ */ #endif /* __riscos__ */
if( !pt->is_partial ) { if( !pt->is_partial ) {