Removed the obsolete -t and -x options in webcit and their documentation

diff --git a/webcit/README.txt b/webcit/README.txt
index 14a20655e87d1ca8f7a864d5186421935c9960e9..95653514d6a990c559076fe8e28b1aba4e356760 100644 (file)
--- a/webcit/README.txt
+++ b/webcit/README.txt
@@ -108,14 +108,14 @@ something like this:
  Several command-line options are also available.  Here's the usage for
 the "webcit" program:
   
- webcit [-i ip_addr] [-p http_port] [-s] [-S cipher_suite] [-t tracefile]
-           [-g guest_landing_page ]
+ webcit [-i ip_addr] [-p http_port] [-s] [-S cipher_suite]
+           [-g guest_landing_page]
            [-c] [-f] [remotehost [remoteport]]
  
    *or*
  
- webcit [-i ip_addr] [-p http_port] [-s] [-S cipher_suite] [-t tracefile]
-           [-g guest_landing_page ]
+ webcit [-i ip_addr] [-p http_port] [-s] [-S cipher_suite]
+           [-g guest_landing_page]
            [-c] [-f] uds /your/citadel/directory
  
  Explained: 
@@ -134,9 +134,6 @@ the "webcit" program:
      different port.  If you do not specify a port number, WebCit will attempt
      to use port 80.
      
-  -> tracefile: where you want WebCit to log to.  This can be a file, a
-     virtual console, or /dev/null to suppress logging altogether.
-
   -> The "guest landing page" is a location on your WebCit installation where
      unauthenticated guest users are taken when they first enter the root of
      your site.  If guest mode is not enabled on your Citadel server, they will

diff --git a/webcit/sysdep.c b/webcit/sysdep.c
index 16c8e4f61b8cf3d649141b4852280f41a47e12f2..197d2df6f692801bbe1fedd8aa4842f8d897e04d 100644 (file)
--- a/webcit/sysdep.c
+++ b/webcit/sysdep.c
@@ -79,7 +79,6 @@ pthread_key_t MyConKey;                               /* TSD key for MyContext() */
 pthread_key_t MyReq;                           /* TSD key for MyReq() */
 int msock;                     /* master listening socket */
 int time_to_die = 0;            /* Nonzero if server is shutting down */
-int verbosity = 9;             /* Logging level */
 
 extern void *context_loop(ParsedHttpHdrs *Hdr);
 extern void *housekeeping_loop(void);

diff --git a/webcit/webserver.c b/webcit/webserver.c
index ef1c5eb8e66cd4ef1b19eccaff7f80c76b59397a..668247ecddf5d60ae0be1a516bdda42733c7c061 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -18,7 +18,6 @@ int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp);
 
 
 extern int msock;                              /* master listening socket */
-extern int verbosity;                          /* Logging level */
 extern char static_icon_dir[PATH_MAX];          /* where should we find our mime icons */
 int is_https = 0;                              /* Nonzero if I am an HTTPS service */
 int follow_xff = 0;                            /* Follow X-Forwarded-For: header? */
@@ -74,7 +73,6 @@ int main(int argc, char **argv)
        pthread_t SessThread;           /* Thread descriptor */
        pthread_attr_t attr;            /* Thread attributes */
        int a;                          /* General-purpose variable */
-       char tracefile[PATH_MAX];
        char ip_addr[256]="*";
        int relh=0;
        int home=0;
@@ -85,7 +83,6 @@ int main(int argc, char **argv)
        const char *basedir = NULL;
        char uds_listen_path[PATH_MAX]; /* listen on a unix domain socket? */
        const char *I18nDumpFile = NULL;
-       FILE *rvfp = NULL;
        int rv = 0;
 
        WildFireInitBacktrace(argv[0], 2);
@@ -154,10 +151,7 @@ int main(int argc, char **argv)
                        }
                        break;
                case 't':
-                       safestrncpy(tracefile, optarg, sizeof tracefile);
-                       rvfp = freopen(tracefile, "w", stdout);
-                       rvfp = freopen(tracefile, "w", stderr);
-                       rvfp = freopen(tracefile, "r", stdin);
+                       /* no longer used, but ignored so old scripts don't break */
                        break;
                case 'T':
                        LoadTemplates = atoi(optarg);
@@ -168,7 +162,7 @@ int main(int argc, char **argv)
                        DisableGzip = 1;
                        break;
                case 'x':
-                       verbosity = atoi(optarg);
+                       /* no longer used, but ignored so old scripts don't break */
                        break;
                case 'f':
                        follow_xff = 1;
@@ -204,7 +198,7 @@ int main(int argc, char **argv)
                default:
                        fprintf(stderr, "usage: webcit "
                                "[-i ip_addr] [-p http_port] "
-                               "[-t tracefile] [-c] [-f] "
+                               "[-c] [-f] "
                                "[-T Templatedebuglevel] "
                                "[-d] [-Z] [-G i18ndumpfile] "
 #ifdef HAVE_OPENSSL