=================================================================== RCS file: /cvs/mandoc/Attic/argv.c,v retrieving revision 1.30 retrieving revision 1.34 diff -u -p -r1.30 -r1.34 --- mandoc/Attic/argv.c 2009/02/24 11:43:13 1.30 +++ mandoc/Attic/argv.c 2009/02/28 12:16:02 1.34 @@ -1,4 +1,4 @@ -/* $Id: argv.c,v 1.30 2009/02/24 11:43:13 kristaps Exp $ */ +/* $Id: argv.c,v 1.34 2009/02/28 12:16:02 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -74,7 +74,7 @@ static int mdoc_argflags[MDOC_MAX] = { 0, /* Ed */ 0, /* Bl */ 0, /* El */ - ARGS_DELIM, /* It */ + 0, /* It */ ARGS_DELIM, /* Ad */ ARGS_DELIM, /* An */ ARGS_DELIM, /* Ar */ @@ -267,7 +267,7 @@ static int args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v) { - int i, c; + int i; char *p, *pp; assert(*pos > 0); @@ -290,14 +290,15 @@ args(struct mdoc *mdoc, int line, */ if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) { - for (i = *pos; (c = buf[i]); ) { - if ( ! mdoc_iscdelim(c)) + for (i = *pos; buf[i]; ) { + if ( ! mdoc_iscdelim(buf[i])) break; i++; - if (0 == buf[i] || ! isspace(c)) + /* There must be at least one space... */ + if (0 == buf[i] || ! isspace((int)buf[i])) break; i++; - while (buf[i] && isspace(c)) + while (buf[i] && isspace((int)buf[i])) i++; } if (0 == buf[i]) { @@ -375,7 +376,7 @@ args(struct mdoc *mdoc, int line, p++; if (0 != *p) *(p - 1) = 0; - *pos += p - *v; + *pos += (int)(p - *v); } if (p && 0 == *p) @@ -396,7 +397,7 @@ args(struct mdoc *mdoc, int line, if (p > *v && ' ' == *(p - 1)) if ( ! pwarn(mdoc, line, *pos, WTAILWS)) return(0); - *pos += p - *v; + *pos += (int)(p - *v); return(ARGS_WORD); } @@ -404,8 +405,8 @@ args(struct mdoc *mdoc, int line, /* Do non-tabsep look-ahead here. */ if ( ! (ARGS_TABSEP & fl)) - while ((c = buf[*pos])) { - if (isspace(c)) + while (buf[*pos]) { + if (isspace((int)buf[*pos])) if ('\\' != buf[*pos - 1]) break; (*pos)++; @@ -650,7 +651,7 @@ argv_multi(struct mdoc *mdoc, int line, return(0); } else if (ARGS_EOLN == c) break; - v->value[v->sz] = p; + v->value[(int)v->sz] = p; } if (0 < v->sz && v->sz < MDOC_LINEARG_MAX)