X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/10921eba21e8e74d086854e1e361c381e4661eda..0fc2fcd010ac5cc98aab67222f3c2af2ec2beefe:/cgi/cgimain.c

diff --git a/cgi/cgimain.c b/cgi/cgimain.c
index e96bbab..e4c7220 100644
--- a/cgi/cgimain.c
+++ b/cgi/cgimain.c
@@ -2,22 +2,20 @@
  * This file is part of DisOrder.
  * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/** @file server/cgimain.c
+/** @file cgi/cgimain.c
  * @brief DisOrder CGI
  */
 
@@ -36,7 +34,9 @@ int main(int argc, char **argv) {
     printf("Content-Type: text/html; charset=UTF-8\n");
     printf("Status: 404\n");
     printf("\n");
-    printf("<p>Sorry, PATH_INFO not supported.</p>\n");
+    printf("<p>Sorry, is PATH_INFO not supported."
+           "<a href=\"%s\">Try here instead.</a></p>\n",
+           cgi_sgmlquote(infer_url(0/*!include_path_info*/)));
     exit(0);
   }
   /* Parse CGI arguments */
@@ -48,12 +48,12 @@ int main(int argc, char **argv) {
   if(getenv("DISORDER_DEBUG"))
     debugging = 1;
   /* Read configuration */
-  if(config_read(0/*!server*/))
+  if(config_read(0/*!server*/, NULL))
     exit(EXIT_FAILURE);
   /* Figure out our URL.  This can still be overridden from the config file if
    * necessary but it shouldn't be necessary in ordinary installations. */
   if(!config->url)
-    config->url = infer_url();
+    config->url = infer_url(1/*include_path_info*/);
   /* Pick up the cookie, if there is one */
   dcgi_get_cookie();
   /* Register expansions */