mandoc/main.c - diff

Return to main.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/main.c between version 1.47 and 1.51

version 1.47, 2009/10/26 04:15:42

version 1.51, 2009/10/27 08:26:11

Line 35

#ifdef __linux__

extern int getsubopt(char **, char * const *, char **);

extern size_t strlcat(char *, const char *, size_t);

# ifndef __dead

# define __dead __attribute__((__noreturn__))

# endif

Line 88 struct curparse {

Line 89 struct curparse {

out_man outman;

out_free outfree;

void *outdata;

char *outopts;

char outopts[BUFSIZ];

};

static int foptions(int *, char *);

Line 118 main(int argc, char *argv[])

Line 119 main(int argc, char *argv[])

struct buf ln, blk;

struct curparse curp;

bzero(&curp, sizeof(struct curparse));

memset(&curp, 0, sizeof(struct curparse));

curp.inttype = INTT_AUTO;

curp.outtype = OUTT_ASCII;

Line 134 main(int argc, char *argv[])

Line 135 main(int argc, char *argv[])

if ( ! moptions(&curp.inttype, optarg))

return(EXIT_FAILURE);

break;

case ('o'):

case ('O'):

curp.outopts = optarg;

(void)strlcat(curp.outopts, optarg, BUFSIZ);

(void)strlcat(curp.outopts, ",", BUFSIZ);

break;

case ('T'):

if ( ! toptions(&curp.outtype, optarg))

Line 156 main(int argc, char *argv[])

Line 158 main(int argc, char *argv[])

argc -= optind;

argv += optind;

bzero(&ln, sizeof(struct buf));

memset(&ln, 0, sizeof(struct buf));

bzero(&blk, sizeof(struct buf));

memset(&blk, 0, sizeof(struct buf));

rc = 1;

Line 221 usage(void)

Line 223 usage(void)

{

(void)fprintf(stderr, "usage: %s [-V] [-foption...] "

"[-mformat] [-Toutput] [-Werr...]\n",

"[-mformat] [-Ooption] [-Toutput] "

__progname);

"[-Werr...]\n", __progname);

exit(EXIT_FAILURE);

}

Line 569 static int

Line 571 static int

foptions(int *fflags, char *arg)

{

char *v, *o;

const char *toks[7];

const char *toks[8];

toks[0] = "ign-scope";

toks[1] = "no-ign-escape";

Line 577 foptions(int *fflags, char *arg)

Line 579 foptions(int *fflags, char *arg)

toks[3] = "no-ign-chars";

toks[4] = "ign-errors";

toks[5] = "strict";

toks[6] = NULL;

toks[6] = "ign-escape";

toks[7] = NULL;

while (*arg) {

o = arg;

Line 600 foptions(int *fflags, char *arg)

Line 603 foptions(int *fflags, char *arg)

case (5):

*fflags |= NO_IGN_ESCAPE |

NO_IGN_MACRO | NO_IGN_CHARS;

break;

case (6):

*fflags &= ~NO_IGN_ESCAPE;

break;

default:

warnx("bad argument: -f%s", o);

CVSweb