Remove --enable-recode feature, since it's been broken by IPv6 changes,

and seems to have too few users to justify maintaining.

Author: tglsfdc

INSTALL

@@ -342,13 +342,6 @@ are encouraged to read in any case.
             installed in non-standard locations.
             Example: --with-libraries=/opt/gnu/lib:/usr/sup/lib.
 
-        --enable-recode
-
-            Enables single-byte character set recode support. See the
-            Administrator's Guide about this feature. Note that a more general
-            form of character set conversion is supported in the default
-            configuration; this feature is obsolete.
-
         --enable-nls[=LANGUAGES]
 
             Enables Native Language Support (NLS), that is, the ability to

configure

@@ -838,7 +838,6 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-integer-datetimes  enable 64-bit integer date/time support
-  --enable-recode         enable single-byte recode support
   --enable-nls[=LANGUAGES]  enable Native Language Support
   --disable-shared        do not build shared libraries
   --disable-rpath         do not embed shared library search path in executables
@@ -1597,43 +1596,6 @@ echo "$as_me:$LINENO: result: $enable_integer_datetimes" >&5
 echo "${ECHO_T}$enable_integer_datetimes" >&6
 
 
-# Character set recode (--enable-recode)
-#
-echo "$as_me:$LINENO: checking whether to build with recode support" >&5
-echo $ECHO_N "checking whether to build with recode support... $ECHO_C" >&6
-
-
-# Check whether --enable-recode or --disable-recode was given.
-if test "${enable_recode+set}" = set; then
-  enableval="$enable_recode"
-
-  case $enableval in
-    yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define CYR_RECODE 1
-_ACEOF
-
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-recode option" >&5
-echo "$as_me: error: no argument expected for --enable-recode option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  enable_recode=no
-
-fi;
-
-echo "$as_me:$LINENO: result: $enable_recode" >&5
-echo "${ECHO_T}$enable_recode" >&6
-
-
 #
 # NLS
 #

configure.in

@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Header: /cvsroot/pgsql/configure.in,v 1.273 2003/08/03 20:23:14 tgl Exp $
+dnl $Header: /cvsroot/pgsql/configure.in,v 1.274 2003/08/04 04:03:03 tgl Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -153,15 +153,6 @@ PGAC_ARG_BOOL(enable, integer-datetimes, no, [  --enable-integer-datetimes  enab
 AC_MSG_RESULT([$enable_integer_datetimes])
 
 
-# Character set recode (--enable-recode)
-#
-AC_MSG_CHECKING([whether to build with recode support])
-PGAC_ARG_BOOL(enable, recode, no, [  --enable-recode         enable single-byte recode support],
-              [AC_DEFINE([CYR_RECODE], 1,
-                         [Define to 1 if you want single-byte recode support. (--enable-recode)])])
-AC_MSG_RESULT([$enable_recode])
-
-
 #
 # NLS
 #

doc/src/sgml/charset.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/charset.sgml,v 2.36 2003/05/15 15:50:18 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/charset.sgml,v 2.37 2003/08/04 04:03:03 tgl Exp $ -->
 
 <chapter id="charset">
  <title>Localization</>
@@ -7,7 +7,7 @@
   This chapter describes the available localization features from the
   point of view of the administrator.
   <productname>PostgreSQL</productname> supports localization with
-  three approaches:
+  two approaches:
 
    <itemizedlist>
     <listitem>
@@ -23,17 +23,10 @@
       Providing a number of different character sets defined in the
       <productname>PostgreSQL</productname> server, including
       multiple-byte character sets, to support storing text in all
-      kinds of languages, and providing character set recoding between
+      kinds of languages, and providing character set translation between
       client and server.
      </para>
     </listitem>
-
-    <listitem>
-     <para>
-      Single-byte character recoding provides a more light-weight
-      solution for users of multiple, yet single-byte character sets.
-     </para>
-    </listitem>
    </itemizedlist>
   </para>
 
@@ -884,75 +877,6 @@ RESET CLIENT_ENCODING;
 
   </sect1>
 
-
- <sect1 id="recode">
-  <title>Single-Byte Character Set Recoding</>
-
-  <para>
-   You can set up this feature with the <option>--enable-recode</> option
-   to <filename>configure</>. This option was formerly described as
-   <quote>Cyrillic recode support</> which doesn't express all its
-   power. It can be used for <emphasis>any</> single-byte character
-   set recoding.
-  </para>
-
-  <para>
-   This method uses a file <filename>charset.conf</> file located in
-   the data directory for configuration.  It's a typical
-   configuration text file where spaces and newlines separate fields
-   and records and <literal>#</> starts a comment.  Three key words with the
-   following syntax are recognized here:
-<synopsis>
-BaseCharset <replaceable>server_charset</>
-RecodeTable <replaceable>from_charset</> <replaceable>to_charset</> <replaceable>file_name</>
-HostCharset <replaceable>host_spec</>    <replaceable>host_charset</>
-</synopsis>
-  </para>
-
-  <para>
-   <token>BaseCharset</> defines the character set of the database server.
-   All character set names are only used for mapping inside of
-   <filename>charset.conf</> so you can freely use typing-friendly
-   names.
-  </para>
-
-  <para>
-   <token>RecodeTable</> records specify conversion tables between
-   server and client.  The file name is relative to the
-   data directory.  The table file format is very
-   simple. There are no key words, and character mappings are represented by a
-   pair of decimal or hexadecimal (prefixed by <literal>0x</>) values on single
-   lines:
-<synopsis>
-<replaceable>char_value</>   <replaceable>converted_char_value</>
-</synopsis>
-   In the <filename>src/data/</> directory in the source distribution you can find an
-   example <filename>charset.conf</> and a few recoding tables.
-  </para>
-
-  <para>
-   <token>HostCharset</> records define the client character set by IP
-   address. You can use a single IP address, an IP mask range starting
-   from the given address or an IP interval (e.g., <literal>127.0.0.1</>,
-   <literal>192.168.1.100/24</>, <literal>192.168.1.20-192.168.1.40</>).
-  </para>
-
-  <para>
-   The <filename>charset.conf</> file is always processed to the
-   end, so you can easily specify exceptions from preceding rules.
-  </para>
-
-  <para>
-   As this solution is based on the client's IP address there are
-   obviously some restrictions as well. You cannot use different
-   character sets on the same host at the same time. It is also
-   inconvenient when you boot your client hosts into multiple
-   operating systems.  Nevertheless, when these restrictions are not
-   limiting and you do not need multibyte characters then it is a
-   simple and effective solution.
-  </para>
- </sect1>
-
 </chapter>
 
 <!-- Keep this comment at the end of the file

doc/src/sgml/installation.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.137 2003/08/01 03:10:04 momjian Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.138 2003/08/04 04:03:03 tgl Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -699,19 +699,6 @@ JAVACMD=$JAVA_HOME/bin/java
        </listitem>
       </varlistentry>
 
-      <varlistentry>
-       <term><option>--enable-recode</option></term>
-       <listitem>
-        <para>
-         Enables single-byte character set recode support. See
-         <![%standalone-include[the documentation]]> <![%standalone-ignore[<xref
-         linkend="recode">]]> about this feature.  Note that a more
-         general form of character set conversion is supported in the
-         default configuration; this feature is obsolete.
-        </para>
-       </listitem>
-      </varlistentry>
-
       <varlistentry>
        <term><option>--enable-nls<optional>=<replaceable>LANGUAGES</replaceable></optional></option></term>
        <listitem>

src/backend/tcop/postgres.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.355 2003/08/04 02:40:04 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.356 2003/08/04 04:03:06 tgl Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -2613,14 +2613,6 @@ PostgresMain(int argc, char *argv[], const char *username)
 		on_shmem_exit(DumpFreeSpaceMap, 0);
 	}
 
-	/*
-	 * Set up additional info.
-	 */
-
-#ifdef CYR_RECODE
-	SetCharSet();
-#endif
-
 	/*
 	 * General initialization.
 	 *
@@ -2651,7 +2643,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.355 $ $Date: 2003/08/04 02:40:04 $\n");
+		puts("$Revision: 1.356 $ $Date: 2003/08/04 04:03:06 $\n");
 	}
 
 	/*

src/backend/utils/adt/varchar.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.101 2003/08/04 02:40:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.102 2003/08/04 04:03:10 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -130,10 +130,6 @@ bpcharin(PG_FUNCTION_ARGS)
 	for (; i < maxlen; i++)
 		*r++ = ' ';
 
-#ifdef CYR_RECODE
-	convertstr(VARDATA(result), len, 0);
-#endif
-
 	PG_RETURN_BPCHAR_P(result);
 }
 
@@ -154,10 +150,6 @@ bpcharout(PG_FUNCTION_ARGS)
 	memcpy(result, VARDATA(s), len);
 	result[len] = '\0';
 
-#ifdef CYR_RECODE
-	convertstr(result, len, 1);
-#endif
-
 	PG_RETURN_CSTRING(result);
 }
 
@@ -396,10 +388,6 @@ varcharin(PG_FUNCTION_ARGS)
 	VARATT_SIZEP(result) = len + VARHDRSZ;
 	memcpy(VARDATA(result), s, len);
 
-#ifdef CYR_RECODE
-	convertstr(VARDATA(result), len, 0);
-#endif
-
 	PG_RETURN_VARCHAR_P(result);
 }
 
@@ -420,10 +408,6 @@ varcharout(PG_FUNCTION_ARGS)
 	memcpy(result, VARDATA(s), len);
 	result[len] = '\0';
 
-#ifdef CYR_RECODE
-	convertstr(result, len, 1);
-#endif
-
 	PG_RETURN_CSTRING(result);
 }
 

src/backend/utils/adt/varlena.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.104 2003/08/04 02:40:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.105 2003/08/04 04:03:10 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -268,10 +268,6 @@ textin(PG_FUNCTION_ARGS)
 
 	memcpy(VARDATA(result), inputText, len);
 
-#ifdef CYR_RECODE
-	convertstr(VARDATA(result), len, 0);
-#endif
-
 	PG_RETURN_TEXT_P(result);
 }
 
@@ -290,10 +286,6 @@ textout(PG_FUNCTION_ARGS)
 	memcpy(result, VARDATA(t), len);
 	result[len] = '\0';
 
-#ifdef CYR_RECODE
-	convertstr(result, len, 1);
-#endif
-
 	PG_RETURN_CSTRING(result);
 }