# include <getopt.h>
#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;
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);
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;
{
char *t;
short is_quoted = 0;
- char *dd = d;
s = skip_ws (s);
};
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;
}
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? */
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;
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:
static int handle_docline (char *l, int docstat)
{
- char buff[BUFFSIZE];
+ char buff[BUFSIZ];
char *s, *d;
l = skip_ws (l);