Merge branch 'lh/section-from-path'

Conflicts:
	scan-tree.c

diff --combined cgit.c
index 04cef23d0d0f27b4a7c9fa663bb9c7e425e23ebf,5666875d21509b90eb3659ccfbbce3b3db7d5a90..e1d2216ffb3ae32b3a343cb677647fb716c01a40
--- 1/cgit.c
--- 2/cgit.c
+++ b/cgit.c
@@@ -72,7 -72,11 +72,7 @@@ void repo_config(struct cgit_repo *repo
        else if (!strcmp(name, "section"))
                repo->section = xstrdup(value);
        else if (!strcmp(name, "readme") && value != NULL) {
 -              char *colon;
 -              if (*value == '/' || ((colon = strchr(value, ':')) != NULL && colon != value && *(colon + 1) != '\0'))
 -                      repo->readme = xstrdup(value);
 -              else
 -                      repo->readme = xstrdup(fmt("%s/%s", repo->path, value));
 +              repo->readme = xstrdup(value);
        } else if (ctx.cfg.enable_filter_overrides) {
                if (!strcmp(name, "about-filter"))
                        repo->about_filter = new_filter(value, 0);
@@@ -93,8 -97,6 +93,8 @@@ void config_cb(const char *name, const 
                ctx.repo->path = trim_end(value, '/');
        else if (ctx.repo && !prefixcmp(name, "repo."))
                repo_config(ctx.repo, name + 5, value);
 +      else if (!strcmp(name, "readme"))
 +              ctx.cfg.readme = xstrdup(value);
        else if (!strcmp(name, "root-title"))
                ctx.cfg.root_title = xstrdup(value);
        else if (!strcmp(name, "root-desc"))
@@@ -193,6 -195,8 +193,8 @@@
                                      ctx.cfg.project_list, repo_config);
                else
                        scan_tree(expand_macros(value), repo_config);
+       else if (!strcmp(name, "section-from-path"))
+               ctx.cfg.section_from_path = atoi(value);
        else if (!strcmp(name, "source-filter"))
                ctx.cfg.source_filter = new_filter(value, 1);
        else if (!strcmp(name, "summary-log"))

diff --combined cgit.h
index 72fb1c700fe90e86e34ae7046b9d972094cee79f,9b269ccff46762ee619fedbd389bc7c2aeec642c..f8076c58061cdde0a1656006525e6e5c58f96b56
--- 1/cgit.h
--- 2/cgit.h
+++ b/cgit.h
@@@ -168,7 -168,6 +168,7 @@@ struct cgit_config 
        char *logo_link;
        char *module_link;
        char *project_list;
 +      char *readme;
        char *robots;
        char *root_title;
        char *root_desc;
@@@ -206,6 -205,7 +206,7 @@@
        int noheader;
        int renamelimit;
        int remove_suffix;
+       int section_from_path;
        int snapshots;
        int summary_branches;
        int summary_log;

diff --combined cgitrc.5.txt
index 187031aaa408a486eb1673d96ad68c1f0bbfb5df,95782dfb3180956415ab852eef67b9201f9aa2ad..ce78d419debc78718a3633aced47ec16feedea1f
--- 1/cgitrc.5.txt
--- 2/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@@ -234,10 -234,6 +234,10 @@@ project-list:
        should loaded as git repositories. This must be defined prior to
        scan-path. Default value: none. See also: scan-path.
  
 +readme::
 +      Text which will be used as default value for "repo.readme". Default
 +      value: none.
 +
  remove-suffix::
        If set to "1" and scan-path is enabled, if any repositories are found
        with a suffix of ".git", this suffix will be removed for the url and
@@@ -282,6 -278,12 +282,12 @@@ section:
        after this option will inherit the current section name. Default value:
        none.
  
+ section-from-path::
+       A number which, if specified before scan-path, specifies how many
+       path elements from each repo path to use as a default section name.
+       If negative, cgit will discard the specified number of path elements
+       above the repo directory. Default value: 0.
+ 
  side-by-side-diffs::
        If set to "1" shows side-by-side diffs instead of unidiffs per
        default. Default value: "0".
@@@ -377,7 -379,7 +383,7 @@@ repo.readme:
        A path (relative to <repo.path>) which specifies a file to include
        verbatim as the "About" page for this repo. You may also specify a
        git refspec by head or by hash by prepending the refspec followed by
 -      a colon. For example, "master:docs/readme.mkd" Default value: none.
 +      a colon. For example, "master:docs/readme.mkd" Default value: <readme>.
  
  repo.snapshots::
        A mask of allowed snapshot-formats for this repo, restricted by the

diff --combined scan-tree.c
index 780d405425b283d096dda4dd86b89bcee5028f76,6ba9193e2e3d5c5894a5493b9db2cab328bbb095..b5b50f332b812e4afcd7622a57d84bcf653959a6
--- 1/scan-tree.c
--- 2/scan-tree.c
+++ b/scan-tree.c
@@@ -61,11 -61,19 +61,19 @@@ static int git_owner_config(const char 
        return 0;
  }
  
+ static char *xstrrchr(char *s, char *from, int c)
+ {
+       while (from >= s && *from != c)
+               from--;
+       return from < s ? NULL : from;
+ }
+ 
  static void add_repo(const char *base, const char *path, repo_config_fn fn)
  {
        struct stat st;
        struct passwd *pwd;
-       char *p;
+       char *rel, *p, *slash;
+       int n;
        size_t size;
  
        if (stat(path, &st)) {
@@@ -80,14 -88,14 +88,14 @@@
        if (ctx.cfg.enable_gitweb_owner)
                git_config_from_file(git_owner_config, fmt("%s/config", path), NULL);
        if (base == path)
-               p = fmt("%s", path);
+               rel = xstrdup(fmt("%s", path));
        else
-               p = fmt("%s", path + strlen(base) + 1);
+               rel = xstrdup(fmt("%s", path + strlen(base) + 1));
  
-       if (!strcmp(p + strlen(p) - 5, "/.git"))
-               p[strlen(p) - 5] = '\0';
+       if (!strcmp(rel + strlen(rel) - 5, "/.git"))
+               rel[strlen(rel) - 5] = '\0';
  
-       repo = cgit_add_repo(xstrdup(p));
+       repo = cgit_add_repo(rel);
        if (ctx.cfg.remove_suffix)
                if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git"))
                        *p = '\0';
@@@ -110,11 -118,31 +118,33 @@@
        if (!stat(p, &st))
                readfile(p, &repo->desc, &size);
  
 -      p = fmt("%s/README.html", path);
 -      if (!stat(p, &st))
 -              repo->readme = "README.html";
 +      if (!repo->readme) {
 +              p = fmt("%s/README.html", path);
 +              if (!stat(p, &st))
 +                      repo->readme = "README.html";
 +      }
+       if (ctx.cfg.section_from_path) {
+               n  = ctx.cfg.section_from_path;
+               if (n > 0) {
+                       slash = rel;
+                       while (slash && n && (slash = strchr(slash, '/')))
+                               n--;
+               } else {
+                       slash = rel + strlen(rel);
+                       while (slash && n && (slash = xstrrchr(rel, slash, '/')))
+                               n++;
+               }
+               if (slash && !n) {
+                       *slash = '\0';
+                       repo->section = xstrdup(rel);
+                       *slash = '/';
+                       if (!prefixcmp(repo->name, repo->section)) {
+                               repo->name += strlen(repo->section);
+                               if (*repo->name == '/')
+                                       repo->name++;
+                       }
+               }
+       }
  
        p = fmt("%s/cgitrc", path);
        if (!stat(p, &st)) {