* texi2mdoc: zap trailing whitespace; verified with diff -b; patch from
@ 2015-03-19 9:54 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2015-03-19 9:54 UTC (permalink / raw)
To: source
Log Message:
-----------
zap trailing whitespace; verified with diff -b;
patch from Svyatoslav Mishyn <juef at openmailbox dot org>
Modified Files:
--------------
texi2mdoc:
Makefile
index.xml
main.c
util.c
Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mdocml/texi2mdoc/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -LMakefile -LMakefile -u -p -r1.11 -r1.12
--- Makefile
+++ Makefile
@@ -1,13 +1,13 @@
VERSION = 0.1.2
-CFLAGS += -g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
-OBJS = main.o util.o
-SRCS = main.c util.c
+CFLAGS += -g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+OBJS = main.o util.o
+SRCS = main.c util.c
AFLS = afl/in/test01.texi \
afl/in/test02.texi
VERSIONS = version_0_1_1.xml \
version_0_1_2.xml
-PREFIX = /usr/local
+PREFIX = /usr/local
all: texi2mdoc
@@ -33,7 +33,7 @@ installwww: www
$(OBJS): extern.h
-afl/texi2mdoc: extern.h $(SRCS)
+afl/texi2mdoc: extern.h $(SRCS)
$(CC) -o $@ $(SRCS)
index.html: index.xml $(VERSIONS)
Index: index.xml
===================================================================
RCS file: /home/cvs/mdocml/texi2mdoc/index.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lindex.xml -Lindex.xml -u -p -r1.5 -r1.6
--- index.xml
+++ index.xml
@@ -2,7 +2,7 @@
<html>
<head>
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
- <meta charset="utf-8" />
+ <meta charset="utf-8" />
<title>texi2mdoc | Convert texinfo data to mdoc input </title>
<style>
body { margin: 0; font-size: 13pt; }
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/texi2mdoc/main.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -Lmain.c -Lmain.c -u -p -r1.70 -r1.71
--- main.c
+++ main.c
@@ -376,7 +376,7 @@ dodefindex(struct texi *p, enum texicmd
if (*pos == BUFSZ(p)) {
texiwarn(p, "unexpected EOF");
return;
- }
+ }
if (0 == *pos - start)
texiwarn(p, "zero-length index definition");
else
@@ -464,7 +464,7 @@ dodefn(struct texi *p, enum texicmd cmd,
case (TEXICMD_DEFMAC):
case (TEXICMD_DEFMACX):
teximacroopen(p, "Dv");
- while (parselinearg(p, pos))
+ while (parselinearg(p, pos))
/* Spin. */ ;
teximacroclose(p);
break;
@@ -476,7 +476,7 @@ dodefn(struct texi *p, enum texicmd cmd,
parselinearg(p, pos);
teximacroclose(p);
teximacroopen(p, "Fa");
- while (parselinearg(p, pos))
+ while (parselinearg(p, pos))
/* Spin. */ ;
teximacroclose(p);
teximacro(p, "Fc");
@@ -496,7 +496,7 @@ dodefn(struct texi *p, enum texicmd cmd,
parselinearg(p, pos);
teximacroclose(p);
teximacroopen(p, "Fa");
- while (parselinearg(p, pos))
+ while (parselinearg(p, pos))
/* Spin. */ ;
teximacroclose(p);
teximacro(p, "Fc");
@@ -508,7 +508,7 @@ dodefn(struct texi *p, enum texicmd cmd,
case (TEXICMD_DEFTYPEVR):
case (TEXICMD_DEFTYPEVRX):
teximacroopen(p, "Vt");
- while (parselinearg(p, pos))
+ while (parselinearg(p, pos))
/* Spin. */ ;
teximacroclose(p);
break;
@@ -519,7 +519,7 @@ dodefn(struct texi *p, enum texicmd cmd,
case (TEXICMD_DEFVR):
case (TEXICMD_DEFVRX):
teximacroopen(p, "Va");
- while (parselinearg(p, pos))
+ while (parselinearg(p, pos))
/* Spin. */ ;
teximacroclose(p);
break;
@@ -639,7 +639,7 @@ domacro(struct texi *p, enum texicmd cmd
while (&BUF(p)[*pos] != blk)
advance(p, pos);
assert('@' == BUF(p)[*pos]);
- if ('\n' != BUF(p)[*pos - 1])
+ if ('\n' != BUF(p)[*pos - 1])
texierr(p, "cannot handle @end macro in-line");
len = blk - &BUF(p)[start];
@@ -651,7 +651,7 @@ domacro(struct texi *p, enum texicmd cmd
p->macros = realloc
(p->macros,
- (p->macrosz + 1) *
+ (p->macrosz + 1) *
sizeof(struct teximacro));
if (NULL == p->macros)
texiabort(p, NULL);
@@ -667,24 +667,24 @@ doignblock(struct texi *p, enum texicmd
const char *endt, *startt;
size_t esz, ssz, newpos, stack;
- /*
+ /*
* FIXME: this is cheating.
* These tokens are supposed to begin on a newline.
* However, if we do that, then we would need to check within
* the loop for trailer (or leading, as the case may be)
* newline, and that's just a bit too complicated right now.
* This is becasue
- * @ifset BAR
- * @ifset FOO
- * @end ifset
- * @end ifset
+ * @ifset BAR
+ * @ifset FOO
+ * @end ifset
+ * @end ifset
* won't work right now: we'd read after the first "@end ifset"
* to the next line, then look for the next line after that.
*/
- ssz = snprintf(start, sizeof(start),
+ ssz = snprintf(start, sizeof(start),
"@%s", texitoks[cmd].tok);
assert(ssz < sizeof(start));
- esz = snprintf(end, sizeof(end),
+ esz = snprintf(end, sizeof(end),
"@end %s", texitoks[cmd].tok);
assert(esz < sizeof(end));
stack = 1;
@@ -706,7 +706,7 @@ doignblock(struct texi *p, enum texicmd
"block", texitoks[cmd].tok);
*pos = BUFSZ(p);
break;
- }
+ }
newpos = *pos;
if (NULL == startt || startt > endt) {
@@ -726,7 +726,7 @@ doignblock(struct texi *p, enum texicmd
static void
doblock(struct texi *p, enum texicmd cmd, size_t *pos)
{
-
+
parseto(p, pos, texitoks[cmd].tok);
}
@@ -782,9 +782,9 @@ doinline(struct texi *p, enum texicmd cm
return;
}
- /*
+ /*
* If we haven't seen any whitespace, then we don't want the
- * subsequent macro to insert any whitespace.
+ * subsequent macro to insert any whitespace.
*/
if (p->outmacro && 0 == p->seenws) {
teximacroopen(p, "Ns");
@@ -829,7 +829,7 @@ doverb(struct texi *p, enum texicmd cmd,
start = *pos;
/* Read until we see the delimiter then end-brace. */
while (*pos < BUFSZ(p) - 1) {
- if (BUF(p)[*pos] == delim && BUF(p)[*pos + 1] == '}')
+ if (BUF(p)[*pos] == delim && BUF(p)[*pos + 1] == '}')
break;
advance(p, pos);
}
@@ -941,9 +941,9 @@ doverbatim(struct texi *p, enum texicmd
static void
doverbinclude(struct texi *p, enum texicmd cmd, size_t *pos)
{
- char fname[PATH_MAX], path[PATH_MAX];
- int rc;
- size_t i, end;
+ char fname[PATH_MAX], path[PATH_MAX];
+ int rc;
+ size_t i, end;
const char *v;
enum texicmd type;
@@ -960,7 +960,7 @@ doverbinclude(struct texi *p, enum texic
}
type = texicmd(p, *pos, &end, NULL);
advanceto(p, pos, end);
- if (TEXICMD_VALUE != type)
+ if (TEXICMD_VALUE != type)
texierr(p, "unknown verbatiminclude command");
v = valueblookup(p, pos);
if (NULL == v)
@@ -985,9 +985,9 @@ doverbinclude(struct texi *p, enum texic
if (strstr(fname, "../") || strstr(fname, "/.."))
texierr(p, "insecure path");
- rc = snprintf(path, sizeof(path),
+ rc = snprintf(path, sizeof(path),
"%s/%s", p->dirs[0], fname);
- if (rc < 0)
+ if (rc < 0)
texierr(p, "couldn't format path");
else if ((size_t)rc >= sizeof(path))
texierr(p, "path too long");
@@ -998,9 +998,9 @@ doverbinclude(struct texi *p, enum texic
static void
doinclude(struct texi *p, enum texicmd cmd, size_t *pos)
{
- char fname[PATH_MAX], path[PATH_MAX];
- size_t i, end;
- int rc;
+ char fname[PATH_MAX], path[PATH_MAX];
+ size_t i, end;
+ int rc;
const char *v;
enum texicmd type;
@@ -1018,7 +1018,7 @@ doinclude(struct texi *p, enum texicmd c
}
type = texicmd(p, *pos, &end, NULL);
advanceto(p, pos, end);
- if (TEXICMD_VALUE != type)
+ if (TEXICMD_VALUE != type)
texierr(p, "unknown include command");
v = valueblookup(p, pos);
if (NULL == v)
@@ -1044,9 +1044,9 @@ doinclude(struct texi *p, enum texicmd c
texierr(p, "insecure path");
for (i = 0; i < p->dirsz; i++) {
- rc = snprintf(path, sizeof(path),
+ rc = snprintf(path, sizeof(path),
"%s/%s", p->dirs[i], fname);
- if (rc < 0)
+ if (rc < 0)
texierr(p, "couldn't format path");
else if ((size_t)rc >= sizeof(path))
texierr(p, "path too long");
@@ -1167,7 +1167,7 @@ doaccent(struct texi *p, enum texicmd cm
if ('{' == BUF(p)[*pos]) {
brace = 1;
advance(p, pos);
- } else if (isalpha((unsigned char)texitoks[cmd].tok[0]))
+ } else if (isalpha((unsigned char)texitoks[cmd].tok[0]))
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos]))
advance(p, pos);
@@ -1285,7 +1285,7 @@ doaccent(struct texi *p, enum texicmd cm
}
if (*pos < BUFSZ(p))
advance(p, pos);
- }
+ }
switch (cmd) {
case (TEXICMD_TIEACCENT):
@@ -1499,7 +1499,7 @@ dosymbol(struct texi *p, enum texicmd cm
static void
doquotation(struct texi *p, enum texicmd cmd, size_t *pos)
{
-
+
teximacro(p, "Qo");
parseto(p, pos, "quotation");
teximacro(p, "Qc");
@@ -1517,7 +1517,7 @@ static void
doprintindex(struct texi *p, enum texicmd cmd, size_t *pos)
{
static size_t guard = 0;
- size_t i, j, start, end, len;
+ size_t i, j, start, end, len;
#if HAVE_INDEX
char *cp;
char buf[PATH_MAX];
@@ -1567,8 +1567,8 @@ doprintindex(struct texi *p, enum texicm
}
/* Alphabetically sort our indices. */
- qsort(p->indexs[i].index,
- p->indexs[i].indexsz,
+ qsort(p->indexs[i].index,
+ p->indexs[i].indexsz,
sizeof(struct texiterm), indexcmp);
texivspace(p);
@@ -1598,7 +1598,7 @@ doprintindex(struct texi *p, enum texicm
p->literal++;
}
#endif
- texisplice(p, p->indexs[i].index[j].term,
+ texisplice(p, p->indexs[i].index[j].term,
strlen(p->indexs[i].index[j].term), *pos);
parseeoln(p, pos);
#if HAVE_INDEX
@@ -1649,7 +1649,7 @@ donode(struct texi *p, enum texicmd cmd,
p->nodecur = texicache(p, &BUF(p)[start], end - start);
if (NULL != p->chapters) {
- snprintf(fname, sizeof(fname),
+ snprintf(fname, sizeof(fname),
"%s-%zd.7", p->chapters, p->nodecur);
p->outfile = fopen(fname, "w");
if (NULL == p->outfile)
@@ -1679,14 +1679,14 @@ domenu(struct texi *p, enum texicmd cmd,
{
size_t nodename, entryname;
size_t nodenameend, entrynameend, i;
- ssize_t ppos, lastppos;
+ ssize_t ppos, lastppos;
char buf[PATH_MAX];
enum texicmd tcmd;
advanceeoln(p, pos, 1);
- /*
- * Parse past initial stuff.
+ /*
+ * Parse past initial stuff.
* TODO: the manual says we're supposed to make this in bold or
* something.
*/
@@ -1705,8 +1705,8 @@ domenu(struct texi *p, enum texicmd cmd,
texivspace(p);
teximacro(p, "Bl -tag -width Ds -compact");
while (*pos < BUFSZ(p)) {
- /*
- * Read to next menu item.
+ /*
+ * Read to next menu item.
* We simply parse every line until we get a magic '*'.
* These lines might occur interspersed OR as the
* description of an entry.
@@ -1723,12 +1723,12 @@ domenu(struct texi *p, enum texicmd cmd,
tcmd = peeklinecmd(p, *pos);
if (TEXICMD_END == tcmd)
break;
- else if (TEXICMD_COMMENT == tcmd)
+ else if (TEXICMD_COMMENT == tcmd)
advanceeoln(p, pos, 1);
else
parseeoln(p, pos);
continue;
- }
+ }
/* Now we're parsing a menu item. */
advance(p, pos);
@@ -1763,7 +1763,7 @@ domenu(struct texi *p, enum texicmd cmd,
if (*pos + 1 == BUFSZ(p)) {
advance(p, pos);
continue;
- }
+ }
if (' ' == BUF(p)[*pos + 1]) {
advance(p, pos);
break;
@@ -1782,7 +1782,7 @@ domenu(struct texi *p, enum texicmd cmd,
nodename = entryname;
nodenameend = entrynameend;
}
- ppos = texicache(p, &BUF(p)[nodename],
+ ppos = texicache(p, &BUF(p)[nodename],
nodenameend - nodename);
if (-1 != lastppos)
p->nodecache[lastppos].next = ppos;
@@ -1801,7 +1801,7 @@ domenu(struct texi *p, enum texicmd cmd,
texiputchars(p, "\"");
teximacroclose(p);
} else {
- snprintf(buf, sizeof(buf),
+ snprintf(buf, sizeof(buf),
"%s-%zd 7 ", p->chapters, ppos);
teximacroopen(p, "Xr");
texiputchars(p, buf);
@@ -2019,7 +2019,7 @@ dosection(struct texi *p, enum texicmd c
if (sec < 2)
p->seenvs = -1;
- else
+ else
texivspace(p);
teximacroopen(p, sects[sec]);
@@ -2052,8 +2052,8 @@ doitem(struct texi *p, enum texicmd cmd,
if (p->outcol > 0)
texiputchar(p, '\n');
return;
- }
-
+ }
+
if (p->outmacro)
texierr(p, "item in open line scope!?");
else if (p->literal)
@@ -2101,7 +2101,7 @@ domultitable(struct texi *p, enum texicm
texivspace(p);
p->list = TEXILIST_TABLE;
- /*
+ /*
* TS/TE blocks aren't "in mdoc(7)", so we can disregard the
* fact that we're in literal mode right now.
*/
@@ -2116,7 +2116,7 @@ domultitable(struct texi *p, enum texicm
/* Make sure we don't print anything when scanning. */
p->ign++;
if (*pos < BUFSZ(p) && '@' == BUF(p)[*pos]) {
- /*
+ /*
* Look for @columnfractions.
* We ignore these, but we do use the number of
* arguments to set the number of columns that we'll
@@ -2124,7 +2124,7 @@ domultitable(struct texi *p, enum texicm
*/
type = texicmd(p, *pos, &end, NULL);
advanceto(p, pos, end);
- if (TEXICMD_COLUMNFRACTIONS != type)
+ if (TEXICMD_COLUMNFRACTIONS != type)
texierr(p, "unknown multitable command");
while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) {
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos]))
@@ -2136,7 +2136,7 @@ domultitable(struct texi *p, enum texicm
}
columns++;
}
- } else
+ } else
/*
* We have arguments.
* We could parse these, but it's easier to just let
@@ -2193,7 +2193,7 @@ doend(struct texi *p, enum texicmd cmd,
while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos])
advance(p, pos);
- texiwarn(p, "unexpected \"end\": %.*s",
+ texiwarn(p, "unexpected \"end\": %.*s",
(int)(*pos - start), &BUF(p)[start]);
advanceeoln(p, pos, 1);
}
@@ -2307,9 +2307,9 @@ doignline(struct texi *p, enum texicmd c
static char **
parsedirs(struct texi *p, const char *base, const char *cp, size_t *sz)
{
- char *tok, *str, *tofree;
- const char *cpp;
- size_t i = 0;
+ char *tok, *str, *tofree;
+ const char *cpp;
+ size_t i = 0;
char **dirs;
/* Count up our expected arguments. */
@@ -2322,15 +2322,15 @@ parsedirs(struct texi *p, const char *ba
return(NULL);
if (NULL == (dirs = calloc(*sz, sizeof(char *))))
texiabort(p, NULL);
- if (NULL != base && NULL == (dirs[i++] = strdup(base)))
+ if (NULL != base && NULL == (dirs[i++] = strdup(base)))
texiabort(p, NULL);
if (NULL == cp)
return(dirs);
if (NULL == (tofree = tok = str = strdup(cp)))
texiabort(p, NULL);
- for ( ; NULL != (tok = strsep(&str, ":")); i++)
- if (NULL == (dirs[i] = strdup(tok)))
+ for ( ; NULL != (tok = strsep(&str, ":")); i++)
+ if (NULL == (dirs[i] = strdup(tok)))
texiabort(p, NULL);
free(tofree);
@@ -2357,7 +2357,7 @@ main(int argc, char *argv[])
texi.seenvs = -1;
Idir = NULL;
- while (-1 != (c = getopt(argc, argv, "C:I:")))
+ while (-1 != (c = getopt(argc, argv, "C:I:")))
switch (c) {
case ('C'):
texi.chapters = optarg;
@@ -2383,7 +2383,7 @@ main(int argc, char *argv[])
texiabort(&texi, NULL);
if (NULL == (dir = dirname(dirpath)))
texiabort(&texi, NULL);
- if (NULL != (cp = strrchr(argv[0], '/')))
+ if (NULL != (cp = strrchr(argv[0], '/')))
texi.title = strdup(cp + 1);
else
texi.title = strdup(argv[0]);
Index: util.c
===================================================================
RCS file: /home/cvs/mdocml/texi2mdoc/util.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -Lutil.c -Lutil.c -u -p -r1.33 -r1.34
--- util.c
+++ util.c
@@ -161,7 +161,7 @@ texindex(struct texi *p, const char *tok
texiabort(p, NULL);
memcpy(p->indexs[i].index[isz].term, index, sz);
p->indexs[i].index[isz].term[sz] = '\0';
-
+
/* Output mdoc(7) for index. */
#ifdef HAVE_INDEX
p->seenvs = -1;
@@ -200,8 +200,8 @@ texindex_add(struct texi *p, const char
}
/* Reallocate indices. */
- p->indexs = realloc(p->indexs,
- sizeof(struct texidex) *
+ p->indexs = realloc(p->indexs,
+ sizeof(struct texidex) *
(p->indexsz + 1));
if (NULL == p->indexs)
texiabort(p, NULL);
@@ -241,7 +241,7 @@ texiexit(struct texi *p)
free(p->dirs[i]);
for (i = 0; i < p->indexsz; i++)
texidex_free(&p->indexs[i]);
- for (i = 0; i < p->valsz; i++)
+ for (i = 0; i < p->valsz; i++)
texivaluefree(&p->vals[i]);
free(p->nodecache);
@@ -274,14 +274,14 @@ texiabort(struct texi *p, const char *er
void
texiwarn(const struct texi *p, const char *fmt, ...)
{
- va_list ap;
+ va_list ap;
const struct texifile *f;
f = &p->files[p->filepos - 1];
if (f->insplice)
fprintf(stderr, "%s:%zu:%zu (%zuB left in splice): "
- "warning: ", f->name, f->line + 1,
+ "warning: ", f->name, f->line + 1,
f->col + 1, f->insplice);
else
fprintf(stderr, "%s:%zu:%zu: warning: ",
@@ -300,14 +300,14 @@ texiwarn(const struct texi *p, const cha
void
texierr(struct texi *p, const char *fmt, ...)
{
- va_list ap;
+ va_list ap;
struct texifile *f;
f = &p->files[p->filepos - 1];
- if (f->insplice)
+ if (f->insplice)
fprintf(stderr, "%s:%zu:%zu: (%zuB left in splice): "
- "error: ", f->name, f->line + 1,
+ "error: ", f->name, f->line + 1,
f->col + 1, f->insplice);
else
fprintf(stderr, "%s:%zu:%zu: error: ",
@@ -364,7 +364,7 @@ texiputchars(struct texi *p, const char
fputs("\\&", p->outfile);
if ('\'' == *s && 0 == p->outcol)
fputs("\\&", p->outfile);
- if (p->uppercase)
+ if (p->uppercase)
for ( ; '\0' != *s; s++)
p->outcol += fputc(toupper
((unsigned int)*s), p->outfile);
@@ -533,7 +533,7 @@ texipunctuate(struct texi *p, size_t *po
}
if (end == *pos)
return;
- if (end + 1 == BUFSZ(p) || ' ' == BUF(p)[end] ||
+ if (end + 1 == BUFSZ(p) || ' ' == BUF(p)[end] ||
'@' == BUF(p)[end] || '\n' == BUF(p)[end]) {
for ( ; start < end; start++) {
texiputchar(p, ' ');
@@ -551,14 +551,14 @@ texipunctuate(struct texi *p, size_t *po
static size_t
advancenext(struct texi *p, size_t *pos)
{
-
+
if (p->literal) {
while (*pos < BUFSZ(p) && ismspace(BUF(p)[*pos])) {
texiputchar(p, BUF(p)[*pos]);
advance(p, pos);
}
return(*pos);
- }
+ }
while (*pos < BUFSZ(p) && ismspace(BUF(p)[*pos])) {
p->seenws = 1;
@@ -599,14 +599,14 @@ advanceto(struct texi *p, size_t *pos, s
{
assert(*pos <= end);
- while (*pos < end)
+ while (*pos < end)
advance(p, pos);
}
static void
texiexecmacro(struct texi *p, struct teximacro *m, size_t sv, size_t *pos)
{
- size_t valsz, realsz, aasz, asz,
+ size_t valsz, realsz, aasz, asz,
ssz, i, j, k, start, end;
char *val;
char **args;
@@ -664,7 +664,7 @@ texiexecmacro(struct texi *p, struct tex
/* Parse to terminating delimiter. */
/* FIXME: embedded, escaped delimiters? */
- for (start = end = i + 1; end < realsz; end++)
+ for (start = end = i + 1; end < realsz; end++)
if ('\\' == m->value[end])
break;
if (end == realsz)
@@ -678,8 +678,8 @@ texiexecmacro(struct texi *p, struct tex
break;
}
- /*
- * Argument didn't exist in argument table.
+ /*
+ * Argument didn't exist in argument table.
* Just ignore it.
*/
if (k == aasz) {
@@ -694,7 +694,7 @@ texiexecmacro(struct texi *p, struct tex
texiabort(p, NULL);
}
- for (cp = args[k]; '\0' != *cp; cp++)
+ for (cp = args[k]; '\0' != *cp; cp++)
val[j++] = *cp;
val[j] = '\0';
@@ -707,7 +707,7 @@ texiexecmacro(struct texi *p, struct tex
free(args[i]);
free(args);
free(val);
-}
+}
/*
* Output a free-form word in the input stream, progressing to the next
@@ -717,8 +717,8 @@ texiexecmacro(struct texi *p, struct tex
static void
parseword(struct texi *p, size_t *pos, char extra)
{
- size_t i, end, len;
- int c;
+ size_t i, end, len;
+ int c;
/*
* If a prior word had a terminating double-newline, then begin
@@ -738,7 +738,7 @@ parseword(struct texi *p, size_t *pos, c
* have more than 72 characters written to the screen, then
* output a newline before getting started.
*/
- if (p->seenws && 0 == p->outmacro &&
+ if (p->seenws && 0 == p->outmacro &&
p->outcol > 72 && 0 == p->literal)
texiputchar(p, '\n');
@@ -806,25 +806,25 @@ parseword(struct texi *p, size_t *pos, c
if ('"' == BUF(p)[*pos]) {
texiputchars(p, "\\(dq");
- } else if (*pos < BUFSZ(p) - 2 &&
- '-' == BUF(p)[*pos] &&
- '-' == BUF(p)[*pos + 1] &&
+ } else if (*pos < BUFSZ(p) - 2 &&
+ '-' == BUF(p)[*pos] &&
+ '-' == BUF(p)[*pos + 1] &&
'-' == BUF(p)[*pos + 2]) {
texiputchars(p, "\\(em");
advance(p, pos);
advance(p, pos);
- } else if (*pos < BUFSZ(p) - 1 &&
- '-' == BUF(p)[*pos] &&
+ } else if (*pos < BUFSZ(p) - 1 &&
+ '-' == BUF(p)[*pos] &&
'-' == BUF(p)[*pos + 1]) {
texiputchars(p, "\\(en");
advance(p, pos);
- } else if (*pos < BUFSZ(p) - 1 &&
- '`' == BUF(p)[*pos] &&
+ } else if (*pos < BUFSZ(p) - 1 &&
+ '`' == BUF(p)[*pos] &&
'`' == BUF(p)[*pos + 1]) {
texiputchars(p, "\\(lq");
advance(p, pos);
- } else if (*pos < BUFSZ(p) - 1 &&
- '\'' == BUF(p)[*pos] &&
+ } else if (*pos < BUFSZ(p) - 1 &&
+ '\'' == BUF(p)[*pos] &&
'\'' == BUF(p)[*pos + 1]) {
texiputchars(p, "\\(rq");
advance(p, pos);
@@ -834,7 +834,7 @@ parseword(struct texi *p, size_t *pos, c
advance(p, pos);
}
- /*
+ /*
* New sentence, new line:if we (non-macro, non-literal) see a
* period at the end of the last printed word, then open a
* newline.
@@ -889,7 +889,7 @@ texicmd(const struct texi *p, size_t pos
/* Scan to the end of the possible command name. */
for (*end = pos; *end < BUFSZ(p) && ! ismspace(BUF(p)[*end]); (*end)++)
- if ((*end > pos && ('@' == BUF(p)[*end] ||
+ if ((*end > pos && ('@' == BUF(p)[*end] ||
'{' == BUF(p)[*end] || '}' == BUF(p)[*end])))
break;
@@ -974,7 +974,7 @@ parsearg(struct texi *p, size_t *pos, si
advanceto(p, pos, end);
if (NULL != macro)
texiexecmacro(p, macro, sv, pos);
- if (TEXICMD__MAX == cmd)
+ if (TEXICMD__MAX == cmd)
continue;
if (NULL != texitoks[cmd].fp)
(*texitoks[cmd].fp)(p, cmd, pos);
@@ -1035,7 +1035,7 @@ parsebracket(struct texi *p, size_t *pos
advanceto(p, pos, end);
if (NULL != macro)
texiexecmacro(p, macro, sv, pos);
- if (TEXICMD__MAX == cmd)
+ if (TEXICMD__MAX == cmd)
continue;
if (NULL != texitoks[cmd].fp)
(*texitoks[cmd].fp)(p, cmd, pos);
@@ -1090,7 +1090,7 @@ parseeoln(struct texi *p, size_t *pos)
advanceto(p, pos, end);
if (NULL != macro)
texiexecmacro(p, macro, sv, pos);
- if (TEXICMD__MAX == cmd)
+ if (TEXICMD__MAX == cmd)
continue;
if (NULL != texitoks[cmd].fp)
(*texitoks[cmd].fp)(p, cmd, pos);
@@ -1166,7 +1166,7 @@ parsesingle(struct texi *p, size_t *pos)
advanceto(p, pos, end);
if (NULL != macro)
texiexecmacro(p, macro, sv, pos);
- if (TEXICMD__MAX == cmd)
+ if (TEXICMD__MAX == cmd)
return;
if (NULL != texitoks[cmd].fp)
(*texitoks[cmd].fp)(p, cmd, pos);
@@ -1207,7 +1207,7 @@ parseeof(struct texi *p)
{
size_t pos;
- for (pos = 0; pos < BUFSZ(p); )
+ for (pos = 0; pos < BUFSZ(p); )
parsesingle(p, &pos);
}
@@ -1249,7 +1249,7 @@ parseto(struct texi *p, size_t *pos, con
endtoksz = strlen(endtoken);
assert(endtoksz > 0);
-
+
while ((*pos = advancenext(p, pos)) < BUFSZ(p)) {
switch (BUF(p)[*pos]) {
case ('}'):
@@ -1275,7 +1275,7 @@ parseto(struct texi *p, size_t *pos, con
if (TEXICMD_END == cmd) {
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos]))
advance(p, pos);
- /*
+ /*
* FIXME: check the full word, not just its
* initial substring!
*/
@@ -1288,16 +1288,16 @@ parseto(struct texi *p, size_t *pos, con
texiwarn(p, "unexpected \"end\"");
advanceeoln(p, pos, 0);
continue;
- }
+ }
if (NULL != macro)
texiexecmacro(p, macro, sv, pos);
- if (TEXICMD__MAX == cmd)
+ if (TEXICMD__MAX == cmd)
continue;
- if (NULL != texitoks[cmd].fp)
+ if (NULL != texitoks[cmd].fp)
(*texitoks[cmd].fp)(p, cmd, pos);
}
- if (*pos == BUFSZ(p))
+ if (*pos == BUFSZ(p))
texiwarn(p, "EOF expecting \"%s\" end\n", endtoken);
}
@@ -1322,17 +1322,17 @@ parsestdin(struct texi *p)
if (f->mapsz == f->mapmaxsz) {
if (f->mapmaxsz == (1U << 31))
texierr(p, "stdin buffer too long");
- f->mapmaxsz = f->mapmaxsz > 65536 / 2 ?
+ f->mapmaxsz = f->mapmaxsz > 65536 / 2 ?
2 * f->mapmaxsz : 65536;
f->map = realloc(f->map, f->mapmaxsz);
- if (NULL == f->map)
+ if (NULL == f->map)
texiabort(p, NULL);
}
- ssz = read(STDIN_FILENO, f->map +
+ ssz = read(STDIN_FILENO, f->map +
(int)f->mapsz, f->mapmaxsz - f->mapsz);
if (0 == ssz)
break;
- else if (-1 == ssz)
+ else if (-1 == ssz)
texiabort(p, NULL);
}
@@ -1356,7 +1356,7 @@ parsefile(struct texi *p, const char *fn
size_t i;
char *map;
- if (64 == p->filepos)
+ if (64 == p->filepos)
texierr(p, "too many open files");
f = &p->files[p->filepos];
memset(f, 0, sizeof(struct texifile));
@@ -1368,7 +1368,7 @@ parsefile(struct texi *p, const char *fn
} else if (-1 == fstat(fd, &st)) {
close(fd);
texiabort(p, fname);
- }
+ }
f->mapsz = f->mapmaxsz = st.st_size;
map = mmap(NULL, f->mapsz,
@@ -1518,7 +1518,7 @@ valueadd(struct texi *p, char *key, char
p->vals[i].value = val;
} else {
/* FIXME: reallocarray() */
- p->vals = realloc(p->vals,
+ p->vals = realloc(p->vals,
(p->valsz + 1) *
sizeof(struct texivalue));
if (NULL == p->vals)
@@ -1589,7 +1589,7 @@ argparse(struct texi *p, size_t *pos, si
start = *pos;
stack = 0;
while (*pos < BUFSZ(p)) {
- /*
+ /*
* According to the manual, commas within
* embedded commands are escaped.
* We keep track of embedded-ness in the "stack"
@@ -1631,7 +1631,7 @@ argparse(struct texi *p, size_t *pos, si
advance(p, pos);
}
- if (*pos == BUFSZ(p))
+ if (*pos == BUFSZ(p))
texierr(p, "unterminated arguments");
assert('}' == BUF(p)[*pos]);
advance(p, pos);
@@ -1658,7 +1658,7 @@ teximdocclose(struct texi *p, int last)
/* Print a reference to the "top" node. */
if (-1 != p->nodecache[p->nodecur].up) {
texiputchars(p, "Top node,");
- snprintf(buf, sizeof(buf), "%s-%zd 7",
+ snprintf(buf, sizeof(buf), "%s-%zd 7",
p->chapters, p->nodecache[p->nodecur].up);
p->seenvs = 0;
teximacroopen(p, "Xr ");
@@ -1669,15 +1669,15 @@ teximdocclose(struct texi *p, int last)
if (-1 != p->nodecache[p->nodecur].prev) {
texiputchars(p, "previous node,");
- snprintf(buf, sizeof(buf), "%s-%zd 7",
+ snprintf(buf, sizeof(buf), "%s-%zd 7",
p->chapters, p->nodecache[p->nodecur].prev);
p->seenvs = 0;
teximacroopen(p, "Xr ");
texiputchars(p, buf);
- if ( ! last)
+ if ( ! last)
texiputchars(p, " ;");
teximacroclose(p);
- }
+ }
if (-1 != p->nodecache[p->nodecur].next) {
texiputchars(p, "next node,");
@@ -1710,7 +1710,7 @@ texicache(struct texi *p, const char *bu
if (NULL == buf)
return(-1);
p->nodecache = realloc
- (p->nodecache,
+ (p->nodecache,
(p->nodecachesz + 1) * sizeof(struct texinode));
if (NULL == p->nodecache)
texiabort(p, NULL);
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-03-19 9:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-19 9:54 texi2mdoc: zap trailing whitespace; verified with diff -b; patch from schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).