Re: ls(1): Missing fts_close(3)

[Ingo Schwarze]

Hi,

the file ls/main.c is a joke.

Minus one file, minus 15 lines of code, no functional change.

OK?
  Ingo


Index: Makefile
===================================================================
RCS file: /cvs/src/bin/ls/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile    6 Aug 2003 19:09:09 -0000       1.7
+++ Makefile    24 Jun 2015 03:35:00 -0000
@@ -1,7 +1,7 @@
 #      $OpenBSD: Makefile,v 1.7 2003/08/06 19:09:09 tedu Exp $
 
 PROG=  ls
-SRCS=  cmp.c ls.c main.c print.c util.c
+SRCS=  cmp.c ls.c print.c util.c
 DPADD= ${LIBUTIL}
 LDADD= -lutil
 
Index: ls.c
===================================================================
RCS file: /cvs/src/bin/ls/ls.c,v
retrieving revision 1.40
diff -u -p -r1.40 ls.c
--- ls.c        18 Apr 2015 18:28:36 -0000      1.40
+++ ls.c        24 Jun 2015 03:35:00 -0000
@@ -95,7 +95,7 @@ int f_typedir;                        /* add type character f
 int rval;
 
 int
-ls_main(int argc, char *argv[])
+main(int argc, char *argv[])
 {
        static char dot[] = ".", *dotav[] = { dot, NULL };
        struct winsize win;
Index: ls.h
===================================================================
RCS file: /cvs/src/bin/ls/ls.h,v
retrieving revision 1.9
diff -u -p -r1.9 ls.h
--- ls.h        30 May 2013 16:34:32 -0000      1.9
+++ ls.h        24 Jun 2015 03:35:00 -0000
@@ -73,5 +73,3 @@ typedef struct {
        char *flags;
        char data[1];
 } NAMES;
-
-int    ls_main(int, char *[]);
Index: main.c
===================================================================
RCS file: main.c
diff -N main.c
--- main.c      4 Dec 2012 02:27:00 -0000       1.4
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-/*     $OpenBSD: main.c,v 1.4 2012/12/04 02:27:00 deraadt Exp $        */
-
-/*
- * Public domain - no warranty.
- */
-
-int ls_main(int argc, char **argv);
-
-int
-main(int argc, char *argv[])
-{
-       return ls_main(argc, argv);
-}