summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlum <lum@cvs.openbsd.org>2011-01-18 17:35:43 +0000
committerlum <lum@cvs.openbsd.org>2011-01-18 17:35:43 +0000
commitb85241cdf21728bcdde79dd450cee2ff7db29e9d (patch)
treee9ea43f9575220c2f989cb223c57fff33f22db4d
parent64e2dc73c0d4aac711a7755a1225586da3f9f0f9 (diff)
Add missing prototypes and move dired.c to "extensions" in Makefile.
ok kjell@
-rw-r--r--usr.bin/mg/Makefile6
-rw-r--r--usr.bin/mg/buffer.c4
-rw-r--r--usr.bin/mg/cmode.c3
-rw-r--r--usr.bin/mg/dired.c3
4 files changed, 10 insertions, 6 deletions
diff --git a/usr.bin/mg/Makefile b/usr.bin/mg/Makefile
index e97986db8b0..d90fadeedcf 100644
--- a/usr.bin/mg/Makefile
+++ b/usr.bin/mg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2008/12/17 10:27:33 sobrado Exp $
+# $OpenBSD: Makefile,v 1.23 2011/01/18 17:35:42 lum Exp $
PROG= mg
@@ -15,7 +15,7 @@ DPADD+= ${LIBCURSES}
#
CFLAGS+=-Wall -DFKEYS -DREGEX -DXKEYS
-SRCS= autoexec.c basic.c buffer.c cinfo.c dir.c dired.c display.c \
+SRCS= autoexec.c basic.c buffer.c cinfo.c dir.c display.c \
echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \
line.c macro.c main.c match.c modes.c paragraph.c random.c \
re_search.c region.c search.c spawn.c tty.c ttyio.c ttykbd.c \
@@ -24,6 +24,6 @@ SRCS= autoexec.c basic.c buffer.c cinfo.c dir.c dired.c display.c \
#
# More or less standalone extensions.
#
-SRCS+= cmode.c grep.c theo.c
+SRCS+= cmode.c dired.c grep.c theo.c
.include <bsd.prog.mk>
diff --git a/usr.bin/mg/buffer.c b/usr.bin/mg/buffer.c
index 4e8134e080a..2490250cea5 100644
--- a/usr.bin/mg/buffer.c
+++ b/usr.bin/mg/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.74 2010/06/30 19:12:54 oga Exp $ */
+/* $OpenBSD: buffer.c,v 1.75 2011/01/18 17:35:42 lum Exp $ */
/* This file is in the public domain. */
@@ -15,6 +15,8 @@
static struct buffer *makelist(void);
static struct buffer *bnew(const char *);
+static int usebufname(const char *);
+
/* Flag for global working dir */
extern int globalwd;
diff --git a/usr.bin/mg/cmode.c b/usr.bin/mg/cmode.c
index 07a44735fc6..7fae1aa15d1 100644
--- a/usr.bin/mg/cmode.c
+++ b/usr.bin/mg/cmode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmode.c,v 1.6 2008/12/17 10:28:27 sobrado Exp $ */
+/* $OpenBSD: cmode.c,v 1.7 2011/01/18 17:35:42 lum Exp $ */
/*
* This file is in the public domain.
*
@@ -30,6 +30,7 @@ static int findcolpos(const struct buffer *, const struct line *, int);
static struct line *findnonblank(struct line *);
static int isnonblank(const struct line *, int);
+void cmode_init(void);
int cc_comment(int, int);
/* Keymaps */
diff --git a/usr.bin/mg/dired.c b/usr.bin/mg/dired.c
index eb5357dcd65..03e60bb358f 100644
--- a/usr.bin/mg/dired.c
+++ b/usr.bin/mg/dired.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dired.c,v 1.46 2010/06/26 16:18:43 kjell Exp $ */
+/* $OpenBSD: dired.c,v 1.47 2011/01/18 17:35:42 lum Exp $ */
/* This file is in the public domain. */
@@ -36,6 +36,7 @@ static int d_rename(int, int);
static int d_shell_command(int, int);
static int d_create_directory(int, int);
static int d_makename(struct line *, char *, size_t);
+static void reaper(int);
extern struct keymap_s helpmap, cXmap, metamap;