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

Diff for /mandoc/Attic/man_action.c between version 1.9 and 1.15

version 1.9, 2009/04/05 16:34:22 version 1.15, 2009/08/13 11:45:29
Line 1 
Line 1 
 /* $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *   *
  * 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   * purpose with or without fee is hereby granted, provided that the above
  * above copyright notice and this permission notice appear in all   * copyright notice and this permission notice appear in all copies.
  * copies.  
  *   *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * PERFORMANCE OF THIS SOFTWARE.  
  */   */
 #include <sys/utsname.h>  #include <sys/utsname.h>
   
Line 38  static int   post_TH(struct man *);
Line 36  static int   post_TH(struct man *);
 static  time_t    man_atotime(const char *);  static  time_t    man_atotime(const char *);
   
 const   struct actions man_actions[MAN_MAX] = {  const   struct actions man_actions[MAN_MAX] = {
         { NULL }, /* __ */          { NULL }, /* br */
         { post_TH }, /* TH */          { post_TH }, /* TH */
         { NULL }, /* SH */          { NULL }, /* SH */
         { NULL }, /* SS */          { NULL }, /* SS */
Line 59  const struct actions man_actions[MAN_MAX] = {
Line 57  const struct actions man_actions[MAN_MAX] = {
         { NULL }, /* I */          { NULL }, /* I */
         { NULL }, /* IR */          { NULL }, /* IR */
         { NULL }, /* RI */          { NULL }, /* RI */
         { NULL }, /* br */  
         { NULL }, /* na */          { NULL }, /* na */
         { NULL }, /* i */          { NULL }, /* i */
           { NULL }, /* sp */
           { NULL }, /* nf */
           { NULL }, /* fi */
           { NULL }, /* r*/
 };  };
   
   
Line 111  post_TH(struct man *m)
Line 112  post_TH(struct man *m)
         assert(n);          assert(n);
   
         if (NULL == (m->meta.title = strdup(n->string)))          if (NULL == (m->meta.title = strdup(n->string)))
                 return(man_verr(m, n->line, n->pos,                  return(man_nerr(m, n, WNMEM));
                                         "memory exhausted"));  
   
         /* TITLE ->MSEC<- DATE SOURCE VOL */          /* TITLE ->MSEC<- DATE SOURCE VOL */
   
Line 123  post_TH(struct man *m)
Line 123  post_TH(struct man *m)
         lval = strtol(n->string, &ep, 10);          lval = strtol(n->string, &ep, 10);
         if (n->string[0] != '\0' && *ep == '\0')          if (n->string[0] != '\0' && *ep == '\0')
                 m->meta.msec = (int)lval;                  m->meta.msec = (int)lval;
         else if ( ! man_vwarn(m, n->line, n->pos, "invalid section"))          else if ( ! man_nwarn(m, n, WMSEC))
                 return(0);                  return(0);
   
         /* TITLE MSEC ->DATE<- SOURCE VOL */          /* TITLE MSEC ->DATE<- SOURCE VOL */
Line 131  post_TH(struct man *m)
Line 131  post_TH(struct man *m)
         if (NULL == (n = n->next))          if (NULL == (n = n->next))
                 m->meta.date = time(NULL);                  m->meta.date = time(NULL);
         else if (0 == (m->meta.date = man_atotime(n->string))) {          else if (0 == (m->meta.date = man_atotime(n->string))) {
                 if ( ! man_vwarn(m, n->line, n->pos, "invalid date"))                  if ( ! man_nwarn(m, n, WDATE))
                         return(0);                          return(0);
                 m->meta.date = time(NULL);                  m->meta.date = time(NULL);
         }          }
Line 140  post_TH(struct man *m)
Line 140  post_TH(struct man *m)
   
         if (n && (n = n->next))          if (n && (n = n->next))
                 if (NULL == (m->meta.source = strdup(n->string)))                  if (NULL == (m->meta.source = strdup(n->string)))
                         return(man_verr(m, n->line, n->pos,                          return(man_nerr(m, n, WNMEM));
                                                 "memory exhausted"));  
   
         /* TITLE MSEC DATE SOURCE ->VOL<- */          /* TITLE MSEC DATE SOURCE ->VOL<- */
   
         if (n && (n = n->next))          if (n && (n = n->next))
                 if (NULL == (m->meta.vol = strdup(n->string)))                  if (NULL == (m->meta.vol = strdup(n->string)))
                         return(man_verr(m, n->line, n->pos,                          return(man_nerr(m, n, WNMEM));
                                                 "memory exhausted"));  
   
         /*          /*
          * The end document shouldn't have the prologue macros as part           * The end document shouldn't have the prologue macros as part
Line 156  post_TH(struct man *m)
Line 154  post_TH(struct man *m)
          */           */
   
         if (m->last->parent->child == m->last) {          if (m->last->parent->child == m->last) {
                 assert(MAN_ROOT == m->last->parent->type);  
                 m->last->parent->child = NULL;                  m->last->parent->child = NULL;
                 n = m->last;                  n = m->last;
                 m->last = m->last->parent;                  m->last = m->last->parent;
                 m->next = MAN_NEXT_CHILD;                  m->next = MAN_NEXT_CHILD;
                 assert(m->last == m->first);  
         } else {          } else {
                 assert(m->last->prev);                  assert(m->last->prev);
                 m->last->prev->next = NULL;                  m->last->prev->next = NULL;
Line 181  man_atotime(const char *p)
Line 177  man_atotime(const char *p)
         struct tm        tm;          struct tm        tm;
         char            *pp;          char            *pp;
   
         (void)memset(&tm, 0, sizeof(struct tm));          bzero(&tm, sizeof(struct tm));
   
         if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp)          if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp)
                 return(mktime(&tm));                  return(mktime(&tm));
Legend:
Removed from v.1.9  
changed lines
  Added in v.1.15
CVSweb