X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/10921eba21e8e74d086854e1e361c381e4661eda..802bb5963b7883e640a87a11dcd7a81bf811a076:/cgi/cgimain.c
diff --git a/cgi/cgimain.c b/cgi/cgimain.c
index e96bbab..236cca6 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
Sorry, PATH_INFO not supported.
\n"); + printf("Sorry, is PATH_INFO not supported." + "Try here instead.
\n", + cgi_sgmlquote(infer_url(0/*!include_path_info*/))); exit(0); } /* Parse CGI arguments */ @@ -48,12 +49,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 */ @@ -65,7 +66,7 @@ int main(int argc, char **argv) { mx_search_path(pkgdatadir); /* Never cache anythging */ if(printf("Cache-Control: no-cache\n") < 0) - fatal(errno, "error writing to stdout"); + disorder_fatal(errno, "error writing to stdout"); /* Create the initial connection, trying the cookie if we found a suitable * one. */ dcgi_login(); @@ -74,7 +75,7 @@ int main(int argc, char **argv) { /* In practice if a write fails that probably means the web server went away, * but we log it anyway. */ if(fclose(stdout) < 0) - fatal(errno, "error closing stdout"); + disorder_fatal(errno, "error closing stdout"); return 0; }