[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.2 and 1.12

version 1.2, 2009/03/25 16:07:36 version 1.12, 2009/06/16 19:55:28
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>
   
 #include <assert.h>  #include <assert.h>
 #include <err.h>  
 #include <errno.h>  #include <errno.h>
 #include <stdio.h>  
 #include <stdlib.h>  #include <stdlib.h>
 #include <string.h>  #include <string.h>
   
 #include "libman.h"  #include "libman.h"
   
   #ifdef __linux__
   extern  char            *strptime(const char *, const char *, struct tm *);
   #endif
   
 struct  actions {  struct  actions {
         int     (*post)(struct man *);          int     (*post)(struct man *);
Line 34  struct actions {
Line 33  struct actions {
   
   
 static  int       post_TH(struct man *);  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 57  const struct actions man_actions[MAN_MAX] = {
Line 56  const struct actions man_actions[MAN_MAX] = {
         { NULL }, /* B */          { NULL }, /* B */
         { NULL }, /* I */          { NULL }, /* I */
         { NULL }, /* IR */          { NULL }, /* IR */
           { NULL }, /* RI */
           { NULL }, /* na */
           { NULL }, /* i */
 };  };
   
   
Line 106  post_TH(struct man *m)
Line 108  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, "malloc"));                  return(man_verr(m, n->line, n->pos,
                                           "memory exhausted"));
   
         /* TITLE ->MSEC<- DATE SOURCE VOL */          /* TITLE ->MSEC<- DATE SOURCE VOL */
   
Line 122  post_TH(struct man *m)
Line 125  post_TH(struct man *m)
   
         /* TITLE MSEC ->DATE<- SOURCE VOL */          /* TITLE MSEC ->DATE<- SOURCE VOL */
   
         if (NULL == (n = n->next)) {          if (NULL == (n = n->next))
                 m->meta.date = time(NULL);                  m->meta.date = time(NULL);
                 return(1);          else if (0 == (m->meta.date = man_atotime(n->string))) {
         }  
   
         if (0 == (m->meta.date = man_atotime(n->string))) {  
                 if ( ! man_vwarn(m, n->line, n->pos, "invalid date"))                  if ( ! man_vwarn(m, n->line, n->pos, "invalid date"))
                         return(0);                          return(0);
                 m->meta.date = time(NULL);                  m->meta.date = time(NULL);
Line 135  post_TH(struct man *m)
Line 135  post_TH(struct man *m)
   
         /* TITLE MSEC DATE ->SOURCE<- VOL */          /* TITLE MSEC DATE ->SOURCE<- VOL */
   
         if ((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, "malloc"));                          return(man_verr(m, n->line, n->pos,
                                                   "memory exhausted"));
   
         /* TITLE MSEC DATE SOURCE ->VOL<- */          /* TITLE MSEC DATE SOURCE ->VOL<- */
   
         if ((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, "malloc"));                          return(man_verr(m, n->line, n->pos,
                                                   "memory exhausted"));
   
         /*          /*
          * The end document shouldn't have the prologue macros as part           * The end document shouldn't have the prologue macros as part
          * of the syntax tree (they encompass only meta-data).           * of the syntax tree (they encompass only meta-data).
          */           */
   
         assert(MAN_ROOT == m->last->parent->type);          if (m->last->parent->child == m->last) {
         m->last->parent->child = NULL;                  assert(MAN_ROOT == m->last->parent->type);
         n = m->last;                  m->last->parent->child = NULL;
         m->last = m->last->parent;                  n = m->last;
         m->next = MAN_NEXT_CHILD;                  m->last = m->last->parent;
         assert(m->last == m->first);                  m->next = MAN_NEXT_CHILD;
                   assert(m->last == m->first);
           } else {
                   assert(m->last->prev);
                   m->last->prev->next = NULL;
                   n = m->last;
                   m->last = m->last->prev;
                   m->next = MAN_NEXT_SIBLING;
           }
   
         man_node_freelist(n);          man_node_freelist(n);
         return(1);          return(1);
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.12
CVSweb