git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH v2 03/17] ls_colors.c: add function to color a file name
Date: Wed, 26 Mar 2014 15:14:44 -0400	[thread overview]
Message-ID: <CAPig+cSSrc6=nX2=2BpaFRzT4Evf67kuXM8rKBTSkB6JrNN0yQ@mail.gmail.com> (raw)
In-Reply-To: <1395841697-11742-4-git-send-email-pclouds@gmail.com>

On Wed, Mar 26, 2014 at 9:48 AM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
> Tthe new function is based on print_color_indicator() from commit

s/Tthe/The/

> 7326d1f1a67edf21947ae98194f98c38b6e9e527 in coreutils.git.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
>  color.h     |  2 ++
>  ls_colors.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 68 insertions(+)
>
> diff --git a/color.h b/color.h
> index 640fc48..398369a 100644
> --- a/color.h
> +++ b/color.h
> @@ -94,5 +94,7 @@ void color_print_strbuf(FILE *fp, const char *color, const struct strbuf *sb);
>  int color_is_nil(const char *color);
>
>  void parse_ls_color(void);
> +void color_filename(struct strbuf *sb, const char *name,
> +                   const char *display_name, mode_t mode, int linkok);
>
>  #endif /* COLOR_H */
> diff --git a/ls_colors.c b/ls_colors.c
> index cef5a92..1125329 100644
> --- a/ls_colors.c
> +++ b/ls_colors.c
> @@ -422,3 +422,69 @@ void parse_ls_color(void)
>                 color_symlink_as_referent = 1;
>         git_config(ls_colors_config, NULL);
>  }
> +
> +void color_filename(struct strbuf *sb, const char *name,
> +                   const char *display_name, mode_t mode, int linkok)
> +{
> +       int type;
> +       struct color_ext_type *ext;     /* Color extension */
> +
> +       if (S_ISREG (mode)) {
> +               type = LS_FL;
> +               if ((mode & S_ISUID) != 0)
> +                       type = LS_SU;
> +               else if ((mode & S_ISGID) != 0)
> +                       type = LS_SG;
> +               else if ((mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != 0)
> +                       type = LS_EX;
> +       } else if (S_ISDIR (mode)) {
> +               if ((mode & S_ISVTX) && (mode & S_IWOTH))
> +                       type = LS_TW;
> +               else if ((mode & S_IWOTH) != 0)
> +                       type = LS_OW;
> +               else if ((mode & S_ISVTX) != 0)
> +                       type = LS_ST;
> +               else
> +                       type = LS_DI;
> +       } else if (S_ISLNK (mode))
> +               type = (!linkok && *ls_colors[LS_OR]) ? LS_OR : LS_LN;
> +       else if (S_ISFIFO (mode))
> +               type = LS_PI;
> +       else if (S_ISSOCK (mode))
> +               type = LS_SO;
> +       else if (S_ISBLK (mode))
> +               type = LS_BD;
> +       else if (S_ISCHR (mode))
> +               type = LS_CD;
> +#ifdef S_ISDOOR
> +       else if (S_ISDOOR (mode))
> +               type = LS_DO;
> +#endif
> +       else
> +               /* Classify a file of some other type as C_ORPHAN.  */
> +               type = LS_OR;
> +
> +       /* Check the file's suffix only if still classified as C_FILE.  */
> +       ext = NULL;
> +       if (type == LS_FL) {
> +               /* Test if NAME has a recognized suffix.  */
> +               size_t len = strlen(name);
> +               const char *p = name + len;             /* Pointer to final \0.  */
> +               for (ext = color_ext_list; ext != NULL; ext = ext->next) {
> +                       if (ext->ext.len <= len &&
> +                           !strncmp(p - ext->ext.len, ext->ext.string, ext->ext.len))
> +                               break;
> +               }
> +       }
> +
> +       if (display_name)
> +               name = display_name;
> +       if (ext)
> +               strbuf_addf(sb, "\033[%.*sm%s%s",
> +                           (int)ext->seq.len, ext->seq.string,
> +                           name, GIT_COLOR_RESET);
> +       else if (*ls_colors[type])
> +               strbuf_addf(sb, "%s%s%s", ls_colors[type], name, GIT_COLOR_RESET);
> +       else
> +               strbuf_addstr(sb, name);
> +}
> --
> 1.9.1.345.ga1a145c
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

  reply	other threads:[~2014-03-26 19:14 UTC|newest]

Thread overview: 79+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-20 10:15 [PATCH/RFC 0/8] git-ls Nguyễn Thái Ngọc Duy
2014-03-20 10:15 ` [PATCH 1/8] Import $LS_COLORS parsing code from coreutils Nguyễn Thái Ngọc Duy
2014-03-20 19:09   ` David Tran
2014-03-21 11:54     ` Duy Nguyen
2014-03-21 20:01       ` David Tran
2014-03-20 10:15 ` [PATCH 2/8] ls_colors.c: a bit of document on print_color_indicator input Nguyễn Thái Ngọc Duy
2014-03-20 10:15 ` [PATCH 3/8] ls_colors.c: enable coloring on u+x files Nguyễn Thái Ngọc Duy
2014-03-20 11:46   ` Matthieu Moy
2014-03-20 12:14     ` Duy Nguyen
2014-03-20 17:41       ` Junio C Hamano
2014-03-21 11:52         ` Duy Nguyen
2014-03-20 10:15 ` [PATCH 4/8] ls_colors.c: new color descriptors Nguyễn Thái Ngọc Duy
2014-03-20 10:15 ` [PATCH 5/8] ls-files: add --color to highlight based on $LS_COLORS Nguyễn Thái Ngọc Duy
2014-03-20 10:15 ` [PATCH 6/8] ls-files: add --column Nguyễn Thái Ngọc Duy
2014-03-25 11:34   ` Matthieu Moy
2014-03-20 10:15 ` [PATCH 7/8] ls-files: support --max-depth Nguyễn Thái Ngọc Duy
2014-03-25  8:55   ` Matthieu Moy
2014-03-25 11:15     ` Duy Nguyen
2014-03-27 14:36       ` Duy Nguyen
2014-03-28 13:52       ` Matthieu Moy
2014-03-28 14:15         ` Duy Nguyen
2014-03-28 14:38           ` Duy Nguyen
2014-03-20 10:15 ` [PATCH 8/8] Add git-ls, a user friendly version of ls-files and more Nguyễn Thái Ngọc Duy
2014-03-20 11:56   ` Matthieu Moy
2014-03-26 13:48 ` [PATCH v2 00/17] git-ls Nguyễn Thái Ngọc Duy
2014-03-26 13:48   ` [PATCH v2 01/17] ls_colors.c: add $LS_COLORS parsing code Nguyễn Thái Ngọc Duy
2014-03-26 13:48   ` [PATCH v2 02/17] ls_colors.c: parse color.ls.* from config file Nguyễn Thái Ngọc Duy
2014-03-26 13:48   ` [PATCH v2 03/17] ls_colors.c: add function to color a file name Nguyễn Thái Ngọc Duy
2014-03-26 19:14     ` Eric Sunshine [this message]
2014-03-26 13:48   ` [PATCH v2 04/17] ls_colors.c: highlight submodules like directories Nguyễn Thái Ngọc Duy
2014-03-26 13:48   ` [PATCH v2 05/17] ls-files: buffer full item in strbuf before printing Nguyễn Thái Ngọc Duy
2014-03-26 19:22     ` Eric Sunshine
2014-03-26 23:18       ` Duy Nguyen
2014-03-27  5:22         ` Eric Sunshine
2014-03-26 13:48   ` [PATCH v2 06/17] ls-files: add --color to highlight file names Nguyễn Thái Ngọc Duy
2014-03-26 19:13     ` Eric Sunshine
2014-03-26 23:15       ` Duy Nguyen
2014-03-28  0:49         ` Eric Sunshine
2014-03-26 13:48   ` [PATCH v2 07/17] ls-files: add --column Nguyễn Thái Ngọc Duy
2014-03-26 19:46     ` Eric Sunshine
2014-03-26 13:48   ` [PATCH v2 08/17] ls-files: support --max-depth Nguyễn Thái Ngọc Duy
2014-03-26 19:50     ` Eric Sunshine
2014-03-26 13:48   ` [PATCH v2 09/17] ls-files: split main ls-files logic into ls_files() function Nguyễn Thái Ngọc Duy
2014-03-26 13:48   ` [PATCH v2 10/17] Add git-ls, a user friendly version of ls-files and more Nguyễn Thái Ngọc Duy
2014-03-26 20:16     ` Eric Sunshine
2014-03-26 13:48   ` [PATCH v2 11/17] ls: -u does not imply showing stages Nguyễn Thái Ngọc Duy
2014-03-26 13:48   ` [PATCH v2 12/17] ls: add -R/--recursive short for --max-depth=-1 Nguyễn Thái Ngọc Duy
2014-03-26 13:48   ` [PATCH v2 13/17] ls: add -1 short for --no-column in the spirit of GNU ls Nguyễn Thái Ngọc Duy
2014-03-28  3:52     ` Eric Sunshine
2014-03-26 13:48   ` [PATCH v2 14/17] ls: add -t back Nguyễn Thái Ngọc Duy
2014-03-26 13:48   ` [PATCH v2 15/17] ls: sort output and remove duplicates Nguyễn Thái Ngọc Duy
2014-03-26 13:48   ` [PATCH v2 16/17] ls: do not show duplicate cached entries Nguyễn Thái Ngọc Duy
2014-03-28  4:04     ` Eric Sunshine
2014-03-28 13:18       ` [PATCH] ls-files: do not trust stat info if lstat() fails Nguyễn Thái Ngọc Duy
2014-04-02 18:15         ` Junio C Hamano
2014-04-03 12:40           ` Duy Nguyen
2014-04-03 16:30             ` Junio C Hamano
2014-04-05  8:03               ` Duy Nguyen
2014-04-07 17:13                 ` Junio C Hamano
2014-03-26 13:48   ` [PATCH v2 17/17] ls: show directories as well as files Nguyễn Thái Ngọc Duy
2014-03-30 13:55   ` [PATCH v3 00/18] git-ls Nguyễn Thái Ngọc Duy
2014-03-30 13:55     ` [PATCH v3 01/18] ls_colors.c: add $LS_COLORS parsing code Nguyễn Thái Ngọc Duy
2014-03-30 13:55     ` [PATCH v3 02/18] ls_colors.c: parse color.ls.* from config file Nguyễn Thái Ngọc Duy
2014-03-30 13:55     ` [PATCH v3 03/18] ls_colors.c: add a function to color a file name Nguyễn Thái Ngọc Duy
2014-03-30 13:55     ` [PATCH v3 04/18] ls_colors.c: highlight submodules like directories Nguyễn Thái Ngọc Duy
2014-03-30 13:55     ` [PATCH v3 05/18] ls-files: buffer full item in strbuf before printing Nguyễn Thái Ngọc Duy
2014-03-30 13:55     ` [PATCH v3 06/18] ls-files: add --color to highlight file names Nguyễn Thái Ngọc Duy
2014-03-30 13:55     ` [PATCH v3 07/18] ls-files: add --column Nguyễn Thái Ngọc Duy
2014-03-30 13:55     ` [PATCH v3 08/18] ls-files: support --max-depth Nguyễn Thái Ngọc Duy
2014-03-30 13:56     ` [PATCH v3 09/18] Add git-list-files, a user friendly version of ls-files and more Nguyễn Thái Ngọc Duy
2014-03-30 13:56     ` [PATCH v3 10/18] list-files: -u does not imply showing stages Nguyễn Thái Ngọc Duy
2014-03-30 13:56     ` [PATCH v3 11/18] list-files: add -R/--recursive short for --max-depth=-1 Nguyễn Thái Ngọc Duy
2014-03-30 13:56     ` [PATCH v3 12/18] list-files: add -1 short for --no-column Nguyễn Thái Ngọc Duy
2014-03-30 13:56     ` [PATCH v3 13/18] list-files: add -t back Nguyễn Thái Ngọc Duy
2014-03-30 13:56     ` [PATCH v3 14/18] list-files: sort output and remove duplicates Nguyễn Thái Ngọc Duy
2014-03-30 13:56     ` [PATCH v3 15/18] list-files: do not show duplicate cached entries Nguyễn Thái Ngọc Duy
2014-03-30 13:56     ` [PATCH v3 16/18] list-files: show directories as well as files Nguyễn Thái Ngọc Duy
2014-03-30 13:56     ` [PATCH v3 17/18] list-files: add -F/--classify Nguyễn Thái Ngọc Duy
2014-03-30 13:56     ` [PATCH v3 18/18] list-files -F: show submodules with the new indicator '&' Nguyễn Thái Ngọc Duy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAPig+cSSrc6=nX2=2BpaFRzT4Evf67kuXM8rKBTSkB6JrNN0yQ@mail.gmail.com' \
    --to=sunshine@sunshineco.com \
    --cc=git@vger.kernel.org \
    --cc=pclouds@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).