-/* plaintext.c - process an plaintext packet
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+/* plaintext.c - process plaintext packets
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002,
+ * 2003 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
#include <string.h>
#include <errno.h>
#include <assert.h>
+#ifdef HAVE_DOSISH_SYSTEM
+#include <fcntl.h> /* for setmode() */
+#endif
+
+#include "gpg.h"
#include "util.h"
#include "memory.h"
#include "options.h"
*/
int
handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
- int nooutput, int clearsig )
+ int nooutput, int clearsig, int *create_failed )
{
char *fname = NULL;
FILE *fp = NULL;
int rc = 0;
int c;
int convert = pt->mode == 't';
+#ifdef __riscos__
+ int filetype = 0xfff;
+#endif
+ int dummy_create_failed;
+
+ if (!create_failed)
+ create_failed = &dummy_create_failed;
+ *create_failed = 0;
/* create the filename as C string */
if( nooutput )
;
else if( opt.outfile ) {
- fname = m_alloc( strlen( opt.outfile ) + 1);
+ fname = xmalloc ( strlen( opt.outfile ) + 1);
strcpy(fname, opt.outfile );
}
else if( pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8 ) ) {
log_info(_("data not saved; use option \"--output\" to save it\n"));
nooutput = 1;
}
+ else if( !opt.use_embedded_filename ) {
+ fname = make_outfile_name( iobuf_get_real_fname(pt->buf) );
+ if( !fname )
+ fname = ask_outfile_name( pt->name, pt->namelen );
+ if( !fname ) {
+ *create_failed = 1;
+ rc = GPG_ERR_GENERAL;
+ goto leave;
+ }
+ }
else {
- fname = m_alloc( pt->namelen +1 );
- memcpy( fname, pt->name, pt->namelen );
- fname[pt->namelen] = 0;
+ fname = make_printable_string( pt->name, pt->namelen, 0 );
}
if( nooutput )
else if( !*fname || (*fname=='-' && !fname[1])) {
/* no filename or "-" given; write to stdout */
fp = stdout;
+#ifdef HAVE_DOSISH_SYSTEM
+ setmode ( fileno(fp) , O_BINARY );
+#endif
}
- else if( !overwrite_filep( fname ) ) {
- rc = G10ERR_CREATE_FILE;
- goto leave;
+ else {
+ while( !overwrite_filep (fname) ) {
+ char *tmp = ask_outfile_name (NULL, 0);
+ if ( !tmp || !*tmp ) {
+ xfree (tmp);
+ *create_failed = 1;
+ rc = GPG_ERR_GENERAL;
+ goto leave;
+ }
+ xfree (fname);
+ fname = tmp;
+ }
}
+#ifndef __riscos__
if( fp || nooutput )
;
else if( !(fp = fopen(fname,"wb")) ) {
- log_error("Error creating `%s': %s\n", fname, strerror(errno) );
- rc = G10ERR_CREATE_FILE;
+ rc = gpg_error_from_errno (errno);
+ log_error(_("error creating `%s': %s\n"), fname, strerror(errno) );
+ *create_failed = 1;
goto leave;
}
+#else /* __riscos__ */
+ /* Convert all '.' in fname to '/' -- we don't create directories! */
+ for( c=0; fname[c]; ++c )
+ if( fname[c] == '.' )
+ fname[c] = '/';
- if( pt->len ) {
+ if( fp || nooutput )
+ ;
+ else {
+ fp = fopen(fname,"wb");
+ if( !fp ) {
+ rc == gpg_error_from_errno (errno);
+ log_error(_("error creating `%s': %s\n"), fname, strerror(errno) );
+ *create_failed = 1;
+ 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,
+ use that, else check whether the user input (in fname)
+ has a ,xxx appended, then use that in preference */
+ if( (c = riscos_get_filetype_from_string( pt->name,
+ pt->namelen )) != -1 )
+ filetype = c;
+ if( (c = riscos_get_filetype_from_string( fname,
+ strlen(fname) )) != -1 )
+ filetype = c;
+ riscos_set_filetype_by_number(fname, filetype);
+ }
+#endif /* __riscos__ */
+
+ if( !pt->is_partial ) {
+ /* we have an actual length (which might be zero). */
assert( !clearsig );
- if( convert ) { // text mode
+ if( convert ) { /* text mode */
for( ; pt->len; pt->len-- ) {
if( (c = iobuf_get(pt->buf)) == -1 ) {
+ rc = gpg_error_from_errno (errno);
log_error("Problem reading source (%u bytes remaining)\n",
(unsigned)pt->len);
- rc = G10ERR_READ_FILE;
goto leave;
}
if( mfx->md )
- md_putc(mfx->md, c );
- if( c == '\r' )
- continue; /* fixme: this hack might be too simple */
+ gcry_md_putc (mfx->md, c );
+#ifndef HAVE_DOSISH_SYSTEM
+ if( c == '\r' ) /* convert to native line ending */
+ continue; /* fixme: this hack might be too simple */
+#endif
if( fp ) {
- if( putc( c, fp ) == EOF ) {
+ if( putc( c, fp ) == EOF ) {
+ rc = gpg_error_from_errno (errno);
log_error("Error writing to `%s': %s\n",
fname, strerror(errno) );
- rc = G10ERR_WRITE_FILE;
goto leave;
}
}
}
}
- else { // binary mode
- byte *buffer = m_alloc( 32768 );
+ else { /* binary mode */
+ byte *buffer = xmalloc ( 32768 );
while( pt->len ) {
int len = pt->len > 32768 ? 32768 : pt->len;
len = iobuf_read( pt->buf, buffer, len );
if( len == -1 ) {
+ rc = gpg_error_from_errno (errno);
log_error("Problem reading source (%u bytes remaining)\n",
(unsigned)pt->len);
- rc = G10ERR_READ_FILE;
- m_free( buffer );
+ xfree ( buffer );
goto leave;
}
if( mfx->md )
- md_write( mfx->md, buffer, len );
+ gcry_md_write( mfx->md, buffer, len );
if( fp ) {
- if( fwrite( buffer, 1, len, fp ) != len ) {
+ if( fwrite( buffer, 1, len, fp ) != len ) {
+ rc = gpg_error_from_errno (errno);
log_error("Error writing to `%s': %s\n",
fname, strerror(errno) );
- rc = G10ERR_WRITE_FILE;
- m_free( buffer );
+ xfree ( buffer );
goto leave;
}
}
pt->len -= len;
}
- m_free( buffer );
+ xfree ( buffer );
}
}
else if( !clearsig ) {
- if( convert ) { // text mode
+ if( convert ) { /* text mode */
while( (c = iobuf_get(pt->buf)) != -1 ) {
if( mfx->md )
- md_putc(mfx->md, c );
+ gcry_md_putc (mfx->md, c );
+#ifndef HAVE_DOSISH_SYSTEM
if( convert && c == '\r' )
continue; /* fixme: this hack might be too simple */
+#endif
if( fp ) {
- if( putc( c, fp ) == EOF ) {
+ if( putc( c, fp ) == EOF ) {
+ rc = gpg_error_from_errno (errno);
log_error("Error writing to `%s': %s\n",
fname, strerror(errno) );
- rc = G10ERR_WRITE_FILE;
goto leave;
}
}
}
}
- else { // binary mode
- byte *buffer = m_alloc( 32768 );
- for( ;; ) {
+ else { /* binary mode */
+ byte *buffer = xmalloc ( 32768 );
+ int eof;
+ for( eof=0; !eof; ) {
+ /* Why do we check for len < 32768:
+ * If we won't, we would practically read 2 EOFs but
+ * the first one has already popped the block_filter
+ * off and therefore we don't catch the boundary.
+ * So, always assume EOF if iobuf_read returns less bytes
+ * then requested */
int len = iobuf_read( pt->buf, buffer, 32768 );
if( len == -1 )
break;
+ if( len < 32768 )
+ eof = 1;
if( mfx->md )
- md_write( mfx->md, buffer, len );
+ gcry_md_write( mfx->md, buffer, len );
if( fp ) {
if( fwrite( buffer, 1, len, fp ) != len ) {
+ rc = gpg_error_from_errno (errno);
log_error("Error writing to `%s': %s\n",
fname, strerror(errno) );
- rc = G10ERR_WRITE_FILE;
- m_free( buffer );
+ xfree ( buffer );
goto leave;
}
}
}
- m_free( buffer );
+ xfree ( buffer );
}
pt->buf = NULL;
}
while( (c = iobuf_get(pt->buf)) != -1 ) {
if( fp ) {
if( putc( c, fp ) == EOF ) {
+ rc = gpg_error_from_errno (errno);
log_error("Error writing to `%s': %s\n",
fname, strerror(errno) );
- rc = G10ERR_WRITE_FILE;
goto leave;
}
}
if( !mfx->md )
continue;
if( state == 2 ) {
- md_putc(mfx->md, '\r' );
- md_putc(mfx->md, '\n' );
+ gcry_md_putc (mfx->md, '\r' );
+ gcry_md_putc (mfx->md, '\n' );
state = 0;
}
if( !state ) {
if( c == '\r' )
state = 1;
+ else if( c == '\n' )
+ state = 2;
else
- md_putc(mfx->md, c );
+ gcry_md_putc (mfx->md, c );
}
else if( state == 1 ) {
if( c == '\n' )
state = 2;
else {
- md_putc(mfx->md, '\r' );
+ gcry_md_putc (mfx->md, '\r' );
if( c == '\r' )
state = 1;
else {
state = 0;
- md_putc(mfx->md, c );
+ gcry_md_putc (mfx->md, c );
}
}
}
}
if( fp && fp != stdout && fclose(fp) ) {
+ rc = gpg_error_from_errno (errno);
log_error("Error closing `%s': %s\n", fname, strerror(errno) );
fp = NULL;
- rc = G10ERR_WRITE_FILE;
goto leave;
}
fp = NULL;
leave:
if( fp && fp != stdout )
fclose(fp);
- m_free(fname);
+ xfree (fname);
return rc;
}
+static void
+do_hash( MD_HANDLE md, MD_HANDLE md2, iobuf_t fp, int textmode )
+{
+ text_filter_context_t tfx;
+ int c;
+
+ if( textmode ) {
+ memset( &tfx, 0, sizeof tfx);
+ iobuf_push_filter( fp, text_filter, &tfx );
+ }
+ if( md2 ) { /* work around a strange behaviour in pgp2 */
+ /* It seems that at least PGP5 converts a single CR to a CR,LF too */
+ int lc = -1;
+ while( (c = iobuf_get(fp)) != -1 ) {
+ if( c == '\n' && lc == '\r' )
+ gcry_md_putc (md2, c);
+ else if( c == '\n' ) {
+ gcry_md_putc (md2, '\r');
+ gcry_md_putc (md2, c);
+ }
+ else if( c != '\n' && lc == '\r' ) {
+ gcry_md_putc (md2, '\n');
+ gcry_md_putc (md2, c);
+ }
+ else
+ gcry_md_putc (md2, c);
+
+ if( md )
+ gcry_md_putc (md, c );
+ lc = c;
+ }
+ }
+ else {
+ while( (c = iobuf_get(fp)) != -1 ) {
+ if( md )
+ gcry_md_putc (md, c );
+ }
+ }
+}
+
/****************
* Ask for the detached datafile and calculate the digest from it.
* INFILE is the name of the input file.
*/
int
-ask_for_detached_datafile( md_filter_context_t *mfx, const char *inname )
+ask_for_detached_datafile( MD_HANDLE md, MD_HANDLE md2,
+ const char *inname, int textmode )
{
+ progress_filter_context_t pfx;
char *answer = NULL;
- IOBUF fp;
+ iobuf_t fp;
int rc = 0;
- int c;
- fp = open_sigfile( inname ); /* open default file */
+ fp = open_sigfile( inname, &pfx ); /* open default file */
+
if( !fp && !opt.batch ) {
int any=0;
- tty_printf("Detached signature.\n");
+ tty_printf(_("Detached signature.\n"));
do {
- m_free(answer);
+ xfree (answer);
answer = cpr_get("detached_signature.filename",
_("Please enter name of data file: "));
cpr_kill_prompt();
if( any && !*answer ) {
- rc = G10ERR_READ_FILE;
+ rc = GPG_ERR_GENERAL;
goto leave;
}
fp = iobuf_open(answer);
any++;
}
else if( !fp ) {
+ rc = gpg_error_from_errno (errno);
log_error("can't open `%s': %s\n", answer, strerror(errno) );
- rc = G10ERR_READ_FILE;
goto leave;
}
} while( !fp );
if( !fp ) {
if( opt.verbose )
log_info(_("reading stdin ...\n"));
- while( (c = getchar()) != EOF ) {
- if( mfx->md )
- md_putc(mfx->md, c );
- }
- }
- else {
- while( (c = iobuf_get(fp)) != -1 ) {
- if( mfx->md )
- md_putc(mfx->md, c );
- }
- iobuf_close(fp);
+ fp = iobuf_open( NULL );
+ assert(fp);
}
+ do_hash( md, md2, fp, textmode );
+ iobuf_close(fp);
leave:
- m_free(answer);
+ xfree (answer);
return rc;
}
-static void
-do_hash( MD_HANDLE md, MD_HANDLE md2, IOBUF fp, int textmode )
-{
- text_filter_context_t tfx;
- int c;
-
- if( textmode ) {
- memset( &tfx, 0, sizeof tfx);
- iobuf_push_filter( fp, text_filter, &tfx );
- }
- if( md2 ) { /* work around a strange behaviour in pgp2 */
- while( (c = iobuf_get(fp)) != -1 ) {
- if( c == '\n' )
- md_putc(md2, '\r' );
- md_putc(md, c );
- md_putc(md2, c );
- }
- }
- else {
- while( (c = iobuf_get(fp)) != -1 )
- md_putc(md, c );
- }
-}
-
/****************
* Hash the given files and append the hash to hash context md.
hash_datafiles( MD_HANDLE md, MD_HANDLE md2, STRLIST files,
const char *sigfilename, int textmode )
{
- IOBUF fp;
- STRLIST sl=NULL;
+ progress_filter_context_t pfx;
+ iobuf_t fp;
+ STRLIST sl;
if( !files ) {
/* check whether we can open the signed material */
- fp = open_sigfile( sigfilename );
+ fp = open_sigfile( sigfilename, &pfx );
if( fp ) {
do_hash( md, md2, fp, textmode );
iobuf_close(fp);
return 0;
}
- /* no we can't (no sigfile) - read signed stuff from stdin */
- add_to_strlist( &sl, "-");
+ log_error (_("no signed data\n"));
+ return GPG_ERR_NO_DATA;
}
- else
- sl = files;
- for( ; sl; sl = sl->next ) {
+
+ for (sl=files; sl; sl = sl->next ) {
fp = iobuf_open( sl->d );
if( !fp ) {
+ int tmperr = gpg_error_from_errno (errno);
log_error(_("can't open signed data `%s'\n"),
print_fname_stdin(sl->d));
- if( !files )
- free_strlist(sl);
- return G10ERR_OPEN_FILE;
+ return tmperr;
}
+ handle_progress (&pfx, fp, sl->d);
do_hash( md, md2, fp, textmode );
iobuf_close(fp);
}
- if( !files )
- free_strlist(sl);
return 0;
}
-
-
projects / gnupg.git / blobdiff