From: john at keeping.me.uk (John Keeping)
Subject: [RFCv2 PATCH 4/7] ui-blame: html_ntxt with no ellipsis
Date: Sat, 23 Sep 2017 16:47:43 +0100 [thread overview]
Message-ID: <20170923154743.GD2548@john.keeping.me.uk> (raw)
In-Reply-To: <20170923033848.5922-5-whydoubt@gmail.com>
On Fri, Sep 22, 2017 at 10:38:45PM -0500, Jeff Smith wrote:
> For implementing a ui-blame page, there is need for a function that
> outputs a selection from a block of text, transformed for HTML output,
> but with no further modifications or additions.
>
> Signed-off-by: Jeff Smith <whydoubt at gmail.com>
> ---
> html.c | 37 ++++++++++++++++---------------------
> html.h | 1 +
> ui-repolist.c | 2 +-
> 3 files changed, 18 insertions(+), 22 deletions(-)
>
> diff --git a/html.c b/html.c
> index e7e6e07..345300e 100644
> --- a/html.c
> +++ b/html.c
> @@ -122,10 +122,10 @@ void html_vtxtf(const char *format, va_list ap)
> strbuf_release(&buf);
> }
>
> -void html_txt(const char *txt)
> +static int _html_txt(int len, const char *txt)
This should use ssize_t not int.
> {
> const char *t = txt;
> - while (t && *t) {
> + while (t && *t && len--) {
> int c = *t;
> if (c == '<' || c == '>' || c == '&') {
> html_raw(txt, t - txt);
> @@ -140,29 +140,24 @@ void html_txt(const char *txt)
> t++;
> }
> if (t != txt)
> - html(txt);
> + html_raw(txt, t - txt);
> + return len;
> +}
> +
> +void html_txt(const char *txt)
> +{
> + if (txt)
> + _html_txt(strlen(txt), txt);
> }
>
> void html_ntxt(int len, const char *txt)
> {
> - const char *t = txt;
> - while (t && *t && len--) {
> - int c = *t;
> - if (c == '<' || c == '>' || c == '&') {
> - html_raw(txt, t - txt);
> - if (c == '>')
> - html(">");
> - else if (c == '<')
> - html("<");
> - else if (c == '&')
> - html("&");
> - txt = t + 1;
> - }
> - t++;
> - }
> - if (t != txt)
> - html_raw(txt, t - txt);
> - if (len < 0)
> + _html_txt(len, txt);
Why bother with this wrapper function? Just make html_ntxt be _html_txt
and ignore the result everywhere except html_ntxt_ellipsis.
> +}
> +
> +void html_ntxt_ellipsis(int len, const char *txt)
> +{
> + if (_html_txt(len, txt) < 0)
> html("...");
> }
>
> diff --git a/html.h b/html.h
> index 1b24e55..de53430 100644
> --- a/html.h
> +++ b/html.h
> @@ -20,6 +20,7 @@ extern void html_attrf(const char *format,...);
>
> extern void html_txt(const char *txt);
> extern void html_ntxt(int len, const char *txt);
> +extern void html_ntxt_ellipsis(int len, const char *txt);
> extern void html_attr(const char *txt);
> extern void html_url_path(const char *txt);
> extern void html_url_arg(const char *txt);
> diff --git a/ui-repolist.c b/ui-repolist.c
> index 7272e87..77c33fd 100644
> --- a/ui-repolist.c
> +++ b/ui-repolist.c
> @@ -329,7 +329,7 @@ void cgit_print_repolist(void)
> repourl = cgit_repourl(ctx.repo->url);
> html_link_open(repourl, NULL, NULL);
> free(repourl);
> - html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
> + html_ntxt_ellipsis(ctx.cfg.max_repodesc_len, ctx.repo->desc);
> html_link_close();
> html("</td><td>");
> if (ctx.cfg.enable_index_owner) {
next prev parent reply other threads:[~2017-09-23 15:47 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-08 2:18 [RFC PATCH 0/4] Add ui-blame whydoubt
2017-06-08 2:18 ` [RFC PATCH 1/4] git: update to v2.14 whydoubt
2017-07-22 11:25 ` john
2017-06-08 2:18 ` [RFC PATCH 2/4] ui-blame: create placeholder and links whydoubt
2017-07-22 11:31 ` john
2017-06-08 2:18 ` [RFC PATCH 3/4] ui-blame: create needed html_ntxt_noellipsis function whydoubt
2017-07-22 11:36 ` john
2017-06-08 2:18 ` [RFC PATCH 4/4] ui-blame: fill in the contents whydoubt
2017-07-05 8:32 ` list
2017-07-22 11:47 ` john
2017-06-08 9:00 ` [RFC PATCH 0/4] Add ui-blame list
2017-07-22 12:02 ` john
2017-08-05 0:23 ` dlcampbell
2017-08-05 0:57 ` whydoubt
2017-08-24 18:14 ` list
2017-08-31 13:05 ` whydoubt
2017-09-23 3:38 ` [RFCv2 PATCH 0/7] " whydoubt
2017-09-23 3:38 ` [RFCv2 PATCH 1/7] ui-blame: create enable-blame config item whydoubt
2017-09-23 15:46 ` john
2017-09-24 3:12 ` whydoubt
2017-09-23 3:38 ` [RFCv2 PATCH 2/7] ui-blame: create framework whydoubt
2017-09-23 15:47 ` john
2017-09-24 3:24 ` whydoubt
2017-09-23 3:38 ` [RFCv2 PATCH 3/7] ui-blame: create links whydoubt
2017-09-23 15:47 ` john
2017-09-24 20:25 ` whydoubt
2017-09-23 3:38 ` [RFCv2 PATCH 4/7] ui-blame: html_ntxt with no ellipsis whydoubt
2017-09-23 15:47 ` john [this message]
2017-09-23 3:38 ` [RFCv2 PATCH 5/7] ui-blame: pull blame info from libgit whydoubt
2017-09-23 15:47 ` john
2017-09-24 19:06 ` whydoubt
2017-09-24 20:09 ` whydoubt
2017-09-24 20:52 ` john
2017-09-23 3:38 ` [RFCv2 PATCH 6/7] ui-blame: begin building whydoubt
2017-09-23 3:38 ` [RFCv2 PATCH 7/7] ui-blame: generate blame page when requested whydoubt
2017-09-23 15:53 ` [RFCv2 PATCH 0/7] Add ui-blame john
2017-09-24 3:05 ` whydoubt
2017-09-27 22:43 ` [PATCH 0/5] " whydoubt
2017-09-27 22:43 ` [PATCH 1/5] html: html_ntxt with no ellipsis whydoubt
2017-09-30 11:55 ` john
2017-09-27 22:43 ` [PATCH 2/5] ui-tree: move set_title_from_path to ui-shared whydoubt
2017-09-30 11:56 ` john
2017-09-27 22:43 ` [PATCH 3/5] ui-shared: make a char* parameter const whydoubt
2017-09-30 12:00 ` john
2017-09-27 22:43 ` [PATCH 4/5] ui-blame: add blame UI whydoubt
2017-09-30 12:07 ` john
2017-09-27 22:43 ` [PATCH 5/5] ui-tree: link to blame UI if enabled whydoubt
2017-09-30 12:08 ` john
2017-09-30 12:10 ` [PATCH 0/5] Add ui-blame john
2017-10-02 1:17 ` Jason
2017-10-02 5:34 ` list
2017-10-02 22:35 ` whydoubt
2017-10-02 23:29 ` list
2017-10-03 18:22 ` john
2017-10-03 18:23 ` Jason
2017-10-03 18:36 ` Jason
2017-10-03 19:06 ` whydoubt
2017-10-02 4:39 ` [PATCHv2 " whydoubt
2017-10-02 4:39 ` [PATCHv2 1/5] html: html_ntxt with no ellipsis whydoubt
2017-10-02 4:39 ` [PATCHv2 2/5] ui-tree: move set_title_from_path to ui-shared whydoubt
2017-10-02 4:39 ` [PATCHv2 3/5] ui-shared: make a char* parameter const whydoubt
2017-10-02 4:39 ` [PATCHv2 4/5] ui-blame: add blame UI whydoubt
2017-10-02 4:39 ` [PATCHv2 5/5] ui-tree: link to blame UI if enabled whydoubt
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=20170923154743.GD2548@john.keeping.me.uk \
--to=cgit@lists.zx2c4.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).