Using putchar for single-character prints (noted by Joerg Sonnenberger).

[mandoc.git] / mdoc_strings.c

diff --git a/mdoc_strings.c b/mdoc_strings.c
index 126a2439e0ca9126e8e66e02d1c86f351ad10c07..0d63dac1d7d982b4c0eeb52a1b8d8a31c92f4547 100644 (file)
--- a/mdoc_strings.c
+++ b/mdoc_strings.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_strings.c,v 1.8 2009/06/22 12:22:35 kristaps Exp $ */
+/*     $Id: mdoc_strings.c,v 1.12 2009/10/27 08:26:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -17,10 +17,10 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 
 #include "libmdoc.h"
 
@@ -31,7 +31,7 @@ struct mdoc_secname {
        enum mdoc_sec    sec;   /* Corresponding section. */
 };
 
-#define        SECNAME_MAX     (18)
+#define        SECNAME_MAX     (20)
 
 static const struct mdoc_secname secnames[SECNAME_MAX] = {
        { "NAME", SEC_NAME },
@@ -39,6 +39,7 @@ static        const struct mdoc_secname secnames[SECNAME_MAX] = {
        { "SYNOPSIS", SEC_SYNOPSIS },
        { "DESCRIPTION", SEC_DESCRIPTION },
        { "IMPLEMENTATION NOTES", SEC_IMPLEMENTATION },
+       { "EXIT STATUS", SEC_EXIT_STATUS },
        { "RETURN VALUES", SEC_RETURN_VALUES },
        { "ENVIRONMENT", SEC_ENVIRONMENT },
        { "FILES", SEC_FILES },
@@ -52,6 +53,7 @@ static        const struct mdoc_secname secnames[SECNAME_MAX] = {
        { "AUTHORS", SEC_AUTHORS },
        { "CAVEATS", SEC_CAVEATS },
        { "BUGS", SEC_BUGS },
+       { "SECURITY CONSIDERATIONS", SEC_SECURITY }
 };
 
 #ifdef __linux__
@@ -59,82 +61,6 @@ extern       char            *strptime(const char *, const char *, struct tm *);
 #endif
 
 
-size_t
-mdoc_isescape(const char *p)
-{
-       size_t           c;
-       
-       if ('\\' != *p++)
-               return(0);
-
-       switch (*p) {
-       case ('\\'):
-               /* FALLTHROUGH */
-       case ('\''):
-               /* FALLTHROUGH */
-       case ('`'):
-               /* FALLTHROUGH */
-       case ('q'):
-               /* FALLTHROUGH */
-       case ('-'):
-               /* FALLTHROUGH */
-       case ('~'):
-               /* FALLTHROUGH */
-       case ('^'):
-               /* FALLTHROUGH */
-       case ('%'):
-               /* FALLTHROUGH */
-       case ('0'):
-               /* FALLTHROUGH */
-       case (' '):
-               /* FALLTHROUGH */
-       case ('|'):
-               /* FALLTHROUGH */
-       case ('&'):
-               /* FALLTHROUGH */
-       case ('.'):
-               /* FALLTHROUGH */
-       case (':'):
-               /* FALLTHROUGH */
-       case ('e'):
-               return(2);
-       case ('*'):
-               if (0 == *++p || ! isgraph((u_char)*p))
-                       return(0);
-               switch (*p) {
-               case ('('):
-                       if (0 == *++p || ! isgraph((u_char)*p))
-                               return(0);
-                       return(4);
-               case ('['):
-                       for (c = 3, p++; *p && ']' != *p; p++, c++)
-                               if ( ! isgraph((u_char)*p))
-                                       break;
-                       return(*p == ']' ? c : 0);
-               default:
-                       break;
-               }
-               return(3);
-       case ('('):
-               if (0 == *++p || ! isgraph((u_char)*p))
-                       return(0);
-               if (0 == *++p || ! isgraph((u_char)*p))
-                       return(0);
-               return(4);
-       case ('['):
-               break;
-       default:
-               return(0);
-       }
-
-       for (c = 3, p++; *p && ']' != *p; p++, c++)
-               if ( ! isgraph((u_char)*p))
-                       break;
-
-       return(*p == ']' ? c : 0);
-}
-
-
 int
 mdoc_iscdelim(char p)
 {
@@ -205,7 +131,7 @@ mdoc_atotime(const char *p)
        struct tm        tm;
        char            *pp;
 
-       bzero(&tm, sizeof(struct tm));
+       memset(&tm, 0, sizeof(struct tm));
 
        if (0 == strcmp(p, "$" "Mdocdate$"))
                return(time(NULL));