Split for future dircolors

diff --git a/Makefile b/Makefile
index 2cf3c76fc844b2deca8bfa70333b47786f861582..187a51581b2d3c925e92716ab8b07693481c6183 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,14 @@
-PROG=  opendircolors
-SRCS=  convert.c
+PROGS= opendircolors dirconvert
+SRCS.opendircolors=    opendircolors.c
+SRCS.dirconvert=       dirconvert.c
+#TODO: Write manpage

 MAN=   
 
 BINDIR=/usr/local/bin
 MAN=   
 
 BINDIR=/usr/local/bin

-LINKS= ${BINDIR}/opendircolors ${BINDIR}/dircolors
+SYMLINKS=opendircolors ${BINDIR}/dircolors
+#TODO: Write manpage
+#MLINKS= opendircolors.1 dircolors.1

 
 MAKEOBJDIR=obj
 
 
 MAKEOBJDIR=obj
 

-.include <bsd.prog.mk>
+.include <bsd.progs.mk>

diff --git a/convert.c b/dirconvert.c
similarity index 95%
rename from convert.c
rename to dirconvert.c
index 004e8c48cbcb63132d075923f8179720282acf52..40c7ed1364cf0fcbd6854fb3b460b130f7435d9a 100644 (file)
--- a/convert.c
+++ b/dirconvert.c
@@ -37,10 +37,10 @@ const char *types[11] = { "di", "ln", "so", "pi", "ex", "bd", "cd", "su", "sg",
        "tw", "ow" };
 const char col[8] = "abcdefgh";
 
        "tw", "ow" };
 const char col[8] = "abcdefgh";
 

-int tolscolors(char *);
-int tols_colors(char *);
-void usage(void);
-char numtocol(char, bool);
+void   usage(void);
+int    tolscolors(char *);
+int    tols_colors(char *);
+char   numtocol(char, bool);

 
 int
 main(int argc, char **argv)
 
 int
 main(int argc, char **argv)


@@ -129,6 +129,6 @@ tols_colors(char *lscolors)
 void
 usage(void)
 {
 void
 usage(void)
 {

-       (void)fprintf(stderr, "%s\n", "usage: lscolors LSCOLORS|LS_COLORS ");
+       (void)fprintf(stderr, "usage: %s LSCOLORS|LS_COLORS\n", getprogname());

        exit(EX_USAGE);
 }
        exit(EX_USAGE);
 }

diff --git a/opendircolors.c b/opendircolors.c
new file mode 100644 (file)
index 0000000..bc1e748
--- /dev/null
+++ b/opendircolors.c
@@ -0,0 +1,61 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2021
+ *     Cameron Katri.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CAMERON KATRI AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL CAMERON KATRI OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <sysexits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <getopt.h>
+
+void   usage(void);
+
+static const struct option long_options[] =
+{
+       {"help",                no_argument,            NULL, 'h'},
+       {"bourne-shell",                no_argument,            NULL, 'b'},
+       {"sh",          no_argument,            NULL, 'b'},
+       {"print-database",              no_argument,            NULL, 'p'},
+       {NULL,          no_argument,            NULL, 0}
+};
+
+int
+main(int argc, char **argv)
+{
+       /* TODO */
+       usage();
+
+       /* NOTREACHED */
+       return 0;
+}
+
+void
+usage(void)
+{
+       (void)fprintf(stderr, "usage: %s [-bchp] [FILE]\n", getprogname());
+       exit(EX_USAGE);
+}