src/usr.bin/mandoc/term.c - diff - 1.15

Return to term.c CVS log

Up to [local] / src / usr.bin / mandoc

Diff for /src/usr.bin/mandoc/term.c between version 1.14 and 1.15

version 1.14, 2009/10/18 21:03:31

version 1.15, 2009/10/19 09:16:58

Line 20

Line 20

#include <stdlib.h>

#include <stdlib.h>

#include <string.h>

#include <string.h>

#include "chars.h"

#include "term.h"

#include "term.h"

#include "man.h"

#include "man.h"

#include "mdoc.h"

#include "mdoc.h"

Line 56

Line 57

p = (struct termp *)arg;

p = (struct termp *)arg;

if (NULL == p->symtab)

if (NULL == p->symtab)

p->symtab = term_ascii2htab();

p->symtab = chars_init(CHARS_ASCII);

man_run(p, man);

man_run(p, man);

}

}

Line 69

Line 70

p = (struct termp *)arg;

p = (struct termp *)arg;

if (NULL == p->symtab)

if (NULL == p->symtab)

p->symtab = term_ascii2htab();

p->symtab = chars_init(CHARS_ASCII);

mdoc_run(p, mdoc);

mdoc_run(p, mdoc);

}

}

Line 89

Line 90

if (p->buf)

if (p->buf)

free(p->buf);

free(p->buf);

if (TERMENC_ASCII == p->enc && p->symtab)

if (p->symtab)

term_asciifree(p->symtab);

chars_free(p->symtab);

free(p);

free(p);

}

}

Line 102

Line 103

struct termp *p;

struct termp *p;

if (NULL == (p = malloc(sizeof(struct termp))))

if (NULL == (p = malloc(sizeof(struct termp))))

err(1, "malloc");

return(NULL);

bzero(p, sizeof(struct termp));

bzero(p, sizeof(struct termp));

p->maxrmargin = 78;

p->maxrmargin = 78;

p->enc = enc;

p->enc = enc;

Line 331

Line 332

size_t sz;

size_t sz;

int i;

int i;

rhs = term_a2ascii(p->symtab, word, len, &sz);

rhs = chars_a2ascii(p->symtab, word, len, &sz);

if (NULL == rhs) {

if (NULL == rhs) {

#if 0

#if 0

Line 354

Line 355

size_t sz;

size_t sz;

int i;

int i;

rhs = term_a2res(p->symtab, word, len, &sz);

rhs = chars_a2res(p->symtab, word, len, &sz);

if (NULL == rhs) {

if (NULL == rhs) {

#if 0

#if 0

Line 555

Line 556

s = p->maxcols * 2;

s = p->maxcols * 2;

p->buf = realloc(p->buf, s);

p->buf = realloc(p->buf, s);

if (NULL == p->buf)

if (NULL == p->buf)

err(1, "realloc");

err(1, "realloc"); /* FIXME: shouldn't be here! */

p->maxcols = s;

p->maxcols = s;

}

}

p->buf[(int)(p->col)++] = c;

p->buf[(int)(p->col)++] = c;