X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=makedoc.c;h=6451c48b74a2265261c0d2ab33dd0a850bb3ee56;hp=b8a120f20b13fb8e24bb3a011921fd26822e4ab4;hb=f3cbb9f51357972f6e74244494236a41dc4d84cd;hpb=928ca0d87eb15bfa4c150abdadadaf3b177f95bd diff --git a/makedoc.c b/makedoc.c index b8a120f..6451c48 100644 --- a/makedoc.c +++ b/makedoc.c @@ -27,21 +27,6 @@ # include #endif -#ifndef HAVE_STRERROR -#ifndef STDC_HEADERS -extern int sys_nerr; -extern char *sys_errlist[]; -#endif - -#define strerror(x) ((x) > 0 && (x) < sys_nerr) ? sys_errlist[(x)] : 0 -#endif /* !HAVE_STRERROR */ - -extern int optind; - -#define BUFFSIZE 2048 - -#define STRLEN(s) (s ? strlen(s) : 0) - typedef struct { short seen; char *name; @@ -53,7 +38,7 @@ static var_t *outbuf = NULL; static int var_cmp (const void *a, const void *b) { - return (strcmp (((var_t *) a)->name, ((var_t *) b)->name)); + return (m_strcmp (((var_t *) a)->name, ((var_t *) b)->name)); } enum output_formats_t { @@ -180,7 +165,7 @@ static void add_var (const char *name) static int add_s (const char *s) { - size_t lnew = STRLEN (s), lold = STRLEN (outbuf[outcount - 1].descr); + size_t lnew = m_strlen(s), lold = m_strlen(outbuf[outcount - 1].descr); if (lnew == 0) return (0); @@ -210,8 +195,8 @@ static int add_c (int c) static void makedoc (FILE * in, FILE * out) { - char buffer[BUFFSIZE]; - char token[BUFFSIZE]; + char buffer[BUFSIZ]; + char token[BUFSIZ]; char *p; int active = 0; int line = 0; @@ -230,15 +215,15 @@ static void makedoc (FILE * in, FILE * out) if (!(p = get_token (token, sizeof (token), buffer))) continue; - if (!strcmp (token, "/*++*/")) + if (!m_strcmp (token, "/*++*/")) active = 1; - else if (!strcmp (token, "/*--*/")) { + else if (!m_strcmp (token, "/*--*/")) { docstat = flush_doc (docstat); active = 0; } - else if (active && (!strcmp (token, "/**") || !strcmp (token, "**"))) + else if (active && (!m_strcmp (token, "/**") || !m_strcmp (token, "**"))) docstat = handle_docline (p, docstat); - else if (active && !strcmp (token, "{")) { + else if (active && !m_strcmp (token, "{")) { docstat = flush_doc (docstat); handle_confline (p); } @@ -274,7 +259,6 @@ static char *get_token (char *d, size_t l, char *s) { char *t; short is_quoted = 0; - char *dd = d; s = skip_ws (s); @@ -363,32 +347,30 @@ enum { }; struct { - char *machine; - char *human; + const char *machine; + const char *human; } types[] = { - { - "DT_NONE", "-none-"}, { - "DT_BOOL", "boolean"}, { - "DT_NUM", "number"}, { - "DT_STR", "string"}, { - "DT_PATH", "path"}, { - "DT_QUAD", "quadoption"}, { - "DT_SORT", "sort order"}, { - "DT_RX", "regular expression"}, { - "DT_MAGIC", "folder magic"}, { - "DT_SYN", NULL}, { - "DT_ADDR", "e-mail address"}, { - "DT_SYS", "system property"}, { - NULL, NULL} + {"DT_NONE", "-none-"}, + {"DT_BOOL", "boolean"}, + {"DT_NUM", "number"}, + {"DT_STR", "string"}, + {"DT_PATH", "path"}, + {"DT_QUAD", "quadoption"}, + {"DT_SORT", "sort order"}, + {"DT_RX", "regular expression"}, + {"DT_MAGIC", "folder magic"}, + {"DT_SYN", NULL}, + {"DT_ADDR", "e-mail address"}, + {"DT_SYS", "system property"}, + {NULL, NULL} }; - static int buff2type (const char *s) { int type; for (type = DT_NONE; types[type].machine; type++) - if (!strcmp (types[type].machine, s)) + if (!m_strcmp (types[type].machine, s)) return type; return DT_NONE; @@ -400,11 +382,11 @@ static const char *type2human (int type) } static void handle_confline (char *s) { - char varname[BUFFSIZE]; - char buff[BUFFSIZE]; + char varname[BUFSIZ]; + char buff[BUFSIZ]; int type; - char val[BUFFSIZE]; + char val[BUFSIZ]; /* xxx - put this into an actual state machine? */ @@ -426,7 +408,7 @@ static void handle_confline (char *s) if (!(s = get_token (buff, sizeof (buff), s))) return; - if (!strcmp (buff, "|")) { + if (!m_strcmp (buff, "|")) { /* ignore subtype and comma */ if (!(s = get_token (buff, sizeof (buff), s))) return; @@ -439,14 +421,14 @@ static void handle_confline (char *s) while (1) { if (!(s = get_token (buff, sizeof (buff), s))) return; - if (!strcmp (buff, ",")) + if (!m_strcmp (buff, ",")) break; } /* option name or UL &address */ if (!(s = get_token (buff, sizeof (buff), s))) return; - if (!strcmp (buff, "UL")) + if (!m_strcmp (buff, "UL")) if (!(s = get_token (buff, sizeof (buff), s))) return; @@ -457,7 +439,7 @@ static void handle_confline (char *s) /* or UL */ if (!(s = get_token (buff, sizeof (buff), s))) return; - if (!strcmp (buff, "UL")) { + if (!m_strcmp (buff, "UL")) { if (!(s = get_token (buff, sizeof (buff), s))) return; } @@ -465,7 +447,7 @@ static void handle_confline (char *s) memset(val, 0, sizeof(val)); do { - if (!strcmp (buff, "}")) + if (!m_strcmp (buff, "}")) break; m_strcat(val, sizeof(val), buff); @@ -480,17 +462,17 @@ static void char_to_escape (char *dest, unsigned int c) { switch (c) { case '\r': - strcpy (dest, "\\r"); - break; /* __STRCPY_CHECKED__ */ + m_strcpy(dest, "\\r"); + break; case '\n': - strcpy (dest, "\\n"); - break; /* __STRCPY_CHECKED__ */ + m_strcpy(dest, "\\n"); + break; case '\t': - strcpy (dest, "\\t"); - break; /* __STRCPY_CHECKED__ */ + m_strcpy(dest, "\\t"); + break; case '\f': - strcpy (dest, "\\f"); - break; /* __STRCPY_CHECKED__ */ + m_strcpy(dest, "\\f"); + break; default: sprintf (dest, "\\%03o", c); break; @@ -853,7 +835,7 @@ static int print_it (int special, char *str, int docstat) if (docstat & D_DT) { int i; - for (i = STRLEN (str); i < 8; i++) + for (i = m_strlen(str); i < 8; i++) add_c (' '); docstat &= ~D_DT; docstat |= D_NL; @@ -1114,7 +1096,7 @@ static int print_it (int special, char *str, int docstat) return docstat; } -void print_ref (int output_dollar, const char *ref) +static void print_ref (int output_dollar, const char *ref) { switch (OutputFormat) { case F_CONF: @@ -1152,7 +1134,7 @@ static int commit_buff (char *buff, char **d, int docstat) static int handle_docline (char *l, int docstat) { - char buff[BUFFSIZE]; + char buff[BUFSIZ]; char *s, *d; l = skip_ws (l);