Complete options help and put it in less random order.

diff --git a/doc/src/sgml/ref/ecpg-ref.sgml b/doc/src/sgml/ref/ecpg-ref.sgml
index f47c33601b8b063ce5d513d3fd6a8c35a1e03727..338895815dd3184ecf3e4b908b4bbda41b01f395 100644 (file)
--- a/doc/src/sgml/ref/ecpg-ref.sgml
+++ b/doc/src/sgml/ref/ecpg-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/ecpg-ref.sgml,v 1.28 2003/09/20 20:12:05 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/ecpg-ref.sgml,v 1.29 2003/11/02 12:55:24 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -76,6 +76,17 @@ PostgreSQL documentation
      </listitem>
     </varlistentry>
 
+    <varlistentry>
+     <term><option>-C <replaceable>mode</replaceable></option></term>
+     <listitem>
+      <para>
+       Set a compatibility mode.  <replaceable>mode</replaceable> may
+       be <literal>INFORMIX</literal> or
+       <literal>INFORMIX_SE</literal>.
+      </para>
+     </listitem>
+    </varlistentry>
+
     <varlistentry>
      <term><option>-D <replaceable>symbol</replaceable></option></term>
      <listitem>
@@ -85,6 +96,15 @@ PostgreSQL documentation
      </listitem>
     </varlistentry>
 
+    <varlistentry>
+     <term><option>-i</option></term>
+     <listitem>
+      <para>
+       Parse system include files as well.
+      </para>
+     </listitem>
+    </varlistentry>
+
     <varlistentry>
      <term><option>-I <replaceable class="parameter">directory</replaceable></option></term>
      <listitem>
@@ -111,6 +131,17 @@ PostgreSQL documentation
      </listitem>
     </varlistentry>
 
+    <varlistentry>
+     <term><option>-r <replaceable>option</replaceable></option></term>
+     <listitem>
+      <para>
+       Selects a run-time behavior.  Currently,
+       <replaceable>option</replaceable> can only be
+       <literal>no_indicator</literal>.
+      </para>
+     </listitem>
+    </varlistentry>
+
     <varlistentry>
      <term><option>-t</option></term>
      <listitem>

diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index cc8ba9c22bc76365e29e908b92254a8b19021e5a..d8f4b9e1fe33f5a86948ce5ae5a536cf732c9173 100644 (file)
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.80 2003/10/06 06:44:55 meskes Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.81 2003/11/02 12:55:24 petere Exp $ */
 
 /* New main for ecpg, the PostgreSQL embedded SQL precompiler. */
 /* (C) Michael Meskes <meskes@postgresql.org> Feb 5th, 1998 */
@@ -41,18 +41,18 @@ help(const char *progname)
        printf("Options:\n");
        printf("  -c             automatically generate C code from embedded SQL code;\n"
                   "                 currently this works for EXEC SQL TYPE\n");
+       printf("  -C MODE        set compatibility mode;\n"
+                  "                 MODE may be one of \"INFORMIX\", \"INFORMIX_SE\"\n");
 #ifdef YYDEBUG
        printf("  -d             generate parser debug output\n");
 #endif
-       printf("  -C MODE        set compatibility mode;\n"
-                  "                 MODE may be one of \"INFORMIX\", \"INFORMIX_SE\"\n");
-       printf("  -r OPTION      specify runtime behaviour;\n"
-                  "                 OPTION may only be \"no_indicator\"\n");
        printf("  -D SYMBOL      define SYMBOL\n");
+       printf("  -i             parse system include files as well\n");
        printf("  -I DIRECTORY   search DIRECTORY for include files\n");
        printf("  -o OUTFILE     write result to OUTFILE\n");
+       printf("  -r OPTION      specify runtime behaviour;\n"
+                  "                 OPTION may only be \"no_indicator\"\n");
        printf("  -t             turn on autocommit of transactions\n");
-       printf("  -i             parse system include files as well\n");
        printf("  --help         show this help, then exit\n");
        printf("  --version      output version information, then exit\n");
        printf("\nIf no output file is specified, the name is formed by adding .c to the\n"