summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-03-23 14:31:58 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-03-23 14:31:58 +0000
commit9e1962924d277421ea2bce83eed6738227fc0b54 (patch)
treeb3bdcfb6638b011ad4651fe70e926f6206929720
parenteae8f4ff2cd357d92c5e6aa901cf82cc4d344470 (diff)
downloadmandoc-9e1962924d277421ea2bce83eed6738227fc0b54.tar.gz
mandoc-9e1962924d277421ea2bce83eed6738227fc0b54.tar.zst
mandoc-9e1962924d277421ea2bce83eed6738227fc0b54.zip
Linux fixes.
-rw-r--r--action.c3
-rw-r--r--argv.c6
-rw-r--r--man_macro.c40
3 files changed, 25 insertions, 24 deletions
diff --git a/action.c b/action.c
index 3b0c33c2..168c851f 100644
--- a/action.c
+++ b/action.c
@@ -1,4 +1,4 @@
-/* $Id: action.c,v 1.50 2009/03/23 14:22:11 kristaps Exp $ */
+/* $Id: action.c,v 1.51 2009/03/23 14:31:58 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
@@ -19,6 +19,7 @@
#include <sys/utsname.h>
#include <assert.h>
+#include <err.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/argv.c b/argv.c
index db5b7ea4..bf2d3fc6 100644
--- a/argv.c
+++ b/argv.c
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.56 2009/03/23 14:22:11 kristaps Exp $ */
+/* $Id: argv.c,v 1.57 2009/03/23 14:31:58 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
@@ -765,8 +765,8 @@ argv_multi(struct mdoc *mdoc, int line,
if (0 == v->sz % MULTI_STEP)
v->value = xrealloc(v->value,
(v->sz + MULTI_STEP) * sizeof(char *));
-
- v->value[(int)v->sz] = xstrdup(p);
+ if (NULL == (v->value[(int)v->sz] = strdup(p)))
+ err(1, "strdup");
}
if (v->sz)
diff --git a/man_macro.c b/man_macro.c
index 0c35903a..a8b21819 100644
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/* $Id: man_macro.c,v 1.1 2009/03/23 14:22:11 kristaps Exp $ */
+/* $Id: man_macro.c,v 1.2 2009/03/23 14:31:58 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
@@ -27,25 +27,25 @@
static int in_line_eoln(MACRO_PROT_ARGS);
const struct man_macro __man_macros[MAN_MAX] = {
- { in_line_eoln, NULL }, /* MAN___ */
- { in_line_eoln, NULL }, /* MAN_TH */
- { in_line_eoln, NULL }, /* MAN_SH */
- { in_line_eoln, NULL }, /* MAN_SS */
- { in_line_eoln, NULL }, /* MAN_TP */
- { in_line_eoln, NULL }, /* MAN_LP */
- { in_line_eoln, NULL }, /* MAN_PP */
- { in_line_eoln, NULL }, /* MAN_P */
- { in_line_eoln, NULL }, /* MAN_IP */
- { in_line_eoln, NULL }, /* MAN_HP */
- { in_line_eoln, NULL }, /* MAN_SM */
- { in_line_eoln, NULL }, /* MAN_SB */
- { in_line_eoln, NULL }, /* MAN_BI */
- { in_line_eoln, NULL }, /* MAN_IB */
- { in_line_eoln, NULL }, /* MAN_BR */
- { in_line_eoln, NULL }, /* MAN_RB */
- { in_line_eoln, NULL }, /* MAN_R */
- { in_line_eoln, NULL }, /* MAN_B */
- { in_line_eoln, NULL }, /* MAN_I */
+ { in_line_eoln, 0 }, /* MAN___ */
+ { in_line_eoln, 0 }, /* MAN_TH */
+ { in_line_eoln, 0 }, /* MAN_SH */
+ { in_line_eoln, 0 }, /* MAN_SS */
+ { in_line_eoln, 0 }, /* MAN_TP */
+ { in_line_eoln, 0 }, /* MAN_LP */
+ { in_line_eoln, 0 }, /* MAN_PP */
+ { in_line_eoln, 0 }, /* MAN_P */
+ { in_line_eoln, 0 }, /* MAN_IP */
+ { in_line_eoln, 0 }, /* MAN_HP */
+ { in_line_eoln, 0 }, /* MAN_SM */
+ { in_line_eoln, 0 }, /* MAN_SB */
+ { in_line_eoln, 0 }, /* MAN_BI */
+ { in_line_eoln, 0 }, /* MAN_IB */
+ { in_line_eoln, 0 }, /* MAN_BR */
+ { in_line_eoln, 0 }, /* MAN_RB */
+ { in_line_eoln, 0 }, /* MAN_R */
+ { in_line_eoln, 0 }, /* MAN_B */
+ { in_line_eoln, 0 }, /* MAN_I */
};
const struct man_macro * const man_macros = __man_macros;