Minor change

* runcap.h (filecapture) <fc_linestart>: Rename to fc_cur.
All uses updated.
* runcap.c (filecapture_put): Use fc_cur as current pointer
and fc_level as the limit, for consistency.
(runcap_init): Initialize fc_cur.

5 files changed, 20 insertions, 18 deletions

diff --git a/getc.c b/getc.c
index 3c203d9..fce14ea 100644
--- a/getc.c
+++ b/getc.c
@@ -36,3 +36,3 @@ runcap_getc(struct runcap *rc, int stream, char *cp)
 	
-	if (fp->fc_level == fp->fc_linestart) {
+	if (fp->fc_level == fp->fc_cur) {
 		if (fp->fc_tmpfd != -1) {
@@ -45,3 +45,3 @@ runcap_getc(struct runcap *rc, int stream, char *cp)
 			fp->fc_level = r;
-			fp->fc_linestart = 0;
+			fp->fc_cur = 0;
 		} else {
@@ -50,3 +50,3 @@ runcap_getc(struct runcap *rc, int stream, char *cp)
 	}
-	*cp = fp->fc_base[fp->fc_linestart++];
+	*cp = fp->fc_base[fp->fc_cur++];
 	return 1;
diff --git a/runcap.c b/runcap.c
index 9dcefa1..9abc492 100644
--- a/runcap.c
+++ b/runcap.c
@@ -41,3 +41,3 @@ filecapture_alloc(struct filecapture *fc, size_t size)
 	fc->fc_nlines = 0;
-	fc->fc_linestart = 0;
+	fc->fc_cur = 0;
 	fc->fc_tmpfd = -1;
@@ -67,3 +67,3 @@ filecapture_reset(struct filecapture *fc)
 	fc->fc_nlines = 0;
-	fc->fc_linestart = 0;
+	fc->fc_cur = 0;
 
@@ -128,3 +128,3 @@ filecapture_flush(struct filecapture *fc)
 	fc->fc_level = 0;
-	fc->fc_linestart = 0;
+	fc->fc_cur = 0;
 	return 0;
@@ -156,6 +156,6 @@ filecapture_get(struct filecapture *fc, int *feof)
 		if (fc->fc_linemon)
-			fc->fc_linemon(fc->fc_base + fc->fc_linestart,
-				       fc->fc_level - fc->fc_linestart,
+			fc->fc_linemon(fc->fc_base + fc->fc_cur,
+				       fc->fc_level - fc->fc_cur,
 				       fc->fc_monarg);
-		fc->fc_linestart = fc->fc_level;
+		fc->fc_cur = fc->fc_level;
 		fc->fc_nlines++;
@@ -168,4 +168,4 @@ filecapture_put(struct filecapture *fc, int *feof)
 {
-	if (fc->fc_level < fc->fc_size) {
-		int n = write(fc->fc_fd, &fc->fc_base[fc->fc_level], 1);
+	if (fc->fc_cur < fc->fc_level) {
+		int n = write(fc->fc_fd, &fc->fc_base[fc->fc_cur], 1);
 		if (n == -1)
@@ -176,5 +176,5 @@ filecapture_put(struct filecapture *fc, int *feof)
 		}
-		fc->fc_level++;
+		fc->fc_cur++;
 	}
-	*feof = fc->fc_level == fc->fc_size;
+	*feof = fc->fc_cur == fc->fc_level;
 	return 0;
@@ -430,3 +430,5 @@ runcap_init(struct runcap *rc, int flags)
 		}
-		rc->rc_cap[RUNCAP_STDIN].fc_level = 0;
+		rc->rc_cap[RUNCAP_STDIN].fc_level =
+			rc->rc_cap[RUNCAP_STDIN].fc_size;
+		rc->rc_cap[RUNCAP_STDIN].fc_cur = 0;
 	} else if (filecapture_init(&rc->rc_cap[RUNCAP_STDIN], 0))
diff --git a/runcap.h b/runcap.h
index 517cd43..c57f2e1 100644
--- a/runcap.h
+++ b/runcap.h
@@ -24,3 +24,3 @@ struct filecapture
 	size_t fc_nlines;    /* number of captured lines */
-	size_t fc_linestart; /* current offset in buffer */
+	size_t fc_cur;       /* current offset in buffer */
 	char * fc_base;      /* buffer space */
diff --git a/seek.c b/seek.c
index 5b5b111..b69cfe0 100644
--- a/seek.c
+++ b/seek.c
@@ -57,3 +57,3 @@ runcap_seek(struct runcap *rc, int stream, off_t off, int whence)
 	if (cur <= off && off <= cur + fp->fc_level) {
-		fp->fc_linestart = off - cur;
+		fp->fc_cur = off - cur;
 	} else if (fp->fc_tmpfd != -1) {
@@ -62,3 +62,3 @@ runcap_seek(struct runcap *rc, int stream, off_t off, int whence)
 		fp->fc_level = 0;
-		fp->fc_linestart = 0;
+		fp->fc_cur = 0;
 	} else {
diff --git a/tell.c b/tell.c
index 7044ddd..47729ed 100644
--- a/tell.c
+++ b/tell.c
@@ -38,3 +38,3 @@ runcap_tell(struct runcap *rc, int stream)
 
-	return off + fp->fc_linestart;
+	return off + fp->fc_cur;
 }