fix bug and improve performance

Author: dongyx

Makefile

@@ -73,6 +73,12 @@ tag:
 		echo workspace not clean; \
 		exit 1; \
 	fi; \
+	if grep dev version; then \
+		echo this is a dev version; \
+		exit 1; \
+	fi; \
+	printf 'tag: '; \
+	cat version; \
 	git tag "v$$(cat version)"
 
 arch:

README.md

@@ -171,7 +171,7 @@ See the man page `hardv(1)` for detail about how to implement a mod.
 Installation
 ------------
 
-- Chose a version from
+- Choose a version from
 the [release page](https://github.com/dongyx/hardv/releases);
 The latest is always recommended unless otherwise noted in the
 release note.
@@ -185,7 +185,7 @@ release note.
 	$ sudo make install
 	~~~
 
-`make install` copies file to `/usr/local` by default.
+`make install` copies files to `/usr/local` by default.
 The man page `hardv(1)` is shipped with the installation.
 
 Input Format

ctab.c

@@ -83,7 +83,7 @@ WERR:	fclose(fp);
 static char *backup(char *src)
 {
 	static char dst[PATHSZ];
-	char *ret, buf[BUFSIZ];
+	char *ret, buf[8192];
 	int fd[2], n;
 
 	ret = NULL;

learn.c

@@ -32,7 +32,7 @@ static int sety(struct card *card, time_t now);
 static int setn(struct card *card, time_t now);
 static void preset(struct card *card, time_t now,
 	time_t *prev, time_t *next, time_t *diff);
-char *indent(char *s, char *buf, int n);
+int pindent(char *s);
 
 int learn(char *filename, int now, struct learnopt *opt)
 {
@@ -146,16 +146,15 @@ static int exemod(struct card *card, time_t now)
 
 static int recall(struct card *card, time_t now)
 {
-	char in[BUFSIZ], ques[VALSZ], answ[VALSZ], buf[VALSZ];
+	char in[BUFSIZ], ques[VALSZ], answ[VALSZ];
 
 	if (learnopt->any)
 		putchar('\n');
-	indent(normval(getques(card), buf, VALSZ), ques, VALSZ);
-	indent(normval(getansw(card), buf, VALSZ), answ, VALSZ);
+	normval(getques(card), ques, VALSZ);
+	normval(getansw(card), answ, VALSZ);
 	puts("Q:\n");
-	printf("%s\n", ques);
-	if (ques[strlen(ques) - 1] != '\n')
-		putchar('\n');
+	pindent(ques);
+	puts("\n");
 	fflush(stdout);
 CHECK:
 	fputs("Press <ENTER> to check the answer.\n", stdout);
@@ -169,9 +168,8 @@ static int recall(struct card *card, time_t now)
 	if (strcmp(in, "\n"))
 		goto CHECK;
 	puts("A:\n");
-	printf("%s\n", answ);
-	if (answ[strlen(answ) - 1] != '\n')
-		putchar('\n');
+	pindent(answ);
+	puts("\n");
 	fflush(stdout);
 QUERY:
 	fputs("Do you recall? (y/n/s)\n", stdout);
@@ -245,18 +243,14 @@ static void preset(struct card *card, time_t now,
 		*diff = DAY;
 }
 
-char *indent(char *s, char *buf, int n)
+int pindent(char *s)
 {
-	char *sp, *bp;
+	char *sp;
 
-	for (sp = s, bp = buf; *sp && bp < &buf[n]; sp++) {
+	for (sp = s; *sp ; sp++) {
 		if (sp == s || sp[-1] == '\n')
-			*bp++ = '\t';
-		if (bp < &buf[n])
-			*bp++ = *sp;
+			putchar('\t');
+		putchar(*sp);
 	}
-	if (bp >= &buf[n])
-		return NULL;
-	*bp = '\0';
-	return buf;
+	return sp - s;
 }

legacy_v1.c

@@ -7,9 +7,15 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include "apperr.h"
-#include "applim.h"
 #include "siglock.h"
 #include "legacy_v1.h"
+#define PATHSZ	1024
+#define NLINE	32767
+#define LINESZ	1024
+#define NCARD	32767
+#define NFIELD	8
+#define KEYSZ	8
+#define VALSZ	1024
 #define MOD "MOD"
 #define QUES "Q"
 #define ANSW "A"
@@ -18,6 +24,16 @@
 #define TIMEFMT "%Y-%m-%d %H:%M:%S"
 #define TIMEFMT_P "%d-%d-%d %d:%d:%d %c%2d%2d"
 
+struct field_v1 {
+	char key[KEYSZ];
+	char val[VALSZ];
+};
+
+struct card_v1 {
+	int nfield, leadnewl, trainewl;
+	struct field_v1 field[NFIELD];
+};
+
 static char *getfield_v1(struct card_v1 *card, char *key);
 static int gettime_v1(struct card_v1 *card, char *key, time_t *tp);
 static int settime_v1(struct card_v1 *card, char *key, time_t t);

legacy_v1.h

@@ -1,18 +1,6 @@
 #ifndef CARD_V1_H
 #define	CARD_V1_H
 
-#include "applim.h"
-
-struct field_v1 {
-	char key[KEYSZ];
-	char val[VALSZ];
-};
-
-struct card_v1 {
-	int nfield, leadnewl, trainewl;
-	struct field_v1 field[NFIELD];
-};
-
 int conv_1to2(char *fname);
 
 #endif

parse.c

@@ -60,7 +60,7 @@ int readcard(FILE *fp, struct card *card, int *nline, int maxnl)
 		}
 		if (line[0] == '%') {
 			/* end of card */
-			strncpy(card->sep, line, sizeof card->sep);
+			strncpy(card->sep, line, LINESZ);
 			break;
 		} else if (line[0] == '\t' || line[0] == '\n') {
 			/* successive value line */
@@ -117,6 +117,7 @@ int readcard(FILE *fp, struct card *card, int *nline, int maxnl)
 #undef INCNLINE
 #undef CHK_FIELD
 #undef CHK_VALSZ
+#undef BACK_LINENO
 }
 
 int writecard(FILE *fp, struct card *card)

version

@@ -1 +1 @@
-2.0.0
+2.0.1