Break out main to an own file so we can include ls in ftpd.

3 files changed, 22 insertions, 5 deletions

diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index bc39afbd239..c0e1ac9ef4e 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.4 1997/09/21 11:35:17 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 1999/02/23 23:54:16 art Exp $
 
 PROG=	ls
-SRCS=	cmp.c stat_flags.c ls.c print.c util.c
+SRCS=	cmp.c stat_flags.c ls.c main.c print.c util.c
 
 .include <bsd.prog.mk>
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 17c83dba1a3..fba7361f76b 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ls.c,v 1.10 1999/02/20 18:59:25 deraadt Exp $	*/
+/*	$OpenBSD: ls.c,v 1.11 1999/02/23 23:54:17 art Exp $	*/
 /*	$NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)ls.c	8.7 (Berkeley) 8/5/94";
 #else
-static char rcsid[] = "$OpenBSD: ls.c,v 1.10 1999/02/20 18:59:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ls.c,v 1.11 1999/02/23 23:54:17 art Exp $";
 #endif
 #endif /* not lint */
 
@@ -113,7 +113,7 @@ int f_whiteout;			/* show whiteout entries */
 int rval;
 
 int
-main(argc, argv)
+ls_main(argc, argv)
 	int argc;
 	char *argv[];
 {
diff --git a/bin/ls/main.c b/bin/ls/main.c
new file mode 100644
index 00000000000..21a35e85730
--- /dev/null
+++ b/bin/ls/main.c
@@ -0,0 +1,17 @@
+/*	$OpenBSD: main.c,v 1.1 1999/02/23 23:54:17 art Exp $	*/
+
+/*
+ * Public domain - no warranty.
+ */
+
+#include <sys/cdefs.h>
+
+int ls_main __P((int argc, char **argv));
+
+int
+main(argc, argv)
+	int argc;
+	char **argv;
+{
+	return ls_main(argc, argv);
+}