summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2006-04-26 17:09:35 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2006-04-26 17:09:35 +0000
commit6c855dab9c201fd807f1d73c7ec45f1959211e0d (patch)
tree6f93c25d055f639d5bc4e8fcf66ba2b0958a3230
parenta52e4194c3e078719dfae4b3a3d4091b0448e5a7 (diff)
man page is gzip'd, should store as unsigned char array.
-rw-r--r--sbin/disklabel/Makefile6
-rw-r--r--sbin/disklabel/editor.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile
index 86532aaae6e..6c930f260ae 100644
--- a/sbin/disklabel/Makefile
+++ b/sbin/disklabel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2005/08/30 05:02:40 uwe Exp $
+# $OpenBSD: Makefile,v 1.40 2006/04/26 17:09:34 deraadt Exp $
PROG= disklabel
SRCS= disklabel.c dkcksum.c editor.c manual.c
@@ -13,12 +13,12 @@ CLEANFILES+=manual.c
.ifdef NOMAN
manual.c:
- (echo 'const char manpage[] = {'; \
+ (echo 'const unsigned char manpage[] = {'; \
echo 'no manual' | gzip -9c | hexdump -ve '"0x" 1/1 "%02x,"'; \
echo '};'; echo 'const int manpage_sz = sizeof(manpage);') > manual.c
.else
manual.c: disklabel.cat8
- (echo 'const char manpage[] = {'; \
+ (echo 'const unsigned char manpage[] = {'; \
cat disklabel.cat8 | gzip -9c | hexdump -ve '"0x" 1/1 "%02x,"'; \
echo '};'; echo 'const int manpage_sz = sizeof(manpage);') > manual.c
.endif
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index cb7e5f643cb..4b50de2d9eb 100644
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: editor.c,v 1.102 2006/04/14 16:38:42 pedro Exp $ */
+/* $OpenBSD: editor.c,v 1.103 2006/04/26 17:09:34 deraadt Exp $ */
/*
* Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -17,7 +17,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: editor.c,v 1.102 2006/04/14 16:38:42 pedro Exp $";
+static char rcsid[] = "$OpenBSD: editor.c,v 1.103 2006/04/26 17:09:34 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -295,7 +295,7 @@ editor(struct disklabel *lp, int f, char *dev, char *fstabfile)
case 'M': {
sig_t opipe = signal(SIGPIPE, SIG_IGN);
char *pager, *cmd = NULL;
- extern const char manpage[];
+ extern const u_char manpage[];
extern const int manpage_sz;
if ((pager = getenv("PAGER")) == NULL || *pager == '\0')