summaryrefslogtreecommitdiffstats
path: root/assuan
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2001-11-24 22:10:22 +0100
committerWerner Koch <wk@gnupg.org>2001-11-24 22:10:22 +0100
commitd3a626ba68a4f843e09473ff83b1c58c21b907ad (patch)
treec0173267f044bb92bc556b7794a117c587755118 /assuan
parentFriedman is setting up his desk (diff)
downloadgnupg2-d3a626ba68a4f843e09473ff83b1c58c21b907ad.tar.xz
gnupg2-d3a626ba68a4f843e09473ff83b1c58c21b907ad.zip
* assuan-buffer.c (_assuan_read_line): Deal with reads of more
than a line. * assuan-defs.h: Add space in the context for this.
Diffstat (limited to 'assuan')
-rw-r--r--assuan/ChangeLog7
-rw-r--r--assuan/assuan-buffer.c36
-rw-r--r--assuan/assuan-defs.h6
3 files changed, 41 insertions, 8 deletions
diff --git a/assuan/ChangeLog b/assuan/ChangeLog
new file mode 100644
index 000000000..656052637
--- /dev/null
+++ b/assuan/ChangeLog
@@ -0,0 +1,7 @@
+2001-11-24 Werner Koch <wk@gnupg.org>
+
+ * assuan-buffer.c (_assuan_read_line): Deal with reads of more
+ than a line.
+ * assuan-defs.h: Add space in the context for this.
+
+
diff --git a/assuan/assuan-buffer.c b/assuan/assuan-buffer.c
index 912272f18..f3fe2b188 100644
--- a/assuan/assuan-buffer.c
+++ b/assuan/assuan-buffer.c
@@ -78,7 +78,7 @@ readline (int fd, char *buf, size_t buflen, int *r_nread, int *eof)
for (; n && *p != '\n'; n--, p++)
;
if (n)
- break;
+ break; /* at least one full line available - that's enough for now */
}
return 0;
@@ -95,7 +95,26 @@ _assuan_read_line (ASSUAN_CONTEXT ctx)
if (ctx->inbound.eof)
return -1;
- rc = readline (ctx->inbound.fd, line, LINELENGTH, &nread, &ctx->inbound.eof);
+ if (ctx->inbound.attic.linelen)
+ {
+ memcpy (line, ctx->inbound.attic.line, ctx->inbound.attic.linelen);
+ nread = ctx->inbound.attic.linelen;
+ ctx->inbound.attic.linelen = 0;
+ for (n=0; n < nread && line[n] != '\n'; n++)
+ ;
+ if (n < nread)
+ rc = 0; /* found another line in the attic */
+ else
+ { /* read the rest */
+ n = nread;
+ assert (n < LINELENGTH);
+ rc = readline (ctx->inbound.fd, line + n, LINELENGTH - n,
+ &nread, &ctx->inbound.eof);
+ }
+ }
+ else
+ rc = readline (ctx->inbound.fd, line, LINELENGTH,
+ &nread, &ctx->inbound.eof);
if (rc)
return ASSUAN_Read_Error;
if (!nread)
@@ -104,15 +123,18 @@ _assuan_read_line (ASSUAN_CONTEXT ctx)
return -1;
}
- for (n=nread-1; n>=0 ; n--)
+ for (n=0; n < nread; n++)
{
if (line[n] == '\n')
{
- if (n != nread-1)
+ if (n+1 < nread)
{
- fprintf (stderr, "DBG-assuan: %d bytes left over after read\n",
- nread-1 - n);
- /* fixme: store them for the next read */
+ n++;
+ /* we have to copy the rest because the handlers are
+ allowed to modify the passed buffer */
+ memcpy (ctx->inbound.attic.line, line+n, nread-n);
+ ctx->inbound.attic.linelen = nread-n;
+ n--;
}
if (n && line[n-1] == '\r')
n--;
diff --git a/assuan/assuan-defs.h b/assuan/assuan-defs.h
index 8723fd315..3772e2966 100644
--- a/assuan/assuan-defs.h
+++ b/assuan/assuan-defs.h
@@ -24,7 +24,7 @@
#include <sys/types.h>
#include "assuan.h"
-#define LINELENGTH 1002 /* 1000 + [CR,]LF */
+#define LINELENGTH 102 /* 1000 + [CR,]LF */
struct cmdtbl_s {
const char *name;
@@ -45,6 +45,10 @@ struct assuan_context_s {
int linelen; /* w/o CR, LF - might not be the same as
strlen(line) due to embedded nuls. However a nul
is always written at this pos */
+ struct {
+ char line[LINELENGTH];
+ int linelen ;
+ } attic;
} inbound;
struct {