httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-1.3/htdocs/manual invoking.html
Date Thu, 17 Dec 1998 15:09:34 GMT
rse         98/12/17 07:09:33

  Modified:    src      CHANGES
               src/main http_main.c
               src/support httpd.8
               htdocs/manual invoking.html
  Log:
  Cleanup the command line options: `-?' was documented to show the usage list
  but does it with an error because `?' is not a valid command. OTOH a lot of
  users expect `-h' to print such a usage list and instead are annoyed for ages
  by our huge unreadable list of directives.  So we now changed the command line
  options this way:
  
   1. `-L' => `-R'
      Intent: we need `-L' to be free, and `-R' for the DSO run-time path is
      very similar to the popular linker option.
  
   2. `-h' => `-L'
      Intent: while -l gives the small list of modules, -L now gives the
      large list of directives implemented by these modules.  This is also
      consistent with -v (short version info) and -V (large version info).
  
   3. `-?' => `-h'
      Intent: it's now the expected option ;-)
  
  The manual page was adjusted accordingly.
  
  Submitted by: Ralf S. Engelschall
  Reviewed by: Randy Terbush
  PR: 2714
  
  Revision  Changes    Path
  1.1173    +17 -0     apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1172
  retrieving revision 1.1173
  diff -u -r1.1172 -r1.1173
  --- CHANGES	1998/12/17 14:58:55	1.1172
  +++ CHANGES	1998/12/17 15:09:27	1.1173
  @@ -1,5 +1,22 @@
   Changes with Apache 1.3.4
   
  +  *) Cleanup the command line options: `-?' was documented to show
  +     the usage list but does it with an error because `?' is not a valid
  +     command. OTOH a lot of users expect `-h' to print such a usage list and
  +     instead are annoyed for ages by our huge unreadable list of directives.
  +     So we now changed the command line options this way:
  +     1. `-L' => `-R' 
  +        Intent: we need `-L' to be free, and `-R' for the DSO run-time path is
  +        very similar to the popular linker option.
  +     2. `-h' => `-L'
  +        Intent: while -l gives the small list of modules, -L now gives the
  +        large list of directives implemented by these modules.  This is also
  +        consistent with -v (short version info) and -V (large version info).
  +     3. `-?' => `-h' 
  +        Intent: it's now the expected option ;-)
  +     The manual page was adjusted accordingly. 
  +     [Ralf S. Engelschall] PR#2714
  +
     *) Fixed problem of fclose() on an unopened file in suexec if LOG_EXEC
        wasn't defined.  [Rick Franchuk <rickf@transpect.net>]
   
  
  
  
  1.412     +22 -16    apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.411
  retrieving revision 1.412
  diff -u -r1.411 -r1.412
  --- http_main.c	1998/12/11 15:33:40	1.411
  +++ http_main.c	1998/12/17 15:09:31	1.412
  @@ -978,15 +978,15 @@
   	pad[i] = ' ';
       pad[i] = '\0';
   #ifdef SHARED_CORE
  -    fprintf(stderr, "Usage: %s [-L directory] [-d directory] [-f file]\n", bin);
  +    fprintf(stderr, "Usage: %s [-R directory] [-d directory] [-f file]\n", bin);
   #else
       fprintf(stderr, "Usage: %s [-d directory] [-f file]\n", bin);
   #endif
       fprintf(stderr, "       %s [-C \"directive\"] [-c \"directive\"]\n", pad);
  -    fprintf(stderr, "       %s [-v] [-V] [-h] [-l] [-S] [-t]\n", pad);
  +    fprintf(stderr, "       %s [-v] [-V] [-h] [-l] [-L] [-S] [-t]\n", pad);
       fprintf(stderr, "Options:\n");
   #ifdef SHARED_CORE
  -    fprintf(stderr, "  -L directory     : specify an alternate location for shared object
files\n");
  +    fprintf(stderr, "  -R directory     : specify an alternate location for shared object
files\n");
   #endif
       fprintf(stderr, "  -D name          : define a name for use in <IfDefine name>
directives\n");
       fprintf(stderr, "  -d directory     : specify an alternate initial ServerRoot\n");
  @@ -995,8 +995,9 @@
       fprintf(stderr, "  -c \"directive\"   : process directive after  reading config files\n");
       fprintf(stderr, "  -v               : show version number\n");
       fprintf(stderr, "  -V               : show compile settings\n");
  -    fprintf(stderr, "  -h               : list available configuration directives\n");
  +    fprintf(stderr, "  -h               : list available command line options (this page)\n");
       fprintf(stderr, "  -l               : list compiled-in modules\n");
  +    fprintf(stderr, "  -L               : list available configuration directives\n");
       fprintf(stderr, "  -S               : show parsed settings (currently only vhost settings)\n");
       fprintf(stderr, "  -t               : run syntax test for configuration files only\n");
   #ifdef WIN32
  @@ -4499,7 +4500,7 @@
   
   #ifndef TPF
       while ((c = getopt(argc, argv,
  -				    "D:C:c:Xd:f:vVhlL:St"
  +				    "D:C:c:Xd:f:vVlLR:Sth"
   #ifdef DEBUG_SIGSTOP
   				    "Z:"
   #endif
  @@ -4533,12 +4534,12 @@
   	    ap_set_version();
   	    show_compile_settings();
   	    exit(0);
  -	case 'h':
  -	    ap_show_directives();
  -	    exit(0);
   	case 'l':
   	    ap_show_modules();
   	    exit(0);
  +	case 'L':
  +	    ap_show_directives();
  +	    exit(0);
   	case 'X':
   	    ++one_process;	/* Weird debugging mode. */
   	    break;
  @@ -4548,7 +4549,7 @@
   	    break;
   #endif
   #ifdef SHARED_CORE
  -	case 'L':
  +	case 'R':
   	    /* just ignore this option here, because it has only
   	     * effect when SHARED_CORE is used and then it was
   	     * already handled in the Shared Core Bootstrap
  @@ -4562,6 +4563,8 @@
   	case 't':
   	    configtestonly = 1;
   	    break;
  +	case 'h':
  +	    usage(argv[0]);
   	case '?':
   	    usage(argv[0]);
   	}
  @@ -5856,7 +5859,7 @@
   
       ap_setup_prelinked_modules();
   
  -    while ((c = getopt(argc, argv, "D:C:c:Xd:f:vVhlZ:iusStk:")) != -1) {
  +    while ((c = getopt(argc, argv, "D:C:c:Xd:f:vVlLZ:iusSthk:")) != -1) {
           char **new;
   	switch (c) {
   	case 'c':
  @@ -5914,18 +5917,20 @@
   	    ap_set_version();
   	    show_compile_settings();
   	    exit(0);
  -	case 'h':
  -	    ap_show_directives();
  -	    exit(0);
   	case 'l':
   	    ap_show_modules();
   	    exit(0);
  +	case 'L':
  +	    ap_show_directives();
  +	    exit(0);
   	case 'X':
   	    ++one_process;	/* Weird debugging mode. */
   	    break;
   	case 't':
   	    configtestonly = 1;
   	    break;
  +	case 'h':
  +	    usage(argv[0]);
   	case '?':
   	    usage(argv[0]);
   	}
  @@ -6063,7 +6068,7 @@
        * but only handle the -L option 
        */
       llp_dir = SHARED_CORE_DIR;
  -    while ((c = getopt(argc, argv, "D:C:c:Xd:f:vVhlL:SZ:t")) != -1) {
  +    while ((c = getopt(argc, argv, "D:C:c:Xd:f:vVlLR:SZ:th")) != -1) {
   	switch (c) {
   	case 'D':
   	case 'C':
  @@ -6073,14 +6078,15 @@
   	case 'f':
   	case 'v':
   	case 'V':
  -	case 'h':
   	case 'l':
  +	case 'L':
   	case 'S':
   	case 'Z':
   	case 't':
  +	case 'h':
   	case '?':
   	    break;
  -	case 'L':
  +	case 'R':
   	    llp_dir = strdup(optarg);
   	    break;
   	}
  
  
  
  1.12      +10 -12    apache-1.3/src/support/httpd.8
  
  Index: httpd.8
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/httpd.8,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- httpd.8	1998/06/16 03:37:32	1.11
  +++ httpd.8	1998/12/17 15:09:32	1.12
  @@ -60,7 +60,7 @@
   [
   .B \-X
   ] [
  -.BI \-L " libexecdir"
  +.BI \-R " libexecdir"
   ] [
   .BI \-d " serverroot"
   ] [
  @@ -81,6 +81,9 @@
   .B \-l
   ] 
   [
  +.B \-L
  +] 
  +[
   .B \-v
   ] 
   [
  @@ -89,9 +92,6 @@
   [
   .B \-S
   ] 
  -[
  -.B \-?
  -] 
   
   .SH DESCRIPTION
   .B httpd
  @@ -115,7 +115,7 @@
   .B httpd.
   .SH OPTIONS
   .TP 12
  -.BI \-L " libexecdir"
  +.BI \-R " libexecdir"
   This option is only available if Apache was built with
   the 
   .I SHARED_CORE
  @@ -146,12 +146,15 @@
   to conditionally skip or process commands.
   .TP
   .B \-h
  -Output a list of directives together with expected arguments and
  -places where the directive is valid.
  +Output a short summary of available command line options.
   .TP
   .B \-l
   Output a list of modules compiled into the server.
   .TP
  +.B \-L
  +Output a list of directives together with expected arguments and
  +places where the directive is valid.
  +.TP
   .B \-S
   Show the settings as parsed from the config file (currently only shows the
   virtualhost settings).
  @@ -175,11 +178,6 @@
   Print the version and build parameters of 
   .B httpd
   , and then exit.
  -.TP
  -.B \-?
  -Print a list of the 
  -.B httpd 
  -options, and then exit.
   .SH FILES
   .PD 0
   .B /usr/local/apache/conf/httpd.conf
  
  
  
  1.23      +1 -1      apache-1.3/htdocs/manual/invoking.html
  
  Index: invoking.html
  ===================================================================
  RCS file: /home/cvs/apache-1.3/htdocs/manual/invoking.html,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- invoking.html	1998/11/20 16:39:03	1.22
  +++ invoking.html	1998/12/17 15:09:33	1.23
  @@ -78,7 +78,7 @@
   <SAMP>-DUSE_MMAP_FILES</SAMP>),
   then exit.
   
  -<DT><A NAME="help"><CODE>-h</CODE></A>
  +<DT><A NAME="help"><CODE>-L</CODE></A>
   <DD>Give a list of directives together with expected arguments and
   places where the directive is valid. (New in Apache 1.2)
   
  
  
  

Mime
View raw message