Re: [PATCH v2 03/17] ls_colors.c: add function to color a file name

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Mar 26, 2014 at 9:48 AM, Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> 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@xxxxxxxxx>
> ---
>  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@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]