From 68618a758d40b09cf2775fe881653310e1f14fdb Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Fri, 15 Jan 2021 15:06:31 -0500 Subject: Simplyify htagml match output --- bin/htagml.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/bin/htagml.c b/bin/htagml.c index b95f6a96..f6971de4 100644 --- a/bin/htagml.c +++ b/bin/htagml.c @@ -51,7 +51,7 @@ static size_t escape(bool esc, const char *ptr, size_t len) { return len; } -static char *hstrstr(char *haystack, char *needle) { +static char *hstrstr(const char *haystack, const char *needle) { while (haystack) { char *elem = strchr(haystack, '<'); char *match = strstr(haystack, needle); @@ -169,25 +169,25 @@ int main(int argc, char *argv[]) { continue; } - char *text = tag->tag; - char *match = (pipe ? hstrstr(buf, text) : strstr(buf, text)); + size_t mlen = strlen(tag->tag); + char *match = (pipe ? hstrstr : strstr)(buf, tag->tag); if (!match && tag->tag[0] == 'M') { - text = "main"; - match = (pipe ? hstrstr(buf, text) : strstr(buf, text)); + mlen = 4; + match = (pipe ? hstrstr : strstr)(buf, "main"); } - if (match) escape(!pipe, buf, match - buf); + if (!match) { + mlen = strlen(buf) - 1; + match = buf; + } + escape(!pipe, buf, match - buf); printf("tag, strlen(tag->tag)); printf("\" href=\"#"); escape(true, tag->tag, strlen(tag->tag)); printf("\">"); - if (match) { - match += escape(!pipe, match, strlen(text)); - } else { - escape(!pipe, buf, strlen(buf)); - } + match += escape(!pipe, match, mlen); printf(""); - if (match) escape(!pipe, match, strlen(match)); + escape(!pipe, match, strlen(match)); } printf(pre ? "" : index ? "\n" : ""); } -- cgit 1.4.1 ype='hidden' name='h' value='1.4.0'/>
path: root/ui-summary.c (unfollow)
Commit message (Collapse)Author
2007-05-11Makefile: add support for building w.o. preinstalled gitLars Hjemli
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-05-11Tag release v0.3Lars Hjemli
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-05-11Update README with submodule build infoLars Hjemli
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-05-11Add submodule links in tree listingLars Hjemli
When a submodule occurs in a tree, generate a link to show the module/commit. The link is specified as a sprintf string in /etc/cgitrc, using parameters 'module-link' and 'repo.module-link'. This should probably be extended with repo.module-link.$path. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-05-11Add submodules.sh and use it during buildsLars Hjemli
This adds a shell script which can be be used to initialize, list and update submodules in a git repository. It reads the file .gitmodules to find a mapping between submodule path and repository url for the initial clone of all submodules. The script is used during cgit builds to enable automatic download and checkout of the git git repository. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-05-11Added git as a submoduleLars Hjemli
This commit adds the subdirectory 'git' as a submodule containing the git git repository, but doesn't add support for automatically cloning the submodule. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-05-09Add support for downloading single blobsLars Hjemli
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-05-08ui-view: show pathname if specified in querystringLars Hjemli
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-05-08Update to libgit 1.5.2-rc2Lars Hjemli
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-02-21Layout updateLars Hjemli
2007-02-08Make snapshot feature configurableLars Hjemli
Snapshots can now be enabled/disabled by default for all repositories in cgitrc with param "snapshots". Additionally, any repo can override the default setting with param "repo.snapshots". By default, no snapshotting is enabled. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-02-08Add support for snapshotsLars Hjemli
Make a link from the commit viewer to a snapshot of the corresponding tree. Currently only zip-format is supported. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-02-05cgit v0.2Lars Hjemli
Main changes since v0.1: -list tags in repo summary -allow search in log-view -read repository paths from cgitrc Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-02-05Add support for prefix and gitsrc arguments to 'make'Lars Hjemli
This should improve the installation a little, especially since the new options are mentioned in the README. Also, add a make-rule to build the git binaries if necessary + a dependency between cgit and libgit.a. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-02-04Update cgitrc templateLars Hjemli
Make the descriptions more helpfull. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-02-04Add support for lightweight tagsLars Hjemli
There is nothing bad about a tag that has no tag-object, but the old code didn't handle such tags correctly. Fix it. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-02-04Read repo-info from /etc/cgitrcLars Hjemli
This makes cgit read all repo-info from the configfile, instead of scanning for possible git-dirs below a common root path. This is primarily done to get better security (separate physical path from logical repo-name). In /etc/cgitrc each repo is registered with the following keys: repo.url repo.name repo.path repo.desc repo.owner Note: *Required keys are repo.url and repo.path, all others are optional *Each occurrence of repo.url starts a new repository registration *Default value for repo.name is taken from repo.url *The value of repo.url cannot contain characters with special meaning for urls (i.e. one of /?%&), while repo.name can contain anything. Example: repo.url=cgit-pub repo.name=cgit/public repo.path=/pub/git/cgit repo.desc=My public cgit repo repo.owner=Lars Hjemli repo.url=cgit-priv repo.name=cgit/private repo.path=/home/larsh/src/cgit/.git repo.desc=My private cgit repo repo.owner=Lars Hjemli Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-02-04Do not die if tag has no messageLars Hjemli
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-02-03Fix search for non-virtual urlsLars Hjemli
When cgit don't use virtual urls, the current repo and page url parameters must be included in the search form as hidden input fields. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2007-01-28Update README with install/config informationLars Hjemli