X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/e4ea58f8cb4dccaa8e99306a3497de1e37600480..dc69abf1a840990e2e0885777d697e0d98541d86:/error.c

diff --git a/error.c b/error.c
index abd8d61..7b9ceaa 100644
--- a/error.c
+++ b/error.c
@@ -15,10 +15,10 @@
 
 static void do_error(int code, va_list ap) {
     char error[1024];
-    char auxbuf[256];
     char c;
+    int i, j;
     char *sp, *sp2;
-    wchar_t *wsp;
+    wchar_t *wsp, *wsp2;
     filepos fpos, fpos2;
     int flags;
 
@@ -82,18 +82,20 @@ static void do_error(int code, va_list ap) {
 	break;
       case err_badparatype:
 	wsp = va_arg(ap, wchar_t *);
-	sp = ustrtoa(wsp, auxbuf, sizeof(auxbuf), CS_LOCAL);
+	sp = utoa_locale_dup(wsp);
 	fpos = *va_arg(ap, filepos *);
 	sprintf(error, "command `%.200s' unrecognised at start of"
 		" paragraph", sp);
 	flags = FILEPOS;
+	sfree(sp);
 	break;
       case err_badmidcmd:
 	wsp = va_arg(ap, wchar_t *);
-	sp = ustrtoa(wsp, auxbuf, sizeof(auxbuf), CS_LOCAL);
+	sp = utoa_locale_dup(wsp);
 	fpos = *va_arg(ap, filepos *);
 	sprintf(error, "command `%.200s' unexpected in mid-paragraph", sp);
 	flags = FILEPOS;
+	sfree(sp);
 	break;
       case err_unexbrace:
 	fpos = *va_arg(ap, filepos *);
@@ -115,6 +117,11 @@ static void do_error(int code, va_list ap) {
 	sprintf(error, "expected `}' after cross-reference");
 	flags = FILEPOS;
 	break;
+      case err_codequote:
+	fpos = *va_arg(ap, filepos *);
+	sprintf(error, "unable to nest \\q{...} within \\c{...} or \\cw{...}");
+	flags = FILEPOS;
+	break;	
       case err_missingrbrace:
 	fpos = *va_arg(ap, filepos *);
 	sprintf(error, "unclosed braces at end of paragraph");
@@ -135,26 +142,43 @@ static void do_error(int code, va_list ap) {
 	sprintf(error, "unable to nest index markings");
 	flags = FILEPOS;
 	break;
+      case err_indexcase:
+	fpos = *va_arg(ap, filepos *);
+	wsp = va_arg(ap, wchar_t *);
+	sp = utoa_locale_dup(wsp);
+	fpos2 = *va_arg(ap, filepos *);
+	wsp2 = va_arg(ap, wchar_t *);
+	sp2 = utoa_locale_dup(wsp2);
+	sprintf(error, "warning: index tag `%.200s' used with ", sp);
+	sprintf(error + strlen(error), "different case (`%.200s') at %s:%d",
+		sp2, fpos2.filename, fpos2.line);
+	flags = FILEPOS;
+	sfree(sp);
+	sfree(sp2);
+	break;
       case err_nosuchkw:
 	fpos = *va_arg(ap, filepos *);
 	wsp = va_arg(ap, wchar_t *);
-	sp = ustrtoa(wsp, auxbuf, sizeof(auxbuf), CS_LOCAL);
+	sp = utoa_locale_dup(wsp);
 	sprintf(error, "unable to resolve cross-reference to `%.200s'", sp);
 	flags = FILEPOS;
+	sfree(sp);
 	break;
       case err_multiBR:
 	fpos = *va_arg(ap, filepos *);
 	wsp = va_arg(ap, wchar_t *);
-	sp = ustrtoa(wsp, auxbuf, sizeof(auxbuf), CS_LOCAL);
+	sp = utoa_locale_dup(wsp);
 	sprintf(error, "multiple `\\BR' entries given for `%.200s'", sp);
 	flags = FILEPOS;
+	sfree(sp);
 	break;
       case err_nosuchidxtag:
+	fpos = *va_arg(ap, filepos *);
 	wsp = va_arg(ap, wchar_t *);
-	sp = ustrtoa(wsp, auxbuf, sizeof(auxbuf), CS_LOCAL);
+	sp = utoa_locale_dup(wsp);
 	sprintf(error, "`\\IM' on unknown index tag `%.200s'", sp);
-	flags = 0;
-	/* FIXME: need to get a filepos to here somehow */
+	sfree(sp);
+	flags = FILEPOS;
 	break;
       case err_cantopenw:
 	sp = va_arg(ap, char *);
@@ -164,9 +188,10 @@ static void do_error(int code, va_list ap) {
       case err_macroexists:
 	fpos = *va_arg(ap, filepos *);
 	wsp = va_arg(ap, wchar_t *);
-	sp = ustrtoa(wsp, auxbuf, sizeof(auxbuf), CS_LOCAL);
+	sp = utoa_locale_dup(wsp);
 	sprintf(error, "macro `%.200s' already defined", sp);
 	flags = FILEPOS;
+	sfree(sp);
 	break;
       case err_sectjump:
 	fpos = *va_arg(ap, filepos *);
@@ -185,10 +210,11 @@ static void do_error(int code, va_list ap) {
 	fpos = *va_arg(ap, filepos *);
 	fpos2 = *va_arg(ap, filepos *);
 	wsp = va_arg(ap, wchar_t *);
-	sp = ustrtoa(wsp, auxbuf, sizeof(auxbuf), CS_LOCAL);
+	sp = utoa_locale_dup(wsp);
 	sprintf(error, "paragraph keyword `%.200s' already defined at ", sp);
 	sprintf(error + strlen(error), "%s:%d", fpos2.filename, fpos2.line);
 	flags = FILEPOS;
+	sfree(sp);
 	break;
       case err_misplacedlcont:
 	fpos = *va_arg(ap, filepos *);
@@ -215,6 +241,30 @@ static void do_error(int code, va_list ap) {
 		" node names; removing", c);
 	flags = FILEPOS;
 	break;
+      case err_text_codeline:
+	fpos = *va_arg(ap, filepos *);
+	i = va_arg(ap, int);
+	j = va_arg(ap, int);
+	sprintf(error, "warning: code paragraph line is %d chars wide, wider"
+		" than body width %d", i, j);
+	flags = FILEPOS;
+	break;
+      case err_htmlver:
+	fpos = *va_arg(ap, filepos *);
+	wsp = va_arg(ap, wchar_t *);
+	sp = utoa_locale_dup(wsp);
+	sprintf(error, "unrecognised HTML version keyword `%.200s'", sp);
+	sfree(sp);
+	flags = FILEPOS;
+	break;
+      case err_charset:
+	fpos = *va_arg(ap, filepos *);
+	wsp = va_arg(ap, wchar_t *);
+	sp = utoa_locale_dup(wsp);
+	sprintf(error, "character set `%.200s' not recognised", sp);
+	flags = FILEPOS;
+	sfree(sp);
+	break;
       case err_whatever:
 	sp = va_arg(ap, char *);
         vsprintf(error, sp, ap);