commit b5f0780096f443734de8fc503ca92bf737e2a7b2 from: Stefan Sperling date: Tue Jan 28 18:42:10 2020 UTC remove got_www_path which is not actually used commit - ee882e7505ef92bf73fbb54352a67fdf56857e95 commit + b5f0780096f443734de8fc503ca92bf737e2a7b2 blob - 060b7e076846611ba547d754dc4ec28836ac3eeb blob + eb932301ce65530d2c6f23c999fe4be88293d6f4 --- gotweb/gotweb.c +++ gotweb/gotweb.c @@ -2756,7 +2756,6 @@ done: } if (gw_malloc) { free(gw_trans->gw_conf->got_repos_path); - free(gw_trans->gw_conf->got_www_path); free(gw_trans->gw_conf->got_site_name); free(gw_trans->gw_conf->got_site_owner); free(gw_trans->gw_conf->got_site_link); blob - f31730a372344ecc7f3308841865d28c456954f8 blob + d3cfc24e900f2b1428a6100c273812e6c0017704 --- gotweb/gotweb.conf.5 +++ gotweb/gotweb.conf.5 @@ -80,8 +80,6 @@ Set the displayed site name title. Set the displayed site owner. .It Ic got_show_site_owner Ar on | off Toggle display of the site owner. -.It Ic got_www_path Ar string -Set the public gotweb httpd path. .El .Sh EXAMPLES These are the currently configurable items for Gotweb. @@ -94,7 +92,6 @@ The configuration file gotweb.conf must be located at # got_repos_path "/got/public" -got_www_path "/gotweb" #got_max_repos 100 #got_max_repos_display 25 blob - 664f2731e0a19f79ff966dd2bfcc7a1466a2c93b blob + 499f3cb477ef3cee7075b8075aba4d603a99cdaa --- gotweb/gotweb.h +++ gotweb/gotweb.h @@ -51,7 +51,6 @@ struct gotweb_conf { char *got_repos_path; - char *got_www_path; char *got_site_name; char *got_site_owner; char *got_site_link; blob - c3ab5293ee64cc727f720cea7d41acca4c2d13f5 blob + 2271bbde9b190920695f4451cfe046353cbe8ec7 --- gotweb/parse.y +++ gotweb/parse.y @@ -108,10 +108,6 @@ main : GOT_REPOS_PATH STRING { if ((gw_conf->got_repos_path = strdup($2)) == NULL) errx(1, "out of memory"); } - | GOT_WWW_PATH STRING { - if ((gw_conf->got_www_path = strdup($2)) == NULL) - errx(1, "out of memory"); - } | GOT_MAX_REPOS NUMBER { if ($2 > 0) gw_conf->got_max_repos = $2; @@ -211,7 +207,6 @@ lookup(char *s) { "got_site_link", GOT_SITE_LINK }, { "got_site_name", GOT_SITE_NAME }, { "got_site_owner", GOT_SITE_OWNER }, - { "got_www_path", GOT_WWW_PATH }, }; const struct keywords *p; @@ -490,8 +485,6 @@ parse_conf(const char *filename, struct gotweb_conf *g gw_conf = gconf; if ((gw_conf->got_repos_path = strdup(D_GOTPATH)) == NULL) err(1, "strdup"); - if ((gw_conf->got_www_path = strdup(D_GOTWWW)) == NULL) - err(1, "strdup"); if ((gw_conf->got_site_name = strdup(D_SITENAME)) == NULL) err(1, "strdup"); if ((gw_conf->got_site_owner = strdup(D_SITEOWNER)) == NULL)