[BACK]Return to main.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/main.c between version 1.87 and 1.90

version 1.87, 2010/06/12 10:09:19 version 1.90, 2010/06/26 15:22:19
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
Line 30 
Line 30 
 #include <unistd.h>  #include <unistd.h>
   
 #include "mandoc.h"  #include "mandoc.h"
   #include "regs.h"
   #include "main.h"
 #include "mdoc.h"  #include "mdoc.h"
 #include "man.h"  #include "man.h"
 #include "roff.h"  #include "roff.h"
 #include "main.h"  
   
 #define UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))  #define UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))
   
Line 109  static const char * const mandocerrs[MANDOCERR_MAX] = 
Line 110  static const char * const mandocerrs[MANDOCERR_MAX] = 
         "unterminated quoted string",          "unterminated quoted string",
         "argument requires the width argument",          "argument requires the width argument",
         "superfluous width argument",          "superfluous width argument",
           "ignoring argument",
         "bad date argument",          "bad date argument",
         "bad width argument",          "bad width argument",
         "unknown manual section",          "unknown manual section",
Line 449  fdesc(struct curparse *curp)
Line 451  fdesc(struct curparse *curp)
         struct man      *man;          struct man      *man;
         struct mdoc     *mdoc;          struct mdoc     *mdoc;
         struct roff     *roff;          struct roff     *roff;
           struct regset    regs;
   
         man = NULL;          man = NULL;
         mdoc = NULL;          mdoc = NULL;
         roff = NULL;          roff = NULL;
         memset(&ln, 0, sizeof(struct buf));          memset(&ln, 0, sizeof(struct buf));
           memset(&regs, 0, sizeof(struct regset));
   
         /*          /*
          * Two buffers: ln and buf.  buf is the input file and may be           * Two buffers: ln and buf.  buf is the input file and may be
Line 536  fdesc(struct curparse *curp)
Line 540  fdesc(struct curparse *curp)
   
                 of = 0;                  of = 0;
                 do {                  do {
                         re = roff_parseln(roff, lnn_start,                          re = roff_parseln(roff, &regs, lnn_start,
                                         &ln.buf, &ln.sz, of, &of);                                          &ln.buf, &ln.sz, of, &of);
                 } while (ROFF_RERUN == re);                  } while (ROFF_RERUN == re);
   
Legend:
Removed from v.1.87  
changed lines
  Added in v.1.90
CVSweb