===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.4
retrieving revision 1.43
diff -u -p -r1.4 -r1.43
--- mandoc/mandoc.c	2009/10/28 19:21:59	1.4
+++ mandoc/mandoc.c	2011/03/22 14:05:45	1.43
@@ -1,19 +1,24 @@
-/*	$Id: mandoc.c,v 1.4 2009/10/28 19:21:59 kristaps Exp $ */
+/*	$Id: mandoc.c,v 1.43 2011/03/22 14:05:45 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 
 #include <assert.h>
@@ -21,88 +26,205 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 
+#include "mandoc.h"
 #include "libmandoc.h"
 
+#define DATESIZE 32
+
+static	int	 a2time(time_t *, const char *, const char *);
+static	char	*time2a(time_t);
+
 int
-mandoc_special(const char *p)
+mandoc_special(char *p)
 {
-	int		 c;
+	int		 len, i;
+	char		 term;
+	char		*sv;
 	
-	if ('\\' != *p++)
-		return(0);
+	len = 0;
+	term = '\0';
+	sv = p;
 
-	switch (*p) {
-	case ('\\'):
+	assert('\\' == *p);
+	p++;
+
+	switch (*p++) {
+#if 0
+	case ('Z'):
 		/* FALLTHROUGH */
-	case ('\''):
+	case ('X'):
 		/* FALLTHROUGH */
-	case ('`'):
+	case ('x'):
 		/* FALLTHROUGH */
-	case ('q'):
+	case ('S'):
 		/* FALLTHROUGH */
-	case ('-'):
+	case ('R'):
 		/* FALLTHROUGH */
-	case ('~'):
+	case ('N'):
 		/* FALLTHROUGH */
-	case ('^'):
+	case ('l'):
 		/* FALLTHROUGH */
-	case ('%'):
+	case ('L'):
 		/* FALLTHROUGH */
-	case ('0'):
+	case ('H'):
 		/* FALLTHROUGH */
-	case (' '):
+	case ('h'):
 		/* FALLTHROUGH */
-	case ('|'):
+	case ('D'):
 		/* FALLTHROUGH */
-	case ('&'):
+	case ('C'):
 		/* FALLTHROUGH */
-	case ('.'):
+	case ('b'):
 		/* FALLTHROUGH */
-	case (':'):
+	case ('B'):
 		/* FALLTHROUGH */
-	case ('c'):
-		return(2);
-	case ('e'):
-		return(2);
-	case ('f'):
-		if (0 == *++p || ! isgraph((u_char)*p))
+	case ('a'):
+		/* FALLTHROUGH */
+	case ('A'):
+		if (*p++ != '\'')
 			return(0);
-		return(3);
-	case ('*'):
-		if (0 == *++p || ! isgraph((u_char)*p))
-			return(0);
-		switch (*p) {
+		term = '\'';
+		break;
+#endif
+	case ('h'):
+		/* FALLTHROUGH */
+	case ('v'):
+		/* FALLTHROUGH */
+	case ('s'):
+		if (ASCII_HYPH == *p)
+			*p = '-';
+
+		i = 0;
+		if ('+' == *p || '-' == *p) {
+			p++;
+			i = 1;
+		}
+
+		switch (*p++) {
 		case ('('):
-			if (0 == *++p || ! isgraph((u_char)*p))
+			len = 2;
+			break;
+		case ('['):
+			term = ']';
+			break;
+		case ('\''):
+			term = '\'';
+			break;
+		case ('0'):
+			i = 1;
+			/* FALLTHROUGH */
+		default:
+			len = 1;
+			p--;
+			break;
+		}
+
+		if (ASCII_HYPH == *p)
+			*p = '-';
+		if ('+' == *p || '-' == *p) {
+			if (i)
 				return(0);
-			return(4);
+			p++;
+		} 
+		
+		/* Handle embedded numerical subexp or escape. */
+
+		if ('(' == *p) {
+			while (*p && ')' != *p)
+				if ('\\' == *p++) {
+					i = mandoc_special(--p);
+					if (0 == i)
+						return(0);
+					p += i;
+				}
+
+			if (')' == *p++)
+				break;
+
+			return(0);
+		} else if ('\\' == *p) {
+			if (0 == (i = mandoc_special(p)))
+				return(0);
+			p += i;
+		}
+
+		break;
+#if 0
+	case ('Y'):
+		/* FALLTHROUGH */
+	case ('V'):
+		/* FALLTHROUGH */
+	case ('$'):
+		/* FALLTHROUGH */
+	case ('n'):
+		/* FALLTHROUGH */
+#endif
+	case ('k'):
+		/* FALLTHROUGH */
+	case ('M'):
+		/* FALLTHROUGH */
+	case ('m'):
+		/* FALLTHROUGH */
+	case ('f'):
+		/* FALLTHROUGH */
+	case ('F'):
+		/* FALLTHROUGH */
+	case ('*'):
+		switch (*p++) {
+		case ('('):
+			len = 2;
+			break;
 		case ('['):
-			for (c = 3, p++; *p && ']' != *p; p++, c++)
-				if ( ! isgraph((u_char)*p))
-					break;
-			return(*p == ']' ? c : 0);
+			term = ']';
+			break;
 		default:
+			len = 1;
+			p--;
 			break;
 		}
-		return(3);
+		break;
 	case ('('):
-		if (0 == *++p || ! isgraph((u_char)*p))
-			return(0);
-		if (0 == *++p || ! isgraph((u_char)*p))
-			return(0);
-		return(4);
+		len = 2;
+		break;
 	case ('['):
+		term = ']';
 		break;
+	case ('z'):
+		len = 1;
+		if ('\\' == *p) {
+			if (0 == (i = mandoc_special(p)))
+				return(0);
+			p += i;
+			return(*p ? (int)(p - sv) : 0);
+		}
+		break;
+	case ('o'):
+		/* FALLTHROUGH */
+	case ('w'):
+		if ('\'' == *p++) {
+			term = '\'';
+			break;
+		}
+		/* FALLTHROUGH */
 	default:
-		return(0);
+		len = 1;
+		p--;
+		break;
 	}
 
-	for (c = 3, p++; *p && ']' != *p; p++, c++)
-		if ( ! isgraph((u_char)*p))
-			break;
+	if (term) {
+		for ( ; *p && term != *p; p++)
+			if (ASCII_HYPH == *p)
+				*p = '-';
+		return(*p ? (int)(p - sv) : 0);
+	}
 
-	return(*p == ']' ? c : 0);
+	for (i = 0; *p && i < len; i++, p++)
+		if (ASCII_HYPH == *p)
+			*p = '-';
+	return(i == len ? (int)(p - sv) : 0);
 }
 
 
@@ -113,8 +235,8 @@ mandoc_calloc(size_t num, size_t size)
 
 	ptr = calloc(num, size);
 	if (NULL == ptr) {
-		fprintf(stderr, "memory exhausted\n");
-		exit(EXIT_FAILURE);
+		perror(NULL);
+		exit((int)MANDOCLEVEL_SYSERR);
 	}
 
 	return(ptr);
@@ -128,8 +250,8 @@ mandoc_malloc(size_t size)
 
 	ptr = malloc(size);
 	if (NULL == ptr) {
-		fprintf(stderr, "memory exhausted\n");
-		exit(EXIT_FAILURE);
+		perror(NULL);
+		exit((int)MANDOCLEVEL_SYSERR);
 	}
 
 	return(ptr);
@@ -142,37 +264,245 @@ mandoc_realloc(void *ptr, size_t size)
 
 	ptr = realloc(ptr, size);
 	if (NULL == ptr) {
-		fprintf(stderr, "memory exhausted\n");
-		exit(EXIT_FAILURE);
+		perror(NULL);
+		exit((int)MANDOCLEVEL_SYSERR);
 	}
 
 	return(ptr);
 }
 
 
-void *
-mandoc_reallocf(void *old_ptr, size_t size) /* FIXME: remove (not used) */
+char *
+mandoc_strdup(const char *ptr)
 {
-	void		*ptr;
+	char		*p;
 
-	ptr = realloc(old_ptr, size);
-	if (NULL == ptr)
-		free(old_ptr);
+	p = strdup(ptr);
+	if (NULL == p) {
+		perror(NULL);
+		exit((int)MANDOCLEVEL_SYSERR);
+	}
 
-	return(ptr);
+	return(p);
 }
 
+/*
+ * Parse a quoted or unquoted roff-style request or macro argument.
+ * Return a pointer to the parsed argument, which is either the original
+ * pointer or advanced by one byte in case the argument is quoted.
+ * Null-terminate the argument in place.
+ * Collapse pairs of quotes inside quoted arguments.
+ * Advance the argument pointer to the next argument,
+ * or to the null byte terminating the argument line.
+ */
+char *
+mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)
+{
+	char	 *start, *cp;
+	int	  quoted, pairs, white;
 
+	/* Quoting can only start with a new word. */
+	start = *cpp;
+	if ('"' == *start) {
+		quoted = 1;
+		start++;
+	} else
+		quoted = 0;
+
+	pairs = 0;
+	white = 0;
+	for (cp = start; '\0' != *cp; cp++) {
+		/* Move left after quoted quotes and escaped backslashes. */
+		if (pairs)
+			cp[-pairs] = cp[0];
+		if ('\\' == cp[0]) {
+			if ('\\' == cp[1]) {
+				/* Poor man's copy mode. */
+				pairs++;
+				cp++;
+			} else if (0 == quoted && ' ' == cp[1])
+				/* Skip escaped blanks. */
+				cp++;
+		} else if (0 == quoted) {
+			if (' ' == cp[0]) {
+				/* Unescaped blanks end unquoted args. */
+				white = 1;
+				break;
+			}
+		} else if ('"' == cp[0]) {
+			if ('"' == cp[1]) {
+				/* Quoted quotes collapse. */
+				pairs++;
+				cp++;
+			} else {
+				/* Unquoted quotes end quoted args. */
+				quoted = 2;
+				break;
+			}
+		}
+	}
+
+	/* Quoted argument without a closing quote. */
+	if (1 == quoted)
+		mandoc_msg(MANDOCERR_BADQUOTE, parse, ln, *pos, NULL);
+
+	/* Null-terminate this argument and move to the next one. */
+	if (pairs)
+		cp[-pairs] = '\0';
+	if ('\0' != *cp) {
+		*cp++ = '\0';
+		while (' ' == *cp)
+			cp++;
+	}
+	*pos += (int)(cp - start) + (quoted ? 1 : 0);
+	*cpp = cp;
+
+	if ('\0' == *cp && (white || ' ' == cp[-1]))
+		mandoc_msg(MANDOCERR_EOLNSPACE, parse, ln, *pos, NULL);
+
+	return(start);
+}
+
+static int
+a2time(time_t *t, const char *fmt, const char *p)
+{
+	struct tm	 tm;
+	char		*pp;
+
+	memset(&tm, 0, sizeof(struct tm));
+
+	pp = strptime(p, fmt, &tm);
+	if (NULL != pp && '\0' == *pp) {
+		*t = mktime(&tm);
+		return(1);
+	}
+
+	return(0);
+}
+
+static char *
+time2a(time_t t)
+{
+	struct tm	 tm;
+	char		*buf, *p;
+	size_t		 ssz;
+	int		 isz;
+
+	localtime_r(&t, &tm);
+
+	/*
+	 * Reserve space:
+	 * up to 9 characters for the month (September) + blank
+	 * up to 2 characters for the day + comma + blank
+	 * 4 characters for the year and a terminating '\0'
+	 */
+	p = buf = mandoc_malloc(10 + 4 + 4 + 1);
+
+	if (0 == (ssz = strftime(p, 10 + 1, "%B ", &tm)))
+		goto fail;
+	p += (int)ssz;
+
+	if (-1 == (isz = snprintf(p, 4 + 1, "%d, ", tm.tm_mday)))
+		goto fail;
+	p += isz;
+
+	if (0 == strftime(p, 4 + 1, "%Y", &tm))
+		goto fail;
+	return(buf);
+
+fail:
+	free(buf);
+	return(NULL);
+}
+
 char *
-mandoc_strdup(const char *ptr)
+mandoc_normdate(struct mparse *parse, char *in, int ln, int pos)
 {
-	char		*p;
+	char		*out;
+	time_t		 t;
 
-	p = strdup(ptr);
-	if (NULL == p) {
-		fprintf(stderr, "memory exhausted\n");
-		exit(EXIT_FAILURE);
+	if (NULL == in || '\0' == *in ||
+	    0 == strcmp(in, "$" "Mdocdate$")) {
+		mandoc_msg(MANDOCERR_NODATE, parse, ln, pos, NULL);
+		time(&t);
 	}
+	else if (!a2time(&t, "$" "Mdocdate: %b %d %Y $", in) &&
+	    !a2time(&t, "%b %d, %Y", in) &&
+	    !a2time(&t, "%Y-%m-%d", in)) {
+		mandoc_msg(MANDOCERR_BADDATE, parse, ln, pos, NULL);
+		t = 0;
+	}
+	out = t ? time2a(t) : NULL;
+	return(out ? out : mandoc_strdup(in));
+}
 
-	return(p);
+int
+mandoc_eos(const char *p, size_t sz, int enclosed)
+{
+	const char *q;
+	int found;
+
+	if (0 == sz)
+		return(0);
+
+	/*
+	 * End-of-sentence recognition must include situations where
+	 * some symbols, such as `)', allow prior EOS punctuation to
+	 * propogate outward.
+	 */
+
+	found = 0;
+	for (q = p + (int)sz - 1; q >= p; q--) {
+		switch (*q) {
+		case ('\"'):
+			/* FALLTHROUGH */
+		case ('\''):
+			/* FALLTHROUGH */
+		case (']'):
+			/* FALLTHROUGH */
+		case (')'):
+			if (0 == found)
+				enclosed = 1;
+			break;
+		case ('.'):
+			/* FALLTHROUGH */
+		case ('!'):
+			/* FALLTHROUGH */
+		case ('?'):
+			found = 1;
+			break;
+		default:
+			return(found && (!enclosed || isalnum((unsigned char)*q)));
+		}
+	}
+
+	return(found && !enclosed);
 }
+
+int
+mandoc_hyph(const char *start, const char *c)
+{
+
+	/*
+	 * Choose whether to break at a hyphenated character.  We only
+	 * do this if it's free-standing within a word.
+	 */
+
+	/* Skip first/last character of buffer. */
+	if (c == start || '\0' == *(c + 1))
+		return(0);
+	/* Skip first/last character of word. */
+	if ('\t' == *(c + 1) || '\t' == *(c - 1))
+		return(0);
+	if (' ' == *(c + 1) || ' ' == *(c - 1))
+		return(0);
+	/* Skip double invocations. */
+	if ('-' == *(c + 1) || '-' == *(c - 1))
+		return(0);
+	/* Skip escapes. */
+	if ('\\' == *(c - 1))
+		return(0);
+
+	return(1);
+}
+