2007-06-26 15:48:44 +02:00
|
|
|
|
/* iobuf.c - File Handling for OpenPGP.
|
2010-03-08 13:37:54 +01:00
|
|
|
|
* Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2006, 2007, 2008,
|
2011-01-18 12:50:02 +01:00
|
|
|
|
* 2009, 2010, 2011 Free Software Foundation, Inc.
|
2015-08-09 16:49:04 +02:00
|
|
|
|
* Copyright (C) 2015 g10 Code GmbH
|
2003-08-05 19:11:04 +02:00
|
|
|
|
*
|
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
|
*
|
Change license for some files in common to LGPLv3+/GPLv2+.
Having the LGPL on the common GnuPG code helps to share code
between GnuPG and related projects (like GPGME and Libassuan). This
is good for interoperability and to reduces bugs.
* common/asshelp.c, common/asshelp.h, common/asshelp2.c, common/b64dec.c
* common/b64enc.c, common/convert.c, common/dns-cert.c
* common/dns-cert.h common/exechelp-posix.c, common/exechelp-w32.c
* common/exechelp-w32ce.c, common/exechelp.h, common/get-passphrase.c
* common/get-passphrase.h, common/gettime.c, common/gpgrlhelp.c
* common/helpfile.c, common/homedir.c, common/http.c, common/http.h
* common/i18n.c, common/init.c, common/init.h, common/iobuf.c
* common/iobuf.h, common/localename.c, common/membuf.c, common/membuf.h
* common/miscellaneous.c, common/openpgp-oid.c, common/openpgpdefs.h
* common/percent.c, common/pka.c, common/pka.h, common/session-env.c
* common/session-env.h, common/sexp-parse.h, common/sexputil.c
* common/signal.c, common/srv.c, common/srv.h, common/ssh-utils.c
* common/ssh-utils.h, common/sysutils.c, common/sysutils.h
* common/tlv.c, common/tlv.h, common/ttyio.c, common/ttyio.h
* common/userids.c, common/userids.h, common/xasprintf.c: Change
license to LGPLv3+/GPLv2+/
2012-04-20 15:43:06 +02:00
|
|
|
|
* This file is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of either
|
2003-08-05 19:11:04 +02:00
|
|
|
|
*
|
Change license for some files in common to LGPLv3+/GPLv2+.
Having the LGPL on the common GnuPG code helps to share code
between GnuPG and related projects (like GPGME and Libassuan). This
is good for interoperability and to reduces bugs.
* common/asshelp.c, common/asshelp.h, common/asshelp2.c, common/b64dec.c
* common/b64enc.c, common/convert.c, common/dns-cert.c
* common/dns-cert.h common/exechelp-posix.c, common/exechelp-w32.c
* common/exechelp-w32ce.c, common/exechelp.h, common/get-passphrase.c
* common/get-passphrase.h, common/gettime.c, common/gpgrlhelp.c
* common/helpfile.c, common/homedir.c, common/http.c, common/http.h
* common/i18n.c, common/init.c, common/init.h, common/iobuf.c
* common/iobuf.h, common/localename.c, common/membuf.c, common/membuf.h
* common/miscellaneous.c, common/openpgp-oid.c, common/openpgpdefs.h
* common/percent.c, common/pka.c, common/pka.h, common/session-env.c
* common/session-env.h, common/sexp-parse.h, common/sexputil.c
* common/signal.c, common/srv.c, common/srv.h, common/ssh-utils.c
* common/ssh-utils.h, common/sysutils.c, common/sysutils.h
* common/tlv.c, common/tlv.h, common/ttyio.c, common/ttyio.h
* common/userids.c, common/userids.h, common/xasprintf.c: Change
license to LGPLv3+/GPLv2+/
2012-04-20 15:43:06 +02:00
|
|
|
|
* - the GNU Lesser General Public License as published by the Free
|
|
|
|
|
* Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
* your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* or
|
|
|
|
|
*
|
|
|
|
|
* - the GNU General Public License as published by the Free
|
|
|
|
|
* Software Foundation; either version 2 of the License, or (at
|
|
|
|
|
* your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* or both in parallel, as here.
|
|
|
|
|
*
|
|
|
|
|
* This file is distributed in the hope that it will be useful,
|
2003-08-05 19:11:04 +02:00
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2016-11-05 12:02:19 +01:00
|
|
|
|
* along with this program; if not, see <https://www.gnu.org/licenses/>.
|
2003-08-05 19:11:04 +02:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#include <unistd.h>
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2014-03-07 09:46:44 +01:00
|
|
|
|
# ifdef HAVE_WINSOCK2_H
|
|
|
|
|
# include <winsock2.h>
|
|
|
|
|
# endif
|
2007-06-26 15:48:44 +02:00
|
|
|
|
# include <windows.h>
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#endif
|
|
|
|
|
#ifdef __riscos__
|
2007-06-26 15:48:44 +02:00
|
|
|
|
# include <kernel.h>
|
|
|
|
|
# include <swis.h>
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#endif /* __riscos__ */
|
|
|
|
|
|
2010-06-08 20:33:21 +02:00
|
|
|
|
#include <assuan.h>
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#include "util.h"
|
2007-06-25 13:54:43 +02:00
|
|
|
|
#include "sysutils.h"
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#include "iobuf.h"
|
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
/*-- Begin configurable part. --*/
|
|
|
|
|
|
2018-01-24 18:29:08 +01:00
|
|
|
|
/* The standard size of the internal buffers. */
|
2018-01-24 18:37:55 +01:00
|
|
|
|
#define DEFAULT_IOBUF_BUFFER_SIZE (64*1024)
|
2006-04-21 14:56:40 +02:00
|
|
|
|
|
2013-10-04 08:20:49 +02:00
|
|
|
|
/* To avoid a potential DoS with compression packets we better limit
|
|
|
|
|
the number of filters in a chain. */
|
|
|
|
|
#define MAX_NESTING_FILTER 64
|
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
/*-- End configurable part. --*/
|
|
|
|
|
|
2018-10-24 21:56:18 +02:00
|
|
|
|
/* The size of the iobuffers. This can be changed using the
|
|
|
|
|
* iobuf_set_buffer_size function. */
|
2018-01-24 18:37:55 +01:00
|
|
|
|
static unsigned int iobuf_buffer_size = DEFAULT_IOBUF_BUFFER_SIZE;
|
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2010-03-24 13:15:30 +01:00
|
|
|
|
# ifdef HAVE_W32CE_SYSTEM
|
|
|
|
|
# define FD_FOR_STDIN (es_fileno (es_stdin))
|
|
|
|
|
# define FD_FOR_STDOUT (es_fileno (es_stdout))
|
|
|
|
|
# else
|
|
|
|
|
# define FD_FOR_STDIN (GetStdHandle (STD_INPUT_HANDLE))
|
|
|
|
|
# define FD_FOR_STDOUT (GetStdHandle (STD_OUTPUT_HANDLE))
|
|
|
|
|
# endif
|
2010-03-08 13:37:54 +01:00
|
|
|
|
#else /*!HAVE_W32_SYSTEM*/
|
2010-03-08 14:06:53 +01:00
|
|
|
|
# define FD_FOR_STDIN (0)
|
|
|
|
|
# define FD_FOR_STDOUT (1)
|
2010-03-08 13:37:54 +01:00
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
2007-06-26 15:48:44 +02:00
|
|
|
|
|
2010-03-08 14:06:53 +01:00
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
/* The context used by the file filter. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
typedef struct
|
|
|
|
|
{
|
2010-03-08 14:06:53 +01:00
|
|
|
|
gnupg_fd_t fp; /* Open file pointer or handle. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
int keep_open;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int no_cache;
|
|
|
|
|
int eof_seen;
|
2018-01-24 18:37:55 +01:00
|
|
|
|
int delayed_rc;
|
2007-06-26 15:48:44 +02:00
|
|
|
|
int print_only_name; /* Flags indicating that fname is not a real file. */
|
|
|
|
|
char fname[1]; /* Name of the file. */
|
2010-03-08 14:06:53 +01:00
|
|
|
|
} file_filter_ctx_t;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2011-01-18 12:50:02 +01:00
|
|
|
|
/* The context used by the estream filter. */
|
|
|
|
|
typedef struct
|
|
|
|
|
{
|
|
|
|
|
estream_t fp; /* Open estream handle. */
|
|
|
|
|
int keep_open;
|
|
|
|
|
int no_cache;
|
|
|
|
|
int eof_seen;
|
2019-09-10 15:45:58 +02:00
|
|
|
|
int use_readlimit; /* Take care of the readlimit. */
|
|
|
|
|
size_t readlimit; /* Number of bytes left to read. */
|
2011-01-18 12:50:02 +01:00
|
|
|
|
int print_only_name; /* Flags indicating that fname is not a real file. */
|
|
|
|
|
char fname[1]; /* Name of the file. */
|
|
|
|
|
} file_es_filter_ctx_t;
|
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
|
2010-03-08 13:37:54 +01:00
|
|
|
|
/* Object to control the "close cache". */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
struct close_cache_s
|
|
|
|
|
{
|
|
|
|
|
struct close_cache_s *next;
|
2010-03-08 14:06:53 +01:00
|
|
|
|
gnupg_fd_t fp;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
char fname[1];
|
|
|
|
|
};
|
2007-06-26 15:48:44 +02:00
|
|
|
|
typedef struct close_cache_s *close_cache_t;
|
|
|
|
|
static close_cache_t close_cache;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2020-02-10 16:37:34 +01:00
|
|
|
|
int iobuf_debug_mode;
|
2007-06-26 15:48:44 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2003-08-05 19:11:04 +02:00
|
|
|
|
typedef struct
|
|
|
|
|
{
|
|
|
|
|
int sock;
|
|
|
|
|
int keep_open;
|
|
|
|
|
int no_cache;
|
|
|
|
|
int eof_seen;
|
2007-06-26 15:48:44 +02:00
|
|
|
|
int print_only_name; /* Flag indicating that fname is not a real file. */
|
|
|
|
|
char fname[1]; /* Name of the file */
|
2010-03-08 13:37:54 +01:00
|
|
|
|
|
|
|
|
|
} sock_filter_ctx_t;
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#endif /*HAVE_W32_SYSTEM*/
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2015-08-17 12:30:04 +02:00
|
|
|
|
/* The first partial length header block must be of size 512 to make
|
|
|
|
|
* it easier (and more efficient) we use a min. block size of 512 for
|
|
|
|
|
* all chunks (but the last one) */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#define OP_MIN_PARTIAL_CHUNK 512
|
|
|
|
|
#define OP_MIN_PARTIAL_CHUNK_2POW 9
|
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
/* The context we use for the block filter (used to handle OpenPGP
|
|
|
|
|
length information header). */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
typedef struct
|
|
|
|
|
{
|
|
|
|
|
int use;
|
|
|
|
|
size_t size;
|
|
|
|
|
size_t count;
|
2007-06-26 15:48:44 +02:00
|
|
|
|
int partial; /* 1 = partial header, 2 in last partial packet. */
|
|
|
|
|
char *buffer; /* Used for partial header. */
|
|
|
|
|
size_t buflen; /* Used size of buffer. */
|
|
|
|
|
int first_c; /* First character of a partial header (which is > 0). */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int eof;
|
|
|
|
|
}
|
|
|
|
|
block_filter_ctx_t;
|
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
|
|
|
|
|
/* Local prototypes. */
|
2015-08-12 22:57:58 +02:00
|
|
|
|
static int underflow (iobuf_t a, int clear_pending_eof);
|
2016-07-26 18:29:01 +02:00
|
|
|
|
static int underflow_target (iobuf_t a, int clear_pending_eof, size_t target);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
static int translate_file_handle (int fd, int for_write);
|
|
|
|
|
|
2015-08-13 15:53:11 +02:00
|
|
|
|
/* Sends any pending data to the filter's FILTER function. Note: this
|
|
|
|
|
works on the filter and not on the whole pipeline. That is,
|
|
|
|
|
iobuf_flush doesn't necessarily cause data to be written to any
|
|
|
|
|
underlying file; it just causes any data buffered at the filter A
|
|
|
|
|
to be sent to A's filter function.
|
|
|
|
|
|
2015-09-02 09:56:09 +02:00
|
|
|
|
If A is a IOBUF_OUTPUT_TEMP filter, then this also enlarges the
|
2018-01-24 18:37:55 +01:00
|
|
|
|
buffer by iobuf_buffer_size.
|
2015-08-13 15:53:11 +02:00
|
|
|
|
|
2015-09-02 09:56:09 +02:00
|
|
|
|
May only be called on an IOBUF_OUTPUT or IOBUF_OUTPUT_TEMP filters. */
|
2015-08-13 15:53:11 +02:00
|
|
|
|
static int filter_flush (iobuf_t a);
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
|
2009-04-01 15:23:27 +02:00
|
|
|
|
/* This is a replacement for strcmp. Under W32 it does not
|
|
|
|
|
distinguish between backslash and slash. */
|
|
|
|
|
static int
|
|
|
|
|
fd_cache_strcmp (const char *a, const char *b)
|
|
|
|
|
{
|
|
|
|
|
#ifdef HAVE_DOSISH_SYSTEM
|
|
|
|
|
for (; *a && *b; a++, b++)
|
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if (*a != *b && !((*a == '/' && *b == '\\')
|
2009-04-01 15:23:27 +02:00
|
|
|
|
|| (*a == '\\' && *b == '/')) )
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return *(const unsigned char *)a - *(const unsigned char *)b;
|
|
|
|
|
#else
|
|
|
|
|
return strcmp (a, b);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
/*
|
|
|
|
|
* Invalidate (i.e. close) a cached iobuf
|
|
|
|
|
*/
|
2009-04-01 15:23:27 +02:00
|
|
|
|
static int
|
2003-08-05 19:11:04 +02:00
|
|
|
|
fd_cache_invalidate (const char *fname)
|
|
|
|
|
{
|
2007-06-26 15:48:44 +02:00
|
|
|
|
close_cache_t cc;
|
2009-04-01 15:23:27 +02:00
|
|
|
|
int rc = 0;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
assert (fname);
|
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug ("fd_cache_invalidate (%s)\n", fname);
|
|
|
|
|
|
|
|
|
|
for (cc = close_cache; cc; cc = cc->next)
|
|
|
|
|
{
|
2010-03-08 14:06:53 +01:00
|
|
|
|
if (cc->fp != GNUPG_INVALID_FD && !fd_cache_strcmp (cc->fname, fname))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug (" did (%s)\n", cc->fname);
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2009-04-01 15:23:27 +02:00
|
|
|
|
if (!CloseHandle (cc->fp))
|
|
|
|
|
rc = -1;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#else
|
2009-04-01 15:23:27 +02:00
|
|
|
|
rc = close (cc->fp);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#endif
|
2010-03-08 14:06:53 +01:00
|
|
|
|
cc->fp = GNUPG_INVALID_FD;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2009-04-01 15:23:27 +02:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Try to sync changes to the disk. This is to avoid data loss during
|
|
|
|
|
a system crash in write/close/rename cycle on some file
|
|
|
|
|
systems. */
|
|
|
|
|
static int
|
|
|
|
|
fd_cache_synchronize (const char *fname)
|
|
|
|
|
{
|
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_FSYNC
|
|
|
|
|
close_cache_t cc;
|
|
|
|
|
|
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug ("fd_cache_synchronize (%s)\n", fname);
|
|
|
|
|
|
|
|
|
|
for (cc=close_cache; cc; cc = cc->next )
|
|
|
|
|
{
|
2010-03-08 14:06:53 +01:00
|
|
|
|
if (cc->fp != GNUPG_INVALID_FD && !fd_cache_strcmp (cc->fname, fname))
|
2009-04-01 15:23:27 +02:00
|
|
|
|
{
|
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug (" did (%s)\n", cc->fname);
|
|
|
|
|
|
|
|
|
|
err = fsync (cc->fp);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
(void)fname;
|
|
|
|
|
#endif /*HAVE_FSYNC*/
|
|
|
|
|
|
|
|
|
|
return err;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-03-08 14:06:53 +01:00
|
|
|
|
static gnupg_fd_t
|
2014-06-25 20:25:28 +02:00
|
|
|
|
direct_open (const char *fname, const char *mode, int mode700)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2003-08-05 19:11:04 +02:00
|
|
|
|
unsigned long da, cd, sm;
|
|
|
|
|
HANDLE hfile;
|
|
|
|
|
|
2015-11-27 17:53:52 +01:00
|
|
|
|
(void)mode700;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
/* Note, that we do not handle all mode combinations */
|
|
|
|
|
|
|
|
|
|
/* According to the ReactOS source it seems that open() of the
|
2009-04-01 15:23:27 +02:00
|
|
|
|
* standard MSW32 crt does open the file in shared mode which is
|
2003-08-05 19:11:04 +02:00
|
|
|
|
* something new for MS applications ;-)
|
|
|
|
|
*/
|
|
|
|
|
if (strchr (mode, '+'))
|
|
|
|
|
{
|
2009-04-01 15:23:27 +02:00
|
|
|
|
if (fd_cache_invalidate (fname))
|
2010-03-08 14:06:53 +01:00
|
|
|
|
return GNUPG_INVALID_FD;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
da = GENERIC_READ | GENERIC_WRITE;
|
|
|
|
|
cd = OPEN_EXISTING;
|
|
|
|
|
sm = FILE_SHARE_READ | FILE_SHARE_WRITE;
|
|
|
|
|
}
|
|
|
|
|
else if (strchr (mode, 'w'))
|
|
|
|
|
{
|
2009-04-01 15:23:27 +02:00
|
|
|
|
if (fd_cache_invalidate (fname))
|
2010-03-08 14:06:53 +01:00
|
|
|
|
return GNUPG_INVALID_FD;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
da = GENERIC_WRITE;
|
|
|
|
|
cd = CREATE_ALWAYS;
|
|
|
|
|
sm = FILE_SHARE_WRITE;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
da = GENERIC_READ;
|
|
|
|
|
cd = OPEN_EXISTING;
|
|
|
|
|
sm = FILE_SHARE_READ;
|
|
|
|
|
}
|
|
|
|
|
|
2010-03-02 22:25:08 +01:00
|
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
|
|
|
{
|
|
|
|
|
wchar_t *wfname = utf8_to_wchar (fname);
|
|
|
|
|
if (wfname)
|
|
|
|
|
{
|
|
|
|
|
hfile = CreateFile (wfname, da, sm, NULL, cd,
|
|
|
|
|
FILE_ATTRIBUTE_NORMAL, NULL);
|
|
|
|
|
xfree (wfname);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
hfile = INVALID_HANDLE_VALUE;
|
|
|
|
|
}
|
|
|
|
|
#else
|
2003-08-05 19:11:04 +02:00
|
|
|
|
hfile = CreateFile (fname, da, sm, NULL, cd, FILE_ATTRIBUTE_NORMAL, NULL);
|
2010-03-02 22:25:08 +01:00
|
|
|
|
#endif
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return hfile;
|
2014-06-25 20:25:28 +02:00
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#else /*!HAVE_W32_SYSTEM*/
|
2014-06-25 20:25:28 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int oflag;
|
2014-06-25 20:25:28 +02:00
|
|
|
|
int cflag = S_IRUSR | S_IWUSR;
|
|
|
|
|
|
|
|
|
|
if (!mode700)
|
|
|
|
|
cflag |= S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
/* Note, that we do not handle all mode combinations */
|
|
|
|
|
if (strchr (mode, '+'))
|
|
|
|
|
{
|
2009-04-01 15:23:27 +02:00
|
|
|
|
if (fd_cache_invalidate (fname))
|
2010-03-08 14:06:53 +01:00
|
|
|
|
return GNUPG_INVALID_FD;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
oflag = O_RDWR;
|
|
|
|
|
}
|
|
|
|
|
else if (strchr (mode, 'w'))
|
|
|
|
|
{
|
2009-04-01 15:23:27 +02:00
|
|
|
|
if (fd_cache_invalidate (fname))
|
2010-03-08 14:06:53 +01:00
|
|
|
|
return GNUPG_INVALID_FD;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
oflag = O_WRONLY | O_CREAT | O_TRUNC;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
oflag = O_RDONLY;
|
|
|
|
|
}
|
|
|
|
|
#ifdef O_BINARY
|
|
|
|
|
if (strchr (mode, 'b'))
|
|
|
|
|
oflag |= O_BINARY;
|
|
|
|
|
#endif
|
2014-06-25 20:25:28 +02:00
|
|
|
|
|
|
|
|
|
#ifdef __riscos__
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
struct stat buf;
|
|
|
|
|
|
|
|
|
|
/* Don't allow iobufs on directories */
|
2014-06-25 20:25:28 +02:00
|
|
|
|
if (!stat (fname, &buf) && S_ISDIR (buf.st_mode) && !S_ISREG (buf.st_mode))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return __set_errno (EISDIR);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2014-06-25 20:25:28 +02:00
|
|
|
|
return open (fname, oflag, cflag);
|
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2011-02-04 12:57:53 +01:00
|
|
|
|
* Instead of closing an FD we keep it open and cache it for later reuse
|
2003-08-05 19:11:04 +02:00
|
|
|
|
* Note that this caching strategy only works if the process does not chdir.
|
|
|
|
|
*/
|
|
|
|
|
static void
|
2010-03-08 14:06:53 +01:00
|
|
|
|
fd_cache_close (const char *fname, gnupg_fd_t fp)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2007-06-26 15:48:44 +02:00
|
|
|
|
close_cache_t cc;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
assert (fp);
|
|
|
|
|
if (!fname || !*fname)
|
|
|
|
|
{
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2003-08-05 19:11:04 +02:00
|
|
|
|
CloseHandle (fp);
|
|
|
|
|
#else
|
|
|
|
|
close (fp);
|
|
|
|
|
#endif
|
|
|
|
|
if (DBG_IOBUF)
|
2007-06-06 20:12:30 +02:00
|
|
|
|
log_debug ("fd_cache_close (%d) real\n", (int)fp);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
/* try to reuse a slot */
|
|
|
|
|
for (cc = close_cache; cc; cc = cc->next)
|
|
|
|
|
{
|
2010-03-08 14:06:53 +01:00
|
|
|
|
if (cc->fp == GNUPG_INVALID_FD && !fd_cache_strcmp (cc->fname, fname))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
cc->fp = fp;
|
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug ("fd_cache_close (%s) used existing slot\n", fname);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* add a new one */
|
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug ("fd_cache_close (%s) new slot created\n", fname);
|
|
|
|
|
cc = xcalloc (1, sizeof *cc + strlen (fname));
|
|
|
|
|
strcpy (cc->fname, fname);
|
|
|
|
|
cc->fp = fp;
|
|
|
|
|
cc->next = close_cache;
|
|
|
|
|
close_cache = cc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
2015-08-17 12:30:04 +02:00
|
|
|
|
* Do a direct_open on FNAME but first try to reuse one from the fd_cache
|
2003-08-05 19:11:04 +02:00
|
|
|
|
*/
|
2010-03-08 14:06:53 +01:00
|
|
|
|
static gnupg_fd_t
|
2003-08-05 19:11:04 +02:00
|
|
|
|
fd_cache_open (const char *fname, const char *mode)
|
|
|
|
|
{
|
2007-06-26 15:48:44 +02:00
|
|
|
|
close_cache_t cc;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
assert (fname);
|
|
|
|
|
for (cc = close_cache; cc; cc = cc->next)
|
|
|
|
|
{
|
2010-03-08 14:06:53 +01:00
|
|
|
|
if (cc->fp != GNUPG_INVALID_FD && !fd_cache_strcmp (cc->fname, fname))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2010-03-08 14:06:53 +01:00
|
|
|
|
gnupg_fd_t fp = cc->fp;
|
|
|
|
|
cc->fp = GNUPG_INVALID_FD;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug ("fd_cache_open (%s) using cached fp\n", fname);
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (SetFilePointer (fp, 0, NULL, FILE_BEGIN) == 0xffffffff)
|
|
|
|
|
{
|
|
|
|
|
log_error ("rewind file failed on handle %p: ec=%d\n",
|
|
|
|
|
fp, (int) GetLastError ());
|
2010-03-08 14:06:53 +01:00
|
|
|
|
fp = GNUPG_INVALID_FD;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
if (lseek (fp, 0, SEEK_SET) == (off_t) - 1)
|
|
|
|
|
{
|
|
|
|
|
log_error ("can't rewind fd %d: %s\n", fp, strerror (errno));
|
2010-03-08 14:06:53 +01:00
|
|
|
|
fp = GNUPG_INVALID_FD;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
return fp;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug ("fd_cache_open (%s) not cached\n", fname);
|
2014-06-25 20:25:28 +02:00
|
|
|
|
return direct_open (fname, mode, 0);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
file_filter (void *opaque, int control, iobuf_t chain, byte * buf,
|
|
|
|
|
size_t * ret_len)
|
|
|
|
|
{
|
|
|
|
|
file_filter_ctx_t *a = opaque;
|
2010-03-08 14:06:53 +01:00
|
|
|
|
gnupg_fd_t f = a->fp;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
size_t size = *ret_len;
|
|
|
|
|
size_t nbytes = 0;
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
2008-10-20 15:53:23 +02:00
|
|
|
|
(void)chain; /* Not used. */
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (control == IOBUFCTRL_UNDERFLOW)
|
|
|
|
|
{
|
2018-01-24 18:37:55 +01:00
|
|
|
|
log_assert (size); /* We need a buffer. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (a->eof_seen)
|
|
|
|
|
{
|
|
|
|
|
rc = -1;
|
|
|
|
|
*ret_len = 0;
|
|
|
|
|
}
|
2018-01-24 18:37:55 +01:00
|
|
|
|
else if (a->delayed_rc)
|
|
|
|
|
{
|
|
|
|
|
rc = a->delayed_rc;
|
|
|
|
|
a->delayed_rc = 0;
|
|
|
|
|
if (rc == -1)
|
|
|
|
|
a->eof_seen = -1;
|
|
|
|
|
*ret_len = 0;
|
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2003-08-05 19:11:04 +02:00
|
|
|
|
unsigned long nread;
|
|
|
|
|
|
|
|
|
|
nbytes = 0;
|
|
|
|
|
if (!ReadFile (f, buf, size, &nread, NULL))
|
|
|
|
|
{
|
|
|
|
|
int ec = (int) GetLastError ();
|
|
|
|
|
if (ec != ERROR_BROKEN_PIPE)
|
|
|
|
|
{
|
|
|
|
|
rc = gpg_error_from_errno (ec);
|
|
|
|
|
log_error ("%s: read error: ec=%d\n", a->fname, ec);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (!nread)
|
|
|
|
|
{
|
|
|
|
|
a->eof_seen = 1;
|
|
|
|
|
rc = -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
nbytes = nread;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
nbytes = 0;
|
2018-01-24 18:37:55 +01:00
|
|
|
|
read_more:
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
n = read (f, buf + nbytes, size - nbytes);
|
|
|
|
|
}
|
|
|
|
|
while (n == -1 && errno == EINTR);
|
|
|
|
|
if (n > 0)
|
|
|
|
|
{
|
|
|
|
|
nbytes += n;
|
|
|
|
|
if (nbytes < size)
|
|
|
|
|
goto read_more;
|
|
|
|
|
}
|
|
|
|
|
else if (!n) /* eof */
|
|
|
|
|
{
|
|
|
|
|
if (nbytes)
|
|
|
|
|
a->delayed_rc = -1;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
a->eof_seen = 1;
|
|
|
|
|
rc = -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else /* error */
|
|
|
|
|
{
|
|
|
|
|
rc = gpg_error_from_syserror ();
|
|
|
|
|
if (gpg_err_code (rc) != GPG_ERR_EPIPE)
|
|
|
|
|
log_error ("%s: read error: %s\n", a->fname, gpg_strerror (rc));
|
|
|
|
|
if (nbytes)
|
|
|
|
|
{
|
|
|
|
|
a->delayed_rc = rc;
|
|
|
|
|
rc = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#endif
|
|
|
|
|
*ret_len = nbytes;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_FLUSH)
|
|
|
|
|
{
|
|
|
|
|
if (size)
|
|
|
|
|
{
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2003-08-05 19:11:04 +02:00
|
|
|
|
byte *p = buf;
|
|
|
|
|
unsigned long n;
|
|
|
|
|
|
|
|
|
|
nbytes = size;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
if (size && !WriteFile (f, p, nbytes, &n, NULL))
|
|
|
|
|
{
|
|
|
|
|
int ec = (int) GetLastError ();
|
|
|
|
|
rc = gpg_error_from_errno (ec);
|
|
|
|
|
log_error ("%s: write error: ec=%d\n", a->fname, ec);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
p += n;
|
|
|
|
|
nbytes -= n;
|
|
|
|
|
}
|
|
|
|
|
while (nbytes);
|
|
|
|
|
nbytes = p - buf;
|
|
|
|
|
#else
|
|
|
|
|
byte *p = buf;
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
nbytes = size;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
n = write (f, p, nbytes);
|
|
|
|
|
}
|
|
|
|
|
while (n == -1 && errno == EINTR);
|
|
|
|
|
if (n > 0)
|
|
|
|
|
{
|
|
|
|
|
p += n;
|
|
|
|
|
nbytes -= n;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (n != -1 && nbytes);
|
|
|
|
|
if (n == -1)
|
|
|
|
|
{
|
2006-09-14 18:50:33 +02:00
|
|
|
|
rc = gpg_error_from_syserror ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
log_error ("%s: write error: %s\n", a->fname, strerror (errno));
|
|
|
|
|
}
|
|
|
|
|
nbytes = p - buf;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
*ret_len = nbytes;
|
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_INIT)
|
|
|
|
|
{
|
|
|
|
|
a->eof_seen = 0;
|
2018-01-24 18:37:55 +01:00
|
|
|
|
a->delayed_rc = 0;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
a->keep_open = 0;
|
|
|
|
|
a->no_cache = 0;
|
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_DESC)
|
|
|
|
|
{
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
mem2str (buf, "file_filter(fd)", *ret_len);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_FREE)
|
|
|
|
|
{
|
2010-03-08 14:06:53 +01:00
|
|
|
|
if (f != FD_FOR_STDIN && f != FD_FOR_STDOUT)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
if (DBG_IOBUF)
|
2010-03-08 14:06:53 +01:00
|
|
|
|
log_debug ("%s: close fd/handle %d\n", a->fname, FD2INT (f));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (!a->keep_open)
|
|
|
|
|
fd_cache_close (a->no_cache ? NULL : a->fname, f);
|
|
|
|
|
}
|
2008-10-20 15:53:23 +02:00
|
|
|
|
xfree (a); /* We can free our context now. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
2010-03-08 13:37:54 +01:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
|
2011-01-18 12:50:02 +01:00
|
|
|
|
/* Similar to file_filter but using the estream system. */
|
|
|
|
|
static int
|
|
|
|
|
file_es_filter (void *opaque, int control, iobuf_t chain, byte * buf,
|
|
|
|
|
size_t * ret_len)
|
|
|
|
|
{
|
|
|
|
|
file_es_filter_ctx_t *a = opaque;
|
|
|
|
|
estream_t f = a->fp;
|
|
|
|
|
size_t size = *ret_len;
|
|
|
|
|
size_t nbytes = 0;
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
|
|
(void)chain; /* Not used. */
|
|
|
|
|
|
|
|
|
|
if (control == IOBUFCTRL_UNDERFLOW)
|
|
|
|
|
{
|
|
|
|
|
assert (size); /* We need a buffer. */
|
|
|
|
|
if (a->eof_seen)
|
|
|
|
|
{
|
|
|
|
|
rc = -1;
|
|
|
|
|
*ret_len = 0;
|
|
|
|
|
}
|
2019-09-10 15:45:58 +02:00
|
|
|
|
else if (a->use_readlimit)
|
|
|
|
|
{
|
|
|
|
|
nbytes = 0;
|
|
|
|
|
if (!a->readlimit)
|
|
|
|
|
{ /* eof */
|
|
|
|
|
a->eof_seen = 1;
|
|
|
|
|
rc = -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (size > a->readlimit)
|
|
|
|
|
size = a->readlimit;
|
|
|
|
|
rc = es_read (f, buf, size, &nbytes);
|
|
|
|
|
if (rc == -1)
|
|
|
|
|
{ /* error */
|
|
|
|
|
rc = gpg_error_from_syserror ();
|
|
|
|
|
log_error ("%s: read error: %s\n", a->fname,strerror (errno));
|
|
|
|
|
}
|
|
|
|
|
else if (!nbytes)
|
|
|
|
|
{ /* eof */
|
|
|
|
|
a->eof_seen = 1;
|
|
|
|
|
rc = -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
a->readlimit -= nbytes;
|
|
|
|
|
}
|
|
|
|
|
*ret_len = nbytes;
|
|
|
|
|
}
|
2011-01-18 12:50:02 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
nbytes = 0;
|
|
|
|
|
rc = es_read (f, buf, size, &nbytes);
|
|
|
|
|
if (rc == -1)
|
|
|
|
|
{ /* error */
|
|
|
|
|
rc = gpg_error_from_syserror ();
|
|
|
|
|
log_error ("%s: read error: %s\n", a->fname, strerror (errno));
|
|
|
|
|
}
|
|
|
|
|
else if (!nbytes)
|
|
|
|
|
{ /* eof */
|
|
|
|
|
a->eof_seen = 1;
|
|
|
|
|
rc = -1;
|
|
|
|
|
}
|
|
|
|
|
*ret_len = nbytes;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_FLUSH)
|
|
|
|
|
{
|
|
|
|
|
if (size)
|
|
|
|
|
{
|
|
|
|
|
byte *p = buf;
|
|
|
|
|
size_t nwritten;
|
|
|
|
|
|
|
|
|
|
nbytes = size;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
nwritten = 0;
|
|
|
|
|
if (es_write (f, p, nbytes, &nwritten))
|
|
|
|
|
{
|
|
|
|
|
rc = gpg_error_from_syserror ();
|
|
|
|
|
log_error ("%s: write error: %s\n",
|
|
|
|
|
a->fname, strerror (errno));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
p += nwritten;
|
|
|
|
|
nbytes -= nwritten;
|
|
|
|
|
}
|
|
|
|
|
while (nbytes);
|
|
|
|
|
nbytes = p - buf;
|
|
|
|
|
}
|
|
|
|
|
*ret_len = nbytes;
|
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_INIT)
|
|
|
|
|
{
|
|
|
|
|
a->eof_seen = 0;
|
|
|
|
|
a->no_cache = 0;
|
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_DESC)
|
|
|
|
|
{
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
mem2str (buf, "estream_filter", *ret_len);
|
2011-01-18 12:50:02 +01:00
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_FREE)
|
|
|
|
|
{
|
|
|
|
|
if (f != es_stdin && f != es_stdout)
|
|
|
|
|
{
|
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug ("%s: es_fclose %p\n", a->fname, f);
|
|
|
|
|
if (!a->keep_open)
|
|
|
|
|
es_fclose (f);
|
|
|
|
|
}
|
|
|
|
|
f = NULL;
|
|
|
|
|
xfree (a); /* We can free our context now. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
/* Because network sockets are special objects under Lose32 we have to
|
|
|
|
|
use a dedicated filter for them. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
static int
|
|
|
|
|
sock_filter (void *opaque, int control, iobuf_t chain, byte * buf,
|
|
|
|
|
size_t * ret_len)
|
|
|
|
|
{
|
|
|
|
|
sock_filter_ctx_t *a = opaque;
|
|
|
|
|
size_t size = *ret_len;
|
|
|
|
|
size_t nbytes = 0;
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
2008-10-20 15:53:23 +02:00
|
|
|
|
(void)chain;
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (control == IOBUFCTRL_UNDERFLOW)
|
|
|
|
|
{
|
|
|
|
|
assert (size); /* need a buffer */
|
|
|
|
|
if (a->eof_seen)
|
|
|
|
|
{
|
|
|
|
|
rc = -1;
|
|
|
|
|
*ret_len = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int nread;
|
|
|
|
|
|
|
|
|
|
nread = recv (a->sock, buf, size, 0);
|
|
|
|
|
if (nread == SOCKET_ERROR)
|
|
|
|
|
{
|
|
|
|
|
int ec = (int) WSAGetLastError ();
|
|
|
|
|
rc = gpg_error_from_errno (ec);
|
|
|
|
|
log_error ("socket read error: ec=%d\n", ec);
|
|
|
|
|
}
|
|
|
|
|
else if (!nread)
|
|
|
|
|
{
|
|
|
|
|
a->eof_seen = 1;
|
|
|
|
|
rc = -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
nbytes = nread;
|
|
|
|
|
}
|
|
|
|
|
*ret_len = nbytes;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_FLUSH)
|
|
|
|
|
{
|
|
|
|
|
if (size)
|
|
|
|
|
{
|
|
|
|
|
byte *p = buf;
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
nbytes = size;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
n = send (a->sock, p, nbytes, 0);
|
|
|
|
|
if (n == SOCKET_ERROR)
|
|
|
|
|
{
|
|
|
|
|
int ec = (int) WSAGetLastError ();
|
|
|
|
|
rc = gpg_error_from_errno (ec);
|
|
|
|
|
log_error ("socket write error: ec=%d\n", ec);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
p += n;
|
|
|
|
|
nbytes -= n;
|
|
|
|
|
}
|
|
|
|
|
while (nbytes);
|
|
|
|
|
nbytes = p - buf;
|
|
|
|
|
}
|
|
|
|
|
*ret_len = nbytes;
|
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_INIT)
|
|
|
|
|
{
|
|
|
|
|
a->eof_seen = 0;
|
|
|
|
|
a->keep_open = 0;
|
|
|
|
|
a->no_cache = 0;
|
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_DESC)
|
|
|
|
|
{
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
mem2str (buf, "sock_filter", *ret_len);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_FREE)
|
|
|
|
|
{
|
|
|
|
|
if (!a->keep_open)
|
|
|
|
|
closesocket (a->sock);
|
|
|
|
|
xfree (a); /* we can free our context now */
|
|
|
|
|
}
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#endif /*HAVE_W32_SYSTEM*/
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* This is used to implement the block write mode.
|
|
|
|
|
* Block reading is done on a byte by byte basis in readbyte(),
|
|
|
|
|
* without a filter
|
|
|
|
|
*/
|
|
|
|
|
static int
|
2005-06-16 10:12:03 +02:00
|
|
|
|
block_filter (void *opaque, int control, iobuf_t chain, byte * buffer,
|
2003-08-05 19:11:04 +02:00
|
|
|
|
size_t * ret_len)
|
|
|
|
|
{
|
|
|
|
|
block_filter_ctx_t *a = opaque;
|
2005-06-16 10:12:03 +02:00
|
|
|
|
char *buf = (char *)buffer;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
size_t size = *ret_len;
|
|
|
|
|
int c, needed, rc = 0;
|
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
|
|
if (control == IOBUFCTRL_UNDERFLOW)
|
|
|
|
|
{
|
|
|
|
|
size_t n = 0;
|
|
|
|
|
|
|
|
|
|
p = buf;
|
|
|
|
|
assert (size); /* need a buffer */
|
|
|
|
|
if (a->eof) /* don't read any further */
|
|
|
|
|
rc = -1;
|
|
|
|
|
while (!rc && size)
|
|
|
|
|
{
|
|
|
|
|
if (!a->size)
|
|
|
|
|
{ /* get the length bytes */
|
|
|
|
|
if (a->partial == 2)
|
|
|
|
|
{
|
|
|
|
|
a->eof = 1;
|
|
|
|
|
if (!n)
|
|
|
|
|
rc = -1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else if (a->partial)
|
|
|
|
|
{
|
|
|
|
|
/* These OpenPGP introduced huffman like encoded length
|
|
|
|
|
* bytes are really a mess :-( */
|
|
|
|
|
if (a->first_c)
|
|
|
|
|
{
|
|
|
|
|
c = a->first_c;
|
|
|
|
|
a->first_c = 0;
|
|
|
|
|
}
|
|
|
|
|
else if ((c = iobuf_get (chain)) == -1)
|
|
|
|
|
{
|
|
|
|
|
log_error ("block_filter: 1st length byte missing\n");
|
|
|
|
|
rc = GPG_ERR_BAD_DATA;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (c < 192)
|
|
|
|
|
{
|
|
|
|
|
a->size = c;
|
|
|
|
|
a->partial = 2;
|
|
|
|
|
if (!a->size)
|
|
|
|
|
{
|
|
|
|
|
a->eof = 1;
|
|
|
|
|
if (!n)
|
|
|
|
|
rc = -1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (c < 224)
|
|
|
|
|
{
|
|
|
|
|
a->size = (c - 192) * 256;
|
|
|
|
|
if ((c = iobuf_get (chain)) == -1)
|
|
|
|
|
{
|
|
|
|
|
log_error
|
|
|
|
|
("block_filter: 2nd length byte missing\n");
|
|
|
|
|
rc = GPG_ERR_BAD_DATA;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
a->size += c + 192;
|
|
|
|
|
a->partial = 2;
|
|
|
|
|
if (!a->size)
|
|
|
|
|
{
|
|
|
|
|
a->eof = 1;
|
|
|
|
|
if (!n)
|
|
|
|
|
rc = -1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (c == 255)
|
|
|
|
|
{
|
2018-09-10 06:44:47 +02:00
|
|
|
|
a->size = iobuf_get_noeof (chain) << 24;
|
|
|
|
|
a->size |= iobuf_get_noeof (chain) << 16;
|
|
|
|
|
a->size |= iobuf_get_noeof (chain) << 8;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if ((c = iobuf_get (chain)) == -1)
|
|
|
|
|
{
|
|
|
|
|
log_error ("block_filter: invalid 4 byte length\n");
|
|
|
|
|
rc = GPG_ERR_BAD_DATA;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
a->size |= c;
|
2006-04-21 14:56:40 +02:00
|
|
|
|
a->partial = 2;
|
|
|
|
|
if (!a->size)
|
|
|
|
|
{
|
|
|
|
|
a->eof = 1;
|
|
|
|
|
if (!n)
|
|
|
|
|
rc = -1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2006-04-21 14:56:40 +02:00
|
|
|
|
{ /* Next partial body length. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
a->size = 1 << (c & 0x1f);
|
|
|
|
|
}
|
|
|
|
|
/* log_debug("partial: ctx=%p c=%02x size=%u\n", a, c, a->size); */
|
|
|
|
|
}
|
|
|
|
|
else
|
2011-02-04 12:57:53 +01:00
|
|
|
|
BUG ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while (!rc && size && a->size)
|
|
|
|
|
{
|
|
|
|
|
needed = size < a->size ? size : a->size;
|
|
|
|
|
c = iobuf_read (chain, p, needed);
|
|
|
|
|
if (c < needed)
|
|
|
|
|
{
|
|
|
|
|
if (c == -1)
|
|
|
|
|
c = 0;
|
|
|
|
|
log_error
|
|
|
|
|
("block_filter %p: read error (size=%lu,a->size=%lu)\n",
|
|
|
|
|
a, (ulong) size + c, (ulong) a->size + c);
|
|
|
|
|
rc = GPG_ERR_BAD_DATA;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
size -= c;
|
|
|
|
|
a->size -= c;
|
|
|
|
|
p += c;
|
|
|
|
|
n += c;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
*ret_len = n;
|
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_FLUSH)
|
|
|
|
|
{
|
|
|
|
|
if (a->partial)
|
|
|
|
|
{ /* the complicated openpgp scheme */
|
|
|
|
|
size_t blen, n, nbytes = size + a->buflen;
|
|
|
|
|
|
|
|
|
|
assert (a->buflen <= OP_MIN_PARTIAL_CHUNK);
|
|
|
|
|
if (nbytes < OP_MIN_PARTIAL_CHUNK)
|
|
|
|
|
{
|
|
|
|
|
/* not enough to write a partial block out; so we store it */
|
|
|
|
|
if (!a->buffer)
|
|
|
|
|
a->buffer = xmalloc (OP_MIN_PARTIAL_CHUNK);
|
|
|
|
|
memcpy (a->buffer + a->buflen, buf, size);
|
|
|
|
|
a->buflen += size;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{ /* okay, we can write out something */
|
|
|
|
|
/* do this in a loop to use the most efficient block lengths */
|
|
|
|
|
p = buf;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
/* find the best matching block length - this is limited
|
|
|
|
|
* by the size of the internal buffering */
|
|
|
|
|
for (blen = OP_MIN_PARTIAL_CHUNK * 2,
|
|
|
|
|
c = OP_MIN_PARTIAL_CHUNK_2POW + 1; blen <= nbytes;
|
|
|
|
|
blen *= 2, c++)
|
|
|
|
|
;
|
|
|
|
|
blen /= 2;
|
|
|
|
|
c--;
|
|
|
|
|
/* write the partial length header */
|
|
|
|
|
assert (c <= 0x1f); /*;-) */
|
|
|
|
|
c |= 0xe0;
|
|
|
|
|
iobuf_put (chain, c);
|
|
|
|
|
if ((n = a->buflen))
|
|
|
|
|
{ /* write stuff from the buffer */
|
|
|
|
|
assert (n == OP_MIN_PARTIAL_CHUNK);
|
|
|
|
|
if (iobuf_write (chain, a->buffer, n))
|
2006-09-14 18:50:33 +02:00
|
|
|
|
rc = gpg_error_from_syserror ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
a->buflen = 0;
|
|
|
|
|
nbytes -= n;
|
|
|
|
|
}
|
|
|
|
|
if ((n = nbytes) > blen)
|
|
|
|
|
n = blen;
|
|
|
|
|
if (n && iobuf_write (chain, p, n))
|
2006-09-14 18:50:33 +02:00
|
|
|
|
rc = gpg_error_from_syserror ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
p += n;
|
|
|
|
|
nbytes -= n;
|
|
|
|
|
}
|
|
|
|
|
while (!rc && nbytes >= OP_MIN_PARTIAL_CHUNK);
|
|
|
|
|
/* store the rest in the buffer */
|
|
|
|
|
if (!rc && nbytes)
|
|
|
|
|
{
|
|
|
|
|
assert (!a->buflen);
|
|
|
|
|
assert (nbytes < OP_MIN_PARTIAL_CHUNK);
|
|
|
|
|
if (!a->buffer)
|
|
|
|
|
a->buffer = xmalloc (OP_MIN_PARTIAL_CHUNK);
|
|
|
|
|
memcpy (a->buffer, p, nbytes);
|
|
|
|
|
a->buflen = nbytes;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
2006-04-21 14:56:40 +02:00
|
|
|
|
BUG ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_INIT)
|
|
|
|
|
{
|
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug ("init block_filter %p\n", a);
|
|
|
|
|
if (a->partial)
|
|
|
|
|
a->count = 0;
|
2015-08-09 10:52:34 +02:00
|
|
|
|
else if (a->use == IOBUF_INPUT)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
a->count = a->size = 0;
|
|
|
|
|
else
|
|
|
|
|
a->count = a->size; /* force first length bytes */
|
|
|
|
|
a->eof = 0;
|
|
|
|
|
a->buffer = NULL;
|
|
|
|
|
a->buflen = 0;
|
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_DESC)
|
|
|
|
|
{
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
mem2str (buf, "block_filter", *ret_len);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else if (control == IOBUFCTRL_FREE)
|
|
|
|
|
{
|
2015-08-09 10:52:34 +02:00
|
|
|
|
if (a->use == IOBUF_OUTPUT)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{ /* write the end markers */
|
|
|
|
|
if (a->partial)
|
|
|
|
|
{
|
|
|
|
|
u32 len;
|
|
|
|
|
/* write out the remaining bytes without a partial header
|
|
|
|
|
* the length of this header may be 0 - but if it is
|
|
|
|
|
* the first block we are not allowed to use a partial header
|
|
|
|
|
* and frankly we can't do so, because this length must be
|
|
|
|
|
* a power of 2. This is _really_ complicated because we
|
|
|
|
|
* have to check the possible length of a packet prior
|
|
|
|
|
* to it's creation: a chain of filters becomes complicated
|
|
|
|
|
* and we need a lot of code to handle compressed packets etc.
|
|
|
|
|
* :-(((((((
|
|
|
|
|
*/
|
|
|
|
|
/* construct header */
|
|
|
|
|
len = a->buflen;
|
|
|
|
|
/*log_debug("partial: remaining length=%u\n", len ); */
|
|
|
|
|
if (len < 192)
|
|
|
|
|
rc = iobuf_put (chain, len);
|
|
|
|
|
else if (len < 8384)
|
|
|
|
|
{
|
|
|
|
|
if (!(rc = iobuf_put (chain, ((len - 192) / 256) + 192)))
|
|
|
|
|
rc = iobuf_put (chain, ((len - 192) % 256));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{ /* use a 4 byte header */
|
|
|
|
|
if (!(rc = iobuf_put (chain, 0xff)))
|
|
|
|
|
if (!(rc = iobuf_put (chain, (len >> 24) & 0xff)))
|
|
|
|
|
if (!(rc = iobuf_put (chain, (len >> 16) & 0xff)))
|
|
|
|
|
if (!(rc = iobuf_put (chain, (len >> 8) & 0xff)))
|
|
|
|
|
rc = iobuf_put (chain, len & 0xff);
|
|
|
|
|
}
|
|
|
|
|
if (!rc && len)
|
|
|
|
|
rc = iobuf_write (chain, a->buffer, len);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("block_filter: write error: %s\n",
|
|
|
|
|
strerror (errno));
|
2006-09-14 18:50:33 +02:00
|
|
|
|
rc = gpg_error_from_syserror ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
xfree (a->buffer);
|
|
|
|
|
a->buffer = NULL;
|
|
|
|
|
a->buflen = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
2006-04-21 14:56:40 +02:00
|
|
|
|
BUG ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else if (a->size)
|
|
|
|
|
{
|
|
|
|
|
log_error ("block_filter: pending bytes!\n");
|
|
|
|
|
}
|
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug ("free block_filter %p\n", a);
|
|
|
|
|
xfree (a); /* we can free our context now */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-24 18:37:55 +01:00
|
|
|
|
|
|
|
|
|
/* Change the default size for all IOBUFs to KILOBYTE. This needs to
|
|
|
|
|
* be called before any iobufs are used and can only be used once.
|
|
|
|
|
* Returns the current value. Using 0 has no effect except for
|
|
|
|
|
* returning the current value. */
|
|
|
|
|
unsigned int
|
|
|
|
|
iobuf_set_buffer_size (unsigned int kilobyte)
|
|
|
|
|
{
|
|
|
|
|
static int used;
|
|
|
|
|
|
|
|
|
|
if (!used && kilobyte)
|
|
|
|
|
{
|
|
|
|
|
if (kilobyte < 4)
|
|
|
|
|
kilobyte = 4;
|
|
|
|
|
else if (kilobyte > 16*1024)
|
|
|
|
|
kilobyte = 16*1024;
|
|
|
|
|
|
|
|
|
|
iobuf_buffer_size = kilobyte * 1024;
|
|
|
|
|
used = 1;
|
|
|
|
|
}
|
|
|
|
|
return iobuf_buffer_size / 1024;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
#define MAX_IOBUF_DESC 32
|
|
|
|
|
/*
|
|
|
|
|
* Fill the buffer by the description of iobuf A.
|
|
|
|
|
* The buffer size should be MAX_IOBUF_DESC (or larger).
|
|
|
|
|
* Returns BUF as (const char *).
|
|
|
|
|
*/
|
2015-08-09 16:57:42 +02:00
|
|
|
|
static const char *
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
iobuf_desc (iobuf_t a, byte *buf)
|
2015-08-09 16:57:42 +02:00
|
|
|
|
{
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
size_t len = MAX_IOBUF_DESC;
|
2015-08-09 16:57:42 +02:00
|
|
|
|
|
|
|
|
|
if (! a || ! a->filter)
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
memcpy (buf, "?", 2);
|
|
|
|
|
else
|
|
|
|
|
a->filter (a->filter_ov, IOBUFCTRL_DESC, NULL, buf, &len);
|
2015-08-09 16:57:42 +02:00
|
|
|
|
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
return buf;
|
2015-08-09 16:57:42 +02:00
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_chain (iobuf_t a)
|
|
|
|
|
{
|
|
|
|
|
if (!DBG_IOBUF)
|
|
|
|
|
return;
|
|
|
|
|
for (; a; a = a->chain)
|
|
|
|
|
{
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
byte desc[MAX_IOBUF_DESC];
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_debug ("iobuf chain: %d.%d '%s' filter_eof=%d start=%d len=%d\n",
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
a->no, a->subno, iobuf_desc (a, desc), a->filter_eof,
|
2003-08-05 19:11:04 +02:00
|
|
|
|
(int) a->d.start, (int) a->d.len);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
iobuf_print_chain (iobuf_t a)
|
|
|
|
|
{
|
|
|
|
|
print_chain (a);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
iobuf_t
|
|
|
|
|
iobuf_alloc (int use, size_t bufsize)
|
|
|
|
|
{
|
|
|
|
|
iobuf_t a;
|
|
|
|
|
static int number = 0;
|
|
|
|
|
|
2015-09-02 10:24:33 +02:00
|
|
|
|
assert (use == IOBUF_INPUT || use == IOBUF_INPUT_TEMP
|
2015-09-02 09:56:09 +02:00
|
|
|
|
|| use == IOBUF_OUTPUT || use == IOBUF_OUTPUT_TEMP);
|
2015-08-17 12:52:20 +02:00
|
|
|
|
if (bufsize == 0)
|
|
|
|
|
{
|
|
|
|
|
log_bug ("iobuf_alloc() passed a bufsize of 0!\n");
|
2018-01-24 18:37:55 +01:00
|
|
|
|
bufsize = iobuf_buffer_size;
|
2015-08-17 12:52:20 +02:00
|
|
|
|
}
|
2015-08-08 13:09:00 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
a = xcalloc (1, sizeof *a);
|
|
|
|
|
a->use = use;
|
|
|
|
|
a->d.buf = xmalloc (bufsize);
|
|
|
|
|
a->d.size = bufsize;
|
|
|
|
|
a->no = ++number;
|
|
|
|
|
a->subno = 0;
|
|
|
|
|
a->real_fname = NULL;
|
|
|
|
|
return a;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
iobuf_close (iobuf_t a)
|
|
|
|
|
{
|
2015-08-13 10:08:32 +02:00
|
|
|
|
iobuf_t a_chain;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
size_t dummy_len = 0;
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
2015-08-13 10:08:32 +02:00
|
|
|
|
for (; a; a = a_chain)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
byte desc[MAX_IOBUF_DESC];
|
2015-08-13 10:08:32 +02:00
|
|
|
|
int rc2 = 0;
|
|
|
|
|
|
|
|
|
|
a_chain = a->chain;
|
|
|
|
|
|
2015-08-13 15:53:11 +02:00
|
|
|
|
if (a->use == IOBUF_OUTPUT && (rc = filter_flush (a)))
|
|
|
|
|
log_error ("filter_flush failed on close: %s\n", gpg_strerror (rc));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
if (DBG_IOBUF)
|
2015-08-09 16:57:42 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: close '%s'\n",
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
a->no, a->subno, iobuf_desc (a, desc));
|
2015-08-09 16:57:42 +02:00
|
|
|
|
|
2015-08-13 10:08:32 +02:00
|
|
|
|
if (a->filter && (rc2 = a->filter (a->filter_ov, IOBUFCTRL_FREE,
|
|
|
|
|
a->chain, NULL, &dummy_len)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
log_error ("IOBUFCTRL_FREE failed on close: %s\n", gpg_strerror (rc));
|
2015-08-13 10:08:32 +02:00
|
|
|
|
if (! rc && rc2)
|
2015-11-16 12:41:46 +01:00
|
|
|
|
/* Whoops! An error occurred. Save it in RC if we haven't
|
2015-08-13 10:08:32 +02:00
|
|
|
|
already recorded an error. */
|
|
|
|
|
rc = rc2;
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
xfree (a->real_fname);
|
|
|
|
|
if (a->d.buf)
|
|
|
|
|
{
|
|
|
|
|
memset (a->d.buf, 0, a->d.size); /* erase the buffer */
|
|
|
|
|
xfree (a->d.buf);
|
|
|
|
|
}
|
|
|
|
|
xfree (a);
|
|
|
|
|
}
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
iobuf_cancel (iobuf_t a)
|
|
|
|
|
{
|
|
|
|
|
const char *s;
|
|
|
|
|
iobuf_t a2;
|
|
|
|
|
int rc;
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#if defined(HAVE_W32_SYSTEM) || defined(__riscos__)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
char *remove_name = NULL;
|
|
|
|
|
#endif
|
|
|
|
|
|
2015-08-09 10:52:34 +02:00
|
|
|
|
if (a && a->use == IOBUF_OUTPUT)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
s = iobuf_get_real_fname (a);
|
|
|
|
|
if (s && *s)
|
|
|
|
|
{
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#if defined(HAVE_W32_SYSTEM) || defined(__riscos__)
|
2004-12-15 15:15:54 +01:00
|
|
|
|
remove_name = xstrdup (s);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#else
|
|
|
|
|
remove (s);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* send a cancel message to all filters */
|
|
|
|
|
for (a2 = a; a2; a2 = a2->chain)
|
|
|
|
|
{
|
|
|
|
|
size_t dummy;
|
|
|
|
|
if (a2->filter)
|
|
|
|
|
a2->filter (a2->filter_ov, IOBUFCTRL_CANCEL, a2->chain, NULL, &dummy);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rc = iobuf_close (a);
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#if defined(HAVE_W32_SYSTEM) || defined(__riscos__)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (remove_name)
|
|
|
|
|
{
|
More cleanup of "allow to".
* README, agent/command.c, agent/keyformat.txt, common/i18n.c,
common/iobuf.c, common/keyserver.h, dirmngr/cdblib.c,
dirmngr/ldap-wrapper.c, doc/DETAILS, doc/TRANSLATE,
doc/announce-2.1.txt, doc/gpg.texi, doc/gpgsm.texi,
doc/scdaemon.texi, doc/tools.texi, doc/whats-new-in-2.1.txt,
g10/export.c, g10/getkey.c, g10/import.c, g10/keyedit.c, m4/ksba.m4,
m4/libgcrypt.m4, m4/ntbtls.m4, po/ca.po, po/cs.po, po/da.po,
po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fi.po,
po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po,
po/nb.po, po/pl.po, po/pt.po, po/ro.po, po/ru.po, po/sk.po,
po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po,
scd/app-p15.c, scd/ccid-driver.c, scd/command.c, sm/gpgsm.c,
sm/sign.c, tools/gpgconf-comp.c, tools/gpgtar.h: replace "Allow to"
with clearer text.
In standard English, the normal construction is "${XXX} allows ${YYY}
to" -- that is, the subject (${XXX}) of the sentence is allowing the
object (${YYY}) to do something. When the object is missing, the
phrasing sounds awkward, even if the object is implied by context.
There's almost always a better construction that isn't as awkward.
These changes should make the language a bit clearer.
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
2016-08-02 04:19:17 +02:00
|
|
|
|
/* Argg, MSDOS does not allow removing open files. So
|
2003-08-05 19:11:04 +02:00
|
|
|
|
* we have to do it here */
|
2010-03-02 22:25:08 +01:00
|
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
|
|
|
wchar_t *wtmp = utf8_to_wchar (remove_name);
|
|
|
|
|
if (wtmp)
|
|
|
|
|
DeleteFile (wtmp);
|
|
|
|
|
xfree (wtmp);
|
|
|
|
|
#else
|
2003-08-05 19:11:04 +02:00
|
|
|
|
remove (remove_name);
|
2010-03-02 22:25:08 +01:00
|
|
|
|
#endif
|
2003-08-05 19:11:04 +02:00
|
|
|
|
xfree (remove_name);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
iobuf_t
|
2015-08-17 12:30:04 +02:00
|
|
|
|
iobuf_temp (void)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2018-01-24 18:37:55 +01:00
|
|
|
|
return iobuf_alloc (IOBUF_OUTPUT_TEMP, iobuf_buffer_size);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
iobuf_t
|
|
|
|
|
iobuf_temp_with_content (const char *buffer, size_t length)
|
|
|
|
|
{
|
|
|
|
|
iobuf_t a;
|
2015-02-11 10:27:57 +01:00
|
|
|
|
int i;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2015-09-02 10:24:33 +02:00
|
|
|
|
a = iobuf_alloc (IOBUF_INPUT_TEMP, length);
|
|
|
|
|
assert (length == a->d.size);
|
2015-02-11 10:27:57 +01:00
|
|
|
|
/* memcpy (a->d.buf, buffer, length); */
|
|
|
|
|
for (i=0; i < length; i++)
|
|
|
|
|
a->d.buf[i] = buffer[i];
|
2003-08-05 19:11:04 +02:00
|
|
|
|
a->d.len = length;
|
|
|
|
|
|
|
|
|
|
return a;
|
|
|
|
|
}
|
|
|
|
|
|
2006-04-21 14:56:40 +02:00
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
iobuf_is_pipe_filename (const char *fname)
|
|
|
|
|
{
|
|
|
|
|
if (!fname || (*fname=='-' && !fname[1]) )
|
|
|
|
|
return 1;
|
2016-11-29 16:18:24 +01:00
|
|
|
|
return check_special_filename (fname, 0, 1) != -1;
|
2006-04-21 14:56:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
2016-11-29 16:18:24 +01:00
|
|
|
|
|
2015-08-14 11:18:18 +02:00
|
|
|
|
static iobuf_t
|
|
|
|
|
do_open (const char *fname, int special_filenames,
|
|
|
|
|
int use, const char *opentype, int mode700)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
iobuf_t a;
|
2010-03-08 14:06:53 +01:00
|
|
|
|
gnupg_fd_t fp;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
file_filter_ctx_t *fcx;
|
2014-12-19 23:53:36 +01:00
|
|
|
|
size_t len = 0;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int print_only = 0;
|
|
|
|
|
int fd;
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
byte desc[MAX_IOBUF_DESC];
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2015-09-02 09:56:09 +02:00
|
|
|
|
assert (use == IOBUF_INPUT || use == IOBUF_OUTPUT);
|
|
|
|
|
|
2015-08-14 11:18:18 +02:00
|
|
|
|
if (special_filenames
|
|
|
|
|
/* NULL or '-'. */
|
|
|
|
|
&& (!fname || (*fname == '-' && !fname[1])))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2015-08-14 11:18:18 +02:00
|
|
|
|
if (use == IOBUF_INPUT)
|
|
|
|
|
{
|
|
|
|
|
fp = FD_FOR_STDIN;
|
|
|
|
|
fname = "[stdin]";
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
fp = FD_FOR_STDOUT;
|
|
|
|
|
fname = "[stdout]";
|
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
print_only = 1;
|
|
|
|
|
}
|
2015-08-14 11:18:18 +02:00
|
|
|
|
else if (!fname)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return NULL;
|
2016-11-29 16:18:24 +01:00
|
|
|
|
else if (special_filenames
|
|
|
|
|
&& (fd = check_special_filename (fname, 0, 1)) != -1)
|
2015-08-14 11:18:18 +02:00
|
|
|
|
return iobuf_fdopen (translate_file_handle (fd, use == IOBUF_INPUT ? 0 : 1),
|
|
|
|
|
opentype);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (use == IOBUF_INPUT)
|
|
|
|
|
fp = fd_cache_open (fname, opentype);
|
|
|
|
|
else
|
|
|
|
|
fp = direct_open (fname, opentype, mode700);
|
|
|
|
|
if (fp == GNUPG_INVALID_FD)
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-24 18:37:55 +01:00
|
|
|
|
a = iobuf_alloc (use, iobuf_buffer_size);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
fcx = xmalloc (sizeof *fcx + strlen (fname));
|
|
|
|
|
fcx->fp = fp;
|
|
|
|
|
fcx->print_only_name = print_only;
|
|
|
|
|
strcpy (fcx->fname, fname);
|
|
|
|
|
if (!print_only)
|
|
|
|
|
a->real_fname = xstrdup (fname);
|
|
|
|
|
a->filter = file_filter;
|
|
|
|
|
a->filter_ov = fcx;
|
|
|
|
|
file_filter (fcx, IOBUFCTRL_INIT, NULL, NULL, &len);
|
|
|
|
|
if (DBG_IOBUF)
|
2015-08-14 11:18:18 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: open '%s' desc=%s fd=%d\n",
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
a->no, a->subno, fname, iobuf_desc (a, desc), FD2INT (fcx->fp));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
return a;
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-14 11:18:18 +02:00
|
|
|
|
iobuf_t
|
|
|
|
|
iobuf_open (const char *fname)
|
|
|
|
|
{
|
|
|
|
|
return do_open (fname, 1, IOBUF_INPUT, "rb", 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
iobuf_t
|
|
|
|
|
iobuf_create (const char *fname, int mode700)
|
|
|
|
|
{
|
|
|
|
|
return do_open (fname, 1, IOBUF_OUTPUT, "wb", mode700);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
iobuf_t
|
|
|
|
|
iobuf_openrw (const char *fname)
|
|
|
|
|
{
|
|
|
|
|
return do_open (fname, 0, IOBUF_OUTPUT, "r+b", 0);
|
|
|
|
|
}
|
|
|
|
|
|
2010-03-08 18:05:37 +01:00
|
|
|
|
|
|
|
|
|
static iobuf_t
|
|
|
|
|
do_iobuf_fdopen (int fd, const char *mode, int keep_open)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
iobuf_t a;
|
2010-03-08 14:06:53 +01:00
|
|
|
|
gnupg_fd_t fp;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
file_filter_ctx_t *fcx;
|
|
|
|
|
size_t len;
|
|
|
|
|
|
2010-03-08 18:05:37 +01:00
|
|
|
|
fp = INT2FD (fd);
|
2010-03-08 13:37:54 +01:00
|
|
|
|
|
2015-08-09 10:52:34 +02:00
|
|
|
|
a = iobuf_alloc (strchr (mode, 'w') ? IOBUF_OUTPUT : IOBUF_INPUT,
|
2018-01-24 18:37:55 +01:00
|
|
|
|
iobuf_buffer_size);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
fcx = xmalloc (sizeof *fcx + 20);
|
|
|
|
|
fcx->fp = fp;
|
|
|
|
|
fcx->print_only_name = 1;
|
2010-03-08 18:05:37 +01:00
|
|
|
|
fcx->keep_open = keep_open;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
sprintf (fcx->fname, "[fd %d]", fd);
|
|
|
|
|
a->filter = file_filter;
|
|
|
|
|
a->filter_ov = fcx;
|
|
|
|
|
file_filter (fcx, IOBUFCTRL_INIT, NULL, NULL, &len);
|
|
|
|
|
if (DBG_IOBUF)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: fdopen%s '%s'\n",
|
2010-03-08 18:05:37 +01:00
|
|
|
|
a->no, a->subno, keep_open? "_nc":"", fcx->fname);
|
|
|
|
|
iobuf_ioctl (a, IOBUF_IOCTL_NO_CACHE, 1, NULL);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return a;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-03-08 18:05:37 +01:00
|
|
|
|
iobuf_t
|
|
|
|
|
iobuf_fdopen (int fd, const char *mode)
|
|
|
|
|
{
|
|
|
|
|
return do_iobuf_fdopen (fd, mode, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
iobuf_t
|
|
|
|
|
iobuf_fdopen_nc (int fd, const char *mode)
|
|
|
|
|
{
|
|
|
|
|
return do_iobuf_fdopen (fd, mode, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-01-18 12:50:02 +01:00
|
|
|
|
iobuf_t
|
2019-09-10 15:45:58 +02:00
|
|
|
|
iobuf_esopen (estream_t estream, const char *mode, int keep_open,
|
|
|
|
|
size_t readlimit)
|
2011-01-18 12:50:02 +01:00
|
|
|
|
{
|
|
|
|
|
iobuf_t a;
|
|
|
|
|
file_es_filter_ctx_t *fcx;
|
2015-11-19 16:13:55 +01:00
|
|
|
|
size_t len = 0;
|
2011-01-18 12:50:02 +01:00
|
|
|
|
|
2015-08-09 10:52:34 +02:00
|
|
|
|
a = iobuf_alloc (strchr (mode, 'w') ? IOBUF_OUTPUT : IOBUF_INPUT,
|
2018-01-24 18:37:55 +01:00
|
|
|
|
iobuf_buffer_size);
|
2011-01-18 12:50:02 +01:00
|
|
|
|
fcx = xtrymalloc (sizeof *fcx + 30);
|
|
|
|
|
fcx->fp = estream;
|
|
|
|
|
fcx->print_only_name = 1;
|
|
|
|
|
fcx->keep_open = keep_open;
|
2019-09-10 15:45:58 +02:00
|
|
|
|
fcx->readlimit = readlimit;
|
|
|
|
|
fcx->use_readlimit = !!readlimit;
|
|
|
|
|
snprintf (fcx->fname, 30, "[fd %p]", estream);
|
2011-01-18 12:50:02 +01:00
|
|
|
|
a->filter = file_es_filter;
|
|
|
|
|
a->filter_ov = fcx;
|
|
|
|
|
file_es_filter (fcx, IOBUFCTRL_INIT, NULL, NULL, &len);
|
|
|
|
|
if (DBG_IOBUF)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: esopen%s '%s'\n",
|
2011-01-18 12:50:02 +01:00
|
|
|
|
a->no, a->subno, keep_open? "_nc":"", fcx->fname);
|
|
|
|
|
return a;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
iobuf_t
|
|
|
|
|
iobuf_sockopen (int fd, const char *mode)
|
|
|
|
|
{
|
|
|
|
|
iobuf_t a;
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2003-08-05 19:11:04 +02:00
|
|
|
|
sock_filter_ctx_t *scx;
|
|
|
|
|
size_t len;
|
|
|
|
|
|
2015-08-09 10:52:34 +02:00
|
|
|
|
a = iobuf_alloc (strchr (mode, 'w') ? IOBUF_OUTPUT : IOBUF_INPUT,
|
2018-01-24 18:37:55 +01:00
|
|
|
|
iobuf_buffer_size);
|
2004-12-15 15:15:54 +01:00
|
|
|
|
scx = xmalloc (sizeof *scx + 25);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
scx->sock = fd;
|
|
|
|
|
scx->print_only_name = 1;
|
|
|
|
|
sprintf (scx->fname, "[sock %d]", fd);
|
|
|
|
|
a->filter = sock_filter;
|
|
|
|
|
a->filter_ov = scx;
|
|
|
|
|
sock_filter (scx, IOBUFCTRL_INIT, NULL, NULL, &len);
|
|
|
|
|
if (DBG_IOBUF)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: sockopen '%s'\n", a->no, a->subno, scx->fname);
|
2010-03-08 18:05:37 +01:00
|
|
|
|
iobuf_ioctl (a, IOBUF_IOCTL_NO_CACHE, 1, NULL);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#else
|
|
|
|
|
a = iobuf_fdopen (fd, mode);
|
|
|
|
|
#endif
|
|
|
|
|
return a;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2010-03-08 18:05:37 +01:00
|
|
|
|
iobuf_ioctl (iobuf_t a, iobuf_ioctl_t cmd, int intval, void *ptrval)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
byte desc[MAX_IOBUF_DESC];
|
|
|
|
|
|
2010-03-08 18:05:37 +01:00
|
|
|
|
if (cmd == IOBUF_IOCTL_KEEP_OPEN)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
{
|
2010-03-08 18:05:37 +01:00
|
|
|
|
/* Keep system filepointer/descriptor open. This was used in
|
|
|
|
|
the past by http.c; this ioctl is not directly used
|
|
|
|
|
anymore. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (DBG_IOBUF)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: ioctl '%s' keep_open=%d\n",
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
a ? a->no : -1, a ? a->subno : -1, iobuf_desc (a, desc),
|
2003-08-05 19:11:04 +02:00
|
|
|
|
intval);
|
|
|
|
|
for (; a; a = a->chain)
|
|
|
|
|
if (!a->chain && a->filter == file_filter)
|
|
|
|
|
{
|
|
|
|
|
file_filter_ctx_t *b = a->filter_ov;
|
|
|
|
|
b->keep_open = intval;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2003-08-05 19:11:04 +02:00
|
|
|
|
else if (!a->chain && a->filter == sock_filter)
|
|
|
|
|
{
|
|
|
|
|
sock_filter_ctx_t *b = a->filter_ov;
|
|
|
|
|
b->keep_open = intval;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2010-03-08 18:05:37 +01:00
|
|
|
|
else if (cmd == IOBUF_IOCTL_INVALIDATE_CACHE)
|
|
|
|
|
{
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (DBG_IOBUF)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_debug ("iobuf-*.*: ioctl '%s' invalidate\n",
|
2003-08-05 19:11:04 +02:00
|
|
|
|
ptrval ? (char *) ptrval : "?");
|
|
|
|
|
if (!a && !intval && ptrval)
|
|
|
|
|
{
|
2009-04-01 15:23:27 +02:00
|
|
|
|
if (fd_cache_invalidate (ptrval))
|
|
|
|
|
return -1;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2010-03-08 18:05:37 +01:00
|
|
|
|
else if (cmd == IOBUF_IOCTL_NO_CACHE)
|
|
|
|
|
{
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (DBG_IOBUF)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: ioctl '%s' no_cache=%d\n",
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
a ? a->no : -1, a ? a->subno : -1, iobuf_desc (a, desc),
|
2003-08-05 19:11:04 +02:00
|
|
|
|
intval);
|
|
|
|
|
for (; a; a = a->chain)
|
|
|
|
|
if (!a->chain && a->filter == file_filter)
|
|
|
|
|
{
|
|
|
|
|
file_filter_ctx_t *b = a->filter_ov;
|
|
|
|
|
b->no_cache = intval;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2003-08-05 19:11:04 +02:00
|
|
|
|
else if (!a->chain && a->filter == sock_filter)
|
|
|
|
|
{
|
|
|
|
|
sock_filter_ctx_t *b = a->filter_ov;
|
|
|
|
|
b->no_cache = intval;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2010-03-08 18:05:37 +01:00
|
|
|
|
else if (cmd == IOBUF_IOCTL_FSYNC)
|
2009-04-01 15:23:27 +02:00
|
|
|
|
{
|
|
|
|
|
/* Do a fsync on the open fd and return any errors to the caller
|
|
|
|
|
of iobuf_ioctl. Note that we work on a file name here. */
|
|
|
|
|
if (DBG_IOBUF)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_debug ("iobuf-*.*: ioctl '%s' fsync\n",
|
2009-04-01 15:23:27 +02:00
|
|
|
|
ptrval? (const char*)ptrval:"<null>");
|
|
|
|
|
|
2016-02-15 03:05:29 +01:00
|
|
|
|
if (!a && !intval && ptrval)
|
|
|
|
|
{
|
|
|
|
|
return fd_cache_synchronize (ptrval);
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-04-01 15:23:27 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* Register an i/o filter.
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
iobuf_push_filter (iobuf_t a,
|
|
|
|
|
int (*f) (void *opaque, int control,
|
|
|
|
|
iobuf_t chain, byte * buf, size_t * len),
|
|
|
|
|
void *ov)
|
|
|
|
|
{
|
|
|
|
|
return iobuf_push_filter2 (a, f, ov, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
iobuf_push_filter2 (iobuf_t a,
|
|
|
|
|
int (*f) (void *opaque, int control,
|
|
|
|
|
iobuf_t chain, byte * buf, size_t * len),
|
|
|
|
|
void *ov, int rel_ov)
|
|
|
|
|
{
|
|
|
|
|
iobuf_t b;
|
|
|
|
|
size_t dummy_len = 0;
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
2015-08-13 15:53:11 +02:00
|
|
|
|
if (a->use == IOBUF_OUTPUT && (rc = filter_flush (a)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
2013-10-04 08:20:49 +02:00
|
|
|
|
|
|
|
|
|
if (a->subno >= MAX_NESTING_FILTER)
|
|
|
|
|
{
|
|
|
|
|
log_error ("i/o filter too deeply nested - corrupted data?\n");
|
|
|
|
|
return GPG_ERR_BAD_DATA;
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-17 12:30:04 +02:00
|
|
|
|
/* We want to create a new filter and put it in front of A. A
|
|
|
|
|
simple implementation would do:
|
|
|
|
|
|
|
|
|
|
b = iobuf_alloc (...);
|
|
|
|
|
b->chain = a;
|
|
|
|
|
return a;
|
|
|
|
|
|
|
|
|
|
This is a bit problematic: A is the head of the pipeline and
|
|
|
|
|
there are potentially many pointers to it. Requiring the caller
|
|
|
|
|
to update all of these pointers is a burden.
|
|
|
|
|
|
|
|
|
|
An alternative implementation would add a level of indirection.
|
|
|
|
|
For instance, we could use a pipeline object, which contains a
|
|
|
|
|
pointer to the first filter in the pipeline. This is not what we
|
|
|
|
|
do either.
|
|
|
|
|
|
|
|
|
|
Instead, we allocate a new buffer (B) and copy the first filter's
|
|
|
|
|
state into that and use the initial buffer (A) for the new
|
|
|
|
|
filter. One limitation of this approach is that it is not
|
|
|
|
|
practical to maintain a pointer to a specific filter's state.
|
|
|
|
|
|
|
|
|
|
Before:
|
|
|
|
|
|
|
|
|
|
A
|
|
|
|
|
|
|
|
|
|
|
v 0x100 0x200
|
|
|
|
|
+----------+ +----------+
|
|
|
|
|
| filter x |--------->| filter y |---->....
|
|
|
|
|
+----------+ +----------+
|
|
|
|
|
|
|
|
|
|
After: B
|
|
|
|
|
|
|
|
|
|
|
v 0x300
|
|
|
|
|
+----------+
|
|
|
|
|
A | filter x |
|
|
|
|
|
| +----------+
|
|
|
|
|
v 0x100 ^ v 0x200
|
|
|
|
|
+----------+ +----------+
|
|
|
|
|
| filter w | | filter y |---->....
|
|
|
|
|
+----------+ +----------+
|
|
|
|
|
|
|
|
|
|
Note: filter x's address changed from 0x100 to 0x300, but A still
|
|
|
|
|
points to the head of the pipeline.
|
|
|
|
|
*/
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
b = xmalloc (sizeof *b);
|
|
|
|
|
memcpy (b, a, sizeof *b);
|
|
|
|
|
/* fixme: it is stupid to keep a copy of the name at every level
|
|
|
|
|
* but we need the name somewhere because the name known by file_filter
|
|
|
|
|
* may have been released when we need the name of the file */
|
|
|
|
|
b->real_fname = a->real_fname ? xstrdup (a->real_fname) : NULL;
|
|
|
|
|
/* remove the filter stuff from the new stream */
|
|
|
|
|
a->filter = NULL;
|
|
|
|
|
a->filter_ov = NULL;
|
|
|
|
|
a->filter_ov_owner = 0;
|
|
|
|
|
a->filter_eof = 0;
|
2015-09-02 09:56:09 +02:00
|
|
|
|
if (a->use == IOBUF_OUTPUT_TEMP)
|
2015-08-17 12:29:15 +02:00
|
|
|
|
/* A TEMP filter buffers any data sent to it; it does not forward
|
|
|
|
|
any data down the pipeline. If we add a new filter to the
|
|
|
|
|
pipeline, it shouldn't also buffer data. It should send it
|
|
|
|
|
downstream to be buffered. Thus, the correct type for a filter
|
2015-09-02 09:56:09 +02:00
|
|
|
|
added in front of an IOBUF_OUTPUT_TEMP filter is IOBUF_OUPUT, not
|
|
|
|
|
IOBUF_OUTPUT_TEMP. */
|
2015-08-17 12:29:15 +02:00
|
|
|
|
{
|
|
|
|
|
a->use = IOBUF_OUTPUT;
|
|
|
|
|
|
|
|
|
|
/* When pipeline is written to, the temp buffer's size is
|
|
|
|
|
increased accordingly. We don't need to allocate a 10 MB
|
|
|
|
|
buffer for a non-terminal filter. Just use the default
|
|
|
|
|
size. */
|
2018-01-24 18:37:55 +01:00
|
|
|
|
a->d.size = iobuf_buffer_size;
|
2015-08-17 12:29:15 +02:00
|
|
|
|
}
|
2015-09-02 10:24:33 +02:00
|
|
|
|
else if (a->use == IOBUF_INPUT_TEMP)
|
|
|
|
|
/* Same idea as above. */
|
|
|
|
|
{
|
|
|
|
|
a->use = IOBUF_INPUT;
|
2018-01-24 18:37:55 +01:00
|
|
|
|
a->d.size = iobuf_buffer_size;
|
2015-09-02 10:24:33 +02:00
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2015-08-17 11:56:42 +02:00
|
|
|
|
/* The new filter (A) gets a new buffer.
|
|
|
|
|
|
|
|
|
|
If the pipeline is an output or temp pipeline, then giving the
|
|
|
|
|
buffer to the new filter means that data that was written before
|
|
|
|
|
the filter was pushed gets sent to the filter. That's clearly
|
|
|
|
|
wrong.
|
|
|
|
|
|
|
|
|
|
If the pipeline is an input pipeline, then giving the buffer to
|
|
|
|
|
the new filter (A) means that data that has read from (B), but
|
|
|
|
|
not yet read from the pipeline won't be processed by the new
|
|
|
|
|
filter (A)! That's certainly not what we want. */
|
|
|
|
|
a->d.buf = xmalloc (a->d.size);
|
|
|
|
|
a->d.len = 0;
|
|
|
|
|
a->d.start = 0;
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
/* disable nlimit for the new stream */
|
|
|
|
|
a->ntotal = b->ntotal + b->nbytes;
|
|
|
|
|
a->nlimit = a->nbytes = 0;
|
2015-08-09 16:53:51 +02:00
|
|
|
|
a->nofast = 0;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
/* make a link from the new stream to the original stream */
|
|
|
|
|
a->chain = b;
|
|
|
|
|
|
|
|
|
|
/* setup the function on the new stream */
|
|
|
|
|
a->filter = f;
|
|
|
|
|
a->filter_ov = ov;
|
|
|
|
|
a->filter_ov_owner = rel_ov;
|
|
|
|
|
|
|
|
|
|
a->subno = b->subno + 1;
|
|
|
|
|
|
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
{
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
byte desc[MAX_IOBUF_DESC];
|
2015-08-09 16:57:42 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: push '%s'\n",
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
a->no, a->subno, iobuf_desc (a, desc));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
print_chain (a);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* now we can initialize the new function if we have one */
|
|
|
|
|
if (a->filter && (rc = a->filter (a->filter_ov, IOBUFCTRL_INIT, a->chain,
|
|
|
|
|
NULL, &dummy_len)))
|
|
|
|
|
log_error ("IOBUFCTRL_INIT failed: %s\n", gpg_strerror (rc));
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* Remove an i/o filter.
|
|
|
|
|
*/
|
2016-03-02 15:42:18 +01:00
|
|
|
|
int
|
|
|
|
|
iobuf_pop_filter (iobuf_t a, int (*f) (void *opaque, int control,
|
|
|
|
|
iobuf_t chain, byte * buf, size_t * len),
|
|
|
|
|
void *ov)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
iobuf_t b;
|
|
|
|
|
size_t dummy_len = 0;
|
|
|
|
|
int rc = 0;
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
byte desc[MAX_IOBUF_DESC];
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
if (DBG_IOBUF)
|
2015-08-09 16:57:42 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: pop '%s'\n",
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
a->no, a->subno, iobuf_desc (a, desc));
|
2015-09-02 10:24:33 +02:00
|
|
|
|
if (a->use == IOBUF_INPUT_TEMP || a->use == IOBUF_OUTPUT_TEMP)
|
2015-09-02 09:56:09 +02:00
|
|
|
|
{
|
|
|
|
|
/* This should be the last filter in the pipeline. */
|
|
|
|
|
assert (! a->chain);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (!a->filter)
|
|
|
|
|
{ /* this is simple */
|
|
|
|
|
b = a->chain;
|
|
|
|
|
assert (b);
|
|
|
|
|
xfree (a->d.buf);
|
|
|
|
|
xfree (a->real_fname);
|
|
|
|
|
memcpy (a, b, sizeof *a);
|
|
|
|
|
xfree (b);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
for (b = a; b; b = b->chain)
|
|
|
|
|
if (b->filter == f && (!ov || b->filter_ov == ov))
|
|
|
|
|
break;
|
|
|
|
|
if (!b)
|
2016-03-02 15:42:18 +01:00
|
|
|
|
log_bug ("iobuf_pop_filter(): filter function not found\n");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
/* flush this stream if it is an output stream */
|
2015-08-13 15:53:11 +02:00
|
|
|
|
if (a->use == IOBUF_OUTPUT && (rc = filter_flush (b)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2016-03-02 15:42:18 +01:00
|
|
|
|
log_error ("filter_flush failed in iobuf_pop_filter: %s\n",
|
|
|
|
|
gpg_strerror (rc));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
/* and tell the filter to free it self */
|
|
|
|
|
if (b->filter && (rc = b->filter (b->filter_ov, IOBUFCTRL_FREE, b->chain,
|
|
|
|
|
NULL, &dummy_len)))
|
|
|
|
|
{
|
|
|
|
|
log_error ("IOBUFCTRL_FREE failed: %s\n", gpg_strerror (rc));
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
if (b->filter_ov && b->filter_ov_owner)
|
|
|
|
|
{
|
|
|
|
|
xfree (b->filter_ov);
|
|
|
|
|
b->filter_ov = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* and see how to remove it */
|
|
|
|
|
if (a == b && !b->chain)
|
|
|
|
|
log_bug ("can't remove the last filter from the chain\n");
|
|
|
|
|
else if (a == b)
|
|
|
|
|
{ /* remove the first iobuf from the chain */
|
|
|
|
|
/* everything from b is copied to a. This is save because
|
|
|
|
|
* a flush has been done on the to be removed entry
|
|
|
|
|
*/
|
|
|
|
|
b = a->chain;
|
|
|
|
|
xfree (a->d.buf);
|
|
|
|
|
xfree (a->real_fname);
|
|
|
|
|
memcpy (a, b, sizeof *a);
|
|
|
|
|
xfree (b);
|
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug ("iobuf-%d.%d: popped filter\n", a->no, a->subno);
|
|
|
|
|
}
|
|
|
|
|
else if (!b->chain)
|
|
|
|
|
{ /* remove the last iobuf from the chain */
|
|
|
|
|
log_bug ("Ohh jeee, trying to remove a head filter\n");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{ /* remove an intermediate iobuf from the chain */
|
|
|
|
|
log_bug ("Ohh jeee, trying to remove an intermediate filter\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
2016-07-26 18:29:01 +02:00
|
|
|
|
* read underflow: read at least one byte into the buffer and return
|
2003-08-05 19:11:04 +02:00
|
|
|
|
* the first byte or -1 on EOF.
|
|
|
|
|
*/
|
|
|
|
|
static int
|
2015-08-12 22:57:58 +02:00
|
|
|
|
underflow (iobuf_t a, int clear_pending_eof)
|
2016-07-26 18:29:01 +02:00
|
|
|
|
{
|
|
|
|
|
return underflow_target (a, clear_pending_eof, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* read underflow: read TARGET bytes into the buffer and return
|
|
|
|
|
* the first byte or -1 on EOF.
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
underflow_target (iobuf_t a, int clear_pending_eof, size_t target)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
size_t len;
|
|
|
|
|
int rc;
|
|
|
|
|
|
2015-08-12 22:10:37 +02:00
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug ("iobuf-%d.%d: underflow: buffer size: %d; still buffered: %d => space for %d bytes\n",
|
|
|
|
|
a->no, a->subno,
|
|
|
|
|
(int) a->d.size, (int) (a->d.len - a->d.start),
|
|
|
|
|
(int) (a->d.size - (a->d.len - a->d.start)));
|
|
|
|
|
|
2015-09-02 10:24:33 +02:00
|
|
|
|
if (a->use == IOBUF_INPUT_TEMP)
|
|
|
|
|
/* By definition, there isn't more data to read into the
|
|
|
|
|
buffer. */
|
|
|
|
|
return -1;
|
|
|
|
|
|
2015-08-12 22:10:37 +02:00
|
|
|
|
assert (a->use == IOBUF_INPUT);
|
|
|
|
|
|
|
|
|
|
/* If there is still some buffered data, then move it to the start
|
|
|
|
|
of the buffer and try to fill the end of the buffer. (This is
|
|
|
|
|
useful if we are called from iobuf_peek().) */
|
|
|
|
|
assert (a->d.start <= a->d.len);
|
|
|
|
|
a->d.len -= a->d.start;
|
|
|
|
|
memmove (a->d.buf, &a->d.buf[a->d.start], a->d.len);
|
|
|
|
|
a->d.start = 0;
|
|
|
|
|
|
2016-07-26 18:29:01 +02:00
|
|
|
|
if (a->d.len < target && a->filter_eof)
|
2015-08-12 22:10:37 +02:00
|
|
|
|
/* The last time we tried to read from this filter, we got an EOF.
|
|
|
|
|
We couldn't return the EOF, because there was buffered data.
|
|
|
|
|
Since there is no longer any buffered data, return the
|
|
|
|
|
error. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2015-08-12 22:10:37 +02:00
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug ("iobuf-%d.%d: underflow: eof (pending eof)\n",
|
|
|
|
|
a->no, a->subno);
|
2015-08-12 22:57:58 +02:00
|
|
|
|
if (! clear_pending_eof)
|
|
|
|
|
return -1;
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (a->chain)
|
2015-08-12 22:10:37 +02:00
|
|
|
|
/* A filter follows this one. Free this filter. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
iobuf_t b = a->chain;
|
|
|
|
|
if (DBG_IOBUF)
|
2015-08-12 22:10:37 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: filter popped (pending EOF returned)\n",
|
|
|
|
|
a->no, a->subno);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
xfree (a->d.buf);
|
|
|
|
|
xfree (a->real_fname);
|
|
|
|
|
memcpy (a, b, sizeof *a);
|
|
|
|
|
xfree (b);
|
|
|
|
|
print_chain (a);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
a->filter_eof = 0; /* for the top level filter */
|
|
|
|
|
return -1; /* return one(!) EOF */
|
|
|
|
|
}
|
2015-08-12 22:10:37 +02:00
|
|
|
|
|
|
|
|
|
if (a->d.len == 0 && a->error)
|
|
|
|
|
/* The last time we tried to read from this filter, we got an
|
|
|
|
|
error. We couldn't return the error, because there was
|
|
|
|
|
buffered data. Since there is no longer any buffered data,
|
|
|
|
|
return the error. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
if (DBG_IOBUF)
|
2015-08-12 22:10:37 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: pending error (%s) returned\n",
|
|
|
|
|
a->no, a->subno, gpg_strerror (a->error));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-12 22:10:37 +02:00
|
|
|
|
if (a->filter && ! a->filter_eof && ! a->error)
|
|
|
|
|
/* We have a filter function and the last time we tried to read we
|
|
|
|
|
didn't get an EOF or an error. Try to fill the buffer. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2015-08-12 22:10:37 +02:00
|
|
|
|
/* Be careful to account for any buffered data. */
|
|
|
|
|
len = a->d.size - a->d.len;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (DBG_IOBUF)
|
2015-08-12 22:10:37 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: underflow: A->FILTER (%lu bytes)\n",
|
2003-08-05 19:11:04 +02:00
|
|
|
|
a->no, a->subno, (ulong) len);
|
2015-08-12 22:10:37 +02:00
|
|
|
|
if (len == 0)
|
|
|
|
|
/* There is no space for more data. Don't bother calling
|
|
|
|
|
A->FILTER. */
|
|
|
|
|
rc = 0;
|
|
|
|
|
else
|
|
|
|
|
rc = a->filter (a->filter_ov, IOBUFCTRL_UNDERFLOW, a->chain,
|
|
|
|
|
&a->d.buf[a->d.len], &len);
|
|
|
|
|
a->d.len += len;
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (DBG_IOBUF)
|
2015-08-12 22:10:37 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: A->FILTER() returned rc=%d (%s), read %lu bytes\n",
|
|
|
|
|
a->no, a->subno,
|
|
|
|
|
rc, rc == 0 ? "ok" : rc == -1 ? "EOF" : gpg_strerror (rc),
|
|
|
|
|
(ulong) len);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
/* if( a->no == 1 ) */
|
|
|
|
|
/* log_hexdump (" data:", a->d.buf, len); */
|
2015-08-12 22:10:37 +02:00
|
|
|
|
|
|
|
|
|
if (rc == -1)
|
|
|
|
|
/* EOF. */
|
|
|
|
|
{
|
2003-08-05 19:11:04 +02:00
|
|
|
|
size_t dummy_len = 0;
|
|
|
|
|
|
2015-08-12 22:10:37 +02:00
|
|
|
|
/* Tell the filter to free itself */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if ((rc = a->filter (a->filter_ov, IOBUFCTRL_FREE, a->chain,
|
|
|
|
|
NULL, &dummy_len)))
|
|
|
|
|
log_error ("IOBUFCTRL_FREE failed: %s\n", gpg_strerror (rc));
|
2015-08-12 22:10:37 +02:00
|
|
|
|
|
|
|
|
|
/* Free everything except for the internal buffer. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (a->filter_ov && a->filter_ov_owner)
|
2015-08-12 22:10:37 +02:00
|
|
|
|
xfree (a->filter_ov);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
a->filter_ov = NULL;
|
2015-08-12 22:10:37 +02:00
|
|
|
|
a->filter = NULL;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
a->filter_eof = 1;
|
2015-08-12 22:10:37 +02:00
|
|
|
|
|
2015-08-12 22:57:58 +02:00
|
|
|
|
if (clear_pending_eof && a->d.len == 0 && a->chain)
|
2015-08-12 22:10:37 +02:00
|
|
|
|
/* We don't need to keep this filter around at all:
|
|
|
|
|
|
|
|
|
|
- we got an EOF
|
|
|
|
|
- we have no buffered data
|
|
|
|
|
- a filter follows this one.
|
|
|
|
|
|
|
|
|
|
Unlink this filter. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
iobuf_t b = a->chain;
|
|
|
|
|
if (DBG_IOBUF)
|
2015-08-12 22:10:37 +02:00
|
|
|
|
log_debug ("iobuf-%d.%d: pop in underflow (nothing buffered, got EOF)\n",
|
2008-08-19 21:36:42 +02:00
|
|
|
|
a->no, a->subno);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
xfree (a->d.buf);
|
|
|
|
|
xfree (a->real_fname);
|
|
|
|
|
memcpy (a, b, sizeof *a);
|
|
|
|
|
xfree (b);
|
2015-08-12 22:10:37 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
print_chain (a);
|
2015-08-12 22:10:37 +02:00
|
|
|
|
|
|
|
|
|
return -1;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
2015-08-12 22:10:37 +02:00
|
|
|
|
else if (a->d.len == 0)
|
|
|
|
|
/* We can't unlink this filter (it is the only one in the
|
|
|
|
|
pipeline), but we can immediately return EOF. */
|
|
|
|
|
return -1;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else if (rc)
|
2015-08-12 22:10:37 +02:00
|
|
|
|
/* Record the error. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2015-08-12 22:10:37 +02:00
|
|
|
|
a->error = rc;
|
|
|
|
|
|
|
|
|
|
if (a->d.len == 0)
|
|
|
|
|
/* There is no buffered data. Immediately return EOF. */
|
|
|
|
|
return -1;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2015-08-12 22:10:37 +02:00
|
|
|
|
|
|
|
|
|
assert (a->d.start <= a->d.len);
|
|
|
|
|
if (a->d.start < a->d.len)
|
|
|
|
|
return a->d.buf[a->d.start++];
|
|
|
|
|
|
|
|
|
|
/* EOF. */
|
|
|
|
|
return -1;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2015-08-13 15:53:11 +02:00
|
|
|
|
static int
|
|
|
|
|
filter_flush (iobuf_t a)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
size_t len;
|
|
|
|
|
int rc;
|
|
|
|
|
|
2015-09-02 09:56:09 +02:00
|
|
|
|
if (a->use == IOBUF_OUTPUT_TEMP)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{ /* increase the temp buffer */
|
2018-01-24 18:37:55 +01:00
|
|
|
|
size_t newsize = a->d.size + iobuf_buffer_size;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
if (DBG_IOBUF)
|
|
|
|
|
log_debug ("increasing temp iobuf from %lu to %lu\n",
|
|
|
|
|
(ulong) a->d.size, (ulong) newsize);
|
2015-08-13 15:53:11 +02:00
|
|
|
|
|
|
|
|
|
a->d.buf = xrealloc (a->d.buf, newsize);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
a->d.size = newsize;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2015-08-09 10:52:34 +02:00
|
|
|
|
else if (a->use != IOBUF_OUTPUT)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
log_bug ("flush on non-output iobuf\n");
|
|
|
|
|
else if (!a->filter)
|
2015-08-13 15:53:11 +02:00
|
|
|
|
log_bug ("filter_flush: no filter\n");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
len = a->d.len;
|
|
|
|
|
rc = a->filter (a->filter_ov, IOBUFCTRL_FLUSH, a->chain, a->d.buf, &len);
|
|
|
|
|
if (!rc && len != a->d.len)
|
|
|
|
|
{
|
2015-08-13 15:53:11 +02:00
|
|
|
|
log_info ("filter_flush did not write all!\n");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
rc = GPG_ERR_INTERNAL;
|
|
|
|
|
}
|
|
|
|
|
else if (rc)
|
|
|
|
|
a->error = rc;
|
|
|
|
|
a->d.len = 0;
|
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
iobuf_readbyte (iobuf_t a)
|
|
|
|
|
{
|
|
|
|
|
int c;
|
|
|
|
|
|
2015-09-02 09:56:09 +02:00
|
|
|
|
if (a->use == IOBUF_OUTPUT || a->use == IOBUF_OUTPUT_TEMP)
|
2015-08-17 12:52:20 +02:00
|
|
|
|
{
|
|
|
|
|
log_bug ("iobuf_readbyte called on a non-INPUT pipeline!\n");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assert (a->d.start <= a->d.len);
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (a->nlimit && a->nbytes >= a->nlimit)
|
|
|
|
|
return -1; /* forced EOF */
|
|
|
|
|
|
|
|
|
|
if (a->d.start < a->d.len)
|
|
|
|
|
{
|
|
|
|
|
c = a->d.buf[a->d.start++];
|
|
|
|
|
}
|
2015-08-12 22:57:58 +02:00
|
|
|
|
else if ((c = underflow (a, 1)) == -1)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return -1; /* EOF */
|
|
|
|
|
|
2015-08-17 12:52:20 +02:00
|
|
|
|
assert (a->d.start <= a->d.len);
|
|
|
|
|
|
2015-08-17 12:30:04 +02:00
|
|
|
|
/* Note: if underflow doesn't return EOF, then it returns the first
|
|
|
|
|
byte that was read and advances a->d.start appropriately. */
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
a->nbytes++;
|
|
|
|
|
return c;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
2005-06-16 10:12:03 +02:00
|
|
|
|
iobuf_read (iobuf_t a, void *buffer, unsigned int buflen)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-06-16 10:12:03 +02:00
|
|
|
|
unsigned char *buf = (unsigned char *)buffer;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int c, n;
|
|
|
|
|
|
2015-09-02 09:56:09 +02:00
|
|
|
|
if (a->use == IOBUF_OUTPUT || a->use == IOBUF_OUTPUT_TEMP)
|
2015-08-17 12:52:20 +02:00
|
|
|
|
{
|
|
|
|
|
log_bug ("iobuf_read called on a non-INPUT pipeline!\n");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2006-10-02 13:54:35 +02:00
|
|
|
|
if (a->nlimit)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2006-10-02 13:54:35 +02:00
|
|
|
|
/* Handle special cases. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
for (n = 0; n < buflen; n++)
|
|
|
|
|
{
|
|
|
|
|
if ((c = iobuf_readbyte (a)) == -1)
|
|
|
|
|
{
|
|
|
|
|
if (!n)
|
|
|
|
|
return -1; /* eof */
|
|
|
|
|
break;
|
|
|
|
|
}
|
2015-08-17 13:00:32 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (buf)
|
2015-08-17 13:00:32 +02:00
|
|
|
|
{
|
|
|
|
|
*buf = c;
|
|
|
|
|
buf++;
|
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
n = 0;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
if (n < buflen && a->d.start < a->d.len)
|
2015-08-17 12:30:04 +02:00
|
|
|
|
/* Drain the buffer. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned size = a->d.len - a->d.start;
|
|
|
|
|
if (size > buflen - n)
|
|
|
|
|
size = buflen - n;
|
|
|
|
|
if (buf)
|
|
|
|
|
memcpy (buf, a->d.buf + a->d.start, size);
|
|
|
|
|
n += size;
|
|
|
|
|
a->d.start += size;
|
|
|
|
|
if (buf)
|
|
|
|
|
buf += size;
|
|
|
|
|
}
|
|
|
|
|
if (n < buflen)
|
2015-08-17 12:30:04 +02:00
|
|
|
|
/* Draining the internal buffer didn't fill BUFFER. Call
|
|
|
|
|
underflow to read more data into the filter's internal
|
|
|
|
|
buffer. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2015-08-12 22:57:58 +02:00
|
|
|
|
if ((c = underflow (a, 1)) == -1)
|
2015-08-17 12:30:04 +02:00
|
|
|
|
/* EOF. If we managed to read something, don't return EOF
|
|
|
|
|
now. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
a->nbytes += n;
|
|
|
|
|
return n ? n : -1 /*EOF*/;
|
|
|
|
|
}
|
|
|
|
|
if (buf)
|
|
|
|
|
*buf++ = c;
|
|
|
|
|
n++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (n < buflen);
|
|
|
|
|
a->nbytes += n;
|
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-09-27 15:58:13 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int
|
|
|
|
|
iobuf_peek (iobuf_t a, byte * buf, unsigned buflen)
|
|
|
|
|
{
|
|
|
|
|
int n = 0;
|
|
|
|
|
|
2015-08-12 22:57:58 +02:00
|
|
|
|
assert (buflen > 0);
|
2015-09-02 10:24:33 +02:00
|
|
|
|
assert (a->use == IOBUF_INPUT || a->use == IOBUF_INPUT_TEMP);
|
2015-08-12 22:57:58 +02:00
|
|
|
|
|
|
|
|
|
if (buflen > a->d.size)
|
|
|
|
|
/* We can't peek more than we can buffer. */
|
|
|
|
|
buflen = a->d.size;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2015-08-12 22:57:58 +02:00
|
|
|
|
/* Try to fill the internal buffer with enough data to satisfy the
|
|
|
|
|
request. */
|
|
|
|
|
while (buflen > a->d.len - a->d.start)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2016-07-26 18:29:01 +02:00
|
|
|
|
if (underflow_target (a, 0, buflen) == -1)
|
2015-08-12 22:57:58 +02:00
|
|
|
|
/* EOF. We can't read any more. */
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Underflow consumes the first character (it's the return
|
|
|
|
|
value). unget() it by resetting the "file position". */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
assert (a->d.start == 1);
|
|
|
|
|
a->d.start = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-12 22:57:58 +02:00
|
|
|
|
n = a->d.len - a->d.start;
|
|
|
|
|
if (n > buflen)
|
|
|
|
|
n = buflen;
|
|
|
|
|
|
|
|
|
|
if (n == 0)
|
|
|
|
|
/* EOF. */
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
memcpy (buf, &a->d.buf[a->d.start], n);
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
2005-06-16 10:12:03 +02:00
|
|
|
|
iobuf_writebyte (iobuf_t a, unsigned int c)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
|
2015-09-02 10:24:33 +02:00
|
|
|
|
if (a->use == IOBUF_INPUT || a->use == IOBUF_INPUT_TEMP)
|
2015-08-17 12:52:20 +02:00
|
|
|
|
{
|
|
|
|
|
log_bug ("iobuf_writebyte called on an input pipeline!\n");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (a->d.len == a->d.size)
|
2015-08-13 15:53:11 +02:00
|
|
|
|
if ((rc=filter_flush (a)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
assert (a->d.len < a->d.size);
|
|
|
|
|
a->d.buf[a->d.len++] = c;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
2005-06-16 10:12:03 +02:00
|
|
|
|
iobuf_write (iobuf_t a, const void *buffer, unsigned int buflen)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-06-16 10:12:03 +02:00
|
|
|
|
const unsigned char *buf = (const unsigned char *)buffer;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int rc;
|
|
|
|
|
|
2015-09-02 10:24:33 +02:00
|
|
|
|
if (a->use == IOBUF_INPUT || a->use == IOBUF_INPUT_TEMP)
|
2015-08-17 12:52:20 +02:00
|
|
|
|
{
|
|
|
|
|
log_bug ("iobuf_write called on an input pipeline!\n");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
if (buflen && a->d.len < a->d.size)
|
|
|
|
|
{
|
|
|
|
|
unsigned size = a->d.size - a->d.len;
|
|
|
|
|
if (size > buflen)
|
|
|
|
|
size = buflen;
|
|
|
|
|
memcpy (a->d.buf + a->d.len, buf, size);
|
|
|
|
|
buflen -= size;
|
|
|
|
|
buf += size;
|
|
|
|
|
a->d.len += size;
|
|
|
|
|
}
|
|
|
|
|
if (buflen)
|
|
|
|
|
{
|
2015-08-13 15:53:11 +02:00
|
|
|
|
rc = filter_flush (a);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (buflen);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
iobuf_writestr (iobuf_t a, const char *buf)
|
|
|
|
|
{
|
2015-09-02 10:24:33 +02:00
|
|
|
|
if (a->use == IOBUF_INPUT || a->use == IOBUF_INPUT_TEMP)
|
2015-08-17 12:52:20 +02:00
|
|
|
|
{
|
|
|
|
|
log_bug ("iobuf_writestr called on an input pipeline!\n");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-17 12:33:29 +02:00
|
|
|
|
return iobuf_write (a, buf, strlen (buf));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
2015-08-17 12:40:53 +02:00
|
|
|
|
iobuf_write_temp (iobuf_t dest, iobuf_t source)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2015-09-02 09:56:09 +02:00
|
|
|
|
assert (source->use == IOBUF_OUTPUT || source->use == IOBUF_OUTPUT_TEMP);
|
|
|
|
|
assert (dest->use == IOBUF_OUTPUT || dest->use == IOBUF_OUTPUT_TEMP);
|
2015-08-17 12:40:53 +02:00
|
|
|
|
|
|
|
|
|
iobuf_flush_temp (source);
|
|
|
|
|
return iobuf_write (dest, source->d.buf, source->d.len);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
size_t
|
|
|
|
|
iobuf_temp_to_buffer (iobuf_t a, byte * buffer, size_t buflen)
|
|
|
|
|
{
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
byte desc[MAX_IOBUF_DESC];
|
2015-08-14 13:19:22 +02:00
|
|
|
|
size_t n;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2015-08-14 13:19:22 +02:00
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
int rc = filter_flush (a);
|
|
|
|
|
if (rc)
|
|
|
|
|
log_bug ("Flushing iobuf %d.%d (%s) from iobuf_temp_to_buffer failed. Ignoring.\n",
|
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
* common/iobuf.c (iobuf_desc): Add the second argument DESC.
(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
of iobuf_desc.
(file_filter, file_es_filter, sock_filter, block_filter): Fill the
description.
* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
g10/textfilter.c: Likewise.
--
Newer GCC warns against possible alignment difference of pointers.
This change can silence those warnings.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-01-12 02:32:20 +01:00
|
|
|
|
a->no, a->subno, iobuf_desc (a, desc));
|
2015-08-14 13:19:22 +02:00
|
|
|
|
if (! a->chain)
|
|
|
|
|
break;
|
|
|
|
|
a = a->chain;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
n = a->d.len;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (n > buflen)
|
|
|
|
|
n = buflen;
|
|
|
|
|
memcpy (buffer, a->d.buf, n);
|
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
|
2015-11-05 12:19:45 +01:00
|
|
|
|
/* Copies the data from the input iobuf SOURCE to the output iobuf
|
|
|
|
|
DEST until either an error is encountered or EOF is reached.
|
|
|
|
|
Returns the number of bytes copies. */
|
|
|
|
|
size_t
|
|
|
|
|
iobuf_copy (iobuf_t dest, iobuf_t source)
|
|
|
|
|
{
|
|
|
|
|
char *temp;
|
2016-02-23 22:39:58 +01:00
|
|
|
|
/* Use a 32 KB buffer. */
|
|
|
|
|
const size_t temp_size = 32 * 1024;
|
2015-11-05 12:19:45 +01:00
|
|
|
|
|
|
|
|
|
size_t nread;
|
|
|
|
|
size_t nwrote = 0;
|
2018-12-01 12:43:10 +01:00
|
|
|
|
size_t max_read = 0;
|
2015-11-05 12:19:45 +01:00
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
assert (source->use == IOBUF_INPUT || source->use == IOBUF_INPUT_TEMP);
|
|
|
|
|
assert (dest->use == IOBUF_OUTPUT || source->use == IOBUF_OUTPUT_TEMP);
|
|
|
|
|
|
2016-02-23 21:04:29 +01:00
|
|
|
|
if (iobuf_error (dest))
|
|
|
|
|
return -1;
|
|
|
|
|
|
2015-11-05 12:19:45 +01:00
|
|
|
|
temp = xmalloc (temp_size);
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
nread = iobuf_read (source, temp, temp_size);
|
|
|
|
|
if (nread == -1)
|
|
|
|
|
/* EOF. */
|
|
|
|
|
break;
|
|
|
|
|
|
2018-12-01 12:43:10 +01:00
|
|
|
|
if (nread > max_read)
|
|
|
|
|
max_read = nread;
|
|
|
|
|
|
2015-11-05 12:19:45 +01:00
|
|
|
|
err = iobuf_write (dest, temp, nread);
|
|
|
|
|
if (err)
|
|
|
|
|
break;
|
|
|
|
|
nwrote += nread;
|
|
|
|
|
}
|
2016-02-23 21:07:09 +01:00
|
|
|
|
|
|
|
|
|
/* Burn the buffer. */
|
2018-12-01 12:43:10 +01:00
|
|
|
|
if (max_read)
|
|
|
|
|
wipememory (temp, max_read);
|
2015-11-05 12:19:45 +01:00
|
|
|
|
xfree (temp);
|
|
|
|
|
|
|
|
|
|
return nwrote;
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
iobuf_flush_temp (iobuf_t temp)
|
|
|
|
|
{
|
2015-09-02 10:24:33 +02:00
|
|
|
|
if (temp->use == IOBUF_INPUT || temp->use == IOBUF_INPUT_TEMP)
|
2016-02-08 00:30:10 +01:00
|
|
|
|
log_bug ("iobuf_flush_temp called on an input pipeline!\n");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
while (temp->chain)
|
2016-03-02 15:42:18 +01:00
|
|
|
|
iobuf_pop_filter (temp, temp->filter, NULL);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
iobuf_set_limit (iobuf_t a, off_t nlimit)
|
|
|
|
|
{
|
|
|
|
|
if (nlimit)
|
2015-08-09 16:53:51 +02:00
|
|
|
|
a->nofast = 1;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
else
|
2015-08-09 16:53:51 +02:00
|
|
|
|
a->nofast = 0;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
a->nlimit = nlimit;
|
|
|
|
|
a->ntotal += a->nbytes;
|
|
|
|
|
a->nbytes = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
off_t
|
2006-04-21 14:56:40 +02:00
|
|
|
|
iobuf_get_filelength (iobuf_t a, int *overflow)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2007-06-06 20:12:30 +02:00
|
|
|
|
if (overflow)
|
|
|
|
|
*overflow = 0;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2007-06-06 20:12:30 +02:00
|
|
|
|
/* Hmmm: file_filter may have already been removed */
|
2015-08-17 13:00:32 +02:00
|
|
|
|
for ( ; a->chain; a = a->chain )
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
if (a->filter != file_filter)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
file_filter_ctx_t *b = a->filter_ov;
|
|
|
|
|
gnupg_fd_t fp = b->fp;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2010-03-08 13:37:54 +01:00
|
|
|
|
#if defined(HAVE_W32_SYSTEM)
|
2015-08-17 13:00:32 +02:00
|
|
|
|
ulong size;
|
|
|
|
|
static int (* __stdcall get_file_size_ex) (void *handle,
|
|
|
|
|
LARGE_INTEGER *r_size);
|
|
|
|
|
static int get_file_size_ex_initialized;
|
|
|
|
|
|
|
|
|
|
if (!get_file_size_ex_initialized)
|
|
|
|
|
{
|
|
|
|
|
void *handle;
|
|
|
|
|
|
|
|
|
|
handle = dlopen ("kernel32.dll", RTLD_LAZY);
|
|
|
|
|
if (handle)
|
|
|
|
|
{
|
|
|
|
|
get_file_size_ex = dlsym (handle, "GetFileSizeEx");
|
|
|
|
|
if (!get_file_size_ex)
|
|
|
|
|
dlclose (handle);
|
|
|
|
|
}
|
|
|
|
|
get_file_size_ex_initialized = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (get_file_size_ex)
|
|
|
|
|
{
|
|
|
|
|
/* This is a newer system with GetFileSizeEx; we use this
|
|
|
|
|
then because it seem that GetFileSize won't return a
|
|
|
|
|
proper error in case a file is larger than 4GB. */
|
|
|
|
|
LARGE_INTEGER exsize;
|
|
|
|
|
|
|
|
|
|
if (get_file_size_ex (fp, &exsize))
|
|
|
|
|
{
|
|
|
|
|
if (!exsize.u.HighPart)
|
|
|
|
|
return exsize.u.LowPart;
|
|
|
|
|
if (overflow)
|
|
|
|
|
*overflow = 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if ((size=GetFileSize (fp, NULL)) != 0xffffffff)
|
|
|
|
|
return size;
|
|
|
|
|
}
|
|
|
|
|
log_error ("GetFileSize for handle %p failed: %s\n",
|
|
|
|
|
fp, w32_strerror (0));
|
2015-11-27 17:53:52 +01:00
|
|
|
|
#else /*!HAVE_W32_SYSTEM*/
|
|
|
|
|
{
|
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
|
|
if ( !fstat (FD2INT (fp), &st) )
|
|
|
|
|
return st.st_size;
|
|
|
|
|
log_error("fstat() failed: %s\n", strerror(errno) );
|
|
|
|
|
}
|
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
2015-08-17 13:00:32 +02:00
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2015-08-17 13:00:32 +02:00
|
|
|
|
return 0;
|
2006-04-21 14:56:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
int
|
2006-04-21 14:56:40 +02:00
|
|
|
|
iobuf_get_fd (iobuf_t a)
|
|
|
|
|
{
|
2015-08-17 13:00:32 +02:00
|
|
|
|
for (; a->chain; a = a->chain)
|
|
|
|
|
;
|
2006-04-21 14:56:40 +02:00
|
|
|
|
|
2015-08-17 13:00:32 +02:00
|
|
|
|
if (a->filter != file_filter)
|
|
|
|
|
return -1;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2015-08-17 13:00:32 +02:00
|
|
|
|
{
|
|
|
|
|
file_filter_ctx_t *b = a->filter_ov;
|
|
|
|
|
gnupg_fd_t fp = b->fp;
|
|
|
|
|
|
|
|
|
|
return FD2INT (fp);
|
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
2006-04-21 14:56:40 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
off_t
|
|
|
|
|
iobuf_tell (iobuf_t a)
|
|
|
|
|
{
|
|
|
|
|
return a->ntotal + a->nbytes;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_FSEEKO) && !defined(fseeko)
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_LIMITS_H
|
|
|
|
|
# include <limits.h>
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef LONG_MAX
|
|
|
|
|
# define LONG_MAX ((long) ((unsigned long) -1 >> 1))
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef LONG_MIN
|
|
|
|
|
# define LONG_MIN (-1 - LONG_MAX)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* A substitute for fseeko, for hosts that don't have it.
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
fseeko (FILE * stream, off_t newpos, int whence)
|
|
|
|
|
{
|
|
|
|
|
while (newpos != (long) newpos)
|
|
|
|
|
{
|
|
|
|
|
long pos = newpos < 0 ? LONG_MIN : LONG_MAX;
|
|
|
|
|
if (fseek (stream, pos, whence) != 0)
|
|
|
|
|
return -1;
|
|
|
|
|
newpos -= pos;
|
|
|
|
|
whence = SEEK_CUR;
|
|
|
|
|
}
|
|
|
|
|
return fseek (stream, (long) newpos, whence);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
iobuf_seek (iobuf_t a, off_t newpos)
|
|
|
|
|
{
|
|
|
|
|
file_filter_ctx_t *b = NULL;
|
|
|
|
|
|
2015-09-02 09:56:09 +02:00
|
|
|
|
if (a->use == IOBUF_OUTPUT || a->use == IOBUF_INPUT)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2015-08-17 13:00:32 +02:00
|
|
|
|
/* Find the last filter in the pipeline. */
|
|
|
|
|
for (; a->chain; a = a->chain)
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
if (a->filter != file_filter)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return -1;
|
2015-08-17 13:00:32 +02:00
|
|
|
|
|
|
|
|
|
b = a->filter_ov;
|
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (SetFilePointer (b->fp, newpos, NULL, FILE_BEGIN) == 0xffffffff)
|
|
|
|
|
{
|
|
|
|
|
log_error ("SetFilePointer failed on handle %p: ec=%d\n",
|
|
|
|
|
b->fp, (int) GetLastError ());
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
if (lseek (b->fp, newpos, SEEK_SET) == (off_t) - 1)
|
|
|
|
|
{
|
|
|
|
|
log_error ("can't lseek: %s\n", strerror (errno));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2015-09-02 10:24:33 +02:00
|
|
|
|
/* Discard the buffer it is not a temp stream. */
|
|
|
|
|
a->d.len = 0;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
a->d.start = 0;
|
|
|
|
|
a->nbytes = 0;
|
|
|
|
|
a->nlimit = 0;
|
2015-08-09 16:53:51 +02:00
|
|
|
|
a->nofast = 0;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
a->ntotal = newpos;
|
|
|
|
|
a->error = 0;
|
2015-08-17 12:30:04 +02:00
|
|
|
|
|
|
|
|
|
/* It is impossible for A->CHAIN to be non-NULL. If A is an INPUT
|
|
|
|
|
or OUTPUT buffer, then we find the last filter, which is defined
|
|
|
|
|
as A->CHAIN being NULL. If A is a TEMP filter, then A must be
|
|
|
|
|
the only filter in the pipe: when iobuf_push_filter adds a filter
|
|
|
|
|
to the front of a pipeline, it sets the new filter to be an
|
|
|
|
|
OUTPUT filter if the pipeline is an OUTPUT or TEMP pipeline and
|
|
|
|
|
to be an INPUT filter if the pipeline is an INPUT pipeline.
|
|
|
|
|
Thus, only the last filter in a TEMP pipeline can be a */
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
/* remove filters, but the last */
|
|
|
|
|
if (a->chain)
|
2016-03-02 15:42:18 +01:00
|
|
|
|
log_debug ("iobuf_pop_filter called in iobuf_seek - please report\n");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
while (a->chain)
|
2016-03-02 15:42:18 +01:00
|
|
|
|
iobuf_pop_filter (a, a->filter, NULL);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
iobuf_get_real_fname (iobuf_t a)
|
|
|
|
|
{
|
|
|
|
|
if (a->real_fname)
|
|
|
|
|
return a->real_fname;
|
|
|
|
|
|
|
|
|
|
/* the old solution */
|
|
|
|
|
for (; a; a = a->chain)
|
|
|
|
|
if (!a->chain && a->filter == file_filter)
|
|
|
|
|
{
|
|
|
|
|
file_filter_ctx_t *b = a->filter_ov;
|
|
|
|
|
return b->print_only_name ? NULL : b->fname;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
iobuf_get_fname (iobuf_t a)
|
|
|
|
|
{
|
|
|
|
|
for (; a; a = a->chain)
|
|
|
|
|
if (!a->chain && a->filter == file_filter)
|
|
|
|
|
{
|
|
|
|
|
file_filter_ctx_t *b = a->filter_ov;
|
|
|
|
|
return b->fname;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-30 17:28:38 +02:00
|
|
|
|
const char *
|
|
|
|
|
iobuf_get_fname_nonnull (iobuf_t a)
|
|
|
|
|
{
|
|
|
|
|
const char *fname;
|
|
|
|
|
|
|
|
|
|
fname = iobuf_get_fname (a);
|
|
|
|
|
return fname? fname : "[?]";
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
/****************
|
2016-02-23 21:28:24 +01:00
|
|
|
|
* Enable or disable partial body length mode (RFC 4880 4.2.2.4).
|
|
|
|
|
*
|
|
|
|
|
* If LEN is 0, this disables partial block mode by popping the
|
2017-02-20 22:19:50 +01:00
|
|
|
|
* partial body length filter, which must be the most recently
|
2016-02-23 21:28:24 +01:00
|
|
|
|
* added filter.
|
|
|
|
|
*
|
|
|
|
|
* If LEN is non-zero, it pushes a partial body length filter. If
|
|
|
|
|
* this is a read filter, LEN must be the length byte from the first
|
|
|
|
|
* chunk and A should be position just after this first partial body
|
|
|
|
|
* length header.
|
2003-08-05 19:11:04 +02:00
|
|
|
|
*/
|
|
|
|
|
void
|
2016-02-23 20:36:07 +01:00
|
|
|
|
iobuf_set_partial_body_length_mode (iobuf_t a, size_t len)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
if (!len)
|
2016-02-23 21:28:24 +01:00
|
|
|
|
/* Disable partial body length mode. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2015-08-09 10:52:34 +02:00
|
|
|
|
if (a->use == IOBUF_INPUT)
|
2016-03-02 15:42:18 +01:00
|
|
|
|
log_debug ("iobuf_pop_filter called in set_partial_block_mode"
|
2003-08-05 19:11:04 +02:00
|
|
|
|
" - please report\n");
|
2016-02-23 21:28:24 +01:00
|
|
|
|
|
|
|
|
|
log_assert (a->filter == block_filter);
|
2016-03-02 15:42:18 +01:00
|
|
|
|
iobuf_pop_filter (a, block_filter, NULL);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2016-02-23 21:28:24 +01:00
|
|
|
|
/* Enabled partial body length mode. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2016-06-30 17:29:19 +02:00
|
|
|
|
block_filter_ctx_t *ctx = xcalloc (1, sizeof *ctx);
|
|
|
|
|
ctx->use = a->use;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
ctx->partial = 1;
|
|
|
|
|
ctx->size = 0;
|
|
|
|
|
ctx->first_c = len;
|
|
|
|
|
iobuf_push_filter (a, block_filter, ctx);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
unsigned int
|
|
|
|
|
iobuf_read_line (iobuf_t a, byte ** addr_of_buffer,
|
|
|
|
|
unsigned *length_of_buffer, unsigned *max_length)
|
|
|
|
|
{
|
|
|
|
|
int c;
|
2005-06-16 10:12:03 +02:00
|
|
|
|
char *buffer = (char *)*addr_of_buffer;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
unsigned length = *length_of_buffer;
|
|
|
|
|
unsigned nbytes = 0;
|
|
|
|
|
unsigned maxlen = *max_length;
|
|
|
|
|
char *p;
|
|
|
|
|
|
2015-08-12 02:19:05 +02:00
|
|
|
|
/* The code assumes that we have space for at least a newline and a
|
|
|
|
|
NUL character in the buffer. This requires at least 2 bytes. We
|
|
|
|
|
don't complicate the code by handling the stupid corner case, but
|
|
|
|
|
simply assert that it can't happen. */
|
2017-03-30 15:44:35 +02:00
|
|
|
|
assert (!buffer || length >= 2 || maxlen >= 2);
|
2015-08-12 02:19:05 +02:00
|
|
|
|
|
|
|
|
|
if (!buffer || length <= 1)
|
|
|
|
|
/* must allocate a new buffer */
|
|
|
|
|
{
|
|
|
|
|
length = 256 <= maxlen ? 256 : maxlen;
|
|
|
|
|
buffer = xrealloc (buffer, length);
|
2005-06-16 10:12:03 +02:00
|
|
|
|
*addr_of_buffer = (unsigned char *)buffer;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
*length_of_buffer = length;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p = buffer;
|
2018-11-08 20:31:12 +01:00
|
|
|
|
while (1)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2018-11-08 20:31:12 +01:00
|
|
|
|
if (!a->nofast && a->d.start < a->d.len && nbytes < length - 1)
|
|
|
|
|
/* Fast path for finding '\n' by using standard C library's optimized
|
|
|
|
|
memchr. */
|
|
|
|
|
{
|
|
|
|
|
unsigned size = a->d.len - a->d.start;
|
|
|
|
|
byte *newline_pos;
|
|
|
|
|
|
|
|
|
|
if (size > length - 1 - nbytes)
|
|
|
|
|
size = length - 1 - nbytes;
|
|
|
|
|
|
|
|
|
|
newline_pos = memchr (a->d.buf + a->d.start, '\n', size);
|
|
|
|
|
if (newline_pos)
|
|
|
|
|
{
|
|
|
|
|
/* Found newline, copy buffer and return. */
|
|
|
|
|
size = (newline_pos - (a->d.buf + a->d.start)) + 1;
|
|
|
|
|
memcpy (p, a->d.buf + a->d.start, size);
|
|
|
|
|
p += size;
|
|
|
|
|
nbytes += size;
|
|
|
|
|
a->d.start += size;
|
|
|
|
|
a->nbytes += size;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* No newline, copy buffer and continue. */
|
|
|
|
|
memcpy (p, a->d.buf + a->d.start, size);
|
|
|
|
|
p += size;
|
|
|
|
|
nbytes += size;
|
|
|
|
|
a->d.start += size;
|
|
|
|
|
a->nbytes += size;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
c = iobuf_readbyte (a);
|
|
|
|
|
if (c == -1)
|
|
|
|
|
break;
|
|
|
|
|
*p++ = c;
|
|
|
|
|
nbytes++;
|
|
|
|
|
if (c == '\n')
|
|
|
|
|
break;
|
|
|
|
|
}
|
2015-08-12 02:19:05 +02:00
|
|
|
|
|
|
|
|
|
if (nbytes == length - 1)
|
|
|
|
|
/* We don't have enough space to add a \n and a \0. Increase
|
|
|
|
|
the buffer size. */
|
|
|
|
|
{
|
|
|
|
|
if (length == maxlen)
|
|
|
|
|
/* We reached the buffer's size limit! */
|
|
|
|
|
{
|
|
|
|
|
/* Skip the rest of the line. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
while (c != '\n' && (c = iobuf_get (a)) != -1)
|
|
|
|
|
;
|
2015-08-12 02:19:05 +02:00
|
|
|
|
|
|
|
|
|
/* p is pointing at the last byte in the buffer. We
|
|
|
|
|
always terminate the line with "\n\0" so overwrite
|
|
|
|
|
the previous byte with a \n. */
|
|
|
|
|
assert (p > buffer);
|
|
|
|
|
p[-1] = '\n';
|
|
|
|
|
|
|
|
|
|
/* Indicate truncation. */
|
|
|
|
|
*max_length = 0;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
2015-08-12 02:19:05 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
length += length < 1024 ? 256 : 1024;
|
2015-08-12 02:19:05 +02:00
|
|
|
|
if (length > maxlen)
|
|
|
|
|
length = maxlen;
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
buffer = xrealloc (buffer, length);
|
2005-06-16 10:12:03 +02:00
|
|
|
|
*addr_of_buffer = (unsigned char *)buffer;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
*length_of_buffer = length;
|
|
|
|
|
p = buffer + nbytes;
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-08-12 02:19:05 +02:00
|
|
|
|
/* Add the terminating NUL. */
|
|
|
|
|
*p = 0;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2015-08-12 02:19:05 +02:00
|
|
|
|
/* Return the number of characters written to the buffer including
|
|
|
|
|
the newline, but not including the terminating NUL. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return nbytes;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
translate_file_handle (int fd, int for_write)
|
|
|
|
|
{
|
2010-06-08 20:33:21 +02:00
|
|
|
|
#if defined(HAVE_W32CE_SYSTEM)
|
2010-06-08 18:59:19 +02:00
|
|
|
|
/* This is called only with one of the special filenames. Under
|
|
|
|
|
W32CE the FD here is not a file descriptor but a rendezvous id,
|
|
|
|
|
thus we need to finish the pipe first. */
|
2010-06-08 20:33:21 +02:00
|
|
|
|
fd = _assuan_w32ce_finish_pipe (fd, for_write);
|
2010-06-08 18:59:19 +02:00
|
|
|
|
#elif defined(HAVE_W32_SYSTEM)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
int x;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2008-10-20 15:53:23 +02:00
|
|
|
|
(void)for_write;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
if (fd == 0)
|
|
|
|
|
x = (int) GetStdHandle (STD_INPUT_HANDLE);
|
|
|
|
|
else if (fd == 1)
|
|
|
|
|
x = (int) GetStdHandle (STD_OUTPUT_HANDLE);
|
|
|
|
|
else if (fd == 2)
|
|
|
|
|
x = (int) GetStdHandle (STD_ERROR_HANDLE);
|
|
|
|
|
else
|
|
|
|
|
x = fd;
|
|
|
|
|
|
|
|
|
|
if (x == -1)
|
|
|
|
|
log_debug ("GetStdHandle(%d) failed: ec=%d\n",
|
|
|
|
|
fd, (int) GetLastError ());
|
|
|
|
|
|
|
|
|
|
fd = x;
|
|
|
|
|
}
|
2008-10-20 15:53:23 +02:00
|
|
|
|
#else
|
|
|
|
|
(void)for_write;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#endif
|
|
|
|
|
return fd;
|
|
|
|
|
}
|
2006-04-21 14:56:40 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
iobuf_skip_rest (iobuf_t a, unsigned long n, int partial)
|
|
|
|
|
{
|
|
|
|
|
if ( partial )
|
|
|
|
|
{
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if (a->nofast || a->d.start >= a->d.len)
|
2006-04-21 14:56:40 +02:00
|
|
|
|
{
|
|
|
|
|
if (iobuf_readbyte (a) == -1)
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
}
|
2006-04-21 14:56:40 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
unsigned long count = a->d.len - a->d.start;
|
|
|
|
|
a->nbytes += count;
|
|
|
|
|
a->d.start = a->d.len;
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
}
|
2006-04-21 14:56:40 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
unsigned long remaining = n;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
while (remaining > 0)
|
2006-04-21 14:56:40 +02:00
|
|
|
|
{
|
|
|
|
|
if (a->nofast || a->d.start >= a->d.len)
|
|
|
|
|
{
|
|
|
|
|
if (iobuf_readbyte (a) == -1)
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
--remaining;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
2006-04-21 14:56:40 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned long count = a->d.len - a->d.start;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if (count > remaining)
|
2006-04-21 14:56:40 +02:00
|
|
|
|
{
|
|
|
|
|
count = remaining;
|
|
|
|
|
}
|
|
|
|
|
a->nbytes += count;
|
|
|
|
|
a->d.start += count;
|
|
|
|
|
remaining -= count;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|