ls-1-Allow-LSCOLORS-to-specify-an-underline.patch

   1 From f873a0a04c981fbcc7879bcefe355fbbfd1a8adb Mon Sep 17 00:00:00 2001
   2 From: Cameron Katri <me@cameronkatri.com>
   3 Date: Fri, 28 May 2021 17:56:48 -0400
   4 Subject: [PATCH] ls(1): Allow LSCOLORS to specify an underline
   5
   6 Summary: Allows capitalizing the background color character to unable an underline instead of bold, capitalizing the foreground color char will still do bold.
   7
   8 Differential Revision: https://reviews.freebsd.org/D30547
   9 ---
  10  bin/ls/extern.h |  1 +
  11  bin/ls/ls.1     | 19 +++++++++++--------
  12  bin/ls/ls.c     |  2 ++
  13  bin/ls/print.c  | 16 ++++++++++++++--
  14  4 files changed, 28 insertions(+), 10 deletions(-)
  15
  16 diff --git a/bin/ls/extern.h b/bin/ls/extern.h
  17 index 8dab2bcc9d8..247c2c4a1d5 100644
  18 --- a/bin/ls/extern.h
  19 +++ b/bin/ls/extern.h
  20 @@ -66,6 +66,7 @@ extern        char    *ansi_bgcol;
  21  extern char    *ansi_coloff;
  22  extern char    *attrs_off;
  23  extern char    *enter_bold;
  24 +extern char    *enter_underline;
  25
  26  extern int      colorflag;
  27  extern bool     explicitansi;
  28 diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
  29 index 8510ca609cd..ef412dd2927 100644
  30 --- a/bin/ls/ls.1
  31 +++ b/bin/ls/ls.1
  32 @@ -740,6 +740,7 @@ where
  33  is the foreground color and
  34  .Ar b
  35  is the background color.
  36 +When the background color is capitalized, the text will underlined.
  37  .Pp
  38  The color designators are as follows:
  39  .Pp
  40 @@ -761,23 +762,25 @@ cyan
  41  .It Sy h
  42  light grey
  43  .It Sy A
  44 -bold black, usually shows up as dark grey
  45 +bold or underlined black, usually shows up as dark grey
  46  .It Sy B
  47 -bold red
  48 +bold or underlined red
  49  .It Sy C
  50 -bold green
  51 +bold or underlined green
  52  .It Sy D
  53 -bold brown, usually shows up as yellow
  54 +bold or underlined brown, usually shows up as yellow
  55  .It Sy E
  56 -bold blue
  57 +bold or underlined blue
  58  .It Sy F
  59 -bold magenta
  60 +bold or underlined magenta
  61  .It Sy G
  62 -bold cyan
  63 +bold or underlined cyan
  64  .It Sy H
  65 -bold light grey; looks like bright white
  66 +bold or underlined light grey; looks like bright white
  67  .It Sy x
  68  default foreground or background
  69 +.It Sy X
  70 +default foreground or background, with an underline or bold
  71  .El
  72  .Pp
  73  Note that the above are standard
  74 diff --git a/bin/ls/ls.c b/bin/ls/ls.c
  75 index 338b3d1d2a2..67cb91fdcde 100644
  76 --- a/bin/ls/ls.c
  77 +++ b/bin/ls/ls.c
  78 @@ -161,6 +161,7 @@ char *ansi_fgcol;           /* ANSI sequence to set foreground colour */
  79  char *ansi_coloff;             /* ANSI sequence to reset colours */
  80  char *attrs_off;               /* ANSI sequence to turn off attributes */
  81  char *enter_bold;              /* ANSI sequence to set color to bold mode */
  82 +char *enter_underline;         /* ANSI sequence to enter underline mode */
  83  #endif
  84
  85  static int rval;
  86 @@ -485,6 +486,7 @@ main(int argc, char *argv[])
  87                         ansi_bgcol = tgetstr("AB", &bp);
  88                         attrs_off = tgetstr("me", &bp);
  89                         enter_bold = tgetstr("md", &bp);
  90 +                       enter_underline = tgetstr("us", &bp);
  91
  92                         /* To switch colours off use 'op' if
  93                          * available, otherwise use 'oc', or
  94 diff --git a/bin/ls/print.c b/bin/ls/print.c
  95 index 9a537418f7b..da92668d5c5 100644
  96 --- a/bin/ls/print.c
  97 +++ b/bin/ls/print.c
  98 @@ -107,6 +107,7 @@ static const char *defcolors = "exfxcxdxbxegedabagacad";
  99  static struct {
 100         int     num[2];
 101         int     bold;
 102 +       int     underline;
 103  } colors[C_NUMCOLORS];
 104  #endif
 105
 106 @@ -548,6 +549,8 @@ printcolor_termcap(Colors c)
 107
 108         if (colors[c].bold)
 109                 tputs(enter_bold, 1, putch);
 110 +       if (colors[c].underline)
 111 +               tputs(enter_underline, 1, putch);
 112
 113         if (colors[c].num[0] != -1) {
 114                 ansiseq = tgoto(ansi_fgcol, 0, colors[c].num[0]);
 115 @@ -569,6 +572,8 @@ printcolor_ansi(Colors c)
 116
 117         if (colors[c].bold)
 118                 printf("1");
 119 +       if (colors[c].underline)
 120 +               printf(";4");
 121         if (colors[c].num[0] != -1)
 122                 printf(";3%d", colors[c].num[0]);
 123         if (colors[c].num[1] != -1)
 124 @@ -667,6 +672,7 @@ parsecolors(const char *cs)
 125         len = strlen(cs);
 126         for (i = 0; i < (int)C_NUMCOLORS; i++) {
 127                 colors[i].bold = 0;
 128 +               colors[i].underline = 0;
 129
 130                 if (len <= 2 * (size_t)i) {
 131                         c[0] = defcolors[2 * i];
 132 @@ -689,9 +695,15 @@ parsecolors(const char *cs)
 133                                 colors[i].num[j] = c[j] - 'a';
 134                         else if (c[j] >= 'A' && c[j] <= 'H') {
 135                                 colors[i].num[j] = c[j] - 'A';
 136 -                               colors[i].bold = 1;
 137 -                       } else if (tolower((unsigned char)c[j]) == 'x')
 138 +                               if (j)
 139 +                                       colors[i].underline = 1;
 140 +                               else
 141 +                                       colors[i].bold = 1;
 142 +                       } else if (tolower((unsigned char)c[j]) == 'x') {
 143 +                               if (j && c[j] == 'X')
 144 +                                       colors[i].underline = 1;
 145                                 colors[i].num[j] = -1;
 146 +                       }
 147                         else {
 148                                 warnx("invalid character '%c' in LSCOLORS"
 149                                     " env var", c[j]);
 150 --
 151 2.31.1
 152