From efce3ace762149a406659a6d3614846a4b24c498 Mon Sep 17 00:00:00 2001 From: Cameron Katri Date: Sun, 25 Apr 2021 16:48:29 -0400 Subject: Split for future dircolors --- Makefile | 12 +++-- convert.c | 134 -------------------------------------------------------- dirconvert.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ opendircolors.c | 61 ++++++++++++++++++++++++++ 4 files changed, 203 insertions(+), 138 deletions(-) delete mode 100644 convert.c create mode 100644 dirconvert.c create mode 100644 opendircolors.c diff --git a/Makefile b/Makefile index 2cf3c76..187a515 100644 --- 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 -LINKS= ${BINDIR}/opendircolors ${BINDIR}/dircolors +SYMLINKS=opendircolors ${BINDIR}/dircolors +#TODO: Write manpage +#MLINKS= opendircolors.1 dircolors.1 MAKEOBJDIR=obj -.include +.include diff --git a/convert.c b/convert.c deleted file mode 100644 index 004e8c4..0000000 --- a/convert.c +++ /dev/null @@ -1,134 +0,0 @@ -/*- - * 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 -#include -#include -#include -#include -#include - -const char *types[11] = { "di", "ln", "so", "pi", "ex", "bd", "cd", "su", "sg", - "tw", "ow" }; -const char col[8] = "abcdefgh"; - -int tolscolors(char *); -int tols_colors(char *); -void usage(void); -char numtocol(char, bool); - -int -main(int argc, char **argv) -{ - if (argc != 2) - usage(); - - if (strchr(argv[1], '=')) - return tolscolors(argv[1]); - else - return tols_colors(argv[1]); - - /* NOTREACHED */ - return 0; -} - -int -tolscolors(char *dircolor) -{ - char *ent, *buf, *val, *val2; - char out[22] = "xxxxxxxxxxxxxxxxxxxxxx"; - bool bold = false; - - while ((ent = buf = strsep(&dircolor, ":")) != NULL) { - for (int i = 0; i < 11; i++) { - if (strncmp(ent, types[i], strlen(types[i])) == 0) { - bold = false; - while ((val = strsep(&buf, "=")) != NULL) { - while ((val2 = strsep(&val, ";")) != - NULL) { - if (strcmp(val2, "01") == 0) { - bold = true; - } else if (val2[0] == '3') { - out[2 * i] = numtocol( - val2[1], bold); - } else if (val2[0] == '4') { - out[2 * i + 1] = - numtocol( - val2[1], NULL); - } - } - } - } - } - } - printf("%s\n", out); - return 0; -} - -char -numtocol(char c, bool bold) -{ - char buf = col[strtol(&c, NULL, 10)]; - if (bold) - return toupper(buf); - else - return buf; -} - -int -tols_colors(char *lscolors) -{ - char *ls_out = strdup(""); - - for (int i = 0; i < 11; i++) { - if (lscolors[2 * i] == 'x' && lscolors[2 * i + 1] == 'x') - continue; - sprintf(ls_out + strlen(ls_out), "%s=", types[i]); - if (isupper(lscolors[2 * i])) - sprintf(ls_out + strlen(ls_out), "01;"); - if (tolower(lscolors[2 * i]) == 'x') - sprintf(ls_out + strlen(ls_out), "00"); - else if (tolower(lscolors[2 * i] != 'x')) - sprintf(ls_out + strlen(ls_out), "3%i", - (int)(strchr(col, tolower(lscolors[2 * i])) - col)); - if (tolower(lscolors[2 * i + 1]) != 'x') - sprintf(ls_out + strlen(ls_out), ";4%i", - (int)(strchr(col, tolower(lscolors[2 * i])) - col)); - sprintf(ls_out + strlen(ls_out), ":"); - } - printf("%s\n", ls_out); - free(ls_out); - return 0; -} - -void -usage(void) -{ - (void)fprintf(stderr, "%s\n", "usage: lscolors LSCOLORS|LS_COLORS "); - exit(EX_USAGE); -} diff --git a/dirconvert.c b/dirconvert.c new file mode 100644 index 0000000..40c7ed1 --- /dev/null +++ b/dirconvert.c @@ -0,0 +1,134 @@ +/*- + * 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 +#include +#include +#include +#include +#include + +const char *types[11] = { "di", "ln", "so", "pi", "ex", "bd", "cd", "su", "sg", + "tw", "ow" }; +const char col[8] = "abcdefgh"; + +void usage(void); +int tolscolors(char *); +int tols_colors(char *); +char numtocol(char, bool); + +int +main(int argc, char **argv) +{ + if (argc != 2) + usage(); + + if (strchr(argv[1], '=')) + return tolscolors(argv[1]); + else + return tols_colors(argv[1]); + + /* NOTREACHED */ + return 0; +} + +int +tolscolors(char *dircolor) +{ + char *ent, *buf, *val, *val2; + char out[22] = "xxxxxxxxxxxxxxxxxxxxxx"; + bool bold = false; + + while ((ent = buf = strsep(&dircolor, ":")) != NULL) { + for (int i = 0; i < 11; i++) { + if (strncmp(ent, types[i], strlen(types[i])) == 0) { + bold = false; + while ((val = strsep(&buf, "=")) != NULL) { + while ((val2 = strsep(&val, ";")) != + NULL) { + if (strcmp(val2, "01") == 0) { + bold = true; + } else if (val2[0] == '3') { + out[2 * i] = numtocol( + val2[1], bold); + } else if (val2[0] == '4') { + out[2 * i + 1] = + numtocol( + val2[1], NULL); + } + } + } + } + } + } + printf("%s\n", out); + return 0; +} + +char +numtocol(char c, bool bold) +{ + char buf = col[strtol(&c, NULL, 10)]; + if (bold) + return toupper(buf); + else + return buf; +} + +int +tols_colors(char *lscolors) +{ + char *ls_out = strdup(""); + + for (int i = 0; i < 11; i++) { + if (lscolors[2 * i] == 'x' && lscolors[2 * i + 1] == 'x') + continue; + sprintf(ls_out + strlen(ls_out), "%s=", types[i]); + if (isupper(lscolors[2 * i])) + sprintf(ls_out + strlen(ls_out), "01;"); + if (tolower(lscolors[2 * i]) == 'x') + sprintf(ls_out + strlen(ls_out), "00"); + else if (tolower(lscolors[2 * i] != 'x')) + sprintf(ls_out + strlen(ls_out), "3%i", + (int)(strchr(col, tolower(lscolors[2 * i])) - col)); + if (tolower(lscolors[2 * i + 1]) != 'x') + sprintf(ls_out + strlen(ls_out), ";4%i", + (int)(strchr(col, tolower(lscolors[2 * i])) - col)); + sprintf(ls_out + strlen(ls_out), ":"); + } + printf("%s\n", ls_out); + free(ls_out); + return 0; +} + +void +usage(void) +{ + (void)fprintf(stderr, "usage: %s LSCOLORS|LS_COLORS\n", getprogname()); + exit(EX_USAGE); +} diff --git a/opendircolors.c b/opendircolors.c new file mode 100644 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 +#include +#include +#include +#include + +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); +} -- cgit v1.2.3-56-ge451