GNU nano 1.1.2 release

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@841 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

BUGS

@@ -117,7 +117,16 @@
 - Blank lines are not kept when cutting with -k (discovered by Rocco)
   (61) [FIXED].
 - Nano will not suspend properly inside of mutt (62) [FIXED].
-
+- When switching from Pico mode to normal mode, the previous search is
+  not displayed until cancelling the search (63) [FIXED].
+- If you change search options but don't change the search string in
+  normal mode, hitting  enter causes the search/replace to abort (64)
+  (Jordi Mallach) [FIXED].
+- Cutting one line of text causes the screen to recenter the line
+  (reported and fixed by David Lawrence Ramsey) (65) [FIXED].
+- When cutting marked text including the bottom of the file, a new   
+  "magic line" is not created" (reported by David Lawrence
+  Ramsey, fixed by David Lawrence Ramsey & Chris) (66) [FIXED].
 
 ** Open BUGS **
 

ChangeLog

@@ -1,3 +1,151 @@
+nano-1.1.2 - 10/03/2001
+- General
+	- Added BUGS #63 & 64.  Fixes in search_init() and nanogetstr(),
+	  new flag CLEAR_BACKUPSTRING because there's no easy way to
+	  clear the backupstring without making it global (messy), so we
+	  use a flag instead (just as messy?)
+	- --enable-tiny now leaves out the Auto Indent code, do you really
+	  need that on a bootdisk? =-)
+	- New flag -o, --operatingdir, similar to Pico's -o mode.  New
+	  function check_operating_dir(), changes to load_file (arg),
+	  open_file_dup_search (arg), new function do_gotopos for -F
+	  (David Lawrence Ramsey).
+	- Code to read/write dos formatted files.  Massive amounts of
+	  new code in read_line and write_file.  New cmdline flag
+	  (-D --dos) to automatically write the file in DOS format,
+	  regardless of the original format.
+	- Mac file writing supported too.  Flag -M, --mac.  Toggle 
+	  Meta-O (MacOS? OS-X? =-)
+	- New smooth scroll code by Ken Tyler.  New flag -S, --smooth,
+	  changes to page_up() and page_down().  Many fixes to paging by
+	  David Lawrence Ramsey.
+	- Bracket (brace, parens, etc) matching code by Ken Tyler.  
+	  New functions do_find_bracket(), changes to findnextstr(),
+	  command is Meta-] (hope you dont mind since I already sold off
+	  Meta-O to the MacOS file code Ken...) Fixes to bracket_msg
+	  by DLR.
+	- Call do_gotopos from do_alt_spell() to keep position
+	  consistent when invoking alt speller (DLR).
+	- Readded DISABLE_CURPOS because in certain instances (like
+	  all the "Search Wrapped" lines) the cursor position will
+	  be different yet we don't want the cursor position displayed.
+	- Take control-space out of -tiny build, unneeded.
+- cut.c:
+  cut_marked_segment()
+	- Add magic line when cutting a selection including filebot
+	  (discovered by DLR, fixed by DLR & Chris, fixes BUG #66).
+  do_cut_text()
+	- Don't recenter the line when cutting one line (DLR) (Bug #65).
+- faq.html:
+	- Notes about the Free Translation Project.
+	- Debian additions.
+- files.c:
+  do_writeout()
+	- Expanded strings to not use %s and ?: to determine
+	  write/append string to be nice to translators.
+  new_file()
+	- Initialize totsize (DLR).
+- nano.c:
+  main()
+	- Added var constcheck as a CRC-like check of whether cursor
+	  pos has changed and if so update the pos with -c.
+	- Many tweaks and changes from numerics to char equivs
+	  (David Lawrence Ramsey).
+	- Fix the KEY_IC being undefined when using slang.
+  do_mouse()
+	- Send 27 when the menu item clicked is an alt key seq... The
+	  lines aren't lined up since the menu width changed though,
+	  this breakage depends on whether the new widths will be kept
+	  or not (FEEDBACK!!)
+	- Change k based on currslen to allow the new widths in
+	  bottombars().
+  do_wrap()
+	- Fixes for Pico incompatibility in cases 2b and 2c.  
+	  (David Lawrence Ramsey).
+  global_init()
+	- New arg save_cutbuffer, allows cutbuffer to not be lost when
+	  using multibuffer.
+- nano.1:
+	- Added new features, fixed some typos (Jordi).
+- nano.texi:
+	- Corrected the Mouse Toggle section, noticed by Daniel Bonniot.
+	- Added many command line options, toggles and other additions
+	  (Jordi).
+- rcfile.c:
+	- NUM_RCOPTS fix (DLR).
+	- Add tabsize support to rc file (Nathan Heagy).
+	- Fix incorrect argument in fill and tabsize error message
+	  (Nathan Heagy)
+- search.c:
+	- Changed search prompt to "Search" followed by a list of
+	  bracketed, free-standing modifiers that do not imply a grammar,
+	  and the (to replace) string separately.  Hopefully this resolves
+	  the i18n problems that this provoked.
+  findnextstr()
+	- Various fixes that need testing (Ken Tyler).
+- winio.c:
+	- Add David Lawrence Ramsey to credits.
+  bottombars()
+	- Spread out the menu items, feedback definitely needed on this.
+  nanogetstr()
+	- More key fixes (David Lawrence Ramsey)
+	- Don't be clever and wasteful, just repaint every iteration.
+- po/nl.po:
+	- New Dutch translation, by Guus Sliepen <guus@nl.linux.org>.
+- po/ca.po, po/es.po:
+	- Updated Catalan and Spanish translation (Jordi).
+- po/gl.po:
+	- Updated Galician translation (Jacobo Tarrío).
+- po/da.po:
+	- New Danish translation, by Keld Simonsen <keld@dkuug.dk>.
+- po/sv.po:
+	- Updated Swedish translation (Christian Rose).
+- po/it.po:
+	- Updated Italian translation (Marco Colombo).
+- po/fi.po:
+	- Updated Finnish translation (Pauli Virtanen).
+
+nano-1.1.1 - 07/28/2001
+- General
+	- Reverted included gettext from 0.10.38 to 0.10.35 in intl/ dir.
+	- Added m4/ directory to allow rebuilding using only the internal
+	  version of gettext.m4 (Albert Chin).
+- nano.c:
+  main()
+	- Change the multibuffer getopt option to 'F' (David Lawrence
+	  Ramsey)
+  do_mark()
+	- Temporarily disable cursorpos when enabled to be able to see
+	  the mark (un)set message (Ken Tyler).
+- nanorc.sample
+	- Typo fixes and updates (David Lawrence Ramsey)
+- files.c:
+  new_file()
+	- Do add_open_files if there aren't any open yet (David Lawrence 
+	  Ramsey).
+  close_open_file()
+	- Try to open the next file first, then the previous one 
+	  (David Lawrence Ramsey).
+- global.c:
+  shortcut_init()
+	- Rewrote the whereis and replace lists to put CANCEL at the end
+	  of the list, and not include the toggle functions when using
+	  NANO_SMALL.
+- nano.h:
+	- Fix type in INSERTFILE_LIST_LEN.
+	- Rewrote all the macro definitions to be a little less messy,
+	  for the #ifdefs anyway.
+- rcfile.c:
+	- Update for the multibuffer option (oops) (David Lawrence Ramsey).
+- search.c:
+	- Added #ifdef NANO_SMALLs around the REVERSE_SEARCH code.
+  search_init()
+	- add #ifdef NANO_SMALL around toggles code.
+- winio.c:
+  bottombars()
+	- Fixed an off by one that wasn't letting lines with odd #
+	  shortcuts work in certain cases.
+
 nano-1.1.0 - 07/15/2001
 - General
 	- New global variables currshortcut and currslen to support using

Makefile.am

@@ -1,4 +1,10 @@
 ## $Id$
+AUTOMAKE_OPTIONS = gnu no-dependencies
+M4DIR = $(srcdir)/m4
+ACLOCAL_AMFLAGS = -I $(M4DIR)
+ACINCLUDE_INPUTS = $(M4DIR)/gettext.m4 $(M4DIR)/largefile.m4 \
+	$(M4DIR)/lcmessage.m4 $(M4DIR)/progtest.m4
+
 bin_PROGRAMS = 	nano
 nano_SOURCES =	color.c \
 		cut.c \
@@ -14,16 +20,19 @@ nano_SOURCES =	color.c \
 		winio.c 
 
 man_MANS = nano.1
-nano_LDADD = @INTLLIBS@
+nano_LDADD = @GLIB_LIBS@ @INTLLIBS@
 
 info_TEXINFOS = nano.texi
 MAKEINFO = makeinfo --no-split
 
 EXTRA_DIST =	ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
 		README THANKS TODO install-sh missing mkinstalldirs \
-		nano.1 nano.1.html faq.html nanorc.sample
+		nano.1 nano.1.html faq.html nanorc.sample $(ACINCLUDE_INPUTS)
 
 SUBDIRS = po intl
 
-localedir = $(datadir)/locale
+localedir = @LOCALE_DIR@
 INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
+
+$(srcdir)/acinclude.m4: $(ACINCLUDE_INPUTS)
+	cat $(ACINCLUDE_INPUTS) > $@

Makefile.in

@@ -57,27 +57,26 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CURSES_LIB = @CURSES_LIB@
 DATADIRNAME = @DATADIRNAME@
 GENCAT = @GENCAT@
-GLIBC21 = @GLIBC21@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_CONFIG = @GLIB_CONFIG@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GNU_LOCALE_DIR = @GNU_LOCALE_DIR@
+GT_NO = @GT_NO@
+GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
+INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIBICONV = @LIBICONV@
+LOCALE_DIR = @LOCALE_DIR@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
@@ -87,23 +86,30 @@ RANLIB = @RANLIB@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+l = @l@
+
+AUTOMAKE_OPTIONS = gnu no-dependencies
+M4DIR = $(srcdir)/m4
+ACLOCAL_AMFLAGS = -I $(M4DIR)
+ACINCLUDE_INPUTS = $(M4DIR)/gettext.m4 $(M4DIR)/largefile.m4 	$(M4DIR)/lcmessage.m4 $(M4DIR)/progtest.m4
+
 
 bin_PROGRAMS = nano
 nano_SOURCES = color.c 		cut.c 		files.c 		global.c 		move.c 		nano.c 		nano.h 		proto.h 		rcfile.c 		search.c 		utils.c 		winio.c 
 
 
 man_MANS = nano.1
-nano_LDADD = @INTLLIBS@
+nano_LDADD = @GLIB_LIBS@ @INTLLIBS@
 
 info_TEXINFOS = nano.texi
 MAKEINFO = makeinfo --no-split
 
-EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS 		README THANKS TODO install-sh missing mkinstalldirs 		nano.1 nano.1.html faq.html nanorc.sample
+EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS 		README THANKS TODO install-sh missing mkinstalldirs 		nano.1 nano.1.html faq.html nanorc.sample $(ACINCLUDE_INPUTS)
 
 
 SUBDIRS = po intl
 
-localedir = $(datadir)/locale
+localedir = @LOCALE_DIR@
 INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -156,7 +162,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4):  configure.in 
-	cd $(srcdir) && $(ACLOCAL)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -521,6 +527,7 @@ distdir: $(DISTFILES)
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
+	$(mkinstalldirs) $(distdir)/$(M4DIR)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -632,6 +639,9 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
+$(srcdir)/acinclude.m4: $(ACINCLUDE_INPUTS)
+	cat $(ACINCLUDE_INPUTS) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

NEWS

@@ -1,3 +1,29 @@
+10/03/2001 - GNU nano 1.1.2 is out there.  Many new features in this
+		release, including support for auto-converting from
+		DOS and Mac formatted files, as well as toggles for
+		writing out files in these formats.  Pico's -o flag has
+		been implemented, as has some new smooth scrolling code
+		(which can be used in place of the default jerky scrolling
+		behavior). Also, there is now a "find matching
+		bracket/brace/etc" feature (Meta-]).  The  .nanorc file
+		now accepts setting the tabsize, and the help text at the
+		bottom of the editor is now better spaced out in the
+		search/replace prompts.  There are also the usual helping
+		of bugfixes, translation updates and, surely a bug or two.
+		You better get ready!
+
+07/28/2001 - GNU nano 1.1.1 is released.  Our second 1.1 unstable release
+		features many bugfixes from the initial release, in
+		particular fixs for the multibuffer code, and various
+		compiler macro fixes.  The shortcut lists for
+		the search and replace prompts are a little more logical
+		(with cancel the last option again), and the included
+		gettext was re-downgraded to 0.10.35 due to problems
+		on the PPC platform.  GNU nano now includes its own
+		aclocal macros in the m4/ directory to allow rebuilding
+		the configure script to work on platforms regardless of
+		their gettext version.
+
 07/15/2001 - GNU nano 1.1.0 is released.  This is the first release
 		in the 1.1.x unstable series of GNU nano. It
 		incorporates all changes up to the 1.0.3 release, 

README

@@ -55,7 +55,7 @@ Current Status
 
 	This is the 1.1 or unstable branch of nano.  New features
 	will be added and things will be changed around and basically
-	stabiliity is not guaranteed.  If this is not what you're
+	stability is not guaranteed.  If this is not what you're
 	interested in, please use the latest 1.0.x release of nano.
 
 	New features in this branch include:
@@ -71,6 +71,14 @@ Current Status
 	  shortcuts and files in browser, search toggles that are Pico 
 	  extensions moved to Meta keys so as to not interfere with Pico
 	  control sequences.
+	+ Smooth scrolling through files, instead of the jerky half-page
+	  down, half-page up method.  This is available by using the 
+	  -S or --smooth switch, or the Meta-S toggle.
+	+ Better non-*nix file support.  GNU nano now automatically
+	  converts files from DOS format or Mac format to standard file
+	  format.  It can also write files in either format by using the
+	  appropriate command line (-D, --dos or -M, --mac) or toggle
+	  (Meta-D, Meta-O).
 
    Chris Allegretta (chrisa@asty.org)
 

THANKS

@@ -2,16 +2,23 @@ The following people have helped GNU nano in some way or another.
 If we missed you here, let us now!
 
 Marco Colombo <magicdice@inwind.it>		Italian Translator
+Karl Eichwalder <keichwa@gmx.net>		German Translator
 Tedi Heriyanto <tedi_h@gmx.net>			Indonesian Translator
 Václav Haisman <V.Haisman@sh.cvut.cz>		Czech Translator
-Szabolcs Horvath <horvaths@fi.inf.elte.hu>	Hungarian Translator
+Szabolcs Horvath <horvaths@janus.gimsz.sulinet.hu>
+						Hungarian Translator
+Eivind Kjørstad <ekj@vestdata.no>		Norwegian (Bokmål) Translator
 Florian König <floki@bigfoot.com>		German Translator
 Clement Laforet <clem_laf@wanadoo.fr>		French Translator
 Sergey A. Ribalchenko <fisher@obu.ck.ua>	Russian, Ukrainian Translator
+Christian Rose <menthos@menthos.com>		Swedish Translator
+Keld Simonsen <keld@dkuug.dk>			Danish Translator
+Guus Sliepen <guus@nl.linux.org>		Dutch Translator
 Pierre Tane <tanep@bigfoot.com>			French Translator
 Jacobo Tarrío <jtarrio@trasno.net>		Galician Translator
 Miquel Vidal <miquel@sindominio.net>		Catalan Translator
 Pauli Virtanen <pauli.virtanen@saunalahti.fi>	Finnish Translator
+
 Jim Knoble <jmknoble@pobox.com>			Pico compat for browser
 Thomas Dickey <dickey@herndon4.his.com>		Curses help and advice
 Ryan Krebs <fluffy@highwire.stanford.edu>	Many bug fixes and testing

acconfig.h

@@ -54,7 +54,10 @@
 /* Define this to disable the mouse functions */
 #undef DISABLE_MOUSE
 
-/* Define this to load files upon inserting them, and allow switching between them; this is disabled if NANO_SMALL is defined */
+/* Define this to disable setting of the operating directory (chroot of sorts) */
+#undef DISABLE_OPERATINGDIR
+
+/* Define this to enable multiple file buffers; this is disabled if NANO_SMALL is defined */
 #undef ENABLE_MULTIBUFFER
 
 /* Define this to use the .nanorc file */
@@ -66,3 +69,5 @@
 /* Define this to have syntax hilighting, requires ENABLE_NANORC too! */
 #undef ENABLE_COLOR
 
+/* Define this to enable undoing....something */
+#undef ENABLE_UNDO

aclocal.m4

@@ -125,23 +125,98 @@ for am_file in <<$1>>; do
 done<<>>dnl>>)
 changequote([,]))])
 
-#serial 1
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
+#serial 19
 
-undefine([AC_ISC_POSIX])
+dnl By default, many hosts won't let programs access large files;
+dnl one must use special compiler options to get large-file access to work.
+dnl For more details about this brain damage please see:
+dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
 
-AC_DEFUN([AC_ISC_POSIX],
-  [
-    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-  ]
-)
+dnl Written by Paul Eggert <eggert@twinsun.com>.
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_TEST_INCLUDES
+AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
+  [[#include <sys/types.h>
+    /* Check that off_t can represent 2**63 - 1 correctly.
+       We can't simply "#define LARGE_OFF_T 9223372036854775807",
+       since some C++ compilers masquerading as C compilers
+       incorrectly reject 9223372036854775807.  */
+#   define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+			&& LARGE_OFF_T % 2147483647 == 1)
+		       ? 1 : -1];
+  ]])
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)
+AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
+  [AC_CACHE_CHECK([for $1 value needed for large files], $3,
+     [$3=no
+      AC_TRY_COMPILE([$5],
+	[$6], 
+	,
+	[AC_TRY_COMPILE([#define $1 $2]
+[$5]
+	   ,
+	   [$6],
+	   [$3=$2])])])
+   if test "[$]$3" != no; then
+     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
+   fi])
+
+AC_DEFUN(NANO_AC_SYS_LARGEFILE,
+  [AC_REQUIRE([AC_PROG_CC])
+   AC_ARG_ENABLE(largefile,
+     [  --disable-largefile     omit support for large files])
+   if test "$enable_largefile" != no; then
+
+     AC_CACHE_CHECK([for special C compiler options needed for large files],
+       ac_cv_sys_largefile_CC,
+       [ac_cv_sys_largefile_CC=no
+        if test "$GCC" != yes; then
+	  # IRIX 6.2 and later do not support large files by default,
+	  # so use the C compiler's -n32 option if that helps.
+	  AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
+	    [ac_save_CC="$CC"
+	     CC="$CC -n32"
+	     AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,
+	       ac_cv_sys_largefile_CC=' -n32')
+	     CC="$ac_save_CC"])
+        fi])
+     if test "$ac_cv_sys_largefile_CC" != no; then
+       CC="$CC$ac_cv_sys_largefile_CC"
+     fi
+
+     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
+       ac_cv_sys_file_offset_bits,
+       [Number of bits in a file offset, on hosts where this is settable.],
+       AC_SYS_LARGEFILE_TEST_INCLUDES)
+     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
+       ac_cv_sys_large_files,
+       [Define for large files, on AIX-style hosts.],
+       AC_SYS_LARGEFILE_TEST_INCLUDES)
+   fi
+  ])
+
+AC_DEFUN(AC_FUNC_FSEEKO,
+  [AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
+     ac_cv_sys_largefile_source,
+     [Define to make fseeko visible on some hosts (e.g. glibc 2.2).],
+     [#include <stdio.h>], [return !fseeko;])
+   # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+   # in glibc 2.1.3, but that breaks too many other things.
+   # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+
+   AC_CACHE_CHECK([for fseeko], ac_cv_func_fseeko,
+     [ac_cv_func_fseeko=no
+      AC_TRY_LINK([#include <stdio.h>],
+        [return fseeko && fseeko (stdin, 0, 0);],
+	[ac_cv_func_fseeko=yes])])
+   if test $ac_cv_func_fseeko != no; then
+     AC_DEFINE(HAVE_FSEEKO, 1,
+       [Define if fseeko (and presumably ftello) exists and is declared.])
+   fi])
 
 # Configure paths for GLIB
 # Owen Taylor     97-11-3
@@ -344,41 +419,15 @@ main ()
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
 # This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public License
+# be used in projects which are not available under the GNU Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-# serial 9
+# serial 108
 
-dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
-dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). Otherwise, a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.
-dnl LIBDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_WITH_NLS],
+AC_PREREQ(2.13)               dnl Minimum Autoconf version required.
+
+AC_DEFUN(NANO_AM_WITH_NLS,
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
@@ -387,15 +436,23 @@ AC_DEFUN([AM_WITH_NLS],
     AC_MSG_RESULT($USE_NLS)
     AC_SUBST(USE_NLS)
 
-    BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
-    INTLLIBS=
+
+    AC_ARG_WITH(locale-dir,
+      [  --with-locale-dir=DIR   specify locale directory],
+      LOCALE_DIR=$withval)
+    test -z "$LOCALE_DIR" && LOCALE_DIR='$(datadir)/locale'
+    AC_SUBST(LOCALE_DIR)
+
+    AC_ARG_WITH(gnu-locale-dir,
+      [  --with-gnu-locale-dir=DIR specify GNU locale directory],
+      GNU_LOCALE_DIR=$withval)
+    test -z "$GNU_LOCALE_DIR" && GNU_LOCALE_DIR='$(prefix)/share/locale'
+    AC_SUBST(GNU_LOCALE_DIR)
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
+      AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested.])
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
         [  --with-included-gettext use the GNU gettext library included here],
@@ -406,74 +463,83 @@ AC_DEFUN([AM_WITH_NLS],
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
         dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
+        dnl to use.  If gettext or catgets are available (in this order) we
+        dnl use this.  Else we have to fall back to GNU NLS library.
+	dnl catgets is only used if permitted by option --with-catgets.
+	nls_cv_header_intl=
+	nls_cv_header_libgt=
 	CATOBJEXT=NONE
 
-        dnl Add a version number to the cache macros.
-        define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
-        define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
-
 	AC_CHECK_HEADER(libintl.h,
-	  [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-	    [AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;],
-	       [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
-	       gt_cv_func_gnugettext_libc=yes,
-	       gt_cv_func_gnugettext_libc=no)])
+	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
+	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
+	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
 
-	   if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-	     AC_CACHE_CHECK([for GNU gettext in libintl],
-	       gt_cv_func_gnugettext_libintl,
-	       [gt_save_LIBS="$LIBS"
-		LIBS="$LIBS -lintl $LIBICONV"
-		AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;],
-		  [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
-		  gt_cv_func_gnugettext_libintl=yes,
-		  gt_cv_func_gnugettext_libintl=no)
-		LIBS="$gt_save_LIBS"])
+	   if test "$gt_cv_func_gettext_libc" != "yes"; then
+	     AC_CHECK_LIB(intl, bindtextdomain,
+	       [AC_CHECK_LIB(intl, gettext)])
 	   fi
 
-	   dnl If an already present or preinstalled GNU gettext() is found,
-	   dnl use it.  But if this macro is used in GNU gettext, and GNU
-	   dnl gettext is already preinstalled in libintl, we update this
-	   dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-	   if test "$gt_cv_func_gnugettext_libc" = "yes" \
-	      || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-		   && test "$PACKAGE" != gettext; }; then
-	     AC_DEFINE(HAVE_GETTEXT, 1,
-               [Define if the GNU gettext() function is already present or preinstalled.])
-
-	     if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-	       dnl If iconv() is in a separate libiconv library, then anyone
-	       dnl linking with libintl{.a,.so} also needs to link with
-	       dnl libiconv.
-	       INTLLIBS="-lintl $LIBICONV"
-	     fi
-
-	     gt_save_LIBS="$LIBS"
-	     LIBS="$LIBS $INTLLIBS"
-	     AC_CHECK_FUNCS(dcgettext)
-	     LIBS="$gt_save_LIBS"
-
-	     AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	       [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	     if test "$MSGFMT" != "no"; then
-	       AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-	     fi
-
-	     AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	       [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-
-	     CATOBJEXT=.gmo
-	   fi
+	   if test "$gt_cv_func_gettext_libc" = "yes" \
+	      || test "$ac_cv_lib_intl_gettext" = "yes"; then
+	      AC_DEFINE(HAVE_GETTEXT, 1,
+	  [Define to 1 if you have gettext and don't want to use GNU gettext.])
+	      NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	      if test "$MSGFMT" != "no"; then
+		AC_CHECK_FUNCS(dcgettext)
+		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+		NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			       return _nl_msg_cat_cntr],
+		  [CATOBJEXT=.gmo
+		   DATADIRNAME=share],
+		  [CATOBJEXT=.mo
+		   DATADIRNAME=lib])
+		INSTOBJEXT=.mo
+	      fi
+	    fi
 	])
 
         if test "$CATOBJEXT" = "NONE"; then
-	  dnl GNU gettext is not found in the C library.
+	  AC_MSG_CHECKING([whether catgets can be used])
+	  AC_ARG_WITH(catgets,
+	    [  --with-catgets          use catgets functions if available],
+	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
+	  AC_MSG_RESULT($nls_cv_use_catgets)
+
+	  if test "$nls_cv_use_catgets" = "yes"; then
+	    dnl No gettext in C library.  Try catgets next.
+	    AC_CHECK_LIB(i, main)
+	    AC_CHECK_FUNC(catgets,
+	      [AC_DEFINE(HAVE_CATGETS, 1,
+			 [Define as 1 if you have catgets and don't want to use GNU gettext.])
+	       INTLOBJS="\$(CATOBJS)"
+	       AC_PATH_PROG(GENCAT, gencat, no)dnl
+	       if test "$GENCAT" != "no"; then
+		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
+		 if test "$GMSGFMT" = "no"; then
+		   NANO_AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+		 fi
+		 NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+		 USE_INCLUDED_LIBINTL=yes
+		 CATOBJEXT=.cat
+		 INSTOBJEXT=.cat
+		 DATADIRNAME=lib
+		 INTLDEPS='$(top_builddir)/intl/libintl.a'
+		 INTLLIBS=$INTLDEPS
+		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+		 nls_cv_header_intl=intl/libintl.h
+		 nls_cv_header_libgt=intl/libgettext.h
+	       fi])
+	  fi
+        fi
+
+        if test "$CATOBJEXT" = "NONE"; then
+	  dnl Neither gettext nor catgets in included in the C library.
 	  dnl Fall back on GNU gettext library.
 	  nls_cv_use_gnu_gettext=yes
         fi
@@ -482,17 +548,21 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
       if test "$nls_cv_use_gnu_gettext" = "yes"; then
         dnl Mark actions used to generate GNU NLS library.
         INTLOBJS="\$(GETTOBJS)"
-        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+        NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
 	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
         AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+        NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
 	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
         AC_SUBST(MSGFMT)
-	BUILD_INCLUDED_LIBINTL=yes
 	USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
-	INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
-	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+        INSTOBJEXT=.mo
+        DATADIRNAME=share
+	INTLDEPS='$(top_builddir)/intl/libintl.a'
+	INTLLIBS=$INTLDEPS
+	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+        nls_cv_header_intl=intl/libintl.h
+        nls_cv_header_libgt=intl/libgettext.h
       fi
 
       dnl Test whether we really found GNU xgettext.
@@ -508,74 +578,29 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
 	fi
       fi
 
-      dnl We need to process the po/ directory.
+      # We need to process the po/ directory.
       POSUB=po
-    fi
-    AC_OUTPUT_COMMANDS(
-     [for ac_file in $CONFIG_FILES; do
-        # Support "outfile[:infile[:infile...]]"
-        case "$ac_file" in
-          *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-        esac
-        # PO directories have a Makefile.in generated from Makefile.in.in.
-        case "$ac_file" in */Makefile.in)
-          # Adjust a relative srcdir.
-          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-          test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-          case "$ac_given_srcdir" in
-            .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-            /*) top_srcdir="$ac_given_srcdir" ;;
-            *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-          esac
-          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-            rm -f "$ac_dir/POTFILES"
-            test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
-            test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          fi
-          ;;
-        esac
-      done])
-
-
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-    dnl because plural.y uses bison specific features. It requires at least
-    dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-    dnl compile.
-    dnl bison is only needed for the maintainer (who touches plural.y). But in
-    dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-    dnl the rule in general Makefile. Now, some people carelessly touch the
-    dnl files or have a broken "make" program, hence the plural.c rule will
-    dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-    dnl present or too old.
-    AC_CHECK_PROGS([INTLBISON], [bison])
-    if test -z "$INTLBISON"; then
-      ac_verc_fail=yes
     else
-      dnl Found it, now check the version.
-      AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-      case $ac_prog_version in
-        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
-           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-        *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-      esac
-      AC_MSG_RESULT([$ac_prog_version])
+      DATADIRNAME=share
+      nls_cv_header_intl=intl/libintl.h
+      nls_cv_header_libgt=intl/libgettext.h
     fi
-    if test $ac_verc_fail = yes; then
-      INTLBISON=:
+    if test -z "$nls_cv_header_intl"; then
+      # Clean out junk possibly left behind by a previous configuration.
+      rm -f intl/libintl.h
+    fi
+    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+    AC_OUTPUT_COMMANDS(
+     [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
+
+
+    # If this is used in GNU gettext we have to set USE_NLS to `yes'
+    # because some of the sources are only built for this goal.
+    if test "$PACKAGE" = gettext; then
+      USE_NLS=yes
+      USE_INCLUDED_LIBINTL=yes
     fi
 
     dnl These rules are solely for the distribution goal.  While doing this
@@ -587,38 +612,22 @@ changequote([,])dnl
     done
 
     dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
     AC_SUBST(USE_INCLUDED_LIBINTL)
     AC_SUBST(CATALOGS)
     AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
     AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLDEPS)
     AC_SUBST(INTLLIBS)
     AC_SUBST(INTLOBJS)
     AC_SUBST(POFILES)
     AC_SUBST(POSUB)
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST(GENCAT)
   ])
 
-dnl Usage: Just like AM_WITH_NLS, which see.
-AC_DEFUN([AM_GNU_GETTEXT],
+AC_DEFUN(NANO_AM_GNU_GETTEXT,
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_CANONICAL_HOST])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
    AC_REQUIRE([AC_ISC_POSIX])dnl
    AC_REQUIRE([AC_HEADER_STDC])dnl
@@ -628,18 +637,21 @@ AC_DEFUN([AM_GNU_GETTEXT],
    AC_REQUIRE([AC_TYPE_SIZE_T])dnl
    AC_REQUIRE([AC_FUNC_ALLOCA])dnl
    AC_REQUIRE([AC_FUNC_MMAP])dnl
-   AC_REQUIRE([jm_GLIBC21])dnl
 
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
-   AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
-getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
-strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
+unistd.h sys/param.h])
+   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+strdup __argz_count __argz_stringify __argz_next])
 
-   AM_ICONV
-   AM_LANGINFO_CODESET
-   AM_LC_MESSAGES
-   AM_WITH_NLS([$1],[$2],[$3])
+   if test "${ac_cv_func_stpcpy+set}" != "set"; then
+     AC_CHECK_FUNCS(stpcpy)
+   fi
+   if test "${ac_cv_func_stpcpy}" = "yes"; then
+     AC_DEFINE(HAVE_STPCPY, 1, [Define to 1 if you have the stpcpy function.])
+   fi
+
+   NANO_AM_LC_MESSAGES
+   NANO_AM_WITH_NLS
 
    if test "x$CATOBJEXT" != "x"; then
      if test "x$ALL_LINGUAS" = "x"; then
@@ -647,21 +659,10 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
      else
        AC_MSG_CHECKING(for catalogs to be installed)
        NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
-           # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
+         case "$ALL_LINGUAS" in
+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+         esac
        done
        LINGUAS=$NEW_LINGUAS
        AC_MSG_RESULT($LINGUAS)
@@ -673,8 +674,47 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
      fi
    fi
 
+   dnl The reference to <locale.h> in the installed <libintl.h> file
+   dnl must be resolved because we cannot expect the users of this
+   dnl to define HAVE_LOCALE_H.
+   if test $ac_cv_header_locale_h = yes; then
+     INCLUDE_LOCALE_H="#include <locale.h>"
+   else
+     INCLUDE_LOCALE_H="\
+/* The system does not provide the header <locale.h>.  Take care yourself.  */"
+   fi
+   AC_SUBST(INCLUDE_LOCALE_H)
+
+   dnl Determine which catalog format we have (if any is needed)
+   dnl For now we know about two different formats:
+   dnl   Linux libc-5 and the normal X/Open format
+   test -d intl || mkdir intl
+   if test "$CATOBJEXT" = ".cat"; then
+     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
+
+     dnl Transform the SED scripts while copying because some dumb SEDs
+     dnl cannot handle comments.
+     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
+   fi
+   dnl po2tbl.sed is always needed.
+   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
+     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+
+   dnl In the intl/Makefile.in we have a special dependency which makes
+   dnl only sense for gettext.  We comment this out for non-gettext
+   dnl packages.
+   if test "$PACKAGE" = "gettext"; then
+     GT_NO="#NO#"
+     GT_YES=
+   else
+     GT_NO=
+     GT_YES="#YES#"
+   fi
+   AC_SUBST(GT_NO)
+   AC_SUBST(GT_YES)
+
    dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
    dnl Try to locate is.
    MKINSTALLDIRS=
    if test -n "$ac_aux_dir"; then
@@ -685,16 +725,31 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
    fi
    AC_SUBST(MKINSTALLDIRS)
 
-   dnl Enable libtool support if the surrounding package wishes it.
-   INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
-   AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
+   dnl *** For now the libtool support in intl/Makefile is not for real.
+   l=
+   AC_SUBST(l)
+
+   dnl Generate list of files to be processed by xgettext which will
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   case "$srcdir" in
+   .)
+     posrcprefix="../" ;;
+   /* | [[A-Za-z]]:*)
+     posrcprefix="$srcdir/" ;;
+   *)
+     posrcprefix="../$srcdir/" ;;
+   esac
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
   ])
 
 # Search path for a program which passes the given test.
 # Ulrich Drepper <drepper@cygnus.com>, 1996.
 #
 # This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public License
+# be used in projects which are not available under the GNU Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
@@ -702,7 +757,7 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+AC_DEFUN(NANO_AM_PATH_PROG_WITH_TEST,
 [# Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
@@ -738,139 +793,74 @@ fi
 AC_SUBST($1)dnl
 ])
 
-#serial 2
+# Search path for a program which passes the given test.
+# Ulrich Drepper <drepper@cygnus.com>, 1996.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
 
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
+# serial 1
 
-AC_DEFUN([jm_GLIBC21],
-  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      [AC_EGREP_CPP([Lucky GNU user],
-	[
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-	],
-	ac_cv_gnu_library_2_1=yes,
-	ac_cv_gnu_library_2_1=no)
-      ]
-    )
-    AC_SUBST(GLIBC21)
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)
-
-#serial AM2
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-
-  AC_ARG_WITH([libiconv-prefix],
-[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
-    for dir in `echo "$withval" | tr : ' '`; do
-      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
-      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
-    done
-   ])
-
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      am_cv_func_iconv=yes)
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS -liconv"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
-      LIBS="$am_save_LIBS"
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN(AM_PATH_PROG_WITH_TEST,
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  /*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+	ac_cv_path_$1="$ac_dir/$ac_word"
+	break
+      fi
     fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      [Define as const if the declaration of iconv() needs const.])
-  fi
-  LIBICONV=
-  if test "$am_cv_lib_iconv" = yes; then
-    LIBICONV="-liconv"
-  fi
-  AC_SUBST(LIBICONV)
-])
-
-#serial AM1
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_LANGINFO_CODESET],
-[
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
+  done
+  IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+  ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test -n "[$]$1"; then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
 ])
 
 # Check whether LC_MESSAGES is available in <locale.h>.
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
 # This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public License
+# be used in projects which are not available under the GNU Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
 # serial 2
 
-AC_DEFUN([AM_LC_MESSAGES],
+AC_PREREQ(2.13)               dnl Minimum Autoconf version required.
+
+AC_DEFUN(NANO_AM_LC_MESSAGES,
   [if test $ac_cv_header_locale_h = yes; then
     AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
       [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
        am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
     if test $am_cv_val_LC_MESSAGES = yes; then
       AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
+		[Define if your locale.h file contains LC_MESSAGES.])
     fi
   fi])
 

config.h.in

@@ -1,4 +1,4 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
 /* Define if using alloca.c.  */
 #undef C_ALLOCA
@@ -31,6 +31,9 @@
 /* Define to `long' if <sys/types.h> doesn't define.  */
 #undef off_t
 
+/* Define if you need to in order for stat and other things to work.  */
+#undef _POSIX_SOURCE
+
 /* Define as the return type of signal handlers (int or void).  */
 #undef RETSIGTYPE
 
@@ -88,7 +91,10 @@
 /* Define this to disable the mouse functions */
 #undef DISABLE_MOUSE
 
-/* Define this to load files upon inserting them, and allow switching between them; this is disabled if NANO_SMALL is defined */
+/* Define this to disable setting of the operating directory (chroot of sorts) */
+#undef DISABLE_OPERATINGDIR
+
+/* Define this to enable multiple file buffers; this is disabled if NANO_SMALL is defined */
 #undef ENABLE_MULTIBUFFER
 
 /* Define this to use the .nanorc file */
@@ -100,6 +106,9 @@
 /* Define this to have syntax hilighting, requires ENABLE_NANORC too! */
 #undef ENABLE_COLOR
 
+/* Define this to enable undoing....something */
+#undef ENABLE_UNDO
+
 /* Define if you have the __argz_count function.  */
 #undef HAVE___ARGZ_COUNT
 
@@ -112,36 +121,15 @@
 /* Define if you have the dcgettext function.  */
 #undef HAVE_DCGETTEXT
 
-/* Define if you have the feof_unlocked function.  */
-#undef HAVE_FEOF_UNLOCKED
-
-/* Define if you have the fgets_unlocked function.  */
-#undef HAVE_FGETS_UNLOCKED
-
 /* Define if you have the getcwd function.  */
 #undef HAVE_GETCWD
 
-/* Define if you have the getegid function.  */
-#undef HAVE_GETEGID
-
-/* Define if you have the geteuid function.  */
-#undef HAVE_GETEUID
-
-/* Define if you have the getgid function.  */
-#undef HAVE_GETGID
-
 /* Define if you have the getopt_long function.  */
 #undef HAVE_GETOPT_LONG
 
 /* Define if you have the getpagesize function.  */
 #undef HAVE_GETPAGESIZE
 
-/* Define if you have the getuid function.  */
-#undef HAVE_GETUID
-
-/* Define if you have the mempcpy function.  */
-#undef HAVE_MEMPCPY
-
 /* Define if you have the munmap function.  */
 #undef HAVE_MUNMAP
 
@@ -169,12 +157,6 @@
 /* Define if you have the strdup function.  */
 #undef HAVE_STRDUP
 
-/* Define if you have the strtoul function.  */
-#undef HAVE_STRTOUL
-
-/* Define if you have the tsearch function.  */
-#undef HAVE_TSEARCH
-
 /* Define if you have the vsnprintf function.  */
 #undef HAVE_VSNPRINTF
 
@@ -208,12 +190,6 @@
 /* Define if you have the <regex.h> header file.  */
 #undef HAVE_REGEX_H
 
-/* Define if you have the <stddef.h> header file.  */
-#undef HAVE_STDDEF_H
-
-/* Define if you have the <stdlib.h> header file.  */
-#undef HAVE_STDLIB_H
-
 /* Define if you have the <string.h> header file.  */
 #undef HAVE_STRING_H
 
@@ -229,28 +205,36 @@
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 
+/* Define if you have the i library (-li).  */
+#undef HAVE_LIBI
+
+/* Define if you have the intl library (-lintl).  */
+#undef HAVE_LIBINTL
+
 /* Name of package */
 #undef PACKAGE
 
 /* Version number of package */
 #undef VERSION
 
-/* Define if you have the iconv() function. */
-#undef HAVE_ICONV
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
 
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
 
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#undef HAVE_LANGINFO_CODESET
+/* Define to 1 if you have the stpcpy function. */
+#undef HAVE_STPCPY
 
-/* Define if your <locale.h> file defines LC_MESSAGES. */
+/* Define if your locale.h file contains LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES
 
-/* Define to 1 if translation of program messages to the user's native language
-   is requested. */
+/* Define to 1 if NLS is requested. */
 #undef ENABLE_NLS
 
-/* Define if the GNU gettext() function is already present or preinstalled. */
+/* Define to 1 if you have gettext and don't want to use GNU gettext. */
 #undef HAVE_GETTEXT
 
+/* Define as 1 if you have catgets and don't want to use GNU gettext. */
+#undef HAVE_CATGETS
+

configure.in

@@ -1,13 +1,14 @@
 # $Id$
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(nano.c)
-AM_INIT_AUTOMAKE(nano, 1.1.0)
+AM_INIT_AUTOMAKE(nano, 1.1.2)
 AM_CONFIG_HEADER(config.h:config.h.in)
-ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv no"
+ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv no nl da"
 
 dnl Checks for programs.
 AC_PROG_CC
 AC_ISC_POSIX
+NANO_AC_SYS_LARGEFILE
 
 dnl Checks for header files.
 AC_HEADER_STDC
@@ -25,6 +26,7 @@ AC_ARG_ENABLE(tiny,
     AC_DEFINE(DISABLE_JUSTIFY) 
     AC_DEFINE(DISABLE_BROWSER) 
     AC_DEFINE(DISABLE_MOUSE) 
+    AC_DEFINE(DISABLE_OPERATINGDIR)
  fi])
 
 AC_ARG_ENABLE(extra,
@@ -32,10 +34,17 @@ AC_ARG_ENABLE(extra,
 [if test x$enableval = xyes; then
     AC_DEFINE(NANO_EXTRA) extra_support=yes
     AC_DEFINE(ENABLE_MULTIBUFFER) multibuffer_support=yes
+    AC_DEFINE(ENABLE_UNDO) undo_support=yes
+ fi])
+
+AC_ARG_ENABLE(undo,
+[  --enable-undo           Enable undo support],
+[if test x$enableval = xyes && test x$tiny_support != xyes; then
+    AC_DEFINE(ENABLE_UNDO) undo_support=yes
  fi])
 
 AC_ARG_ENABLE(multibuffer,
-[  --enable-multibuffer    Enable use of file loading on insertion, and switching between loaded files; this is disabled if --enable-tiny is used],
+[  --enable-multibuffer    Enable multiple file buffers; this is disabled if --enable-tiny is used],
 [if test x$enableval = xyes && test x$tiny_support != xyes; then
     AC_DEFINE(ENABLE_MULTIBUFFER) multibuffer_support=yes
  fi])
@@ -102,6 +111,12 @@ AC_ARG_ENABLE(mouse,
     AC_DEFINE(DISABLE_MOUSE)
  fi])
 
+AC_ARG_ENABLE(operatingdir,
+[  --disable-operatingdir         Disable setting of operating directory (chroot of sorts)],
+ [if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_OPERATINGDIR)
+ fi])
+
 AC_MSG_CHECKING([whether to use slang])
 CURSES_LIB_NAME=""
 AC_ARG_WITH(slang,
@@ -289,6 +304,6 @@ then
 fi
 
 dnl i18n stuff - pretty incomplete for now
-AM_GNU_GETTEXT
+NANO_AM_GNU_GETTEXT
 
 AC_OUTPUT([Makefile intl/Makefile po/Makefile.in])

cut.c

@@ -180,6 +180,8 @@ void cut_marked_segment(filestruct * top, int top_x, filestruct * bot,
 		filebot = next;
 	    } else {
 		filebot = top;
+		if (top_x > 0)
+		    new_magicline();
 	    }
 	}
 	if (top->lineno < edittop->lineno)
@@ -192,6 +194,7 @@ int do_cut_text(void)
 {
     filestruct *tmp, *fileptr = current;
 #ifndef NANO_SMALL
+    int cuttingpartialline = 0;
     int cuttingtoend = 0;
 #endif
 
@@ -250,9 +253,12 @@ int do_cut_text(void)
 	}
     }
     if (ISSET(MARK_ISSET)) {
-	if (current->lineno <= mark_beginbuf->lineno)
+	if (current->lineno <= mark_beginbuf->lineno) {
+	    if (current->lineno == mark_beginbuf->lineno)
+		cuttingpartialline = 1;
 	    cut_marked_segment(current, current_x, mark_beginbuf,
 			       mark_beginx, 1);
+	}
 	else
 	    cut_marked_segment(mark_beginbuf, mark_beginx, current,
 			       current_x, 1);
@@ -262,7 +268,7 @@ int do_cut_text(void)
 
 	marked_cut = 1;
 	set_modified();
-	if (cuttingtoend)
+	if (cuttingpartialline || cuttingtoend)
 	    edit_refresh();
 	else
 	    edit_update(current, CENTER);

faq.html

@@ -203,7 +203,7 @@ nano was developed).</font></blockquote>
 of nano?</font></h2>
 
 <blockquote><font color="#330000">The current version of nano *should*
-be 1.1.0.&nbsp; Of course you should always check the nano hompage to
+be 1.1.2.&nbsp; Of course you should always check the nano hompage to
 see what the latest and greatest version is.</font></blockquote>
 
 <h2>
@@ -232,9 +232,6 @@ at the following fine web and ftp sites:</font>
 
 <li>
 <font color="#330000"><a href="ftp://ftp.nano-editor.org/pub/nano">ftp://ftp.nano-editor.org/pub/nano</a></font></li>
-
-<li>
-<font color="#330000"><a href="ftp://nano.sourceforge.net/pub/nano/">ftp://nano.sourceforge.net/pub/nano</a></font></li>
 </ul>
 </blockquote>
 
@@ -252,9 +249,6 @@ packages.</font></h2>
 
 <li>
 <font color="#330000"><a href="ftp://ftp.nano-editor.org/pub/nano/RPMS">ftp://ftp.nano-editor.org/pub/nano/RPMS</a></font></li>
-
-<li>
-<font color="#330000"><a href="ftp://nano.sourceforge.net/pub/nano/RPMS">ftp://nano.sourceforge.net/pub/nano/RPMS</a></font></li>
 </ul>
 <font color="#330000">Additionally, check out the Redhat contribs section
 at:</font>
@@ -276,9 +270,15 @@ current nano packages for:</font>
 <li>
 <font color="#330000"><a href="http://www.debian.org/Packages/stable/editors/nano.html">stable</a></font></li>
 
+<li>
+<font color="#330000"><a href="http://www.debian.org/Packages/testing/editors/nano.html">testing</a></font></li>
+
 <li>
 <font color="#330000"><a href="http://www.debian.org/Packages/unstable/editors/nano.html">unstable</a></font></li>
 </ul>
+<p><font color="#330000">You can also have a look at the</font>
+<font color="#330000"><a href="ftp://ftp.debian.org/debian/pool/main/n/nano/">Package Pool</a> to see all the available binary and source packages.</font></p>
+
 <font color="#330000">Note that versions &lt; 0.9.10 are probably not for
 those wanting to get serious work done, so if you are using Debian 2.2, check
 that you have updated to 2.2r3, which comes with nano 0.9.23. If you're 
@@ -372,6 +372,7 @@ list:
 <b>--disable-browser</b>       Disables mini file browser
 <b>--disable-wrapping</b>      Disables all wrapping of text (and -w flag)
 <b>--disable-mouse</b>         Disables mouse support (and -m flag)
+<b>--disable-operatingdir</b>  Disable setting of operating directory
 </pre><br>
 There's also the <b>--enable-tiny</b> option which disables everything
 above, as well as some larger chunks of the program (like the marker code
@@ -381,7 +382,7 @@ disable internationalization and save a few K to a few dozen K depending
 on if you have locale support on your system. And finally there's always
 good old <b>strip</b> to strip all debugging code and code that exists in
 libraries on your system.
-<p>If, in the other hand, you can't live with bells and whistles, you could
+<p>If, in the other hand, you can't live without bells and whistles, you could
 try:
 <pre>
 <b>--enable-extra</b>          Enable extra functions, including easter eggs
@@ -394,29 +395,33 @@ try:
 <a NAME="3.7"></a><font color="#330000">
 3.7. Tell me more about this multibuffer stuff!</font></h2>
 
-<blockquote><font color="#330000"> To use multiple file buffers, you must be using nano 1.1.0
-or newer, and you must have configured nano with <b>--enable-multibuffer</b> or
-<b>--enable-extra</b> (use nano -V to check).  Then when you want to enable inserting a file
-into its own buffer instead of into the current file, just hit <b>Meta-F</b>, then insert the
-file as normal with <b>^R</b>.  If you always want files to be loaded into their own buffers,
+<blockquote><font color="#330000"> To use multiple file buffers, you must
+be using nano 1.1.2 or newer, and you must have configured nano with
+<b>--enable-multibuffer</b> or <b>--enable-extra</b> (use nano -V to check).
+Then when you want to enable inserting a file into its own buffer instead of
+into the current file, just hit <b>Meta-F</b>, then insert the file as normal
+with <b>^R</b>.  If you always want files to be loaded into their own buffers,
 use the <b>--multibuffer</b> or <b>-F</b> flag when you invoke nano. <P>
 
-You can move between the buffers you have open with the <b>Meta-&lt;</b> and <b>Meta-&gt;</b>
-keys, or more easily with <b>Meta-,</b> and <b>Meta-.</b> (clear as mud, right? =-).
-When you have more than one file buffer open, the ^X shortcut will say "Close", instead of the
-normal "Exit" when only one buffer is open. 
+You can move between the buffers you have open with the <b>Meta-&lt;</b> and
+<b>Meta-&gt;</b> keys, or more easily with <b>Meta-,</b> and <b>Meta-.</b>
+(clear as mud, right? =-). When you have more than one file buffer open,
+the ^X shortcut will say "Close", instead of the normal "Exit" when only one
+buffer is open. 
 </font></blockquote>
 
 <h2>
 <a NAME="3.8"></a><font color="#330000">
 3.8. How do I make a .nanorc file that nano will read when I start it?</font></h2>
 
-<blockquote><font color="#330000"> It's not hard at all!  But, your version of nano must have
-beem compiled with <b>--enable-nanorc</b>, and again must be version 1.1.0 or newer (use nano
--V to check your version and compiled features).  Then simply copy the <b>nanorc.sample</b>
-that came with the nano source or your nano package (most likely in /usr/doc/nano) to .nanorc
-in your home directory. If you didn't get one, the syntax is simple.  Flags are turned on and
-off by using the word <b>set</b> and the getopt_long flag for the feature, for example "set
+<blockquote><font color="#330000"> It's not hard at all!  But, your version
+of nano must have beem compiled with <b>--enable-nanorc</b>, and again must
+be version 1.1.2 or newer (use nano -V to check your version and compiled
+features).  Then simply copy the <b>nanorc.sample</b>
+that came with the nano source or your nano package (most likely in
+/usr/doc/nano) to .nanorc in your home directory. If you didn't get one,
+the syntax is simple.  Flags are turned on and off by using the word
+<b>set</b> and the getopt_long flag for the feature, for example "set
 pico" or "set nowrap". </font></blockquote> <hr WIDTH="100%">
 
 <h1><a NAME="4"></a><font color="#330000">4. Running</font></h1>
@@ -500,7 +505,7 @@ mutt, etc)?</h2>
 
 <blockquote>You need to make nano your $EDITOR.&nbsp; If you want this
 to be saved, you should put a line like this in your <b>.bashrc</b> if
-you use bash:
+you use bash (or <b>.zshrc</b> if you believe in zsh):
 <p><b>export EDITOR=/usr/local/bin/nano</b>
 <p>or if you use tcsh put this in your <b>.cshrc</b> file:
 <p><b>setenv EDITOR /usr/local/bin/nano</b>
@@ -529,20 +534,32 @@ this in your <b>.muttrc</b>:
 <a NAME="5.1"></a><font color="#330000">5.1. There's no translation for
 my language!</font></h2>
 
-<blockquote><font color="#330000">So, uh, get someone who speaks your native
-language to write one =-).&nbsp; Just grab the <b>nano.pot</b> file from
-the latest and greatest nano distribution (it's in the <b>po/</b> directory)
-and translate each line into your native language on the <b>msgstr</b>
-line.&nbsp; Then send it to the <a href="mailto:nano-devel@lists.sourceforge.net">nano-devel</a> list or <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.</font></blockquote>
+<blockquote><font color="#330000">On June of 2001, GNU nano entered the
+<a href="www.iro.umontreal.ca/contrib/po/HTML">Free Translation Project</a>
+and since then, translations should be managed from there.
+<p>If there isn't a translation for your language, you could ask
+<a href="http://www.iro.umontreal.ca/contrib/po/HTML/teams.html">your language
+team</a> to tranlate nano, or better still, join your team and do it yourself.
+Joining a team is easy. You just need to ask the
+<a href="mailto:translation@iro.umontreal.ca">TP coordinator</a> to add you
+to your team, and send a <a href="http://www.iro.umontreal.ca/contrib/po/HTML/disclaim.html">translation disclaimer to the FSF</a> (this is necessary as
+nano is an official GNU package, but it does <strong>not</strong> mean that
+you transfer the rights of your work to the FSF, it's just so the FSF can
+legaly manage them).</p>
+<p>In any case, translating nano is very easy.&nbsp; Just grab the
+<b>nano.pot</b> file from the latest and greatest nano distribution
+(it's in the <b>po/</b> directory) and translate each line into your native
+language on the <b>msgstr</b> line.&nbsp; When you're done, you should
+send it to the TP's central po repository.
 
 <h2>
 <a NAME="5.2"></a><font color="#330000">5.2. I don't like the translation
 for &lt;x> in my language.&nbsp;&nbsp; How can I fix it?</font></h2>
 
 <blockquote><font color="#330000">The best way would probably be to e-mail
-the person listed in the <b>&lt;your_language>.po</b> file with your suggested
-corrections and they can in turn forward it to the nano email address,
-or the devel list.</font></blockquote>
+the person listed in the <code>Last-Translator:</code> field in
+<b>&lt;your_language&gt;.po</b> file with your suggested corrections and
+they can make the changes reach the nano devel list.</font></blockquote>
 
 <hr WIDTH="100%">
 <h1>
@@ -663,10 +680,28 @@ to your resume.</font></blockquote>
 <blockquote><font color="#330000">Re-read Section </font><a href="#7.4">7.4</a><font color="#330000">
 and you should know the answer.</font></blockquote>
 
-<h1>
-<a NAME="8"></a>8. ChangeLog</h1>
+<h2>
+<a NAME="8"></a><font color="#330000">8. ChangeLog</font>
+</h2>
 
-<blockquote>06/31/2000 - Initial framework.</blockquote>
+<blockquote>2001/10/02 - Update for Free Translation Project.</blockquote>
+<blockquote>2001/10/02 - Assorted fixes, Debian additions.</blockquote>
+<blockquote>2001/06/30 - Silly typo fix.</blockquote>
+<blockquote>2001/05/05 - Spelling fixes by David Lawrence Ramsey.</blockquote>
+<blockquote>2001/05/02 - Misc fixes.</blockquote>
+<blockquote>2001/03/26 - Typo fix in an URL.</blockquote>
+<blockquote>2001/02/17 - Advocacy updates.</blockquote>
+<blockquote>2001/02/15 - Added GNU notes for 0.9.99pre3.</blockquote>
+<blockquote>2001/02/06 - Typo fixes.</blockquote>
+<blockquote>2001/01/14 - Added note about numlock glitch.</blockquote>
+<blockquote>2001/01/10 - Linux --&gt; GNU/Linux.</blockquote>
+<blockquote>2001/01/09 - Added "making exe smaller section.</blockquote>
+<blockquote>2000/12/19 - Typo and assorted error fixes.</blockquote>
+<blockquote>2000/11/28 - Added blurb about make install-strip.</blockquote>
+<blockquote>2000/11/19 - Changed Debian frozen to stable.</blockquote>
+<blockquote>2000/11/18 - Previous string display (4.5).</blockquote>
+<blockquote>2000/09/27 - Moved addresses to nano-editor.org.</blockquote>
+<blockquote>2000/06/31 - Initial framework.</blockquote>
 <P>
 $Id$
 </body>

files.c

@@ -44,16 +44,20 @@
 #endif
 
 /* Load file into edit buffer - takes data from file struct */
-void load_file(void)
+void load_file(int quiet)
 {
     current = fileage;
 
 #ifdef ENABLE_MULTIBUFFER
-    /* add a new entry to the open_files structure, and check for
-       duplicate entries; if a duplicate entry was found, reload the
-       currently open file (it may have been changed during duplicate
-       handling) */
-    if (add_open_file(0, 1) == 2)
+    /* if quiet is zero, add a new entry to the open_files structure, and
+       do duplicate checking; otherwise, update the current entry and
+       don't do duplicate checking (the latter is needed in the case of
+       the alternate spell checker); if a duplicate entry was found,
+       reload the currently open file (it may have been changed during
+       duplicate handling) */
+    if (quiet != 0)
+	quiet = 1;
+    if (add_open_file(quiet, 1 - quiet) == 2)
 	load_open_file();
 #endif
 
@@ -74,6 +78,18 @@ void new_file(void)
     editbot = fileage;
     current = fileage;
     totlines = 1;
+    totsize = 0;
+
+#ifdef ENABLE_MULTIBUFFER
+    /* if there aren't any entries in open_files, create the entry for
+       this new file, and, of course, don't bother checking for
+       duplicates; without this, if nano is started without a filename on
+       the command line, a new file will be created, but it will be given
+       no open_files entry, leading to problems later on */
+    if (!open_files)
+	add_open_file(0, 0);
+#endif
+
     UNSET(VIEW_MODE);
 }
 
@@ -109,6 +125,14 @@ filestruct *read_line(char *buf, filestruct * prev, int *line1ins)
     fileptr->data = charalloc(strlen(buf) + 2);
     strcpy(fileptr->data, buf);
 
+#ifndef NANO_SMALL
+    /* If it's a DOS file (CRLF), strip out the CR part*/
+    if (buf[strlen(buf) - 1] == '\r') {
+	fileptr->data[strlen(buf) - 1] = 0;
+	totsize--;
+    }
+#endif
+
     if (*line1ins) {
 	/* Special case, insert with cursor on 1st line. */
 	fileptr->prev = NULL;
@@ -138,7 +162,7 @@ filestruct *read_line(char *buf, filestruct * prev, int *line1ins)
 }
 
 
-int read_file(int fd, char *filename)
+int read_file(int fd, char *filename, int quiet)
 {
     long size, num_lines = 0, linetemp = 0;
     char input[2];		/* buffer */
@@ -162,11 +186,21 @@ int read_file(int fd, char *filename)
     /* Read the entire file into file struct */
     while ((size = read_byte(fd, filename, input)) > 0) {
 	linetemp = 0;
+
 	if (input[0] == '\n') {
 	    fileptr = read_line(buf, fileptr, &line1ins);
 	    num_lines++;
 	    buf[0] = 0;
 	    i = 0;
+#ifndef NANO_SMALL
+	/* If it's a Mac file (no LF just a CR), handle it! */
+	} else if (i > 0 && buf[i-1] == '\r') {
+	    fileptr = read_line(buf, fileptr, &line1ins);
+	    num_lines++;
+	    buf[0] = input[0];
+	    buf[1] = 0;
+	    i = 1;
+#endif
 	} else {
 	    /* Now we allocate a bigger buffer 128 characters at a time.
 	       If we allocate a lot of space for one line, we may indeed 
@@ -209,7 +243,7 @@ int read_file(int fd, char *filename)
 	totsize--;
 
 	/* Update the edit buffer */
-	load_file();
+	load_file(quiet);
     }
     statusbar(_("Read %d lines"), num_lines);
     totlines += num_lines;
@@ -251,13 +285,14 @@ int open_file(char *filename, int insert, int quiet)
 		/* Don't open character or block files.  Sorry, /dev/sndstat! */
 		statusbar(_("File \"%s\" is a device file"), filename);
 
+
 	    if (!insert)
 		new_file();
 	    return -1;
 	}
 	if (!quiet)
 	    statusbar(_("Reading File"));
-	read_file(fd, filename);
+	read_file(fd, filename, quiet);
     }
 
     return 1;
@@ -308,6 +343,15 @@ int do_insertfile(int loading_file)
 	}
 #endif
 
+#ifndef DISABLE_OPERATINGDIR
+	if (operating_dir) {
+	    if (check_operating_dir(realname, 0)) {
+		statusbar(_("Can't insert file from outside of %s"), operating_dir);
+		return 0;
+	    }
+	}
+#endif
+
 #ifdef ENABLE_MULTIBUFFER
 	if (loading_file) {
 
@@ -335,7 +379,7 @@ int do_insertfile(int loading_file)
 
 #ifdef ENABLE_MULTIBUFFER
 	if (loading_file)
-	    load_file();
+	    load_file(0);
 	else
 #endif
 
@@ -464,9 +508,7 @@ int add_open_file(int update, int dup_fix)
     while (current->prev)
 	current = current->prev;
     open_files->file = copy_filestruct(current);
-    do_gotoline(open_files->lineno, 1);
-    placewewant = open_files->file_placewewant;
-    update_line(current, current_x);
+    do_gotopos(open_files->lineno, open_files->file_current_x, open_files->file_current_y, open_files->file_placewewant);
 
     /* save current modification status */
     open_files->file_modified = ISSET(MODIFIED);
@@ -514,13 +556,9 @@ int load_open_file(void)
     totlines = open_files->file_totlines;
     totsize = open_files->file_totsize;
 
-    /* since do_gotoline() resets the x-coordinate but not the
-       y-coordinate, set all coordinates up this way */
-    current_y = open_files->file_current_y;
-    do_gotoline(open_files->lineno, 1);
-    current_x = open_files->file_current_x;
-    placewewant = open_files->file_placewewant;
-    update_line(current, current_x);
+    /* restore full file position: line number, x-coordinate, y-
+       coordinate, place we want */
+    do_gotopos(open_files->lineno, open_files->file_current_x, open_files->file_current_y, open_files->file_placewewant);
 
     /* set up modification status and update the titlebar */
     if (open_files->file_modified)
@@ -545,7 +583,7 @@ int load_open_file(void)
  *
  * Note: This should only be called inside open_file_dup_fix().
  */
-filestruct *open_file_dup_search(void)
+filestruct *open_file_dup_search(int update)
 {
     filestruct *tmp;
     char *path;
@@ -571,9 +609,18 @@ filestruct *open_file_dup_search(void)
 
 	if (!strcmp(tmp->file_path, path)) {
 
-	    /* if it's not the current entry, we've found a duplicate */
-	    if (tmp != open_files) 
+	    if (!update)
+		/* if we're making a new entry and there's an entry with
+		   the same full path, we've found a duplicate */
 		return tmp;
+	    else {
+
+		/* if we're updating an existing entry and there's an
+		   entry with the same full path that isn't the current
+		   entry, we've	found a duplicate */
+		if (tmp != open_files) 
+		    return tmp;
+	    }
 	}
 
 	/* go to the next entry */
@@ -591,7 +638,7 @@ filestruct *open_file_dup_search(void)
  */
 int open_file_dup_fix(int update)
 {
-    filestruct *tmp = open_file_dup_search();
+    filestruct *tmp = open_file_dup_search(update);
 
     if (!tmp)
 	return 0;
@@ -730,7 +777,7 @@ int open_nextfile(int closing_file)
 
 /*
  * Delete an entry from the open_files filestruct.  After deletion of an
- * entry, the previous or next entry is opened, whichever is found first.
+ * entry, the next or previous entry is opened, whichever is found first.
  * Return 0 on success or 1 on error.
  */
 int close_open_file(void)
@@ -741,8 +788,8 @@ int close_open_file(void)
 	return 1;
 
     tmp = open_files;
-    if (open_prevfile(1)) {
-	if (open_nextfile(1))
+    if (open_nextfile(1)) {
+	if (open_prevfile(1))
 	    return 1;
     }
 
@@ -755,17 +802,25 @@ int close_open_file(void)
     display_main_list();
     return 0;
 }
+#endif
 
+#if defined (ENABLE_MULTIBUFFER) || !defined (DISABLE_OPERATINGDIR)
 /*
- * When passed "[relative path][filename]" in origpath, return "[full
- * path][filename]" on success, or NULL on error.
+ * When passed "[relative path]" or "[relative path][filename]" in
+ * origpath, return "[full path]" or "[full path][filename]" on success,
+ * or NULL on error.  This is still done if the file doesn't exist but
+ * the relative path does (since the file could exist in memory but not
+ * yet on disk); it is not done if the relative path doesn't exist (since
+ * the first call to chdir() will fail then).
  */
-char *get_full_path(const char *origpath)
+char *get_full_path(char *origpath)
 {
-    char *newpath = NULL, *last_slash, *d_here, *d_there, *d_there_file;
-    int last_slash_index;
+    char *newpath = NULL, *last_slash, *d_here, *d_there, *d_there_file, tmp;
+    int path_only, last_slash_index;
+    struct stat fileinfo;
 
-    /* first, get the current directory */
+    /* first, get the current directory, and tack a slash onto the end of
+       it, unless it turns out to be "/", in which case leave it alone */
 
 #ifdef PATH_MAX
     d_here = getcwd(NULL, PATH_MAX + 1);
@@ -776,14 +831,44 @@ char *get_full_path(const char *origpath)
     if (d_here) {
 
 	align(&d_here);
+	if (strcmp(d_here, "/")) {
+	    d_here = nrealloc(d_here, strlen(d_here) + 2);
+	    strcat(d_here, "/");
+	}
 
-	/* get the filename (with path included) and save it in both
-	   d_there and d_there_file */
+	/* stat origpath; if stat() fails, assume that origpath refers to
+	   a new file that hasn't been saved to disk yet (i. e. set
+	   path_only to 0); if stat() succeeds, set path_only to 0 if
+	   origpath doesn't refer to a directory, or to 1 if it does */
+	path_only = stat(origpath, &fileinfo);
+	if (path_only == -1)
+		path_only = 0;
+	else {
+	    if (S_ISDIR(fileinfo.st_mode))
+		path_only = 1;
+	    else
+		path_only = 0;
+	}
+
+	/* save the value of origpath in both d_there and d_there_file */
 	d_there = charalloc(strlen(origpath) + 1);
 	d_there_file = charalloc(strlen(origpath) + 1);
 	strcpy(d_there, origpath);
 	strcpy(d_there_file, origpath);
 
+	/* if we have a path but no filename, tack slashes onto the ends
+	   of both d_there and d_there_file, if they don't end in slashes
+	   already */
+	if (path_only) {
+	    tmp = d_there[strlen(d_there) - 1];
+	    if (tmp != '/') {
+		d_there = nrealloc(d_there, strlen(d_there) + 2);
+		strcat(d_there, "/");
+		d_there_file = nrealloc(d_there_file, strlen(d_there_file) + 2);
+		strcat(d_there_file, "/");
+	    }
+	}
+
 	/* search for the last slash in d_there */
 	last_slash = strrchr(d_there, '/');
 
@@ -796,19 +881,27 @@ char *get_full_path(const char *origpath)
 
 	else {
 
-	    /* otherwise, remove all non-path elements from d_there */
+	    /* otherwise, remove all non-path elements from d_there
+	       (i. e. everything after the last slash) */
 	    last_slash_index = strlen(d_there) - strlen(last_slash);
-	    null_at(d_there, last_slash_index);
+	    null_at(d_there, last_slash_index + 1);
 
-	    /* and remove all non-file elements from d_there_file */
-	    last_slash++;
-	    d_there_file = nrealloc(d_there_file, strlen(last_slash) + 1);
-	    strcpy(d_there_file, last_slash);
+	    /* and remove all non-file elements from d_there_file (i. e.
+	       everything before and including the last slash); if we
+	        have a path but no filename, don't do anything */
+	    if (!path_only) {
+		last_slash = strrchr(d_there_file, '/');
+		last_slash++;
+		strcpy(d_there_file, last_slash);
+		align(&d_there_file);
+	    }
 
 	    /* now go to the path specified in d_there */
 	    if (chdir(d_there) != -1) {
 
-		/* get the full pathname, and save it back in d_there */
+		/* get the full pathname, and save it back in d_there,
+		   tacking a slash on the end if we have a path but no
+		   filename; if the saving fails, get out */
 
 		free(d_there);
 
@@ -819,6 +912,17 @@ char *get_full_path(const char *origpath)
 #endif
 
 		align(&d_there);
+		if (d_there) {
+
+		    /* add a slash to d_there, unless it's "/", in which
+		       case we don't need it */
+		    if (strcmp(d_there, "/")) {
+			d_there = nrealloc(d_there, strlen(d_there) + 2);
+			strcat(d_there, "/");
+		    }
+		}
+		else
+		    return NULL;
 	    }
 
 	    /* finally, go back to where we were before, d_here (no error
@@ -829,11 +933,17 @@ char *get_full_path(const char *origpath)
 	
 	/* all data is set up; fill in newpath */
 
-	/* newpath = d_there + "/" + d_there_file */
-	newpath = charalloc(strlen(d_there) + strlen(d_there_file) + 2);
-	strcpy(newpath, d_there);
-	strcat(newpath, "/");
-	strcat(newpath, d_there_file);
+	/* if we have a path and a filename, newpath = d_there +
+	   d_there_file; otherwise, newpath = d_there */
+	if (!path_only) {
+	    newpath = charalloc(strlen(d_there) + strlen(d_there_file) + 1);
+	    strcpy(newpath, d_there);
+	    strcat(newpath, d_there_file);
+	}
+	else {
+	    newpath = charalloc(strlen(d_there) + 1);
+	    strcpy(newpath, d_there);
+	}
 
 	/* finally, clean up */
 	free(d_there_file);
@@ -843,6 +953,80 @@ char *get_full_path(const char *origpath)
 
     return newpath;
 }
+#endif /* ENABLE_MULTIBUFFER || !DISABLE_OPERATINGDIR */
+
+#ifndef DISABLE_OPERATINGDIR
+/*
+ * Check to see if we're inside the operating directory.  Return 0 if we
+ * are, or 1 otherwise.  If allow_tabcomp is nonzero, allow incomplete
+ * names that would be matches for the operating directory, so that tab
+ * completion will work.
+ */
+int check_operating_dir(char *currpath, int allow_tabcomp)
+{
+    /* this is static so that we only need to get it the first time this
+       function is called; also, a relative operating directory path will
+       only be handled properly if this is done */
+    static char *full_operating_dir = NULL;
+
+    char *fullpath, *whereami1, *whereami2 = NULL;
+
+    /* if no operating directory is set, don't bother doing anything */
+    if (!operating_dir)
+	return 0;
+
+    /* if the operating directory is "/", that's the same as having no
+       operating directory, so discard it and get out */
+    if (!strcmp(operating_dir, "/")) {
+	operating_dir = NULL;
+	return 0;
+    }
+
+    /* get the full operating (if we don't have it already) and current
+       directories, and then search the current for the operating (for
+       normal usage) and the operating for the current (for tab
+       completion, if we're allowing it); if the current directory's path
+       doesn't exist, assume we're outside the operating directory */
+    if (!full_operating_dir) {
+	full_operating_dir = get_full_path(operating_dir);
+
+	/* if get_full_path() failed, discard the operating directory */
+	if (!full_operating_dir) {
+	    operating_dir = NULL;
+	    return 0;
+	}
+
+	/* if the full operating directory is "/", that's the same as
+	   having no operating directory, so discard it and get out */
+	if (!strcmp(full_operating_dir, "/")) {
+	    free(full_operating_dir);
+	    operating_dir = NULL;
+	    return 0;
+	}
+    }
+
+    fullpath = get_full_path(currpath);
+    if (!fullpath)
+	return 1;
+
+    whereami1 = strstr(fullpath, full_operating_dir);
+    if (allow_tabcomp)
+	whereami2 = strstr(full_operating_dir, fullpath);
+
+    /* if both searches failed, we're outside the operating directory */
+    if (!whereami1 && !whereami2)
+	return 1;
+
+    /* check the search results; if the full operating directory path is
+       not at the beginning of the full current path (for normal usage)
+       and vice versa (for tab completion, if we're allowing it), we're
+       outside the operating directory */
+    if (whereami1 != fullpath && whereami2 != full_operating_dir)
+	return 1;
+
+    /* otherwise, we're still inside it */
+    return 0;
+}
 #endif
 
 /*
@@ -887,6 +1071,18 @@ int write_file(char *name, int tmp, int append, int nonamechange)
     realname = mallocstrcpy(realname, name);
 #endif
 
+#ifndef DISABLE_OPERATINGDIR
+    if (!tmp && operating_dir) {
+	/* if we're writing a temporary file, we're going outside the
+	   operating directory, so skip the operating directory test */
+	if (check_operating_dir(realname, 0)) {
+	    statusbar(_("Can't write outside of %s"), operating_dir);
+
+	    return -1;
+	}
+    }
+#endif
+
     /* Save the state of file at the end of the symlink (if there is one) */
     realexists = stat(realname, &st);
 
@@ -955,7 +1151,13 @@ int write_file(char *name, int tmp, int append, int nonamechange)
 	    fprintf(stderr, _("Wrote >%s\n"), fileptr->data);
 #endif
 	}
-	write(fd, "\n", 1);
+#ifndef NANO_SMALL
+	if (ISSET(DOS_FILE) || ISSET(MAC_FILE))
+	    write(fd, "\r", 1);
+
+	if (!ISSET(MAC_FILE))
+#endif
+	    write(fd, "\n", 1);
 
 	fileptr = fileptr->next;
 	lineswritten++;
@@ -968,12 +1170,27 @@ int write_file(char *name, int tmp, int append, int nonamechange)
 		      strerror(errno));
 	    return -1;
 	} else if (size > 0) {
-	    size = write(fd, "\n", 1);
-	    lineswritten++;
-	    if (size == -1) {
-		statusbar(_("Could not open file for writing: %s"),
+#ifndef NANO_SMALL
+	    if (ISSET(DOS_FILE) || ISSET(MAC_FILE)) {
+		size = write(fd, "\r", 1);
+		lineswritten++;
+		if (size == -1) {
+		    statusbar(_("Could not open file for writing: %s"),
 			  strerror(errno));
-		return -1;
+		    return -1;
+		}
+	    }
+
+	    if (!ISSET(MAC_FILE))
+#endif
+	    {
+		size = write(fd, "\n", 1);
+		lineswritten++;
+		if (size == -1) {
+		    statusbar(_("Could not open file for writing: %s"),
+			  strerror(errno));
+		    return -1;
+		}
 	    }
 	}
     }
@@ -1068,14 +1285,27 @@ int do_writeout(char *path, int exiting, int append)
     }
 
     while (1) {
+
+	/* Be nice to the translation folks */
 #ifndef NANO_SMALL
-	if (ISSET(MARK_ISSET) && !exiting)
-	    i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, "",
-		    _("%s Selection to File"), append ? _("Append") : _("Write"));
-	else
+	if (ISSET(MARK_ISSET) && !exiting) {
+	    if (append)
+		i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, "",
+		    _("Append Selection to File"));
+	    else
+		i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, "",
+		    _("Write Selection to File"));
+	} else
 #endif
-	    i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, answer,
-		    _("File Name to %s"), append ? _("Append") : _("Write"));
+	{
+	    if (append)
+		i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, answer,
+		    _("File Name to Append"));
+	    else
+		i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, answer,
+		    _("File Name to Write"));
+
+	}
 
 	if (i != -1) {
 
@@ -1314,6 +1544,16 @@ char **username_tab_completion(char *buf, int *num_matches)
 	     * This makes a lot more sense to me (Chris) this way...
 	     */
 
+#ifndef DISABLE_OPERATINGDIR
+	    /* ...unless the match exists outside the operating
+               directory, in which case just go to the next match */
+
+	    if (operating_dir) {
+		if (check_operating_dir(userdata->pw_dir, 1))
+		    continue;
+	    }
+#endif
+
 	    matchline = charalloc(strlen(userdata->pw_name) + 2);
 	    sprintf(matchline, "~%s", userdata->pw_name);
 	    matches[*num_matches] = matchline;
@@ -1404,6 +1644,27 @@ char **cwd_tab_completion(char *buf, int *num_matches)
 	    /* Cool, found a match.  Add it to the list
 	     * This makes a lot more sense to me (Chris) this way...
 	     */
+
+#ifndef DISABLE_OPERATINGDIR
+	    /* ...unless the match exists outside the operating
+               directory, in which case just go to the next match; to
+	       properly do operating directory checking, we have to add the
+	       directory name to the beginning of the proposed match
+	       before we check it */
+
+	    if (operating_dir) {
+		tmp2 = charalloc(strlen(dirName) + strlen(next->d_name) + 2);
+		strcpy(tmp2, dirName);
+		strcat(tmp2, "/");
+		strcat(tmp2, next->d_name);
+		if (check_operating_dir(tmp2, 1)) {
+		    free(tmp2);
+		    continue;
+		}
+	        free(tmp2);
+	    }
+#endif
+
 	    tmp2 = NULL;
 	    tmp2 = charalloc(strlen(next->d_name) + 1);
 	    strcpy(tmp2, next->d_name);
@@ -1507,6 +1768,13 @@ char *input_tab(char *buf, int place, int *lastWasTab, int *newplace)
 	    strncpy(copyto, matches[0], strlen(matches[0]) + 1);
 	    *newplace += strlen(matches[0]) - pos;
 
+	    /* if an exact match is typed in and Tab is pressed,
+	       *newplace will now be negative; in that case, make it
+	       zero, so that the cursor will stay where it is instead of
+	       moving backward */
+	    if (*newplace < 0)
+		*newplace = 0;
+
 	    /* Is it a directory? */
 	    append_slash_if_dir(buf, lastWasTab, newplace);
 
@@ -1914,6 +2182,19 @@ char *do_browser(char *inpath)
 
 	    path = mallocstrcpy(path, filelist[selected]);
 
+#ifndef DISABLE_OPERATINGDIR
+	    /* Note: The case of the user's being completely outside the
+	       operating directory is handled elsewhere, before this
+	       point */
+	    if (operating_dir) {
+		if (check_operating_dir(path, 0)) {
+		    statusbar(_("Can't visit parent in restricted mode"));
+		    beep();
+		    break;
+		}
+	    }
+#endif
+
 	    st = filestat(path);
 	    if (S_ISDIR(st.st_mode)) {
 		if ((test_dir = opendir(path)) == NULL) {
@@ -1950,6 +2231,15 @@ char *do_browser(char *inpath)
 	    bottombars(browser_list, BROWSER_LIST_LEN);
 	    curs_set(0);
 
+#ifndef DISABLE_OPERATINGDIR
+	    if (operating_dir) {
+		if (check_operating_dir(answer, 0)) {
+		    statusbar(_("Can't go outside of %s in restricted mode"), operating_dir);
+		    break;
+		}
+	    }
+#endif
+
 	    if (j < 0) {
 		statusbar(_("Goto Cancelled"));
 		break;

global.c

@@ -75,6 +75,11 @@ char *help_text;		/* The text in the help window */
 filestruct *mark_beginbuf;	/* the begin marker buffer */
 int mark_beginx;		/* X value in the string to start */
 
+#ifndef DISABLE_OPERATINGDIR
+char *operating_dir = NULL;	/* Operating directory, which we can't go
+				   higher than */
+#endif
+
 #ifndef DISABLE_SPELLER
 char *alt_speller;		/* Alternative spell command */
 #endif
@@ -146,7 +151,8 @@ void toggle_init(void)
     char *toggle_const_msg, *toggle_autoindent_msg, *toggle_suspend_msg,
 	*toggle_nohelp_msg, *toggle_picomode_msg, *toggle_mouse_msg,
 	*toggle_cuttoend_msg, *toggle_wrap_msg, *toggle_case_msg, 
-	*toggle_backwards_msg;
+	*toggle_backwards_msg, *toggle_dos_msg, *toggle_mac_msg,
+	*toggle_smooth_msg;
 
 #ifdef ENABLE_MULTIBUFFER
     char *toggle_load_msg, *nano_openprev_msg, *nano_opennext_msg;
@@ -156,6 +162,7 @@ void toggle_init(void)
     char *toggle_regexp_msg;
 #endif
 
+
     toggle_const_msg = _("Constant cursor position");
     toggle_autoindent_msg = _("Auto indent");
     toggle_suspend_msg = _("Suspend");
@@ -163,8 +170,12 @@ void toggle_init(void)
     toggle_picomode_msg = _("Pico mode");
     toggle_mouse_msg = _("Mouse support");
     toggle_cuttoend_msg = _("Cut to end");
-    toggle_backwards_msg = _("Backwards Search");
-    toggle_case_msg = _("Case Sensitive Search");
+    toggle_backwards_msg = _("Backwards search");
+    toggle_case_msg = _("Case sensitive search");
+    toggle_dos_msg = _("Writing file in DOS format");
+    toggle_mac_msg = _("Writing file in Mac format");
+    toggle_smooth_msg = _("Smooth scrolling");
+
 #ifdef HAVE_REGEX_H
     toggle_regexp_msg = _("Regular expressions");
 #endif
@@ -196,13 +207,19 @@ void toggle_init(void)
 		    REVERSE_SEARCH, 0);
     toggle_init_one(&toggles[9], TOGGLE_CASE_KEY, toggle_case_msg,
 		    CASE_SENSITIVE, 0);
+    toggle_init_one(&toggles[10], TOGGLE_DOS_KEY, toggle_dos_msg,
+		    DOS_FILE, 0);
+    toggle_init_one(&toggles[11], TOGGLE_MAC_KEY, toggle_mac_msg,
+		    MAC_FILE, 0);
+    toggle_init_one(&toggles[12], TOGGLE_SMOOTH_KEY, toggle_smooth_msg,
+		    SMOOTHSCROLL, 0);
 
 #ifdef ENABLE_MULTIBUFFER
-    toggle_init_one(&toggles[10], TOGGLE_LOAD_KEY, toggle_load_msg,
+    toggle_init_one(&toggles[13], TOGGLE_LOAD_KEY, toggle_load_msg,
 		    MULTIBUFFER, 0);
-    toggle_init_one(&toggles[11], NANO_OPENPREV_KEY, nano_openprev_msg,
+    toggle_init_one(&toggles[14], NANO_OPENPREV_KEY, nano_openprev_msg,
 		    0, '<');
-    toggle_init_one(&toggles[12], NANO_OPENNEXT_KEY, nano_opennext_msg,
+    toggle_init_one(&toggles[15], NANO_OPENNEXT_KEY, nano_opennext_msg,
 		    0, '>');
 #endif
 
@@ -226,14 +243,15 @@ void shortcut_init(int unjustify)
 	"", *nano_lastline_msg = "", *nano_refresh_msg =
 	"", *nano_mark_msg = "", *nano_delete_msg =
 	"", *nano_backspace_msg = "", *nano_tab_msg =
-	"", *nano_enter_msg = "", *nano_case_msg =
-	"", *nano_cancel_msg = "", *nano_unjustify_msg = 
-	"", *nano_append_msg = "", *nano_reverse_msg = 
-	"", *nano_regexp_msg = "";
+	"", *nano_enter_msg = "", *nano_cancel_msg = 
+	"", *nano_unjustify_msg = "", *nano_append_msg = ""; 
 
 #ifndef NANO_SMALL
-    char *nano_tofiles_msg = "";
-    char *nano_gotodir_msg = "";
+    char *nano_tofiles_msg = "", *nano_gotodir_msg = "", *nano_case_msg =
+	"", *nano_reverse_msg = "";
+#ifdef HAVE_REGEX_H
+    char *nano_regexp_msg = "", *nano_bracket_msg = "";
+#endif
 
     nano_help_msg = _("Invoke the help menu");
     nano_writeout_msg = _("Write the current file to disk");
@@ -277,8 +295,11 @@ void shortcut_init(int unjustify)
     nano_gotodir_msg = _("Goto Directory");
     nano_cancel_msg = _("Cancel the current function");
     nano_append_msg = _("Append to the current file");
-    nano_reverse_msg = _("Search Backwards");
-    nano_regexp_msg = _("Use Regular Expressions");
+    nano_reverse_msg = _("Search backwards");
+#ifdef HAVE_REGEX_H
+    nano_regexp_msg = _("Use Regular expressions");
+    nano_bracket_msg = _("Find other bracket");
+#endif
 #endif
 
 	sc_init_one(&main_list[0], NANO_HELP_KEY, _("Get Help"),
@@ -322,11 +343,11 @@ void shortcut_init(int unjustify)
 
     sc_init_one(&main_list[6], NANO_PREVPAGE_KEY, _("Prev Page"),
 		nano_prevpage_msg,
-		0, NANO_PREVPAGE_FKEY, KEY_PPAGE, VIEW, page_up);
+		0, NANO_PREVPAGE_FKEY, KEY_PPAGE, VIEW, do_page_up);
 
     sc_init_one(&main_list[7], NANO_NEXTPAGE_KEY, _("Next Page"),
 		nano_nextpage_msg,
-		0, NANO_NEXTPAGE_FKEY, KEY_NPAGE, VIEW, page_down);
+		0, NANO_NEXTPAGE_FKEY, KEY_NPAGE, VIEW, do_page_down);
 
     sc_init_one(&main_list[8], NANO_CUT_KEY, _("Cut Text"),
 		nano_cut_msg, 0, NANO_CUT_FKEY, 0, NOVIEW, do_cut_text);
@@ -399,7 +420,11 @@ void shortcut_init(int unjustify)
 		    nano_goto_msg,
 		    NANO_ALT_G, NANO_GOTO_FKEY, 0, VIEW, do_gotoline_void);
 
-
+#if (!defined NANO_SMALL) && (defined HAVE_REGEX_H)
+    sc_init_one(&main_list[26], -9, _("Find Other Bracket"),
+		    nano_bracket_msg,
+		    NANO_BRACKET_KEY, 0, 0, VIEW, do_find_bracket);
+#endif
 
     sc_init_one(&whereis_list[0], NANO_FIRSTLINE_KEY, _("First Line"),
 		nano_firstline_msg, 0, 0, 0, VIEW, do_first_line);
@@ -414,19 +439,22 @@ void shortcut_init(int unjustify)
 		_("Goto Line"), nano_goto_msg, 0, 0, 0, VIEW,
 		do_gotoline_void);
 
-    sc_init_one(&whereis_list[4], NANO_CANCEL_KEY, _("Cancel"),
-		nano_cancel_msg, 0, 0, 0, VIEW, 0);
-
-    sc_init_one(&whereis_list[5], TOGGLE_CASE_KEY, _("Case Sens"),
+#ifndef NANO_SMALL
+    sc_init_one(&whereis_list[4], TOGGLE_CASE_KEY, _("Case Sens"),
 		nano_case_msg, 0, 0, 0, VIEW, 0);
 
-    sc_init_one(&whereis_list[6], TOGGLE_BACKWARDS_KEY, _("Backward"),
+    sc_init_one(&whereis_list[5], TOGGLE_BACKWARDS_KEY, _("Direction"),
 		nano_reverse_msg, 0, 0, 0, VIEW, 0);
 
 #ifdef HAVE_REGEX_H
-    sc_init_one(&whereis_list[7], TOGGLE_REGEXP_KEY, _("Regexp"),
-		nano_regexp_msg, 0, 0, 0, VIEW, 0);
+    sc_init_one(&whereis_list[REPLACE_LIST_LEN - 2], TOGGLE_REGEXP_KEY,
+		_("Regexp"), nano_regexp_msg, 0, 0, 0, VIEW, 0);
 #endif
+#endif /* NANO_SMALL */
+
+    sc_init_one(&whereis_list[REPLACE_LIST_LEN - 1], NANO_CANCEL_KEY,
+		_("Cancel"), nano_cancel_msg, 0, 0, 0, VIEW, 0);
+
 
     sc_init_one(&replace_list[0], NANO_FIRSTLINE_KEY, _("First Line"),
 		nano_firstline_msg, 0, 0, 0, VIEW, do_first_line);
@@ -441,19 +469,21 @@ void shortcut_init(int unjustify)
 		_("Goto Line"), nano_goto_msg, 0, 0, 0, VIEW,
 		do_gotoline_void);
 
-    sc_init_one(&replace_list[4], NANO_CANCEL_KEY, _("Cancel"),
-		nano_cancel_msg, 0, 0, 0, VIEW, 0);
-
-    sc_init_one(&replace_list[5], TOGGLE_CASE_KEY, _("Case Sens"),
+#ifndef NANO_SMALL
+    sc_init_one(&replace_list[4], TOGGLE_CASE_KEY, _("Case Sens"),
 		nano_case_msg, 0, 0, 0, VIEW, 0);
 
-    sc_init_one(&replace_list[6], TOGGLE_BACKWARDS_KEY, _("Backward"),
+    sc_init_one(&replace_list[5], TOGGLE_BACKWARDS_KEY, _("Direction"),
 		nano_reverse_msg, 0, 0, 0, VIEW, 0);
 
 #ifdef HAVE_REGEX_H
-    sc_init_one(&replace_list[7], TOGGLE_REGEXP_KEY, _("Regexp"),
-		nano_regexp_msg, 0, 0, 0, VIEW, 0);
+    sc_init_one(&replace_list[REPLACE_LIST_LEN - 2], TOGGLE_REGEXP_KEY, 
+		_("Regexp"), nano_regexp_msg, 0, 0, 0, VIEW, 0);
 #endif
+#endif /* NANO_SMALL */
+
+    sc_init_one(&replace_list[REPLACE_LIST_LEN - 1], NANO_CANCEL_KEY,
+		_("Cancel"), nano_cancel_msg, 0, 0, 0, VIEW, 0);
 
 
     sc_init_one(&replace_list_2[0], NANO_FIRSTLINE_KEY, _("First Line"),
@@ -478,11 +508,11 @@ void shortcut_init(int unjustify)
 
     sc_init_one(&help_list[0], NANO_PREVPAGE_KEY, _("Prev Page"),
 		nano_prevpage_msg,
-		0, NANO_PREVPAGE_FKEY, KEY_PPAGE, VIEW, page_up);
+		0, NANO_PREVPAGE_FKEY, KEY_PPAGE, VIEW, do_page_up);
 
     sc_init_one(&help_list[1], NANO_NEXTPAGE_KEY, _("Next Page"),
 		nano_nextpage_msg,
-		0, NANO_NEXTPAGE_FKEY, KEY_NPAGE, VIEW, page_down);
+		0, NANO_NEXTPAGE_FKEY, KEY_NPAGE, VIEW, do_page_down);
 
     sc_init_one(&help_list[2], NANO_EXIT_KEY, _("Exit"),
 		nano_exit_msg, 0, NANO_EXIT_FKEY, 0, VIEW, do_exit);

intl/Makefile.in

@@ -1,5 +1,5 @@
 # Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 #
 # 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
@@ -28,106 +28,75 @@ VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 transform = @program_transform_name@
-libdir = @libdir@
-includedir = @includedir@
-datadir = @datadir@
+libdir = $(exec_prefix)/lib
+includedir = $(prefix)/include
+datadir = $(prefix)/@DATADIRNAME@
 localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/intl
-aliaspath = $(localedir)
+gnulocaledir = $(prefix)/share/locale
+gettextsrcdir = @datadir@/gettext/intl
+aliaspath = $(localedir):.
 subdir = intl
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
 
-l = @INTL_LIBTOOL_SUFFIX_PREFIX@
+l = @l@
 
 AR = ar
 CC = @CC@
 LIBTOOL = @LIBTOOL@
 RANLIB = @RANLIB@
-YACC = @INTLBISON@ -y -d
-YFLAGS = --name-prefix=__gettext
 
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
--DLIBDIR=\"$(libdir)\" @DEFS@
+DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
+-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
 CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
-HEADERS = $(COMHDRS) libgnuintl.h libgettext.h loadinfo.h
+HEADERS = $(COMHDRS) libgettext.h loadinfo.h
 COMHDRS = gettext.h gettextP.h hash-string.h
-SOURCES = $(COMSRCS) intl-compat.c
+SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
 COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
 finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
-localcharset.c
+explodename.c
 OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
 finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \
-plural.$lo localcharset.$lo
+explodename.$lo
+CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
 GETTOBJS = intl-compat.$lo
-DISTFILES.common = Makefile.in \
-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
-DISTFILES.generated = plural.c
+DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
+xopen-msg.sed $(HEADERS) $(SOURCES)
 DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc
-DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c
-
-# Libtool's library version information for libintl.
-# Before making a gettext release, the gettext maintainer must change this
-# according to the libtool documentation, section "Library interface versions".
-# Maintainers of other packages that include the intl directory must *not*
-# change these values.
-LTV_CURRENT=1
-LTV_REVISION=1
-LTV_AGE=0
+DISTFILES.gettext = libintl.glibc intlh.inst.in
 
 .SUFFIXES:
-.SUFFIXES: .c .y .o .lo .sin .sed
+.SUFFIXES: .c .o .lo
 .c.o:
 	$(COMPILE) $<
 .c.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) $<
 
-.y.c:
-	$(YACC) $(YFLAGS) --output $@ $<
-	rm -f $*.h
-
-.sin.sed:
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
-	mv t-$@ $@
-
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl
+INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
 
 all: all-@USE_INCLUDED_LIBINTL@
-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
-all-no: all-no-@BUILD_INCLUDED_LIBINTL@
-all-no-yes: libgnuintl.$la
-all-no-no:
 
-libintl.a libgnuintl.a: $(OBJECTS)
+all-yes: libintl.$la intlh.inst
+all-no:
+
+libintl.a: $(OBJECTS)
 	rm -f $@
 	$(AR) cru $@ $(OBJECTS)
 	$(RANLIB) $@
 
-libintl.la libgnuintl.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link \
-	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-	  $(OBJECTS) @LIBICONV@ \
-	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-	  -rpath $(libdir) \
-	  -no-undefined
+libintl.la: $(OBJECTS)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
+		   -version-info 1:0 -rpath $(libdir)
 
-libintl.h: libgnuintl.h
-	cp $(srcdir)/libgnuintl.h libintl.h
-
-charset.alias: config.charset
-	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
-	mv t-$@ $@
+../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
+	cd ../po && $(MAKE) cat-id-tbl.$lo
 
 check: all
 
@@ -135,70 +104,36 @@ check: all
 # only use the library should use install instead.
 
 # We must not install the libintl.h/libintl.a files if we are on a
-# system which has the GNU gettext() function in its C library or in a
-# separate library.
+# system which has the gettext() function in its C library or in a
+# separate library or use the catgets interface.  A special case is
+# where configure found a previously installed GNU gettext library.
 # If you want to use the one which comes with this version of the
 # package, you have to use `configure --with-included-gettext'.
 install: install-exec install-data
 install-exec: all
 	if test "$(PACKAGE)" = "gettext" \
 	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
-	  $(LIBTOOL) --mode=install \
-	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
-	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-	  dest=$(DESTDIR)$(libdir)/charset.alias; \
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	    orig=$(DESTDIR)$(libdir)/charset.alias; \
-	    sed -f ref-add.sed $$orig > $$temp; \
-	    $(INSTALL_DATA) $$temp $$dest; \
-	    rm -f $$temp; \
+	  if test -r $(MKINSTALLDIRS); then \
+	    $(MKINSTALLDIRS) $(libdir) $(includedir); \
 	  else \
-	    if test @GLIBC21@ = no; then \
-	      orig=charset.alias; \
-	      sed -f ref-add.sed $$orig > $$temp; \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	      rm -f $$temp; \
-	    fi; \
+	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
 	  fi; \
-	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
-	  test -f $(DESTDIR)$(localedir)/locale.alias \
-	    && orig=$(DESTDIR)$(localedir)/locale.alias \
-	    || orig=$(srcdir)/locale.alias; \
-	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-	  dest=$(DESTDIR)$(localedir)/locale.alias; \
-	  sed -f ref-add.sed $$orig > $$temp; \
-	  $(INSTALL_DATA) $$temp $$dest; \
-	  rm -f $$temp; \
+	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
+	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
 	else \
 	  : ; \
 	fi
 install-data: all
 	if test "$(PACKAGE)" = "gettext"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
-	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
+	  if test -r $(MKINSTALLDIRS); then \
+	    $(MKINSTALLDIRS) $(gettextsrcdir); \
+	  else \
+	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+	  fi; \
+	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
 	  dists="$(DISTFILES.common)"; \
 	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
-	  dists="$(DISTFILES.generated)"; \
-	  for file in $$dists; do \
-	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	    $(INSTALL_DATA) $$dir/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  dists="$(DISTFILES.obsolete)"; \
-	  for file in $$dists; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	    $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
 	  done; \
 	else \
 	  : ; \
@@ -208,51 +143,14 @@ install-data: all
 installcheck:
 
 uninstall:
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  rm -f $(DESTDIR)$(includedir)/libintl.h; \
-	  $(LIBTOOL) --mode=uninstall \
-	    rm -f $(DESTDIR)$(libdir)/libintl.$la; \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-	    dest=$(DESTDIR)$(libdir)/charset.alias; \
-	    sed -f ref-del.sed $$dest > $$temp; \
-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-	      rm -f $$dest; \
-	    else \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	    fi; \
-	    rm -f $$temp; \
-	  fi; \
-	  if test -f $(DESTDIR)$(localedir)/locale.alias; then \
-	    temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-	    dest=$(DESTDIR)$(localedir)/locale.alias; \
-	    sed -f ref-del.sed $$dest > $$temp; \
-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-	      rm -f $$dest; \
-	    else \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	    fi; \
-	    rm -f $$temp; \
-	  fi; \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext"; then \
-	  for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
+	dists="$(DISTFILES.common)"; \
+	for file in $$dists; do \
+	  rm -f $(gettextsrcdir)/$$file; \
+	done
 
 info dvi:
 
-$(OBJECTS): ../config.h libgnuintl.h
+$(OBJECTS): ../config.h libgettext.h
 bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
 dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
 
@@ -268,19 +166,12 @@ ID: $(HEADERS) $(SOURCES)
 
 
 mostlyclean:
-	rm -f *.a *.la *.o *.lo core core.*
-	rm -f libintl.h charset.alias ref-add.sed ref-del.sed
-	rm -f -r .libs _libs
+	rm -f *.a *.o *.lo core core.*
 
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile ID TAGS
-	if test "$(PACKAGE)" = gettext; then \
-	  rm -f ChangeLog.inst $(DISTFILES.normal); \
-	else \
-	  : ; \
-	fi
+	rm -f Makefile ID TAGS po2msg.sed po2tbl.sed libintl.h
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
@@ -290,23 +181,34 @@ maintainer-clean: distclean
 # GNU gettext needs not contain the file `VERSION' but contains some
 # other files which should not be distributed in other packages.
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile
+dist distdir: Makefile $(DISTFILES)
 	if test "$(PACKAGE)" = gettext; then \
 	  additional="$(DISTFILES.gettext)"; \
 	else \
 	  additional="$(DISTFILES.normal)"; \
 	fi; \
-	$(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
-	for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
-	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	  ln $$dir/$$file $(distdir) 2> /dev/null \
-	    || cp -p $$dir/$$file $(distdir); \
+	for file in $(DISTFILES.common) $$additional; do \
+	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
+	    || cp -p $(srcdir)/$$file $(distdir); \
 	done
 
+dist-libc:
+	tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
+
 Makefile: Makefile.in ../config.status
 	cd .. \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+# The dependency for intlh.inst is different in gettext and all other
+# packages.  Because we cannot you GNU make features we have to solve
+# the problem while rewriting Makefile.in.
+@GT_YES@intlh.inst: intlh.inst.in ../config.status
+@GT_YES@	cd .. \
+@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+@GT_YES@	  $(SHELL) ./config.status
+@GT_NO@.PHONY: intlh.inst
+@GT_NO@intlh.inst:
+
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

intl/VERSION

@@ -1 +1 @@
-GNU gettext library from gettext-0.10.38
+GNU gettext library from gettext-0.10.35

intl/bindtextdom.c

@@ -1,5 +1,5 @@
 /* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
    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
@@ -19,40 +19,33 @@
 # include <config.h>
 #endif
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#else
+# ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+# else
+void free ();
+# endif
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
 
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgnuintl.h"
+# include "libgettext.h"
 #endif
+#include "gettext.h"
 #include "gettextP.h"
 
-#ifdef _LIBC
-/* We have to handle multi-threaded applications.  */
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_dirname _nl_default_dirname__
-# define _nl_domain_bindings _nl_domain_bindings__
-#endif
-
-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
-#ifndef offsetof
-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
-#endif
-
 /* @@ end of prolog @@ */
 
 /* Contains the default location of the message catalogs.  */
@@ -61,9 +54,6 @@ extern const char _nl_default_dirname[];
 /* List with bindings of specific domains.  */
 extern struct binding *_nl_domain_bindings;
 
-/* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
-
 
 /* Names for the libintl functions are a problem.  They must not clash
    with existing names and they should follow ANSI C.  But this source
@@ -71,48 +61,25 @@ __libc_rwlock_define (extern, _nl_state_lock)
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define BINDTEXTDOMAIN __bindtextdomain
-# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
 # ifndef strdup
 #  define strdup(str) __strdup (str)
 # endif
 #else
 # define BINDTEXTDOMAIN bindtextdomain__
-# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__
 #endif
 
-/* Prototypes for local functions.  */
-static void set_binding_values PARAMS ((const char *domainname,
-					const char **dirnamep,
-					const char **codesetp));
-     
-/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
-   to be used for the DOMAINNAME message catalog.
-   If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
-   modified, only the current value is returned.
-   If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
-   modified nor returned.  */
-static void
-set_binding_values (domainname, dirnamep, codesetp)
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+char *
+BINDTEXTDOMAIN (domainname, dirname)
      const char *domainname;
-     const char **dirnamep;
-     const char **codesetp;
+     const char *dirname;
 {
   struct binding *binding;
-  int modified;
 
   /* Some sanity checks.  */
   if (domainname == NULL || domainname[0] == '\0')
-    {
-      if (dirnamep)
-	*dirnamep = NULL;
-      if (codesetp)
-	*codesetp = NULL;
-      return;
-    }
-
-  __libc_rwlock_wrlock (_nl_state_lock);
-
-  modified = 0;
+    return NULL;
 
   for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
     {
@@ -128,173 +95,83 @@ set_binding_values (domainname, dirnamep, codesetp)
 	}
     }
 
+  if (dirname == NULL)
+    /* The current binding has be to returned.  */
+    return binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
+
   if (binding != NULL)
     {
-      if (dirnamep)
+      /* The domain is already bound.  If the new value and the old
+	 one are equal we simply do nothing.  Otherwise replace the
+	 old binding.  */
+      if (strcmp (dirname, binding->dirname) != 0)
 	{
-	  const char *dirname = *dirnamep;
+	  char *new_dirname;
 
-	  if (dirname == NULL)
-	    /* The current binding has be to returned.  */
-	    *dirnamep = binding->dirname;
+	  if (strcmp (dirname, _nl_default_dirname) == 0)
+	    new_dirname = (char *) _nl_default_dirname;
 	  else
 	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->dirname;
-	      if (strcmp (dirname, result) != 0)
-		{
-		  if (strcmp (dirname, _nl_default_dirname) == 0)
-		    result = (char *) _nl_default_dirname;
-		  else
-		    {
 #if defined _LIBC || defined HAVE_STRDUP
-		      result = strdup (dirname);
+	      new_dirname = strdup (dirname);
+	      if (new_dirname == NULL)
+		return NULL;
 #else
-		      size_t len = strlen (dirname) + 1;
-		      result = (char *) malloc (len);
-		      if (__builtin_expect (result != NULL, 1))
-			memcpy (result, dirname, len);
+	      size_t len = strlen (dirname) + 1;
+	      new_dirname = (char *) malloc (len);
+	      if (new_dirname == NULL)
+		return NULL;
+
+	      memcpy (new_dirname, dirname, len);
 #endif
-		    }
-
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->dirname != _nl_default_dirname)
-			free (binding->dirname);
-
-		      binding->dirname = result;
-		      modified = 1;
-		    }
-		}
-	      *dirnamep = result;
 	    }
+
+	  if (binding->dirname != _nl_default_dirname)
+	    free (binding->dirname);
+
+	  binding->dirname = new_dirname;
 	}
-
-      if (codesetp)
-	{
-	  const char *codeset = *codesetp;
-
-	  if (codeset == NULL)
-	    /* The current binding has be to returned.  */
-	    *codesetp = binding->codeset;
-	  else
-	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->codeset;
-	      if (result == NULL || strcmp (codeset, result) != 0)
-		{
-#if defined _LIBC || defined HAVE_STRDUP
-		  result = strdup (codeset);
-#else
-		  size_t len = strlen (codeset) + 1;
-		  result = (char *) malloc (len);
-		  if (__builtin_expect (result != NULL, 1))
-		    memcpy (result, codeset, len);
-#endif
-
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->codeset != NULL)
-			free (binding->codeset);
-
-		      binding->codeset = result;
-		      binding->codeset_cntr++;
-		      modified = 1;
-		    }
-		}
-	      *codesetp = result;
-	    }
-	}
-    }
-  else if ((dirnamep == NULL || *dirnamep == NULL)
-	   && (codesetp == NULL || *codesetp == NULL))
-    {
-      /* Simply return the default values.  */
-      if (dirnamep)
-	*dirnamep = _nl_default_dirname;
-      if (codesetp)
-	*codesetp = NULL;
     }
   else
     {
       /* We have to create a new binding.  */
-      size_t len = strlen (domainname) + 1;
+#if !defined _LIBC && !defined HAVE_STRDUP
+      size_t len;
+#endif
       struct binding *new_binding =
-	(struct binding *) malloc (offsetof (struct binding, domainname) + len);
+	(struct binding *) malloc (sizeof (*new_binding));
 
-      if (__builtin_expect (new_binding == NULL, 0))
-	goto failed;
+      if (new_binding == NULL)
+	return NULL;
 
+#if defined _LIBC || defined HAVE_STRDUP
+      new_binding->domainname = strdup (domainname);
+      if (new_binding->domainname == NULL)
+	return NULL;
+#else
+      len = strlen (domainname) + 1;
+      new_binding->domainname = (char *) malloc (len);
+      if (new_binding->domainname == NULL)
+	return NULL;
       memcpy (new_binding->domainname, domainname, len);
-
-      if (dirnamep)
-	{
-	  const char *dirname = *dirnamep;
-
-	  if (dirname == NULL)
-	    /* The default value.  */
-	    dirname = _nl_default_dirname;
-	  else
-	    {
-	      if (strcmp (dirname, _nl_default_dirname) == 0)
-		dirname = _nl_default_dirname;
-	      else
-		{
-		  char *result;
-#if defined _LIBC || defined HAVE_STRDUP
-		  result = strdup (dirname);
-		  if (__builtin_expect (result == NULL, 0))
-		    goto failed_dirname;
-#else
-		  size_t len = strlen (dirname) + 1;
-		  result = (char *) malloc (len);
-		  if (__builtin_expect (result == NULL, 0))
-		    goto failed_dirname;
-		  memcpy (result, dirname, len);
 #endif
-		  dirname = result;
-		}
-	    }
-	  *dirnamep = dirname;
-	  new_binding->dirname = (char *) dirname;
-	}
-      else
-	/* The default value.  */
+
+      if (strcmp (dirname, _nl_default_dirname) == 0)
 	new_binding->dirname = (char *) _nl_default_dirname;
-
-      new_binding->codeset_cntr = 0;
-
-      if (codesetp)
-	{
-	  const char *codeset = *codesetp;
-
-	  if (codeset != NULL)
-	    {
-	      char *result;
-
-#if defined _LIBC || defined HAVE_STRDUP
-	      result = strdup (codeset);
-	      if (__builtin_expect (result == NULL, 0))
-		goto failed_codeset;
-#else
-	      size_t len = strlen (codeset) + 1;
-	      result = (char *) malloc (len);
-	      if (__builtin_expect (result == NULL, 0))
-		goto failed_codeset;
-	      memcpy (result, codeset, len);
-#endif
-	      codeset = result;
-	      new_binding->codeset_cntr++;
-	    }
-	  *codesetp = codeset;
-	  new_binding->codeset = (char *) codeset;
-	}
       else
-	new_binding->codeset = NULL;
+	{
+#if defined _LIBC || defined HAVE_STRDUP
+	  new_binding->dirname = strdup (dirname);
+	  if (new_binding->dirname == NULL)
+	    return NULL;
+#else
+	  len = strlen (dirname) + 1;
+	  new_binding->dirname = (char *) malloc (len);
+	  if (new_binding->dirname == NULL)
+	    return NULL;
+	  memcpy (new_binding->dirname, dirname, len);
+#endif
+	}
 
       /* Now enqueue it.  */
       if (_nl_domain_bindings == NULL
@@ -314,55 +191,13 @@ set_binding_values (domainname, dirnamep, codesetp)
 	  binding->next = new_binding;
 	}
 
-      modified = 1;
-
-      /* Here we deal with memory allocation failures.  */
-      if (0)
-	{
-	failed_codeset:
-	  if (new_binding->dirname != _nl_default_dirname)
-	    free (new_binding->dirname);
-	failed_dirname:
-	  free (new_binding);
-	failed:
-	  if (dirnamep)
-	    *dirnamep = NULL;
-	  if (codesetp)
-	    *codesetp = NULL;
-	}
+      binding = new_binding;
     }
 
-  /* If we modified any binding, we flush the caches.  */
-  if (modified)
-    ++_nl_msg_cat_cntr;
-
-  __libc_rwlock_unlock (_nl_state_lock);
-}
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-char *
-BINDTEXTDOMAIN (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  set_binding_values (domainname, &dirname, NULL);
-  return (char *) dirname;
-}
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-char *
-BIND_TEXTDOMAIN_CODESET (domainname, codeset)
-     const char *domainname;
-     const char *codeset;
-{
-  set_binding_values (domainname, NULL, &codeset);
-  return (char *) codeset;
+  return binding->dirname;
 }
 
 #ifdef _LIBC
-/* Aliases for function names in GNU C Library.  */
+/* Alias for function name in GNU C Library.  */
 weak_alias (__bindtextdomain, bindtextdomain);
-weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
 #endif

intl/config.charset

@@ -1,438 +0,0 @@
-#! /bin/sh
-# Output a system dependent table of character encoding aliases.
-#
-#   Copyright (C) 2000-2001 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, 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
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library 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.
-#
-# The table consists of lines of the form
-#    ALIAS  CANONICAL
-#
-# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
-# ALIAS is compared in a case sensitive way.
-#
-# CANONICAL is the GNU canonical name for this character encoding.
-# It must be an encoding supported by libiconv. Support by GNU libc is
-# also desirable. CANONICAL is case insensitive. Usually an upper case
-# MIME charset name is preferred.
-# The current list of GNU canonical charset names is as follows.
-#
-#       name                         used by which systems         a MIME name?
-#   ASCII, ANSI_X3.4-1968     glibc solaris freebsd
-#   ISO-8859-1                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-2                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-3                glibc                                     yes
-#   ISO-8859-4                osf solaris freebsd                       yes
-#   ISO-8859-5                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-6                glibc aix hpux solaris                    yes
-#   ISO-8859-7                glibc aix hpux irix osf solaris           yes
-#   ISO-8859-8                glibc aix hpux osf solaris                yes
-#   ISO-8859-9                glibc aix hpux irix osf solaris           yes
-#   ISO-8859-13               glibc
-#   ISO-8859-15               glibc aix osf solaris freebsd
-#   KOI8-R                    glibc solaris freebsd                     yes
-#   KOI8-U                    glibc freebsd                             yes
-#   CP437                     dos
-#   CP775                     dos
-#   CP850                     aix osf dos
-#   CP852                     dos
-#   CP855                     dos
-#   CP856                     aix
-#   CP857                     dos
-#   CP861                     dos
-#   CP862                     dos
-#   CP864                     dos
-#   CP865                     dos
-#   CP866                     freebsd dos
-#   CP869                     dos
-#   CP874                     win32 dos
-#   CP922                     aix
-#   CP932                     aix win32 dos
-#   CP943                     aix
-#   CP949                     osf win32 dos
-#   CP950                     win32 dos
-#   CP1046                    aix
-#   CP1124                    aix
-#   CP1129                    aix
-#   CP1250                    win32
-#   CP1251                    glibc win32
-#   CP1252                    aix win32
-#   CP1253                    win32
-#   CP1254                    win32
-#   CP1255                    win32
-#   CP1256                    win32
-#   CP1257                    win32
-#   GB2312                    glibc aix hpux irix solaris freebsd       yes
-#   EUC-JP                    glibc aix hpux irix osf solaris freebsd   yes
-#   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
-#   EUC-TW                    glibc aix hpux irix osf solaris
-#   BIG5                      glibc aix hpux osf solaris freebsd        yes
-#   BIG5HKSCS                 glibc
-#   GBK                       aix osf win32 dos
-#   GB18030                   glibc
-#   SJIS                      hpux osf solaris freebsd
-#   JOHAB                     glibc win32
-#   TIS-620                   glibc aix hpux osf solaris
-#   VISCII                    glibc                                     yes
-#   HP-ROMAN8                 hpux
-#   HP-ARABIC8                hpux
-#   HP-GREEK8                 hpux
-#   HP-HEBREW8                hpux
-#   HP-TURKISH8               hpux
-#   HP-KANA8                  hpux
-#   DEC-KANJI                 osf
-#   DEC-HANYU                 osf
-#   UTF-8                     glibc aix hpux osf solaris                yes
-#
-# Note: Names which are not marked as being a MIME name should not be used in
-# Internet protocols for information interchange (mail, news, etc.).
-#
-# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
-# must understand both names and treat them as equivalent.
-#
-# The first argument passed to this file is the canonical host specification,
-#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-
-host="$1"
-os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
-echo "# This file contains a table of character encoding aliases,"
-echo "# suitable for operating system '${os}'."
-echo "# It was automatically generated from config.charset."
-# List of references, updated during installation:
-echo "# Packages using this file: "
-case "$os" in
-    linux* | *-gnu*)
-	# With glibc-2.1 or newer, we don't need any canonicalization,
-	# because glibc has iconv and both glibc and libiconv support all
-	# GNU canonical names directly. Therefore, the Makefile does not
-	# need to install the alias file at all.
-	# The following applies only to glibc-2.0.x and older libcs.
-	echo "ISO_646.IRV:1983 ASCII"
-	;;
-    aix*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-6 ISO-8859-6"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "IBM-850 CP850"
-	echo "IBM-856 CP856"
-	echo "IBM-921 ISO-8859-13"
-	echo "IBM-922 CP922"
-	echo "IBM-932 CP932"
-	echo "IBM-943 CP943"
-	echo "IBM-1046 CP1046"
-	echo "IBM-1124 CP1124"
-	echo "IBM-1129 CP1129"
-	echo "IBM-1252 CP1252"
-	echo "IBM-eucCN GB2312"
-	echo "IBM-eucJP EUC-JP"
-	echo "IBM-eucKR EUC-KR"
-	echo "IBM-eucTW EUC-TW"
-	echo "big5 BIG5"
-	echo "GBK GBK"
-	echo "TIS-620 TIS-620"
-	echo "UTF-8 UTF-8"
-	;;
-    hpux*)
-	echo "iso88591 ISO-8859-1"
-	echo "iso88592 ISO-8859-2"
-	echo "iso88595 ISO-8859-5"
-	echo "iso88596 ISO-8859-6"
-	echo "iso88597 ISO-8859-7"
-	echo "iso88598 ISO-8859-8"
-	echo "iso88599 ISO-8859-9"
-	echo "iso885915 ISO-8859-15"
-	echo "roman8 HP-ROMAN8"
-	echo "arabic8 HP-ARABIC8"
-	echo "greek8 HP-GREEK8"
-	echo "hebrew8 HP-HEBREW8"
-	echo "turkish8 HP-TURKISH8"
-	echo "kana8 HP-KANA8"
-	echo "tis620 TIS-620"
-	echo "big5 BIG5"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	echo "hp15CN GB2312"
-	#echo "ccdc ?" # what is this?
-	echo "SJIS SJIS"
-	echo "utf8 UTF-8"
-	;;
-    irix*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "eucCN GB2312"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	;;
-    osf*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-4 ISO-8859-4"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "cp850 CP850"
-	echo "big5 BIG5"
-	echo "dechanyu DEC-HANYU"
-	echo "dechanzi GB2312"
-	echo "deckanji DEC-KANJI"
-	echo "deckorean EUC-KR"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	echo "GBK GBK"
-	echo "KSC5601 CP949"
-	echo "sdeckanji EUC-JP"
-	echo "SJIS SJIS"
-	echo "TACTIS TIS-620"
-	echo "UTF-8 UTF-8"
-	;;
-    solaris*)
-	echo "646 ASCII"
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-4 ISO-8859-4"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-6 ISO-8859-6"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "koi8-r KOI8-R"
-	echo "BIG5 BIG5"
-	echo "gb2312 GB2312"
-	echo "cns11643 EUC-TW"
-	echo "5601 EUC-KR"
-	echo "eucJP EUC-JP"
-	echo "PCK SJIS"
-	echo "TIS620.2533 TIS-620"
-	#echo "sun_eu_greek ?" # what is this?
-	echo "UTF-8 UTF-8"
-	;;
-    freebsd*)
-	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
-	# localcharset.c falls back to using the full locale name
-	# from the environment variables.
-	echo "C ASCII"
-	echo "US-ASCII ASCII"
-	for l in la_LN lt_LN; do
-	  echo "$l.ASCII ASCII"
-	done
-	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
-	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
-	         lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
-	  echo "$l.ISO_8859-1 ISO-8859-1"
-	  echo "$l.DIS_8859-15 ISO-8859-15"
-	done
-	for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
-	  echo "$l.ISO_8859-2 ISO-8859-2"
-	done
-	for l in la_LN lt_LT; do
-	  echo "$l.ISO_8859-4 ISO-8859-4"
-	done
-	for l in ru_RU ru_SU; do
-	  echo "$l.KOI8-R KOI8-R"
-	  echo "$l.ISO_8859-5 ISO-8859-5"
-	  echo "$l.CP866 CP866"
-	done
-	echo "uk_UA.KOI8-U KOI8-U"
-	echo "zh_TW.BIG5 BIG5"
-	echo "zh_TW.Big5 BIG5"
-	echo "zh_CN.EUC GB2312"
-	echo "ja_JP.EUC EUC-JP"
-	echo "ja_JP.SJIS SJIS"
-	echo "ja_JP.Shift_JIS SJIS"
-	echo "ko_KR.EUC EUC-KR"
-	;;
-    beos*)
-	# BeOS has a single locale, and it has UTF-8 encoding.
-	echo "* UTF-8"
-	;;
-    msdosdjgpp*)
-	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
-	# localcharset.c falls back to using the full locale name
-	# from the environment variables.
-	echo "#"
-	echo "# The encodings given here may not all be correct."
-	echo "# If you find that the encoding given for your language and"
-	echo "# country is not the one your DOS machine actually uses, just"
-	echo "# correct it in this file, and send a mail to"
-	echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
-	echo "# and Bruno Haible <haible@clisp.cons.org>."
-	echo "#"
-	echo "C ASCII"
-	# ISO-8859-1 languages
-	echo "ca CP850"
-	echo "ca_ES CP850"
-	echo "da CP865"    # not CP850 ??
-	echo "da_DK CP865" # not CP850 ??
-	echo "de CP850"
-	echo "de_AT CP850"
-	echo "de_CH CP850"
-	echo "de_DE CP850"
-	echo "en CP850"
-	echo "en_AU CP850" # not CP437 ??
-	echo "en_CA CP850"
-	echo "en_GB CP850"
-	echo "en_NZ CP437"
-	echo "en_US CP437"
-	echo "en_ZA CP850" # not CP437 ??
-	echo "es CP850"
-	echo "es_AR CP850"
-	echo "es_BO CP850"
-	echo "es_CL CP850"
-	echo "es_CO CP850"
-	echo "es_CR CP850"
-	echo "es_CU CP850"
-	echo "es_DO CP850"
-	echo "es_EC CP850"
-	echo "es_ES CP850"
-	echo "es_GT CP850"
-	echo "es_HN CP850"
-	echo "es_MX CP850"
-	echo "es_NI CP850"
-	echo "es_PA CP850"
-	echo "es_PY CP850"
-	echo "es_PE CP850"
-	echo "es_SV CP850"
-	echo "es_UY CP850"
-	echo "es_VE CP850"
-	echo "et CP850"
-	echo "et_EE CP850"
-	echo "eu CP850"
-	echo "eu_ES CP850"
-	echo "fi CP850"
-	echo "fi_FI CP850"
-	echo "fr CP850"
-	echo "fr_BE CP850"
-	echo "fr_CA CP850"
-	echo "fr_CH CP850"
-	echo "fr_FR CP850"
-	echo "ga CP850"
-	echo "ga_IE CP850"
-	echo "gd CP850"
-	echo "gd_GB CP850"
-	echo "gl CP850"
-	echo "gl_ES CP850"
-	echo "id CP850"    # not CP437 ??
-	echo "id_ID CP850" # not CP437 ??
-	echo "is CP861"    # not CP850 ??
-	echo "is_IS CP861" # not CP850 ??
-	echo "it CP850"
-	echo "it_CH CP850"
-	echo "it_IT CP850"
-	echo "lt CP775"
-	echo "lt_LT CP775"
-	echo "lv CP775"
-	echo "lv_LV CP775"
-	echo "nb CP865"    # not CP850 ??
-	echo "nb_NO CP865" # not CP850 ??
-	echo "nl CP850"
-	echo "nl_BE CP850"
-	echo "nl_NL CP850"
-	echo "nn CP865"    # not CP850 ??
-	echo "nn_NO CP865" # not CP850 ??
-	echo "no CP865"    # not CP850 ??
-	echo "no_NO CP865" # not CP850 ??
-	echo "pt CP850"
-	echo "pt_BR CP850"
-	echo "pt_PT CP850"
-	echo "sv CP850"
-	echo "sv_SE CP850"
-	# ISO-8859-2 languages
-	echo "cs CP852"
-	echo "cs_CZ CP852"
-	echo "hr CP852"
-	echo "hr_HR CP852"
-	echo "hu CP852"
-	echo "hu_HU CP852"
-	echo "pl CP852"
-	echo "pl_PL CP852"
-	echo "ro CP852"
-	echo "ro_RO CP852"
-	echo "sk CP852"
-	echo "sk_SK CP852"
-	echo "sl CP852"
-	echo "sl_SI CP852"
-	echo "sq CP852"
-	echo "sq_AL CP852"
-	echo "sr CP852"    # CP852 or CP866 or CP855 ??
-	echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
-	# ISO-8859-3 languages
-	echo "mt CP850"
-	echo "mt_MT CP850"
-	# ISO-8859-5 languages
-	echo "be CP866"
-	echo "be_BE CP866"
-	echo "bg CP866"    # not CP855 ??
-	echo "bg_BG CP866" # not CP855 ??
-	echo "mk CP866"    # not CP855 ??
-	echo "mk_MK CP866" # not CP855 ??
-	echo "ru KOI8-R"    # not CP866 ??
-	echo "ru_RU KOI8-R" # not CP866 ??
-	# ISO-8859-6 languages
-	echo "ar CP864"
-	echo "ar_AE CP864"
-	echo "ar_DZ CP864"
-	echo "ar_EG CP864"
-	echo "ar_IQ CP864"
-	echo "ar_IR CP864"
-	echo "ar_JO CP864"
-	echo "ar_KW CP864"
-	echo "ar_MA CP864"
-	echo "ar_OM CP864"
-	echo "ar_QA CP864"
-	echo "ar_SA CP864"
-	echo "ar_SY CP864"
-	# ISO-8859-7 languages
-	echo "el CP869"
-	echo "el_GR CP869"
-	# ISO-8859-8 languages
-	echo "he CP862"
-	echo "he_IL CP862"
-	# ISO-8859-9 languages
-	echo "tr CP857"
-	echo "tr_TR CP857"
-	# Japanese
-	echo "ja CP932"
-	echo "ja_JP CP932"
-	# Chinese
-	echo "zh_CN GBK"
-	echo "zh_TW CP950" # not CP938 ??
-	# Korean
-	echo "kr CP949"    # not CP934 ??
-	echo "kr_KR CP949" # not CP934 ??
-	# Thai
-	echo "th CP874"
-	echo "th_TH CP874"
-	# Other
-	echo "eo CP850"
-	echo "eo_EO CP850"
-	;;
-esac

intl/dcgettext.c

@@ -1,5 +1,5 @@
 /* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
    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
@@ -19,25 +19,220 @@
 # include <config.h>
 #endif
 
+#include <sys/types.h>
+
+#if defined __GNUC__ && !defined C_ALLOCA
+# define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
+#else
+# if (defined HAVE_ALLOCA_H || defined _LIBC) && !defined C_ALLOCA
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca
+char *alloca ();
+#   endif
+#  endif
+# endif
+#endif
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+#ifndef __set_errno
+# define __set_errno(val) errno = (val)
+#endif
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#else
+char *getenv ();
+# ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+# else
+void free ();
+# endif
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE	1
+# endif
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
+# ifndef strchr
+#  define strchr index
+# endif
+#endif
+
+#if defined HAVE_UNISTD_H || defined _LIBC
+# include <unistd.h>
+#endif
+
+#include "gettext.h"
 #include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgnuintl.h"
+# include "libgettext.h"
 #endif
+#include "hash-string.h"
 
 /* @@ end of prolog @@ */
 
+#ifdef _LIBC
+/* Rename the non ANSI C functions.  This is required by the standard
+   because some ANSI C functions will require linking with this object
+   file and the name space must not be polluted.  */
+# define getcwd __getcwd
+# ifndef stpcpy
+#  define stpcpy __stpcpy
+# endif
+#else
+# if !defined HAVE_GETCWD
+char *getwd ();
+#  define getcwd(buf, max) getwd (buf)
+# else
+char *getcwd ();
+# endif
+# ifndef HAVE_STPCPY
+static char *stpcpy PARAMS ((char *dest, const char *src));
+# endif
+#endif
+
+/* Amount to increase buffer size by in each try.  */
+#define PATH_INCR 32
+
+/* The following is from pathmax.h.  */
+/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
+   PATH_MAX but might cause redefinition warnings when sys/param.h is
+   later included (as on MORE/BSD 4.3).  */
+#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
+# include <limits.h>
+#endif
+
+#ifndef _POSIX_PATH_MAX
+# define _POSIX_PATH_MAX 255
+#endif
+
+#if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
+# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
+#endif
+
+/* Don't include sys/param.h if it already has been.  */
+#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
+# include <sys/param.h>
+#endif
+
+#if !defined(PATH_MAX) && defined(MAXPATHLEN)
+# define PATH_MAX MAXPATHLEN
+#endif
+
+#ifndef PATH_MAX
+# define PATH_MAX _POSIX_PATH_MAX
+#endif
+
+/* XPG3 defines the result of `setlocale (category, NULL)' as:
+   ``Directs `setlocale()' to query `category' and return the current
+     setting of `local'.''
+   However it does not specify the exact format.  And even worse: POSIX
+   defines this not at all.  So we can use this feature only on selected
+   system (e.g. those using GNU C Library).  */
+#ifdef _LIBC
+# define HAVE_LOCALE_NULL
+#endif
+
+/* Name of the default domain used for gettext(3) prior any call to
+   textdomain(3).  The default value for this is "messages".  */
+const char _nl_default_default_domain[] = "messages";
+
+/* Value used as the default domain for gettext(3).  */
+const char *_nl_current_default_domain = _nl_default_default_domain;
+
+/* Contains the default location of the message catalogs.  */
+const char _nl_default_dirname[] = GNULOCALEDIR;
+
+/* List with bindings of specific domains created by bindtextdomain()
+   calls.  */
+struct binding *_nl_domain_bindings;
+
+/* Prototypes for local functions.  */
+static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
+			       const char *msgid)) internal_function;
+static const char *category_to_name PARAMS ((int category)) internal_function;
+static const char *guess_category_value PARAMS ((int category,
+						 const char *categoryname))
+     internal_function;
+
+
+/* For those loosing systems which don't have `alloca' we have to add
+   some additional code emulating it.  */
+#ifdef HAVE_ALLOCA
+/* Nothing has to be done.  */
+# define ADD_BLOCK(list, address) /* nothing */
+# define FREE_BLOCKS(list) /* nothing */
+#else
+struct block_list
+{
+  void *address;
+  struct block_list *next;
+};
+# define ADD_BLOCK(list, addr)						      \
+  do {									      \
+    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
+    /* If we cannot get a free block we cannot add the new element to	      \
+       the list.  */							      \
+    if (newp != NULL) {							      \
+      newp->address = (addr);						      \
+      newp->next = (list);						      \
+      (list) = newp;							      \
+    }									      \
+  } while (0)
+# define FREE_BLOCKS(list)						      \
+  do {									      \
+    while (list != NULL) {						      \
+      struct block_list *old = list;					      \
+      list = list->next;						      \
+      free (old);							      \
+    }									      \
+  } while (0)
+# undef alloca
+# define alloca(size) (malloc (size))
+#endif	/* have alloca */
+
+
 /* Names for the libintl functions are a problem.  They must not clash
    with existing names and they should follow ANSI C.  But this source
    code is also used in GNU C Library where the names have a __
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define DCGETTEXT __dcgettext
-# define DCIGETTEXT __dcigettext
 #else
 # define DCGETTEXT dcgettext__
-# define DCIGETTEXT dcigettext__
+#endif
+
+/* Checking whether the binaries runs SUID must be done and glibc provides
+   easier methods therefore we make a difference here.  */
+#ifdef _LIBC
+# define ENABLE_SECURE __libc_enable_secure
+# define DETERMINE_SECURE
+#else
+static int enable_secure;
+# define ENABLE_SECURE (enable_secure == 1)
+# define DETERMINE_SECURE \
+  if (enable_secure == 0)						      \
+    {									      \
+      if (getuid () != geteuid () || getgid () != getegid ())		      \
+	enable_secure = 1;						      \
+      else								      \
+	enable_secure = -1;						      \
+    }
 #endif
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
@@ -48,10 +243,413 @@ DCGETTEXT (domainname, msgid, category)
      const char *msgid;
      int category;
 {
-  return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
+#ifndef HAVE_ALLOCA
+  struct block_list *block_list = NULL;
+#endif
+  struct loaded_l10nfile *domain;
+  struct binding *binding;
+  const char *categoryname;
+  const char *categoryvalue;
+  char *dirname, *xdomainname;
+  char *single_locale;
+  char *retval;
+  int saved_errno = errno;
+
+  /* If no real MSGID is given return NULL.  */
+  if (msgid == NULL)
+    return NULL;
+
+  /* See whether this is a SUID binary or not.  */
+  DETERMINE_SECURE;
+
+  /* If DOMAINNAME is NULL, we are interested in the default domain.  If
+     CATEGORY is not LC_MESSAGES this might not make much sense but the
+     definition left this undefined.  */
+  if (domainname == NULL)
+    domainname = _nl_current_default_domain;
+
+  /* First find matching binding.  */
+  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
+    {
+      int compare = strcmp (domainname, binding->domainname);
+      if (compare == 0)
+	/* We found it!  */
+	break;
+      if (compare < 0)
+	{
+	  /* It is not in the list.  */
+	  binding = NULL;
+	  break;
+	}
+    }
+
+  if (binding == NULL)
+    dirname = (char *) _nl_default_dirname;
+  else if (binding->dirname[0] == '/')
+    dirname = binding->dirname;
+  else
+    {
+      /* We have a relative path.  Make it absolute now.  */
+      size_t dirname_len = strlen (binding->dirname) + 1;
+      size_t path_max;
+      char *ret;
+
+      path_max = (unsigned int) PATH_MAX;
+      path_max += 2;		/* The getcwd docs say to do this.  */
+
+      dirname = (char *) alloca (path_max + dirname_len);
+      ADD_BLOCK (block_list, dirname);
+
+      __set_errno (0);
+      while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
+	{
+	  path_max += PATH_INCR;
+	  dirname = (char *) alloca (path_max + dirname_len);
+	  ADD_BLOCK (block_list, dirname);
+	  __set_errno (0);
+	}
+
+      if (ret == NULL)
+	{
+	  /* We cannot get the current working directory.  Don't signal an
+	     error but simply return the default string.  */
+	  FREE_BLOCKS (block_list);
+	  __set_errno (saved_errno);
+	  return (char *) msgid;
+	}
+
+      stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
+    }
+
+  /* Now determine the symbolic name of CATEGORY and its value.  */
+  categoryname = category_to_name (category);
+  categoryvalue = guess_category_value (category, categoryname);
+
+  xdomainname = (char *) alloca (strlen (categoryname)
+				 + strlen (domainname) + 5);
+  ADD_BLOCK (block_list, xdomainname);
+
+  stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
+		  domainname),
+	  ".mo");
+
+  /* Creating working area.  */
+  single_locale = (char *) alloca (strlen (categoryvalue) + 1);
+  ADD_BLOCK (block_list, single_locale);
+
+
+  /* Search for the given string.  This is a loop because we perhaps
+     got an ordered list of languages to consider for the translation.  */
+  while (1)
+    {
+      /* Make CATEGORYVALUE point to the next element of the list.  */
+      while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
+	++categoryvalue;
+      if (categoryvalue[0] == '\0')
+	{
+	  /* The whole contents of CATEGORYVALUE has been searched but
+	     no valid entry has been found.  We solve this situation
+	     by implicitly appending a "C" entry, i.e. no translation
+	     will take place.  */
+	  single_locale[0] = 'C';
+	  single_locale[1] = '\0';
+	}
+      else
+	{
+	  char *cp = single_locale;
+	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
+	    *cp++ = *categoryvalue++;
+	  *cp = '\0';
+
+	  /* When this is a SUID binary we must not allow accessing files
+	     outside the dedicated directories.  */
+	  if (ENABLE_SECURE
+	      && (memchr (single_locale, '/',
+			  _nl_find_language (single_locale) - single_locale)
+		  != NULL))
+	    /* Ingore this entry.  */
+	    continue;
+	}
+
+      /* If the current locale value is C (or POSIX) we don't load a
+	 domain.  Return the MSGID.  */
+      if (strcmp (single_locale, "C") == 0
+	  || strcmp (single_locale, "POSIX") == 0)
+	{
+	  FREE_BLOCKS (block_list);
+	  __set_errno (saved_errno);
+	  return (char *) msgid;
+	}
+
+
+      /* Find structure describing the message catalog matching the
+	 DOMAINNAME and CATEGORY.  */
+      domain = _nl_find_domain (dirname, single_locale, xdomainname);
+
+      if (domain != NULL)
+	{
+	  retval = find_msg (domain, msgid);
+
+	  if (retval == NULL)
+	    {
+	      int cnt;
+
+	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
+		{
+		  retval = find_msg (domain->successor[cnt], msgid);
+
+		  if (retval != NULL)
+		    break;
+		}
+	    }
+
+	  if (retval != NULL)
+	    {
+	      FREE_BLOCKS (block_list);
+	      __set_errno (saved_errno);
+	      return retval;
+	    }
+	}
+    }
+  /* NOTREACHED */
 }
 
 #ifdef _LIBC
 /* Alias for function name in GNU C Library.  */
 weak_alias (__dcgettext, dcgettext);
 #endif
+
+
+static char *
+internal_function
+find_msg (domain_file, msgid)
+     struct loaded_l10nfile *domain_file;
+     const char *msgid;
+{
+  size_t act = 0;
+  size_t top, bottom;
+  struct loaded_domain *domain;
+
+  if (domain_file->decided == 0)
+    _nl_load_domain (domain_file);
+
+  if (domain_file->data == NULL)
+    return NULL;
+
+  domain = (struct loaded_domain *) domain_file->data;
+
+  /* Locate the MSGID and its translation.  */
+  if (domain->hash_size > 2 && domain->hash_tab != NULL)
+    {
+      /* Use the hashing table.  */
+      nls_uint32 len = strlen (msgid);
+      nls_uint32 hash_val = hash_string (msgid);
+      nls_uint32 idx = hash_val % domain->hash_size;
+      nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
+      nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
+
+      if (nstr == 0)
+	/* Hash table entry is empty.  */
+	return NULL;
+
+      if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
+	  && strcmp (msgid,
+		     domain->data + W (domain->must_swap,
+				       domain->orig_tab[nstr - 1].offset)) == 0)
+	return (char *) domain->data + W (domain->must_swap,
+					  domain->trans_tab[nstr - 1].offset);
+
+      while (1)
+	{
+	  if (idx >= domain->hash_size - incr)
+	    idx -= domain->hash_size - incr;
+	  else
+	    idx += incr;
+
+	  nstr = W (domain->must_swap, domain->hash_tab[idx]);
+	  if (nstr == 0)
+	    /* Hash table entry is empty.  */
+	    return NULL;
+
+	  if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
+	      && strcmp (msgid,
+			 domain->data + W (domain->must_swap,
+					   domain->orig_tab[nstr - 1].offset))
+	         == 0)
+	    return (char *) domain->data
+	      + W (domain->must_swap, domain->trans_tab[nstr - 1].offset);
+	}
+      /* NOTREACHED */
+    }
+
+  /* Now we try the default method:  binary search in the sorted
+     array of messages.  */
+  bottom = 0;
+  top = domain->nstrings;
+  while (bottom < top)
+    {
+      int cmp_val;
+
+      act = (bottom + top) / 2;
+      cmp_val = strcmp (msgid, domain->data
+			       + W (domain->must_swap,
+				    domain->orig_tab[act].offset));
+      if (cmp_val < 0)
+	top = act;
+      else if (cmp_val > 0)
+	bottom = act + 1;
+      else
+	break;
+    }
+
+  /* If an translation is found return this.  */
+  return bottom >= top ? NULL : (char *) domain->data
+                                + W (domain->must_swap,
+				     domain->trans_tab[act].offset);
+}
+
+
+/* Return string representation of locale CATEGORY.  */
+static const char *
+internal_function
+category_to_name (category)
+     int category;
+{
+  const char *retval;
+
+  switch (category)
+  {
+#ifdef LC_COLLATE
+  case LC_COLLATE:
+    retval = "LC_COLLATE";
+    break;
+#endif
+#ifdef LC_CTYPE
+  case LC_CTYPE:
+    retval = "LC_CTYPE";
+    break;
+#endif
+#ifdef LC_MONETARY
+  case LC_MONETARY:
+    retval = "LC_MONETARY";
+    break;
+#endif
+#ifdef LC_NUMERIC
+  case LC_NUMERIC:
+    retval = "LC_NUMERIC";
+    break;
+#endif
+#ifdef LC_TIME
+  case LC_TIME:
+    retval = "LC_TIME";
+    break;
+#endif
+#ifdef LC_MESSAGES
+  case LC_MESSAGES:
+    retval = "LC_MESSAGES";
+    break;
+#endif
+#ifdef LC_RESPONSE
+  case LC_RESPONSE:
+    retval = "LC_RESPONSE";
+    break;
+#endif
+#ifdef LC_ALL
+  case LC_ALL:
+    /* This might not make sense but is perhaps better than any other
+       value.  */
+    retval = "LC_ALL";
+    break;
+#endif
+  default:
+    /* If you have a better idea for a default value let me know.  */
+    retval = "LC_XXX";
+  }
+
+  return retval;
+}
+
+/* Guess value of current locale from value of the environment variables.  */
+static const char *
+internal_function
+guess_category_value (category, categoryname)
+     int category;
+     const char *categoryname;
+{
+  const char *retval;
+
+  /* The highest priority value is the `LANGUAGE' environment
+     variable.  This is a GNU extension.  */
+  retval = getenv ("LANGUAGE");
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+
+  /* `LANGUAGE' is not set.  So we have to proceed with the POSIX
+     methods of looking to `LC_ALL', `LC_xxx', and `LANG'.  On some
+     systems this can be done by the `setlocale' function itself.  */
+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
+  return setlocale (category, NULL);
+#else
+  /* Setting of LC_ALL overwrites all other.  */
+  retval = getenv ("LC_ALL");
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+
+  /* Next comes the name of the desired category.  */
+  retval = getenv (categoryname);
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+
+  /* Last possibility is the LANG environment variable.  */
+  retval = getenv ("LANG");
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+
+  /* We use C as the default domain.  POSIX says this is implementation
+     defined.  */
+  return "C";
+#endif
+}
+
+/* @@ begin of epilog @@ */
+
+/* We don't want libintl.a to depend on any other library.  So we
+   avoid the non-standard function stpcpy.  In GNU C Library this
+   function is available, though.  Also allow the symbol HAVE_STPCPY
+   to be defined.  */
+#if !_LIBC && !HAVE_STPCPY
+static char *
+stpcpy (dest, src)
+     char *dest;
+     const char *src;
+{
+  while ((*dest++ = *src++) != '\0')
+    /* Do nothing. */ ;
+  return dest - 1;
+}
+#endif
+
+
+#ifdef _LIBC
+/* If we want to free all resources we have to do some work at
+   program's end.  */
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  struct binding *runp;
+
+  for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next)
+    {
+      free (runp->domainname);
+      if (runp->dirname != _nl_default_dirname)
+	/* Yes, this is a pointer comparison.  */
+	free (runp->dirname);
+    }
+
+  if (_nl_current_default_domain != _nl_default_default_domain)
+    /* Yes, again a pointer comparison.  */
+    free ((char *) _nl_current_default_domain);
+}
+
+text_set_element (__libc_subfreeres, free_mem);
+#endif

intl/dcngettext.c

@@ -1,59 +0,0 @@
-/* Implementation of the dcngettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-
-   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, 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.
-
-   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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCNGETTEXT __dcngettext
-# define DCIGETTEXT __dcigettext
-#else
-# define DCNGETTEXT dcngettext__
-# define DCIGETTEXT dcigettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-char *
-DCNGETTEXT (domainname, msgid1, msgid2, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-     int category;
-{
-  return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dcngettext, dcngettext);
-#endif

intl/dgettext.c

@@ -1,5 +1,5 @@
-/* Implementation of the dgettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
+/* Implementation of the dgettext(3) function
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
    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
@@ -19,13 +19,14 @@
 # include <config.h>
 #endif
 
-#include <locale.h>
+#if defined HAVE_LOCALE_H || defined _LIBC
+# include <locale.h>
+#endif
 
-#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgnuintl.h"
+# include "libgettext.h"
 #endif
 
 /* @@ end of prolog @@ */

intl/dngettext.c

@@ -1,60 +0,0 @@
-/* Implementation of the dngettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
-
-   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, 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.
-
-   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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <locale.h>
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DNGETTEXT __dngettext
-# define DCNGETTEXT __dcngettext
-#else
-# define DNGETTEXT dngettext__
-# define DCNGETTEXT dcngettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
-   LC_MESSAGES locale and skip message according to the plural form.  */
-char *
-DNGETTEXT (domainname, msgid1, msgid2, n)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dngettext, dngettext);
-#endif

intl/explodename.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -19,8 +19,15 @@
 # include <config.h>
 #endif
 
-#include <stdlib.h>
-#include <string.h>
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#else
+# include <strings.h>
+#endif
 #include <sys/types.h>
 
 #include "loadinfo.h"

intl/finddomain.c

@@ -1,6 +1,6 @@
 /* Handle list of needed message catalogs
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.org>, 1995.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    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
@@ -20,20 +20,45 @@
 # include <config.h>
 #endif
 
+#include <ctype.h>
+#include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#else
+# ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+# else
+void free ();
+# endif
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
+# ifndef strchr
+#  define strchr index
+# endif
+#endif
 
 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
 #endif
 
+#include "gettext.h"
 #include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgnuintl.h"
+# include "libgettext.h"
 #endif
 
 /* @@ end of prolog @@ */
@@ -46,11 +71,10 @@ static struct loaded_l10nfile *_nl_loaded_domains;
    established bindings.  */
 struct loaded_l10nfile *
 internal_function
-_nl_find_domain (dirname, locale, domainname, domainbinding)
+_nl_find_domain (dirname, locale, domainname)
      const char *dirname;
      char *locale;
      const char *domainname;
-     struct binding *domainbinding;
 {
   struct loaded_l10nfile *retval;
   const char *language;
@@ -96,7 +120,7 @@ _nl_find_domain (dirname, locale, domainname, domainbinding)
       int cnt;
 
       if (retval->decided == 0)
-	_nl_load_domain (retval, domainbinding);
+	_nl_load_domain (retval);
 
       if (retval->data != NULL)
 	return retval;
@@ -104,7 +128,7 @@ _nl_find_domain (dirname, locale, domainname, domainbinding)
       for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
 	{
 	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
+	    _nl_load_domain (retval->successor[cnt]);
 
 	  if (retval->successor[cnt]->data != NULL)
 	    break;
@@ -151,14 +175,14 @@ _nl_find_domain (dirname, locale, domainname, domainbinding)
     return NULL;
 
   if (retval->decided == 0)
-    _nl_load_domain (retval, domainbinding);
+    _nl_load_domain (retval);
   if (retval->data == NULL)
     {
       int cnt;
       for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
 	{
 	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
+	    _nl_load_domain (retval->successor[cnt]);
 	  if (retval->successor[cnt]->data != NULL)
 	    break;
 	}
@@ -168,10 +192,6 @@ _nl_find_domain (dirname, locale, domainname, domainbinding)
   if (alias_value != NULL)
     free (locale);
 
-  /* The space for normalized_codeset is dynamically allocated.  Free it.  */
-  if (mask & XPG_NORM_CODESET)
-    free ((void *) normalized_codeset);
-
   return retval;
 }
 
@@ -188,7 +208,6 @@ free_mem (void)
       if (runp->data != NULL)
 	_nl_unload_domain ((struct loaded_domain *) runp->data);
       runp = runp->next;
-      free ((char *) here->filename);
       free (here);
     }
 }

intl/gettext.c

@@ -1,5 +1,5 @@
 /* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
 
    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
@@ -23,14 +23,21 @@
 # define __need_NULL
 # include <stddef.h>
 #else
-# include <stdlib.h>		/* Just for NULL.  */
+# ifdef STDC_HEADERS
+#  include <stdlib.h>		/* Just for NULL.  */
+# else
+#  ifdef HAVE_STRING_H
+#   include <string.h>
+#  else
+#   define NULL ((void *) 0)
+#  endif
+# endif
 #endif
 
-#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgnuintl.h"
+# include "libgettext.h"
 #endif
 
 /* @@ end of prolog @@ */
@@ -41,10 +48,10 @@
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define GETTEXT __gettext
-# define DCGETTEXT __dcgettext
+# define DGETTEXT __dgettext
 #else
 # define GETTEXT gettext__
-# define DCGETTEXT dcgettext__
+# define DGETTEXT dgettext__
 #endif
 
 /* Look up MSGID in the current default message catalog for the current
@@ -54,7 +61,7 @@ char *
 GETTEXT (msgid)
      const char *msgid;
 {
-  return DCGETTEXT (NULL, msgid, LC_MESSAGES);
+  return DGETTEXT (NULL, msgid);
 }
 
 #ifdef _LIBC

intl/gettext.h

@@ -1,5 +1,5 @@
-/* Description of GNU message catalog format: general file layout.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+/* Internal header for GNU gettext internationalization functions.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
 
    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
@@ -11,13 +11,16 @@
    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.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #ifndef _GETTEXT_H
 #define _GETTEXT_H 1
 
+#include <stdio.h>
+
 #if HAVE_LIMITS_H || _LIBC
 # include <limits.h>
 #endif
@@ -34,8 +37,9 @@
 /* The following contortions are an attempt to use the C preprocessor
    to determine an unsigned integral type that is 32 bits wide.  An
    alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
-   when cross-compiling.  */
+   doing that would require that the configure script compile and *run*
+   the resulting executable.  Locally running cross-compiled executables
+   is usually not possible.  */
 
 #if __STDC__
 # define UINT_MAX_32_BITS 4294967295U

intl/gettextP.h

@@ -1,6 +1,6 @@
-/* Header describing internals of libintl library.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
+/* Header describing internals of gettext library
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    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
@@ -19,20 +19,8 @@
 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H
 
-#include <stddef.h>		/* Get size_t.  */
-
-#ifdef _LIBC
-# include "../iconv/gconv_int.h"
-#else
-# if HAVE_ICONV
-#  include <iconv.h>
-# endif
-#endif
-
 #include "loadinfo.h"
 
-#include "gettext.h"		/* Get nls_uint32.  */
-
 /* @@ end of prolog @@ */
 
 #ifndef PARAMS
@@ -47,12 +35,6 @@
 # define internal_function
 #endif
 
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
 #ifndef W
 # define W(flag, data) ((flag) ? SWAP (data) : (data))
 #endif
@@ -62,6 +44,8 @@
 # include <byteswap.h>
 # define SWAP(i) bswap_32 (i)
 #else
+static nls_uint32 SWAP PARAMS ((nls_uint32 i));
+
 static inline nls_uint32
 SWAP (i)
      nls_uint32 i;
@@ -71,52 +55,6 @@ SWAP (i)
 #endif
 
 
-/* This is the representation of the expressions to determine the
-   plural form.  */
-struct expression
-{
-  int nargs;			/* Number of arguments.  */
-  enum operator
-  {
-    /* Without arguments:  */
-    var,			/* The variable "n".  */
-    num,			/* Decimal number.  */
-    /* Unary operators:  */
-    lnot,			/* Logical NOT.  */
-    /* Binary operators:  */
-    mult,			/* Multiplication.  */
-    divide,			/* Division.  */
-    module,			/* Module operation.  */
-    plus,			/* Addition.  */
-    minus,			/* Subtraction.  */
-    less_than,			/* Comparison.  */
-    greater_than,		/* Comparison.  */
-    less_or_equal,		/* Comparison.  */
-    greater_or_equal,		/* Comparison.  */
-    equal,			/* Comparision for equality.  */
-    not_equal,			/* Comparision for inequality.  */
-    land,			/* Logical AND.  */
-    lor,			/* Logical OR.  */
-    /* Ternary operators:  */
-    qmop			/* Question mark operator.  */
-  } operation;
-  union
-  {
-    unsigned long int num;	/* Number value for `num'.  */
-    struct expression *args[3];	/* Up to three arguments.  */
-  } val;
-};
-
-/* This is the data structure to pass information to the parser and get
-   the result in a thread-safe way.  */
-struct parse_args
-{
-  const char *cp;
-  struct expression *res;
-};
-
-
-/* The representation of an opened message catalog.  */
 struct loaded_domain
 {
   const char *data;
@@ -128,123 +66,23 @@ struct loaded_domain
   struct string_desc *trans_tab;
   nls_uint32 hash_size;
   nls_uint32 *hash_tab;
-  int codeset_cntr;
-#ifdef _LIBC
-  __gconv_t conv;
-#else
-# if HAVE_ICONV
-  iconv_t conv;
-# endif
-#endif
-  char **conv_tab;
-
-  struct expression *plural;
-  unsigned long int nplurals;
 };
 
-/* We want to allocate a string at the end of the struct.  But ISO C
-   doesn't allow zero sized arrays.  */
-#ifdef __GNUC__
-# define ZERO 0
-#else
-# define ZERO 1
-#endif
-
-/* A set of settings bound to a message domain.  Used to store settings
-   from bindtextdomain() and bind_textdomain_codeset().  */
 struct binding
 {
   struct binding *next;
+  char *domainname;
   char *dirname;
-  int codeset_cntr;	/* Incremented each time codeset changes.  */
-  char *codeset;
-  char domainname[ZERO];
 };
 
-/* A counter which is incremented each time some previous translations
-   become invalid.
-   This variable is part of the external ABI of the GNU libintl.  */
-extern int _nl_msg_cat_cntr;
-
 struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
 						 char *__locale,
-						 const char *__domainname,
-					      struct binding *__domainbinding))
+						 const char *__domainname))
      internal_function;
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain,
-			      struct binding *__domainbinding))
+void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain))
      internal_function;
 void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
      internal_function;
-const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file,
-					  struct loaded_domain *__domain,
-					  struct binding *__domainbinding))
-     internal_function;
-void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain))
-     internal_function;
-
-char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file,
-			    struct binding *domainbinding,
-			    const char *msgid, size_t *lengthp))
-     internal_function;
-
-#ifdef _LIBC
-extern char *__gettext PARAMS ((const char *__msgid));
-extern char *__dgettext PARAMS ((const char *__domainname,
-				 const char *__msgid));
-extern char *__dcgettext PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n));
-extern char *__dngettext PARAMS ((const char *__domainname,
-				  const char *__msgid1, const char *__msgid2,
-				  unsigned long int n));
-extern char *__dcngettext PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   unsigned long int __n, int __category));
-extern char *__dcigettext PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   int __plural, unsigned long int __n,
-				   int __category));
-extern char *__textdomain PARAMS ((const char *__domainname));
-extern char *__bindtextdomain PARAMS ((const char *__domainname,
-				       const char *__dirname));
-extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname,
-						const char *__codeset));
-#else
-extern char *gettext__ PARAMS ((const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
-				 const char *__msgid));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n));
-extern char *dngettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid1, const char *__msgid2,
-				  unsigned long int __n));
-extern char *dcngettext__ PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   unsigned long int __n, int __category));
-extern char *dcigettext__ PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   int __plural, unsigned long int __n,
-				   int __category));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
-				       const char *__dirname));
-extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname,
-						const char *__codeset));
-#endif
-
-#ifdef _LIBC
-extern void __gettext_free_exp PARAMS ((struct expression *exp))
-     internal_function;
-extern int __gettextparse PARAMS ((void *arg));
-#else
-extern void gettext_free_exp__ PARAMS ((struct expression *exp))
-     internal_function;
-extern int gettextparse__ PARAMS ((void *arg));
-#endif
 
 /* @@ begin of epilog @@ */
 

intl/hash-string.h

@@ -1,5 +1,5 @@
-/* Description of GNU message catalog format: string hashing function.
-   Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+/* Implements a string hashing function.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
 
    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
@@ -11,9 +11,10 @@
    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.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /* @@ end of prolog @@ */
 

intl/intl-compat.c

@@ -1,6 +1,6 @@
 /* intl-compat.c - Stub functions to call gettext functions from GNU gettext
    Library.
-   Copyright (C) 1995, 2000, 2001 Software Foundation, Inc.
+   Copyright (C) 1995 Software Foundation, Inc.
 
 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
@@ -20,79 +20,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <config.h>
 #endif
 
-#include "libgnuintl.h"
-#include "gettextP.h"
+#include "libgettext.h"
 
 /* @@ end of prolog @@ */
 
-/* This file redirects the gettext functions (without prefix or suffix) to
-   those defined in the included GNU gettext library (with "__" suffix).
-   It is compiled into libintl when the included GNU gettext library is
-   configured --with-included-gettext.
-
-   This redirection works also in the case that the system C library or
-   the system libintl library contain gettext/textdomain/... functions.
-   If it didn't, we would need to add preprocessor level redirections to
-   libgnuintl.h of the following form:
-
-#    define gettext gettext__
-#    define dgettext dgettext__
-#    define dcgettext dcgettext__
-#    define ngettext ngettext__
-#    define dngettext dngettext__
-#    define dcngettext dcngettext__
-#    define textdomain textdomain__
-#    define bindtextdomain bindtextdomain__
-#    define bind_textdomain_codeset bind_textdomain_codeset__
-
-   How does this redirection work? There are two cases.
-   A. When libintl.a is linked into an executable, it works because
-      functions defined in the executable always override functions in
-      the shared libraries.
-   B. When libintl.so is used, it works because
-      1. those systems defining gettext/textdomain/... in the C library
-         (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer) are
-         ELF systems and define these symbols as weak, thus explicitly
-         letting other shared libraries override it.
-      2. those systems defining gettext/textdomain/... in a standalone
-         libintl.so library (namely, Solaris 2.3 and newer) have this
-         shared library in /usr/lib, and the linker will search /usr/lib
-         *after* the directory where the GNU gettext library is installed.
-
-   A third case, namely when libintl.a is linked into a shared library
-   whose name is not libintl.so, is not supported. In this case, on
-   Solaris, when -lintl precedes the linker option for the shared library
-   containing GNU gettext, the system's gettext would indeed override
-   the GNU gettext. Anyone doing this kind of stuff must be clever enough
-   to 1. compile libintl.a with -fPIC, 2. remove -lintl from his linker
-   command line.  */
-
 
 #undef gettext
 #undef dgettext
 #undef dcgettext
-#undef ngettext
-#undef dngettext
-#undef dcngettext
 #undef textdomain
 #undef bindtextdomain
-#undef bind_textdomain_codeset
 
 
 char *
-gettext (msgid)
-     const char *msgid;
-{
-  return gettext__ (msgid);
-}
-
-
-char *
-dgettext (domainname, msgid)
+bindtextdomain (domainname, dirname)
      const char *domainname;
-     const char *msgid;
+     const char *dirname;
 {
-  return dgettext__ (domainname, msgid);
+  return bindtextdomain__ (domainname, dirname);
 }
 
 
@@ -107,35 +52,19 @@ dcgettext (domainname, msgid, category)
 
 
 char *
-ngettext (msgid1, msgid2, n)
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
+dgettext (domainname, msgid)
+     const char *domainname;
+     const char *msgid;
 {
-  return ngettext__ (msgid1, msgid2, n);
+  return dgettext__ (domainname, msgid);
 }
 
 
 char *
-dngettext (domainname, msgid1, msgid2, n)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
+gettext (msgid)
+     const char *msgid;
 {
-  return dngettext__ (domainname, msgid1, msgid2, n);
-}
-
-
-char *
-dcngettext (domainname, msgid1, msgid2, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-     int category;
-{
-  return dcngettext__ (domainname, msgid1, msgid2, n, category);
+  return gettext__ (msgid);
 }
 
 
@@ -145,21 +74,3 @@ textdomain (domainname)
 {
   return textdomain__ (domainname);
 }
-
-
-char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  return bindtextdomain__ (domainname, dirname);
-}
-
-
-char *
-bind_textdomain_codeset (domainname, codeset)
-     const char *domainname;
-     const char *codeset;
-{
-  return bind_textdomain_codeset__ (domainname, codeset);
-}

intl/l10nflist.c

@@ -1,4 +1,5 @@
-/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+/* Handle list of needed message catalogs
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -15,18 +16,22 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* Tell glibc's <string.h> to provide a prototype for stpcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#include <string.h>
+
+#if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE	1
+# endif
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
@@ -38,7 +43,10 @@
 #endif
 #include <ctype.h>
 #include <sys/types.h>
-#include <stdlib.h>
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif
 
 #include "loadinfo.h"
 
@@ -216,7 +224,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
 
   /* Construct file name.  */
   memcpy (abs_filename, dirlist, dirlist_len);
-  __argz_stringify (abs_filename, dirlist_len, PATH_SEPARATOR);
+  __argz_stringify (abs_filename, dirlist_len, ':');
   cp = abs_filename + (dirlist_len - 1);
   *cp++ = '/';
   cp = stpcpy (cp, language);
@@ -341,8 +349,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
 
 /* Normalize codeset name.  There is no standard for the codeset
    names.  Normalization allows the user to use any of the common
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
+   names.  */
 const char *
 _nl_normalize_codeset (codeset, name_len)
      const char *codeset;

intl/libgettext.h

@@ -1,5 +1,5 @@
-/* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+/* Message catalogs for internationalization.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
    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
@@ -15,34 +15,168 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ifndef _LIBGETTEXT_H
-#define _LIBGETTEXT_H 1
+/* Because on some systems (e.g. Solaris) we sometimes have to include
+   the systems libintl.h as well as this file we have more complex
+   include protection above.  But the systems header might perhaps also
+   define _LIBINTL_H and therefore we have to protect the definition here.  */
+
+#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H
+#ifndef _LIBINTL_H
+# define _LIBINTL_H	1
+#endif
+#define _LIBGETTEXT_H	1
+
+/* We define an additional symbol to signal that we use the GNU
+   implementation of gettext.  */
+#define __USE_GNU_GETTEXT 1
+
+#include <sys/types.h>
+
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* @@ end of prolog @@ */
+
+#ifndef PARAMS
+# if __STDC__ || defined __cplusplus
+#  define PARAMS(args) args
+# else
+#  define PARAMS(args) ()
+# endif
+#endif
+
+#ifndef NULL
+# if !defined __cplusplus || defined __GNUC__
+#  define NULL ((void *) 0)
+# else
+#  define NULL (0)
+# endif
+#endif
+
+#if !HAVE_LC_MESSAGES
+/* This value determines the behaviour of the gettext() and dgettext()
+   function.  But some system does not have this defined.  Define it
+   to a default value.  */
+# define LC_MESSAGES (-1)
+#endif
+
+
+/* Declarations for gettext-using-catgets interface.  Derived from
+   Jim Meyering's libintl.h.  */
+struct _msg_ent
+{
+  const char *_msg;
+  int _msg_number;
+};
+
+
+#if HAVE_CATGETS
+/* These two variables are defined in the automatically by po-to-tbl.sed
+   generated file `cat-id-tbl.c'.  */
+extern const struct _msg_ent _msg_tbl[];
+extern int _msg_tbl_length;
+#endif
+
+
+/* For automatical extraction of messages sometimes no real
+   translation is needed.  Instead the string itself is the result.  */
+#define gettext_noop(Str) (Str)
+
+/* Look up MSGID in the current default message catalog for the current
+   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
+   text).  */
+extern char *gettext PARAMS ((const char *__msgid));
+extern char *gettext__ PARAMS ((const char *__msgid));
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current
+   LC_MESSAGES locale.  */
+extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
+extern char *dgettext__ PARAMS ((const char *__domainname,
+				 const char *__msgid));
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+   locale.  */
+extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
+				int __category));
+extern char *dcgettext__ PARAMS ((const char *__domainname,
+				  const char *__msgid, int __category));
+
+
+/* Set the current default message catalog to DOMAINNAME.
+   If DOMAINNAME is null, return the current default.
+   If DOMAINNAME is "", reset to the default of "messages".  */
+extern char *textdomain PARAMS ((const char *__domainname));
+extern char *textdomain__ PARAMS ((const char *__domainname));
+
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+extern char *bindtextdomain PARAMS ((const char *__domainname,
+				  const char *__dirname));
+extern char *bindtextdomain__ PARAMS ((const char *__domainname,
+				    const char *__dirname));
 
-/* NLS can be disabled through the configure --disable-nls option.  */
 #if ENABLE_NLS
 
-/* Get declarations of GNU message catalog functions.  */
-# include <libintl.h>
+/* Solaris 2.3 has the gettext function but dcgettext is missing.
+   So we omit this optimization for Solaris 2.3.  BTW, Solaris 2.4
+   has dcgettext.  */
+# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
+
+#  define gettext(Msgid)						      \
+     dgettext (NULL, Msgid)
+
+#  define dgettext(Domainname, Msgid)					      \
+     dcgettext (Domainname, Msgid, LC_MESSAGES)
+
+#  if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
+/* This global variable is defined in loadmsgcat.c.  We need a sign,
+   whether a new catalog was loaded, which can be associated with all
+   translations.  */
+extern int _nl_msg_cat_cntr;
+
+#   define dcgettext(Domainname, Msgid, Category)			      \
+  (__extension__							      \
+   ({									      \
+     char *__result;							      \
+     if (__builtin_constant_p (Msgid))					      \
+       {								      \
+	 static char *__translation__;					      \
+	 static int __catalog_counter__;				      \
+	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
+	   {								      \
+	     __translation__ =						      \
+	       dcgettext__ (Domainname, Msgid, Category);		      \
+	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
+	   }								      \
+	 __result = __translation__;					      \
+       }								      \
+     else								      \
+       __result = dcgettext__ (Domainname, Msgid, Category);		      \
+     __result;								      \
+    }))
+#  endif
+# endif
 
 #else
 
 # define gettext(Msgid) (Msgid)
 # define dgettext(Domainname, Msgid) (Msgid)
 # define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define ngettext(Msgid1, Msgid2, N) \
-    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
-# define dngettext(Domainname, Msgid1, Msgid2, N) \
-    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
-# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
-# define textdomain(Domainname) ((char *) (Domainname))
-# define bindtextdomain(Domainname, Dirname) ((char *) (Dirname))
-# define bind_textdomain_codeset(Domainname, Codeset) ((char *) (Codeset))
+# define textdomain(Domainname) ((char *) Domainname)
+# define bindtextdomain(Domainname, Dirname) ((char *) Dirname)
 
 #endif
 
-/* For automatical extraction of messages sometimes no real
-   translation is needed.  Instead the string itself is the result.  */
-#define gettext_noop(Str) (Str)
+/* @@ begin of epilog @@ */
 
-#endif /* _LIBGETTEXT_H */
+#ifdef __cplusplus
+}
+#endif
+
+#endif

intl/libgnuintl.h

@@ -1,127 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
-
-   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, 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.
-
-   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.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H	1
-
-#include <locale.h>
-
-/* The LC_MESSAGES locale category is the category used by the functions
-   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-   On systems that don't define it, use an arbitrary value instead.
-   On Solaris, <locale.h> defines __LOCALE_H then includes <libintl.h> (i.e.
-   this file!) and then only defines LC_MESSAGES.  To avoid a redefinition
-   warning, don't define LC_MESSAGES in this case.  */
-#if !defined LC_MESSAGES && !defined __LOCALE_H
-# define LC_MESSAGES 1729
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
-   precedence over _conio_gettext.  */
-#ifdef __DJGPP__
-# undef gettext
-# define gettext gettext
-#endif
-
-#ifndef PARAMS
-# if __STDC__ || defined __cplusplus
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
-				int __category));
-
-
-/* Similar to `gettext' but select the plural form corresponding to the
-   number N.  */
-extern char *ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
-			       unsigned long int __n));
-
-/* Similar to `dgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dngettext PARAMS ((const char *__domainname, const char *__msgid1,
-				const char *__msgid2, unsigned long int __n));
-
-/* Similar to `dcgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dcngettext PARAMS ((const char *__domainname, const char *__msgid1,
-				 const char *__msgid2, unsigned long int __n,
-				 int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
-				     const char *__dirname));
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-extern char *bind_textdomain_codeset PARAMS ((const char *__domainname,
-					      const char *__codeset));
-
-
-/* Optimized version of the functions above.  */
-#if defined __OPTIMIZED
-/* These are macros, but could also be inline functions.  */
-
-# define gettext(msgid)							      \
-  dgettext (NULL, msgid)
-
-# define dgettext(domainname, msgid)					      \
-  dcgettext (domainname, msgid, LC_MESSAGES)
-
-# define ngettext(msgid1, msgid2, n)					      \
-  dngettext (NULL, msgid1, msgid2, n)
-
-# define dngettext(domainname, msgid1, msgid2, n)			      \
-  dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES)
-
-#endif /* Optimizing. */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */

intl/loadinfo.h

@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -16,9 +16,6 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ifndef _LOADINFO_H
-#define _LOADINFO_H	1
-
 #ifndef PARAMS
 # if __STDC__
 #  define PARAMS(args) args
@@ -27,25 +24,6 @@
 # endif
 #endif
 
-#ifndef internal_function
-# define internal_function
-#endif
-
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-/* Separator in PATH like lists of pathnames.  */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
-# define PATH_SEPARATOR ';'
-#else
-  /* Unix */
-# define PATH_SEPARATOR ':'
-#endif
-
 /* Encoding of locale name parts.  */
 #define CEN_REVISION		1
 #define CEN_SPONSOR		2
@@ -72,10 +50,6 @@ struct loaded_l10nfile
 };
 
 
-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
 extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
 						  size_t name_len));
 
@@ -92,8 +66,6 @@ _nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
 
 extern const char *_nl_expand_alias PARAMS ((const char *name));
 
-/* normalized_codeset is dynamically allocated and has to be freed by
-   the caller.  */
 extern int _nl_explode_name PARAMS ((char *name, const char **language,
 				     const char **modifier,
 				     const char **territory,
@@ -104,5 +76,3 @@ extern int _nl_explode_name PARAMS ((char *name, const char **language,
 				     const char **revision));
 
 extern char *_nl_find_language PARAMS ((const char *name));
-
-#endif	/* loadinfo.h */

intl/loadmsgcat.c

@@ -1,5 +1,5 @@
 /* Load needed message catalogs.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
    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
@@ -15,52 +15,22 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE    1
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
 #endif
 
-#include <stdlib.h>
-#include <string.h>
-
 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
 #endif
 
-#ifdef _LIBC
-# include <langinfo.h>
-# include <locale.h>
-#endif
-
 #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
     || (defined _LIBC && defined _POSIX_MAPPED_FILES)
 # include <sys/mman.h>
@@ -73,10 +43,6 @@ char *alloca ();
 #include "gettext.h"
 #include "gettextP.h"
 
-#ifdef _LIBC
-# include "../locale/localeinfo.h"
-#endif
-
 /* @@ end of prolog @@ */
 
 #ifdef _LIBC
@@ -90,275 +56,29 @@ char *alloca ();
 # define munmap __munmap
 #endif
 
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define PLURAL_PARSE __gettextparse
-#else
-# define PLURAL_PARSE gettextparse__
-#endif
-
-/* For those losing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
-
-/* For systems that distinguish between text and binary I/O.
-   O_BINARY is usually declared in <fcntl.h>. */
-#if !defined O_BINARY && defined _O_BINARY
-  /* For MSC-compatible compilers.  */
-# define O_BINARY _O_BINARY
-# define O_TEXT _O_TEXT
-#endif
-#ifdef __BEOS__
-  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
-# undef O_BINARY
-# undef O_TEXT
-#endif
-/* On reasonable systems, binary I/O is the default.  */
-#ifndef O_BINARY
-# define O_BINARY 0
-#endif
-
 /* We need a sign, whether a new catalog was loaded, which can be associated
    with all translations.  This is important if the translations are
    cached by one of GCC's features.  */
-int _nl_msg_cat_cntr;
+int _nl_msg_cat_cntr = 0;
 
-#if (defined __GNUC__ && !defined __APPLE_CC__) \
-    || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
-
-/* These structs are the constant expression for the germanic plural
-   form determination.  It represents the expression  "n != 1".  */
-static const struct expression plvar =
-{
-  .nargs = 0,
-  .operation = var,
-};
-static const struct expression plone =
-{
-  .nargs = 0,
-  .operation = num,
-  .val =
-  {
-    .num = 1
-  }
-};
-static struct expression germanic_plural =
-{
-  .nargs = 2,
-  .operation = not_equal,
-  .val =
-  {
-    .args =
-    {
-      [0] = (struct expression *) &plvar,
-      [1] = (struct expression *) &plone
-    }
-  }
-};
-
-# define INIT_GERMANIC_PLURAL()
-
-#else
-
-/* For compilers without support for ISO C 99 struct/union initializers:
-   Initialization at run-time.  */
-
-static struct expression plvar;
-static struct expression plone;
-static struct expression germanic_plural;
-
-static void
-init_germanic_plural ()
-{
-  if (plone.val.num == 0)
-    {
-      plvar.nargs = 0;
-      plvar.operation = var;
-
-      plone.nargs = 0;
-      plone.operation = num;
-      plone.val.num = 1;
-
-      germanic_plural.nargs = 2;
-      germanic_plural.operation = not_equal;
-      germanic_plural.val.args[0] = &plvar;
-      germanic_plural.val.args[1] = &plone;
-    }
-}
-
-# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
-
-#endif
-
-
-/* Initialize the codeset dependent parts of an opened message catalog.
-   Return the header entry.  */
-const char *
-internal_function
-_nl_init_domain_conv (domain_file, domain, domainbinding)
-     struct loaded_l10nfile *domain_file;
-     struct loaded_domain *domain;
-     struct binding *domainbinding;
-{
-  /* Find out about the character set the file is encoded with.
-     This can be found (in textual form) in the entry "".  If this
-     entry does not exist or if this does not contain the `charset='
-     information, we will assume the charset matches the one the
-     current locale and we don't have to perform any conversion.  */
-  char *nullentry;
-  size_t nullentrylen;
-
-  /* Preinitialize fields, to avoid recursion during _nl_find_msg.  */
-  domain->codeset_cntr =
-    (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
-#ifdef _LIBC
-  domain->conv = (__gconv_t) -1;
-#else
-# if HAVE_ICONV
-  domain->conv = (iconv_t) -1;
-# endif
-#endif
-  domain->conv_tab = NULL;
-
-  /* Get the header entry.  */
-  nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
-
-  if (nullentry != NULL)
-    {
-#if defined _LIBC || HAVE_ICONV
-      const char *charsetstr;
-
-      charsetstr = strstr (nullentry, "charset=");
-      if (charsetstr != NULL)
-	{
-	  size_t len;
-	  char *charset;
-	  const char *outcharset;
-
-	  charsetstr += strlen ("charset=");
-	  len = strcspn (charsetstr, " \t\n");
-
-	  charset = (char *) alloca (len + 1);
-# if defined _LIBC || HAVE_MEMPCPY
-	  *((char *) mempcpy (charset, charsetstr, len)) = '\0';
-# else
-	  memcpy (charset, charsetstr, len);
-	  charset[len] = '\0';
-# endif
-
-	  /* The output charset should normally be determined by the
-	     locale.  But sometimes the locale is not used or not correctly
-	     set up, so we provide a possibility for the user to override
-	     this.  Moreover, the value specified through
-	     bind_textdomain_codeset overrides both.  */
-	  if (domainbinding != NULL && domainbinding->codeset != NULL)
-	    outcharset = domainbinding->codeset;
-	  else
-	    {
-	      outcharset = getenv ("OUTPUT_CHARSET");
-	      if (outcharset == NULL || outcharset[0] == '\0')
-		{
-# ifdef _LIBC
-		  outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
-# else
-#  if HAVE_ICONV
-		  extern const char *locale_charset (void);
-		  outcharset = locale_charset ();
-#  endif
-# endif
-		}
-	    }
-
-# ifdef _LIBC
-	  /* We always want to use transliteration.  */
-	  outcharset = norm_add_slashes (outcharset, "TRANSLIT");
-	  charset = norm_add_slashes (charset, NULL);
-	  if (__gconv_open (outcharset, charset, &domain->conv,
-			    GCONV_AVOID_NOCONV)
-	      != __GCONV_OK)
-	    domain->conv = (__gconv_t) -1;
-# else
-#  if HAVE_ICONV
-	  /* When using GNU libiconv, we want to use transliteration.  */
-#   if _LIBICONV_VERSION >= 0x0105
-	  len = strlen (outcharset);
-	  {
-	    char *tmp = (char *) alloca (len + 10 + 1);
-	    memcpy (tmp, outcharset, len);
-	    memcpy (tmp + len, "//TRANSLIT", 10 + 1);
-	    outcharset = tmp;
-	  }
-#   endif
-	  domain->conv = iconv_open (outcharset, charset);
-#   if _LIBICONV_VERSION >= 0x0105
-	  freea (outcharset);
-#   endif
-#  endif
-# endif
-
-	  freea (charset);
-	}
-#endif /* _LIBC || HAVE_ICONV */
-    }
-
-  return nullentry;
-}
-
-/* Frees the codeset dependent parts of an opened message catalog.  */
-void
-internal_function
-_nl_free_domain_conv (domain)
-     struct loaded_domain *domain;
-{
-  if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
-    free (domain->conv_tab);
-
-#ifdef _LIBC
-  if (domain->conv != (__gconv_t) -1)
-    __gconv_close (domain->conv);
-#else
-# if HAVE_ICONV
-  if (domain->conv != (iconv_t) -1)
-    iconv_close (domain->conv);
-# endif
-#endif
-}
 
 /* Load the message catalogs specified by FILENAME.  If it is no valid
    message catalog do nothing.  */
 void
 internal_function
-_nl_load_domain (domain_file, domainbinding)
+_nl_load_domain (domain_file)
      struct loaded_l10nfile *domain_file;
-     struct binding *domainbinding;
 {
   int fd;
   size_t size;
-#ifdef _LIBC
-  struct stat64 st;
-#else
   struct stat st;
-#endif
   struct mo_file_header *data = (struct mo_file_header *) -1;
   int use_mmap = 0;
   struct loaded_domain *domain;
-  const char *nullentry;
 
   domain_file->decided = 1;
   domain_file->data = NULL;
 
-  /* Note that it would be useless to store domainbinding in domain_file
-     because domainbinding might be == NULL now but != NULL later (after
-     a call to bind_textdomain_codeset).  */
-
   /* If the record does not represent a valid locale the FILENAME
      might be NULL.  This can happen when according to the given
      specification the locale file name is different for XPG and CEN
@@ -367,19 +87,14 @@ _nl_load_domain (domain_file, domainbinding)
     return;
 
   /* Try to open the addressed file.  */
-  fd = open (domain_file->filename, O_RDONLY | O_BINARY);
+  fd = open (domain_file->filename, O_RDONLY);
   if (fd == -1)
     return;
 
   /* We must know about the size of the file.  */
-  if (
-#ifdef _LIBC
-      __builtin_expect (fstat64 (fd, &st) != 0, 0)
-#else
-      __builtin_expect (fstat (fd, &st) != 0, 0)
-#endif
-      || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
-      || __builtin_expect (size < sizeof (struct mo_file_header), 0))
+  if (fstat (fd, &st) != 0
+      || (size = (size_t) st.st_size) != st.st_size
+      || size < sizeof (struct mo_file_header))
     {
       /* Something went wrong.  */
       close (fd);
@@ -392,7 +107,7 @@ _nl_load_domain (domain_file, domainbinding)
   data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
 					 MAP_PRIVATE, fd, 0);
 
-  if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
+  if (data != (struct mo_file_header *) -1)
     {
       /* mmap() call was successful.  */
       close (fd);
@@ -416,15 +131,12 @@ _nl_load_domain (domain_file, domainbinding)
       do
 	{
 	  long int nb = (long int) read (fd, read_ptr, to_read);
-	  if (nb <= 0)
+	  if (nb == -1)
 	    {
-#ifdef EINTR
-	      if (nb == -1 && errno == EINTR)
-		continue;
-#endif
 	      close (fd);
 	      return;
 	    }
+
 	  read_ptr += nb;
 	  to_read -= nb;
 	}
@@ -435,8 +147,7 @@ _nl_load_domain (domain_file, domainbinding)
 
   /* Using the magic number we can test whether it really is a message
      catalog file.  */
-  if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
-			0))
+  if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED)
     {
       /* The magic number is wrong: not a message catalog file.  */
 #ifdef HAVE_MMAP
@@ -448,11 +159,12 @@ _nl_load_domain (domain_file, domainbinding)
       return;
     }
 
-  domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
-  if (domain == NULL)
+  domain_file->data
+    = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
+  if (domain_file->data == NULL)
     return;
-  domain_file->data = domain;
 
+  domain = (struct loaded_domain *) domain_file->data;
   domain->data = (char *) data;
   domain->use_mmap = use_mmap;
   domain->mmap_size = size;
@@ -484,62 +196,9 @@ _nl_load_domain (domain_file, domainbinding)
       return;
     }
 
-  /* Now initialize the character set converter from the character set
-     the file is encoded with (found in the header entry) to the domain's
-     specified character set or the locale's character set.  */
-  nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
-
-  /* Also look for a plural specification.  */
-  if (nullentry != NULL)
-    {
-      const char *plural;
-      const char *nplurals;
-
-      plural = strstr (nullentry, "plural=");
-      nplurals = strstr (nullentry, "nplurals=");
-      if (plural == NULL || nplurals == NULL)
-	goto no_plural;
-      else
-	{
-	  /* First get the number.  */
-	  char *endp;
-	  unsigned long int n;
-	  struct parse_args args;
-
-	  nplurals += 9;
-	  while (*nplurals != '\0' && isspace (*nplurals))
-	    ++nplurals;
-#if defined HAVE_STRTOUL || defined _LIBC
-	  n = strtoul (nplurals, &endp, 10);
-#else
-	  for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
-	    n = n * 10 + (*endp - '0');
-#endif
-	  domain->nplurals = n;
-	  if (nplurals == endp)
-	    goto no_plural;
-
-	  /* Due to the restrictions bison imposes onto the interface of the
-	     scanner function we have to put the input string and the result
-	     passed up from the parser into the same structure which address
-	     is passed down to the parser.  */
-	  plural += 7;
-	  args.cp = plural;
-	  if (PLURAL_PARSE (&args) != 0)
-	    goto no_plural;
-	  domain->plural = args.res;
-	}
-    }
-  else
-    {
-      /* By default we are using the Germanic form: singular form only
-         for `one', the plural form otherwise.  Yes, this is also what
-         English is using since English is a Germanic language.  */
-    no_plural:
-      INIT_GERMANIC_PLURAL ();
-      domain->plural = &germanic_plural;
-      domain->nplurals = 2;
-    }
+  /* Show that one domain is changed.  This might make some cached
+     translations invalid.  */
+  ++_nl_msg_cat_cntr;
 }
 
 
@@ -549,16 +208,11 @@ internal_function
 _nl_unload_domain (domain)
      struct loaded_domain *domain;
 {
-  if (domain->plural != &germanic_plural)
-    __gettext_free_exp (domain->plural);
-
-  _nl_free_domain_conv (domain);
-
-# ifdef _POSIX_MAPPED_FILES
+#ifdef _POSIX_MAPPED_FILES
   if (domain->use_mmap)
     munmap ((caddr_t) domain->data, domain->mmap_size);
   else
-# endif	/* _POSIX_MAPPED_FILES */
+#endif	/* _POSIX_MAPPED_FILES */
     free ((void *) domain->data);
 
   free (domain);

intl/localcharset.c

@@ -1,271 +0,0 @@
-/* Determine a canonical name for the current locale's character encoding.
-
-   Copyright (C) 2000-2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* Written by Bruno Haible <haible@clisp.cons.org>.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if HAVE_STDDEF_H
-# include <stddef.h>
-#endif
-
-#include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#if defined _WIN32 || defined __WIN32__
-# undef WIN32   /* avoid warning on mingw32 */
-# define WIN32
-#endif
-
-#ifndef WIN32
-# if HAVE_LANGINFO_CODESET
-#  include <langinfo.h>
-# else
-#  if HAVE_SETLOCALE
-#   include <locale.h>
-#  endif
-# endif
-#else /* WIN32 */
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-
-#ifndef DIRECTORY_SEPARATOR
-# define DIRECTORY_SEPARATOR '/'
-#endif
-
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
-#endif
-
-/* The following static variable is declared 'volatile' to avoid a
-   possible multithread problem in the function get_charset_aliases. If we
-   are running in a threaded environment, and if two threads initialize
-   'charset_aliases' simultaneously, both will produce the same value,
-   and everything will be ok if the two assignments to 'charset_aliases'
-   are atomic. But I don't know what will happen if the two assignments mix.  */
-#if __STDC__ != 1
-# define volatile /* empty */
-#endif
-/* Pointer to the contents of the charset.alias file, if it has already been
-   read, else NULL.  Its format is:
-   ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
-static char * volatile charset_aliases;
-
-/* Return a pointer to the contents of the charset.alias file.  */
-static const char *
-get_charset_aliases ()
-{
-  char *cp;
-
-  cp = charset_aliases;
-  if (cp == NULL)
-    {
-#ifndef WIN32
-      FILE *fp;
-      const char *dir = LIBDIR;
-      const char *base = "charset.alias";
-      char *file_name;
-
-      /* Concatenate dir and base into freshly allocated file_name.  */
-      {
-	size_t dir_len = strlen (dir);
-	size_t base_len = strlen (base);
-	int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
-	file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
-	if (file_name != NULL)
-	  {
-	    memcpy (file_name, dir, dir_len);
-	    if (add_slash)
-	      file_name[dir_len] = DIRECTORY_SEPARATOR;
-	    memcpy (file_name + dir_len + add_slash, base, base_len + 1);
-	  }
-      }
-
-      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
-	/* Out of memory or file not found, treat it as empty.  */
-	cp = "";
-      else
-	{
-	  /* Parse the file's contents.  */
-	  int c;
-	  char buf1[50+1];
-	  char buf2[50+1];
-	  char *res_ptr = NULL;
-	  size_t res_size = 0;
-	  size_t l1, l2;
-
-	  for (;;)
-	    {
-	      c = getc (fp);
-	      if (c == EOF)
-		break;
-	      if (c == '\n' || c == ' ' || c == '\t')
-		continue;
-	      if (c == '#')
-		{
-		  /* Skip comment, to end of line.  */
-		  do
-		    c = getc (fp);
-		  while (!(c == EOF || c == '\n'));
-		  if (c == EOF)
-		    break;
-		  continue;
-		}
-	      ungetc (c, fp);
-	      if (fscanf(fp, "%50s %50s", buf1, buf2) < 2)
-		break;
-	      l1 = strlen (buf1);
-	      l2 = strlen (buf2);
-	      if (res_size == 0)
-		{
-		  res_size = l1 + 1 + l2 + 1;
-		  res_ptr = malloc (res_size + 1);
-		}
-	      else
-		{
-		  res_size += l1 + 1 + l2 + 1;
-		  res_ptr = realloc (res_ptr, res_size + 1);
-		}
-	      if (res_ptr == NULL)
-		{
-		  /* Out of memory. */
-		  res_size = 0;
-		  break;
-		}
-	      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
-	      strcpy (res_ptr + res_size - (l2 + 1), buf2);
-	    }
-	  fclose (fp);
-	  if (res_size == 0)
-	    cp = "";
-	  else
-	    {
-	      *(res_ptr + res_size) = '\0';
-	      cp = res_ptr;
-	    }
-	}
-
-      if (file_name != NULL)
-	free (file_name);
-
-#else /* WIN32 */
-
-      /* To avoid the troubles of installing a separate file in the same
-	 directory as the DLL and of retrieving the DLL's directory at
-	 runtime, simply inline the aliases here.  */
-
-      cp = "CP936" "\0" "GBK" "\0"
-	   "CP1361" "\0" "JOHAB" "\0";
-#endif
-
-      charset_aliases = cp;
-    }
-
-  return cp;
-}
-
-/* Determine the current locale's character encoding, and canonicalize it
-   into one of the canonical names listed in config.charset.
-   The result must not be freed; it is statically allocated.
-   If the canonical name cannot be determined, the result is a non-canonical
-   name.  */
-
-#ifdef STATIC
-STATIC
-#endif
-const char *
-locale_charset ()
-{
-  const char *codeset;
-  const char *aliases;
-
-#ifndef WIN32
-
-# if HAVE_LANGINFO_CODESET
-
-  /* Most systems support nl_langinfo (CODESET) nowadays.  */
-  codeset = nl_langinfo (CODESET);
-
-# else
-
-  /* On old systems which lack it, use setlocale or getenv.  */
-  const char *locale = NULL;
-
-  /* But most old systems don't have a complete set of locales.  Some
-     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
-     use setlocale here; it would return "C" when it doesn't support the
-     locale name the user has set.  */
-#  if HAVE_SETLOCALE && 0
-  locale = setlocale (LC_CTYPE, NULL);
-#  endif
-  if (locale == NULL || locale[0] == '\0')
-    {
-      locale = getenv ("LC_ALL");
-      if (locale == NULL || locale[0] == '\0')
-	{
-	  locale = getenv ("LC_CTYPE");
-	  if (locale == NULL || locale[0] == '\0')
-	    locale = getenv ("LANG");
-	}
-    }
-
-  /* On some old systems, one used to set locale = "iso8859_1". On others,
-     you set it to "language_COUNTRY.charset". In any case, we resolve it
-     through the charset.alias file.  */
-  codeset = locale;
-
-# endif
-
-#else /* WIN32 */
-
-  static char buf[2 + 10 + 1];
-
-  /* Win32 has a function returning the locale's codepage as a number.  */
-  sprintf (buf, "CP%u", GetACP ());
-  codeset = buf;
-
-#endif
-
-  if (codeset == NULL)
-    /* The canonical name cannot be determined.  */
-    codeset = "";
-
-  /* Resolve alias. */
-  for (aliases = get_charset_aliases ();
-       *aliases != '\0';
-       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
-    if (strcmp (codeset, aliases) == 0
-	|| (aliases[0] == '*' && aliases[1] == '\0'))
-      {
-	codeset = aliases + strlen (aliases) + 1;
-	break;
-      }
-
-  return codeset;
-}

intl/locale.alias

@@ -1,77 +0,0 @@
-# Locale name alias data base.
-# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-#
-# 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, 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.
-#
-# 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.
-
-# The format of this file is the same as for the corresponding file of
-# the X Window System, which normally can be found in
-#	/usr/lib/X11/locale/locale.alias
-# A single line contains two fields: an alias and a substitution value.
-# All entries are case independent.
-
-# Note: This file is far from being complete.  If you have a value for
-# your own site which you think might be useful for others too, share
-# it with the rest of us.  Send it using the `glibcbug' script to
-# bugs@gnu.org.
-
-# Packages using this file: 
-
-bokmal		no_NO.ISO-8859-1
-bokmål		no_NO.ISO-8859-1
-catalan		ca_ES.ISO-8859-1
-croatian	hr_HR.ISO-8859-2
-czech		cs_CZ.ISO-8859-2
-danish          da_DK.ISO-8859-1
-dansk		da_DK.ISO-8859-1
-deutsch		de_DE.ISO-8859-1
-dutch		nl_NL.ISO-8859-1
-eesti		et_EE.ISO-8859-1
-estonian	et_EE.ISO-8859-1
-finnish         fi_FI.ISO-8859-1
-français	fr_FR.ISO-8859-1
-french		fr_FR.ISO-8859-1
-galego		gl_ES.ISO-8859-1
-galician	gl_ES.ISO-8859-1
-german		de_DE.ISO-8859-1
-greek           el_GR.ISO-8859-7
-hebrew          iw_IL.ISO-8859-8
-hrvatski	hr_HR.ISO-8859-2
-hungarian       hu_HU.ISO-8859-2
-icelandic       is_IS.ISO-8859-1
-italian         it_IT.ISO-8859-1
-japanese	ja_JP.eucJP
-japanese.euc	ja_JP.eucJP
-ja_JP		ja_JP.eucJP
-ja_JP.ujis	ja_JP.eucJP
-japanese.sjis	ja_JP.SJIS
-korean		ko_KR.eucKR
-korean.euc 	ko_KR.eucKR
-ko_KR		ko_KR.eucKR
-lithuanian      lt_LT.ISO-8859-13
-nb_NO		no_NO.ISO-8859-1
-nb_NO.ISO-8859-1 no_NO.ISO-8859-1
-norwegian       no_NO.ISO-8859-1
-nynorsk		nn_NO.ISO-8859-1
-polish          pl_PL.ISO-8859-2
-portuguese      pt_PT.ISO-8859-1
-romanian        ro_RO.ISO-8859-2
-russian         ru_RU.ISO-8859-5
-slovak          sk_SK.ISO-8859-2
-slovene         sl_SI.ISO-8859-2
-slovenian       sl_SI.ISO-8859-2
-spanish         es_ES.ISO-8859-1
-swedish         sv_SE.ISO-8859-1
-thai		th_TH.TIS-620
-turkish         tr_TR.ISO-8859-9

intl/localealias.c

@@ -1,5 +1,6 @@
 /* Handle aliases for locale names.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    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
@@ -15,13 +16,6 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE    1
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -47,15 +41,35 @@ char *alloca ();
 # endif
 #endif
 
-#include <stdlib.h>
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#else
+char *getenv ();
+# ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+# else
+void free ();
+# endif
+#endif
 
-#include <string.h>
+#if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE	1
+# endif
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
 #endif
 
+#include "gettext.h"
 #include "gettextP.h"
 
 /* @@ end of prolog @@ */
@@ -81,14 +95,40 @@ __libc_lock_define_initialized (static, lock);
 # define internal_function
 #endif
 
-/* For those losing systems which don't have `alloca' we have to add
+/* For those loosing systems which don't have `alloca' we have to add
    some additional code emulating it.  */
 #ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
+/* Nothing has to be done.  */
+# define ADD_BLOCK(list, address) /* nothing */
+# define FREE_BLOCKS(list) /* nothing */
 #else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
+struct block_list
+{
+  void *address;
+  struct block_list *next;
+};
+# define ADD_BLOCK(list, addr)						      \
+  do {									      \
+    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
+    /* If we cannot get a free block we cannot add the new element to	      \
+       the list.  */							      \
+    if (newp != NULL) {							      \
+      newp->address = (addr);						      \
+      newp->next = (list);						      \
+      (list) = newp;							      \
+    }									      \
+  } while (0)
+# define FREE_BLOCKS(list)						      \
+  do {									      \
+    while (list != NULL) {						      \
+      struct block_list *old = list;					      \
+      list = list->next;						      \
+      free (old);							      \
+    }									      \
+  } while (0)
+# undef alloca
+# define alloca(size) (malloc (size))
+#endif	/* have alloca */
 
 #if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED
 # undef fgets
@@ -107,18 +147,18 @@ struct alias_map
 };
 
 
-static char *string_space;
-static size_t string_space_act;
-static size_t string_space_max;
+static char *string_space = NULL;
+static size_t string_space_act = 0;
+static size_t string_space_max = 0;
 static struct alias_map *map;
-static size_t nmap;
-static size_t maxmap;
+static size_t nmap = 0;
+static size_t maxmap = 0;
 
 
 /* Prototypes for local functions.  */
 static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
      internal_function;
-static int extend_alias_table PARAMS ((void));
+static void extend_alias_table PARAMS ((void));
 static int alias_compare PARAMS ((const struct alias_map *map1,
 				  const struct alias_map *map2));
 
@@ -164,12 +204,11 @@ _nl_expand_alias (name)
 	{
 	  const char *start;
 
-	  while (locale_alias_path[0] == PATH_SEPARATOR)
+	  while (locale_alias_path[0] == ':')
 	    ++locale_alias_path;
 	  start = locale_alias_path;
 
-	  while (locale_alias_path[0] != '\0'
-		 && locale_alias_path[0] != PATH_SEPARATOR)
+	  while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
 	    ++locale_alias_path;
 
 	  if (start < locale_alias_path)
@@ -192,12 +231,16 @@ read_alias_file (fname, fname_len)
      const char *fname;
      int fname_len;
 {
+#ifndef HAVE_ALLOCA
+  struct block_list *block_list = NULL;
+#endif
   FILE *fp;
   char *full_fname;
   size_t added;
   static const char aliasfile[] = "/locale.alias";
 
   full_fname = (char *) alloca (fname_len + sizeof aliasfile);
+  ADD_BLOCK (block_list, full_fname);
 #ifdef HAVE_MEMPCPY
   mempcpy (mempcpy (full_fname, fname, fname_len),
 	   aliasfile, sizeof aliasfile);
@@ -207,9 +250,11 @@ read_alias_file (fname, fname_len)
 #endif
 
   fp = fopen (full_fname, "r");
-  freea (full_fname);
   if (fp == NULL)
-    return 0;
+    {
+      FREE_BLOCKS (block_list);
+      return 0;
+    }
 
   added = 0;
   while (!feof (fp))
@@ -281,8 +326,7 @@ read_alias_file (fname, fname_len)
 		*cp++ = '\0';
 
 	      if (nmap >= maxmap)
-		if (__builtin_expect (extend_alias_table (), 0))
-		  return added;
+		extend_alias_table ();
 
 	      alias_len = strlen (alias) + 1;
 	      value_len = strlen (value) + 1;
@@ -295,19 +339,10 @@ read_alias_file (fname, fname_len)
 					? alias_len + value_len : 1024));
 		  char *new_pool = (char *) realloc (string_space, new_size);
 		  if (new_pool == NULL)
-		    return added;
-
-		  if (__builtin_expect (string_space != new_pool, 0))
 		    {
-		      size_t i;
-
-		      for (i = 0; i < nmap; i++)
-			{
-			  map[i].alias += new_pool - string_space;
-			  map[i].value += new_pool - string_space;
-			}
+		      FREE_BLOCKS (block_list);
+		      return added;
 		    }
-
 		  string_space = new_pool;
 		  string_space_max = new_size;
 		}
@@ -334,11 +369,12 @@ read_alias_file (fname, fname_len)
     qsort (map, nmap, sizeof (struct alias_map),
 	   (int (*) PARAMS ((const void *, const void *))) alias_compare);
 
+  FREE_BLOCKS (block_list);
   return added;
 }
 
 
-static int
+static void
 extend_alias_table ()
 {
   size_t new_size;
@@ -349,11 +385,10 @@ extend_alias_table ()
 						* sizeof (struct alias_map)));
   if (new_map == NULL)
     /* Simply don't extend: we don't have any more core.  */
-    return -1;
+    return;
 
   map = new_map;
   maxmap = new_size;
-  return 0;
 }
 
 

intl/ngettext.c

@@ -1,67 +0,0 @@
-/* Implementation of ngettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-   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, 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.
-
-   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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# include <stdlib.h>		/* Just for NULL.  */
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-#include <locale.h>
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define NGETTEXT __ngettext
-# define DCNGETTEXT __dcngettext
-#else
-# define NGETTEXT ngettext__
-# define DCNGETTEXT dcngettext__
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-char *
-NGETTEXT (msgid1, msgid2, n)
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__ngettext, ngettext);
-#endif

intl/plural.y

@@ -1,412 +0,0 @@
-%{
-/* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
-   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, 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.
-
-   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.  */
-
-/* The bison generated parser uses alloca.  AIX 3 forces us to put this
-   declaration at the beginning of the file.  The declaration in bison's
-   skeleton file comes too late.  This must come before <config.h>
-   because <config.h> may include arbitrary system headers.  */
-#if defined _AIX && !defined __GNUC__
- #pragma alloca
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include "gettextP.h"
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define FREE_EXPRESSION __gettext_free_exp
-#else
-# define FREE_EXPRESSION gettext_free_exp__
-# define __gettextparse gettextparse__
-#endif
-
-#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
-#define YYPARSE_PARAM	arg
-%}
-%pure_parser
-%expect 10
-
-%union {
-  unsigned long int num;
-  enum operator op;
-  struct expression *exp;
-}
-
-%{
-/* Prototypes for local functions.  */
-static struct expression *new_exp PARAMS ((int nargs, enum operator op,
-					   struct expression * const *args));
-static inline struct expression *new_exp_0 PARAMS ((enum operator op));
-static inline struct expression *new_exp_1 PARAMS ((enum operator op,
-						   struct expression *right));
-static struct expression *new_exp_2 PARAMS ((enum operator op,
-					     struct expression *left,
-					     struct expression *right));
-static inline struct expression *new_exp_3 PARAMS ((enum operator op,
-						   struct expression *bexp,
-						   struct expression *tbranch,
-						   struct expression *fbranch));
-static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
-static void yyerror PARAMS ((const char *str));
-
-/* Allocation of expressions.  */
-
-static struct expression *
-new_exp (nargs, op, args)
-     int nargs;
-     enum operator op;
-     struct expression * const *args;
-{
-  int i;
-  struct expression *newp;
-
-  /* If any of the argument could not be malloc'ed, just return NULL.  */
-  for (i = nargs - 1; i >= 0; i--)
-    if (args[i] == NULL)
-      goto fail;
-
-  /* Allocate a new expression.  */
-  newp = (struct expression *) malloc (sizeof (*newp));
-  if (newp != NULL)
-    {
-      newp->nargs = nargs;
-      newp->operation = op;
-      for (i = nargs - 1; i >= 0; i--)
-	newp->val.args[i] = args[i];
-      return newp;
-    }
-
- fail:
-  for (i = nargs - 1; i >= 0; i--)
-    FREE_EXPRESSION (args[i]);
-
-  return NULL;
-}
-
-static inline struct expression *
-new_exp_0 (op)
-     enum operator op;
-{
-  return new_exp (0, op, NULL);
-}
-
-static inline struct expression *
-new_exp_1 (op, right)
-     enum operator op;
-     struct expression *right;
-{
-  struct expression *args[1];
-
-  args[0] = right;
-  return new_exp (1, op, args);
-}
-
-static struct expression *
-new_exp_2 (op, left, right)
-     enum operator op;
-     struct expression *left;
-     struct expression *right;
-{
-  struct expression *args[2];
-
-  args[0] = left;
-  args[1] = right;
-  return new_exp (2, op, args);
-}
-
-static inline struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
-     enum operator op;
-     struct expression *bexp;
-     struct expression *tbranch;
-     struct expression *fbranch;
-{
-  struct expression *args[3];
-
-  args[0] = bexp;
-  args[1] = tbranch;
-  args[2] = fbranch;
-  return new_exp (3, op, args);
-}
-
-%}
-
-/* This declares that all operators have the same associativity and the
-   precedence order as in C.  See [Harbison, Steele: C, A Reference Manual].
-   There is no unary minus and no bitwise operators.
-   Operators with the same syntactic behaviour have been merged into a single
-   token, to save space in the array generated by bison.  */
-%right '?'		/*   ?		*/
-%left '|'		/*   ||		*/
-%left '&'		/*   &&		*/
-%left EQUOP2		/*   == !=	*/
-%left CMPOP2		/*   < > <= >=	*/
-%left ADDOP2		/*   + -	*/
-%left MULOP2		/*   * / %	*/
-%right '!'		/*   !		*/
-
-%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
-%token <num> NUMBER
-%type <exp> exp
-
-%%
-
-start:	  exp
-	  {
-	    if ($1 == NULL)
-	      YYABORT;
-	    ((struct parse_args *) arg)->res = $1;
-	  }
-	;
-
-exp:	  exp '?' exp ':' exp
-	  {
-	    $$ = new_exp_3 (qmop, $1, $3, $5);
-	  }
-	| exp '|' exp
-	  {
-	    $$ = new_exp_2 (lor, $1, $3);
-	  }
-	| exp '&' exp
-	  {
-	    $$ = new_exp_2 (land, $1, $3);
-	  }
-	| exp EQUOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp CMPOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp ADDOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp MULOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| '!' exp
-	  {
-	    $$ = new_exp_1 (lnot, $2);
-	  }
-	| 'n'
-	  {
-	    $$ = new_exp_0 (var);
-	  }
-	| NUMBER
-	  {
-	    if (($$ = new_exp_0 (num)) != NULL)
-	      $$->val.num = $1;
-	  }
-	| '(' exp ')'
-	  {
-	    $$ = $2;
-	  }
-	;
-
-%%
-
-void
-internal_function
-FREE_EXPRESSION (exp)
-     struct expression *exp;
-{
-  if (exp == NULL)
-    return;
-
-  /* Handle the recursive case.  */
-  switch (exp->nargs)
-    {
-    case 3:
-      FREE_EXPRESSION (exp->val.args[2]);
-      /* FALLTHROUGH */
-    case 2:
-      FREE_EXPRESSION (exp->val.args[1]);
-      /* FALLTHROUGH */
-    case 1:
-      FREE_EXPRESSION (exp->val.args[0]);
-      /* FALLTHROUGH */
-    default:
-      break;
-    }
-
-  free (exp);
-}
-
-
-static int
-yylex (lval, pexp)
-     YYSTYPE *lval;
-     const char **pexp;
-{
-  const char *exp = *pexp;
-  int result;
-
-  while (1)
-    {
-      if (exp[0] == '\0')
-	{
-	  *pexp = exp;
-	  return YYEOF;
-	}
-
-      if (exp[0] != ' ' && exp[0] != '\t')
-	break;
-
-      ++exp;
-    }
-
-  result = *exp++;
-  switch (result)
-    {
-    case '0': case '1': case '2': case '3': case '4':
-    case '5': case '6': case '7': case '8': case '9':
-      {
-	unsigned long int n = result - '0';
-	while (exp[0] >= '0' && exp[0] <= '9')
-	  {
-	    n *= 10;
-	    n += exp[0] - '0';
-	    ++exp;
-	  }
-	lval->num = n;
-	result = NUMBER;
-      }
-      break;
-
-    case '=':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = equal;
-	  result = EQUOP2;
-	}
-      else
-	result = YYERRCODE;
-      break;
-
-    case '!':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = not_equal;
-	  result = EQUOP2;
-	}
-      break;
-
-    case '&':
-    case '|':
-      if (exp[0] == result)
-	++exp;
-      else
-	result = YYERRCODE;
-      break;
-
-    case '<':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = less_or_equal;
-	}
-      else
-	lval->op = less_than;
-      result = CMPOP2;
-      break;
-
-    case '>':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = greater_or_equal;
-	}
-      else
-	lval->op = greater_than;
-      result = CMPOP2;
-      break;
-
-    case '*':
-      lval->op = mult;
-      result = MULOP2;
-      break;
-
-    case '/':
-      lval->op = divide;
-      result = MULOP2;
-      break;
-
-    case '%':
-      lval->op = module;
-      result = MULOP2;
-      break;
-
-    case '+':
-      lval->op = plus;
-      result = ADDOP2;
-      break;
-
-    case '-':
-      lval->op = minus;
-      result = ADDOP2;
-      break;
-
-    case 'n':
-    case '?':
-    case ':':
-    case '(':
-    case ')':
-      /* Nothing, just return the character.  */
-      break;
-
-    case ';':
-    case '\n':
-    case '\0':
-      /* Be safe and let the user call this function again.  */
-      --exp;
-      result = YYEOF;
-      break;
-
-    default:
-      result = YYERRCODE;
-#if YYDEBUG != 0
-      --exp;
-#endif
-      break;
-    }
-
-  *pexp = exp;
-
-  return result;
-}
-
-
-static void
-yyerror (str)
-     const char *str;
-{
-  /* Do nothing.  We don't print error messages here.  */
-}

intl/ref-add.sin

@@ -1,31 +0,0 @@
-# Add this package to a list of references stored in a text file.
-#
-#   Copyright (C) 2000 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, 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
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library 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.
-#
-# Written by Bruno Haible <haible@clisp.cons.org>.
-#
-/^# Packages using this file: / {
-  s/# Packages using this file://
-  ta
-  :a
-  s/ @PACKAGE@ / @PACKAGE@ /
-  tb
-  s/ $/ @PACKAGE@ /
-  :b
-  s/^/# Packages using this file:/
-}

intl/ref-del.sin

@@ -1,26 +0,0 @@
-# Remove this package from a list of references stored in a text file.
-#
-#   Copyright (C) 2000 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, 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
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library 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.
-#
-# Written by Bruno Haible <haible@clisp.cons.org>.
-#
-/^# Packages using this file: / {
-  s/# Packages using this file://
-  s/ @PACKAGE@ / /
-  s/^/# Packages using this file:/
-}

intl/textdomain.c

@@ -1,5 +1,6 @@
 /* Implementation of the textdomain(3) function.
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    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
@@ -19,32 +20,23 @@
 # include <config.h>
 #endif
 
-#include <stdlib.h>
-#include <string.h>
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif
+
+#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
 
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgnuintl.h"
-#endif
-#include "gettextP.h"
-
-#ifdef _LIBC
-/* We have to handle multi-threaded applications.  */
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_default_domain _nl_default_default_domain__
-# define _nl_current_default_domain _nl_current_default_domain__
+# include "libgettext.h"
 #endif
 
 /* @@ end of prolog @@ */
@@ -69,9 +61,6 @@ extern const char *_nl_current_default_domain;
 # define TEXTDOMAIN textdomain__
 #endif
 
-/* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
-
 /* Set the current default message catalog to DOMAINNAME.
    If DOMAINNAME is null, return the current default.
    If DOMAINNAME is "", reset to the default of "messages".  */
@@ -79,60 +68,38 @@ char *
 TEXTDOMAIN (domainname)
      const char *domainname;
 {
-  char *new_domain;
-  char *old_domain;
+  char *old;
 
   /* A NULL pointer requests the current setting.  */
   if (domainname == NULL)
     return (char *) _nl_current_default_domain;
 
-  __libc_rwlock_wrlock (_nl_state_lock);
-
-  old_domain = (char *) _nl_current_default_domain;
+  old = (char *) _nl_current_default_domain;
 
   /* If domain name is the null string set to default domain "messages".  */
   if (domainname[0] == '\0'
       || strcmp (domainname, _nl_default_default_domain) == 0)
-    {
-      _nl_current_default_domain = _nl_default_default_domain;
-      new_domain = (char *) _nl_current_default_domain;
-    }
-  else if (strcmp (domainname, old_domain) == 0)
-    /* This can happen and people will use it to signal that some
-       environment variable changed.  */
-    new_domain = old_domain;
+    _nl_current_default_domain = _nl_default_default_domain;
   else
     {
       /* If the following malloc fails `_nl_current_default_domain'
 	 will be NULL.  This value will be returned and so signals we
 	 are out of core.  */
 #if defined _LIBC || defined HAVE_STRDUP
-      new_domain = strdup (domainname);
+      _nl_current_default_domain = strdup (domainname);
 #else
       size_t len = strlen (domainname) + 1;
-      new_domain = (char *) malloc (len);
-      if (new_domain != NULL)
-	memcpy (new_domain, domainname, len);
+      char *cp = (char *) malloc (len);
+      if (cp != NULL)
+	memcpy (cp, domainname, len);
+      _nl_current_default_domain = cp;
 #endif
-
-      if (new_domain != NULL)
-	_nl_current_default_domain = new_domain;
     }
 
-  /* We use this possibility to signal a change of the loaded catalogs
-     since this is most likely the case and there is no other easy we
-     to do it.  Do it only when the call was successful.  */
-  if (new_domain != NULL)
-    {
-      ++_nl_msg_cat_cntr;
+  if (old != _nl_default_default_domain)
+    free (old);
 
-      if (old_domain != new_domain && old_domain != _nl_default_default_domain)
-	free (old_domain);
-    }
-
-  __libc_rwlock_unlock (_nl_state_lock);
-
-  return new_domain;
+  return (char *) _nl_current_default_domain;
 }
 
 #ifdef _LIBC

m4/gettext.m4

@@ -0,0 +1,329 @@
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 108
+
+AC_PREREQ(2.13)               dnl Minimum Autoconf version required.
+
+AC_DEFUN(NANO_AM_WITH_NLS,
+  [AC_MSG_CHECKING([whether NLS is requested])
+    dnl Default is enabled NLS
+    AC_ARG_ENABLE(nls,
+      [  --disable-nls           do not use Native Language Support],
+      USE_NLS=$enableval, USE_NLS=yes)
+    AC_MSG_RESULT($USE_NLS)
+    AC_SUBST(USE_NLS)
+
+    USE_INCLUDED_LIBINTL=no
+
+    AC_ARG_WITH(locale-dir,
+      [  --with-locale-dir=DIR   specify locale directory],
+      LOCALE_DIR=$withval)
+    test -z "$LOCALE_DIR" && LOCALE_DIR='$(datadir)/locale'
+    AC_SUBST(LOCALE_DIR)
+
+    AC_ARG_WITH(gnu-locale-dir,
+      [  --with-gnu-locale-dir=DIR specify GNU locale directory],
+      GNU_LOCALE_DIR=$withval)
+    test -z "$GNU_LOCALE_DIR" && GNU_LOCALE_DIR='$(prefix)/share/locale'
+    AC_SUBST(GNU_LOCALE_DIR)
+
+    dnl If we use NLS figure out what method
+    if test "$USE_NLS" = "yes"; then
+      AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested.])
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH(included-gettext,
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If gettext or catgets are available (in this order) we
+        dnl use this.  Else we have to fall back to GNU NLS library.
+	dnl catgets is only used if permitted by option --with-catgets.
+	nls_cv_header_intl=
+	nls_cv_header_libgt=
+	CATOBJEXT=NONE
+
+	AC_CHECK_HEADER(libintl.h,
+	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
+	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
+	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
+
+	   if test "$gt_cv_func_gettext_libc" != "yes"; then
+	     AC_CHECK_LIB(intl, bindtextdomain,
+	       [AC_CHECK_LIB(intl, gettext)])
+	   fi
+
+	   if test "$gt_cv_func_gettext_libc" = "yes" \
+	      || test "$ac_cv_lib_intl_gettext" = "yes"; then
+	      AC_DEFINE(HAVE_GETTEXT, 1,
+	  [Define to 1 if you have gettext and don't want to use GNU gettext.])
+	      NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	      if test "$MSGFMT" != "no"; then
+		AC_CHECK_FUNCS(dcgettext)
+		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+		NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			       return _nl_msg_cat_cntr],
+		  [CATOBJEXT=.gmo
+		   DATADIRNAME=share],
+		  [CATOBJEXT=.mo
+		   DATADIRNAME=lib])
+		INSTOBJEXT=.mo
+	      fi
+	    fi
+	])
+
+        if test "$CATOBJEXT" = "NONE"; then
+	  AC_MSG_CHECKING([whether catgets can be used])
+	  AC_ARG_WITH(catgets,
+	    [  --with-catgets          use catgets functions if available],
+	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
+	  AC_MSG_RESULT($nls_cv_use_catgets)
+
+	  if test "$nls_cv_use_catgets" = "yes"; then
+	    dnl No gettext in C library.  Try catgets next.
+	    AC_CHECK_LIB(i, main)
+	    AC_CHECK_FUNC(catgets,
+	      [AC_DEFINE(HAVE_CATGETS, 1,
+			 [Define as 1 if you have catgets and don't want to use GNU gettext.])
+	       INTLOBJS="\$(CATOBJS)"
+	       AC_PATH_PROG(GENCAT, gencat, no)dnl
+	       if test "$GENCAT" != "no"; then
+		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
+		 if test "$GMSGFMT" = "no"; then
+		   NANO_AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+		 fi
+		 NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+		 USE_INCLUDED_LIBINTL=yes
+		 CATOBJEXT=.cat
+		 INSTOBJEXT=.cat
+		 DATADIRNAME=lib
+		 INTLDEPS='$(top_builddir)/intl/libintl.a'
+		 INTLLIBS=$INTLDEPS
+		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+		 nls_cv_header_intl=intl/libintl.h
+		 nls_cv_header_libgt=intl/libgettext.h
+	       fi])
+	  fi
+        fi
+
+        if test "$CATOBJEXT" = "NONE"; then
+	  dnl Neither gettext nor catgets in included in the C library.
+	  dnl Fall back on GNU gettext library.
+	  nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        INTLOBJS="\$(GETTOBJS)"
+        NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+        NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+        AC_SUBST(MSGFMT)
+	USE_INCLUDED_LIBINTL=yes
+        CATOBJEXT=.gmo
+        INSTOBJEXT=.mo
+        DATADIRNAME=share
+	INTLDEPS='$(top_builddir)/intl/libintl.a'
+	INTLLIBS=$INTLDEPS
+	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+        nls_cv_header_intl=intl/libintl.h
+        nls_cv_header_libgt=intl/libgettext.h
+      fi
+
+      dnl Test whether we really found GNU xgettext.
+      if test "$XGETTEXT" != ":"; then
+	dnl If it is no GNU xgettext we define it as : so that the
+	dnl Makefiles still can work.
+	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+	  : ;
+	else
+	  AC_MSG_RESULT(
+	    [found xgettext program is not GNU xgettext; ignore it])
+	  XGETTEXT=":"
+	fi
+      fi
+
+      # We need to process the po/ directory.
+      POSUB=po
+    else
+      DATADIRNAME=share
+      nls_cv_header_intl=intl/libintl.h
+      nls_cv_header_libgt=intl/libgettext.h
+    fi
+    if test -z "$nls_cv_header_intl"; then
+      # Clean out junk possibly left behind by a previous configuration.
+      rm -f intl/libintl.h
+    fi
+    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+    AC_OUTPUT_COMMANDS(
+     [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
+
+
+    # If this is used in GNU gettext we have to set USE_NLS to `yes'
+    # because some of the sources are only built for this goal.
+    if test "$PACKAGE" = gettext; then
+      USE_NLS=yes
+      USE_INCLUDED_LIBINTL=yes
+    fi
+
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.in.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(USE_INCLUDED_LIBINTL)
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLDEPS)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(INTLOBJS)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+  ])
+
+AC_DEFUN(NANO_AM_GNU_GETTEXT,
+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+   AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_PROG_RANLIB])dnl
+   AC_REQUIRE([AC_ISC_POSIX])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   AC_REQUIRE([AC_C_CONST])dnl
+   AC_REQUIRE([AC_C_INLINE])dnl
+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+   AC_REQUIRE([AC_FUNC_MMAP])dnl
+
+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
+unistd.h sys/param.h])
+   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+strdup __argz_count __argz_stringify __argz_next])
+
+   if test "${ac_cv_func_stpcpy+set}" != "set"; then
+     AC_CHECK_FUNCS(stpcpy)
+   fi
+   if test "${ac_cv_func_stpcpy}" = "yes"; then
+     AC_DEFINE(HAVE_STPCPY, 1, [Define to 1 if you have the stpcpy function.])
+   fi
+
+   NANO_AM_LC_MESSAGES
+   NANO_AM_WITH_NLS
+
+   if test "x$CATOBJEXT" != "x"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
+         case "$ALL_LINGUAS" in
+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+         esac
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+   dnl The reference to <locale.h> in the installed <libintl.h> file
+   dnl must be resolved because we cannot expect the users of this
+   dnl to define HAVE_LOCALE_H.
+   if test $ac_cv_header_locale_h = yes; then
+     INCLUDE_LOCALE_H="#include <locale.h>"
+   else
+     INCLUDE_LOCALE_H="\
+/* The system does not provide the header <locale.h>.  Take care yourself.  */"
+   fi
+   AC_SUBST(INCLUDE_LOCALE_H)
+
+   dnl Determine which catalog format we have (if any is needed)
+   dnl For now we know about two different formats:
+   dnl   Linux libc-5 and the normal X/Open format
+   test -d intl || mkdir intl
+   if test "$CATOBJEXT" = ".cat"; then
+     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
+
+     dnl Transform the SED scripts while copying because some dumb SEDs
+     dnl cannot handle comments.
+     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
+   fi
+   dnl po2tbl.sed is always needed.
+   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
+     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+
+   dnl In the intl/Makefile.in we have a special dependency which makes
+   dnl only sense for gettext.  We comment this out for non-gettext
+   dnl packages.
+   if test "$PACKAGE" = "gettext"; then
+     GT_NO="#NO#"
+     GT_YES=
+   else
+     GT_NO=
+     GT_YES="#YES#"
+   fi
+   AC_SUBST(GT_NO)
+   AC_SUBST(GT_YES)
+
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl *** For now the libtool support in intl/Makefile is not for real.
+   l=
+   AC_SUBST(l)
+
+   dnl Generate list of files to be processed by xgettext which will
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   case "$srcdir" in
+   .)
+     posrcprefix="../" ;;
+   /* | [[A-Za-z]]:*)
+     posrcprefix="$srcdir/" ;;
+   *)
+     posrcprefix="../$srcdir/" ;;
+   esac
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+  ])

m4/largefile.m4

@@ -0,0 +1,92 @@
+#serial 19
+
+dnl By default, many hosts won't let programs access large files;
+dnl one must use special compiler options to get large-file access to work.
+dnl For more details about this brain damage please see:
+dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
+
+dnl Written by Paul Eggert <eggert@twinsun.com>.
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_TEST_INCLUDES
+AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
+  [[#include <sys/types.h>
+    /* Check that off_t can represent 2**63 - 1 correctly.
+       We can't simply "#define LARGE_OFF_T 9223372036854775807",
+       since some C++ compilers masquerading as C compilers
+       incorrectly reject 9223372036854775807.  */
+#   define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+			&& LARGE_OFF_T % 2147483647 == 1)
+		       ? 1 : -1];
+  ]])
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)
+AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
+  [AC_CACHE_CHECK([for $1 value needed for large files], $3,
+     [$3=no
+      AC_TRY_COMPILE([$5],
+	[$6], 
+	,
+	[AC_TRY_COMPILE([#define $1 $2]
+[$5]
+	   ,
+	   [$6],
+	   [$3=$2])])])
+   if test "[$]$3" != no; then
+     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
+   fi])
+
+AC_DEFUN(NANO_AC_SYS_LARGEFILE,
+  [AC_REQUIRE([AC_PROG_CC])
+   AC_ARG_ENABLE(largefile,
+     [  --disable-largefile     omit support for large files])
+   if test "$enable_largefile" != no; then
+
+     AC_CACHE_CHECK([for special C compiler options needed for large files],
+       ac_cv_sys_largefile_CC,
+       [ac_cv_sys_largefile_CC=no
+        if test "$GCC" != yes; then
+	  # IRIX 6.2 and later do not support large files by default,
+	  # so use the C compiler's -n32 option if that helps.
+	  AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
+	    [ac_save_CC="$CC"
+	     CC="$CC -n32"
+	     AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,
+	       ac_cv_sys_largefile_CC=' -n32')
+	     CC="$ac_save_CC"])
+        fi])
+     if test "$ac_cv_sys_largefile_CC" != no; then
+       CC="$CC$ac_cv_sys_largefile_CC"
+     fi
+
+     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
+       ac_cv_sys_file_offset_bits,
+       [Number of bits in a file offset, on hosts where this is settable.],
+       AC_SYS_LARGEFILE_TEST_INCLUDES)
+     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
+       ac_cv_sys_large_files,
+       [Define for large files, on AIX-style hosts.],
+       AC_SYS_LARGEFILE_TEST_INCLUDES)
+   fi
+  ])
+
+AC_DEFUN(AC_FUNC_FSEEKO,
+  [AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
+     ac_cv_sys_largefile_source,
+     [Define to make fseeko visible on some hosts (e.g. glibc 2.2).],
+     [#include <stdio.h>], [return !fseeko;])
+   # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+   # in glibc 2.1.3, but that breaks too many other things.
+   # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+
+   AC_CACHE_CHECK([for fseeko], ac_cv_func_fseeko,
+     [ac_cv_func_fseeko=no
+      AC_TRY_LINK([#include <stdio.h>],
+        [return fseeko && fseeko (stdin, 0, 0);],
+	[ac_cv_func_fseeko=yes])])
+   if test $ac_cv_func_fseeko != no; then
+     AC_DEFINE(HAVE_FSEEKO, 1,
+       [Define if fseeko (and presumably ftello) exists and is declared.])
+   fi])

m4/lcmessage.m4

@@ -0,0 +1,22 @@
+# Check whether LC_MESSAGES is available in <locale.h>.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 2
+
+AC_PREREQ(2.13)               dnl Minimum Autoconf version required.
+
+AC_DEFUN(NANO_AM_LC_MESSAGES,
+  [if test $ac_cv_header_locale_h = yes; then
+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+    if test $am_cv_val_LC_MESSAGES = yes; then
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+		[Define if your locale.h file contains LC_MESSAGES.])
+    fi
+  fi])

m4/progtest.m4

@@ -0,0 +1,47 @@
+# Search path for a program which passes the given test.
+# Ulrich Drepper <drepper@cygnus.com>, 1996.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 1
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN(NANO_AM_PATH_PROG_WITH_TEST,
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  /*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+	ac_cv_path_$1="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+  ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test -n "[$]$1"; then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])

move.c

@@ -34,20 +34,24 @@
 #define _(string) (string)
 #endif
 
-void page_down_center(void)
+void page_down(void)
 {
-    if (editbot != filebot) {
-	edit_update(editbot->next, CENTER);
-	center_cursor();
+    if (!ISSET(SMOOTHSCROLL)) {
+	if (editbot != filebot) {
+	    edit_update(editbot->next, CENTER);
+	    center_cursor();
+	} else {
+	    while (current != filebot)
+		current = current->next;
+	    edit_update(current, CENTER);
+	}
     } else {
-	while (current != filebot)
-	    current = current->next;
-	edit_update(current, CENTER);
+	    edit_update(editbot, NONE);
     }
     update_cursor();
 }
 
-int page_down(void)
+int do_page_down(void)
 {
     wrap_reset();
     current_x = 0;
@@ -124,7 +128,7 @@ int do_down(void)
     if (current_y < editwinrows - 1 && current != editbot)
 	current_y++;
     else
-	page_down_center();
+	page_down();
 
     update_cursor();
     update_line(current->prev, 0);
@@ -134,11 +138,23 @@ int do_down(void)
     return 1;
 }
 
-void page_up_center(void)
+void page_up(void)
 {
     if (edittop != fileage) {
-	edit_update(edittop, CENTER);
-	center_cursor();
+	if (!ISSET(SMOOTHSCROLL)) {
+	    edit_update(edittop, CENTER);
+	    /* Now that we've updated the edit window, edittop might be
+	       at the top of the file; if so, just move the cursor up one
+	       line and don't center it. */
+	    if (edittop != fileage)
+		center_cursor();
+	    else {
+		current = current->prev;
+		reset_cursor();
+	    }
+	} else {
+	    edit_update(edittop->prev, NONE);
+	}
     } else
 	current_y = 0;
 
@@ -146,7 +162,7 @@ void page_up_center(void)
 
 }
 
-int page_up(void)
+int do_page_up(void)
 {
    int i;
 
@@ -184,7 +200,7 @@ int do_up(void)
     if (current_y > 0)
 	current_y--;
     else
-	page_up_center();
+	page_up();
 
     update_cursor();
     update_line(current->next, 0);

nano.1

@@ -5,10 +5,8 @@
 .\" This is free documentation, see the latest version of the GNU General
 .\" Public License for copying conditions. There is NO warranty.
 .\"
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH NANO 1 "April 30, 2001"
+.\" $Id$
+.TH NANO 1 "October 3, 2001"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -33,25 +31,35 @@ also implements some missing (or disabled by default) features in Pico,
 such as "search and replace" and "goto line number".
 .SH OPTIONS
 .TP
+.B \-D (\-\-dos)
+Write file in DOS format.
+.TP
 .B \-F (\-\-multibuffer)
 Enable multiple file buffers (if available).
 .TP
-.B \-T (\-\-tabsize)
-Set the size (width) of a tab.
+.B \-M (\-\-mac)
+Write file in Mac format.
 .TP
 .B \-R (\-\-regexp)
 Enable regular expression matching for search strings, as well as
 \\n subexpression replacement for replace strings, if available.
 .TP
+.B \-S (\-\-smooth)
+Enable smooth scrolling. Text will scroll line-by-line, instead of the
+usual chunk-by-chunk behaviour.
+.TP
+.B \-T [num] (\-\-tabsize=[num])
+Set the size (width) of a tab.
+.TP
 .B \-V (\-\-version)
 Show the current version number and author.
 .TP
-.B \-h (\-\-help)
-Display a summary of command line options.
-.TP
 .B \-c (\-\-const)
 Constantly show the cursor position.
 .TP
+.B \-h (\-\-help)
+Display a summary of command line options.
+.TP
 .B \-i (\-\-autoindent)
 Indent new lines to the previous line's indentation. Useful when editing
 source code.
@@ -66,18 +74,21 @@ a new file, do not follow it.  Good for editing files in /tmp, perhaps?
 .B \-m (\-\-mouse)
 Enable mouse support (if available for your system).
 .TP
+.B \-o [dir] (\-\-operatingdir=[dir])
+Set operating directory. Makes nano set up something similar to a chroot.
+.TP
 .B \-p (\-\-pico)
 Emulate Pico as closely as possible.  This affects both the "shortcut list"
 at the bottom of the screen, as well as the display and entry of previous
 search and replace strings.
 .TP
-.B \-r (\-\-fill)
+.B \-r [#cols] (\-\-fill=[#cols])
 Wrap lines at column #cols.  By default, this is the width of the screen,
 less eight.  If this value is negative, wrapping will occur at #cols from
 the right of the screen, allowing it to vary along with the screen width
 if the screen is resized.
 .TP
-.B \-s (\-\-speller)
+.B \-s [prog] (\-\-speller=[prog])
 Enable alternative spell checker command.
 .TP
 .B \-t (\-\-tempfile)
@@ -95,7 +106,7 @@ Disable help screen at bottom of editor.
 .B \-z (\-\-suspend)
 Enable suspend ability.
 .TP
-.B \-b, \-e, \-f
+.B \-a, \-b, \-e, \-f, \-g, \-j
 Ignored, for compatibility with Pico.
 .TP
 .B \+LINE
@@ -105,8 +116,9 @@ Nano will try to dump the buffer into an emergency file in some cases.
 Mainly, this will happen if Nano receives a SIGHUP or runs out of
 memory, when it will write the buffer into a file named "nano.save" if the
 buffer didn't have a name already, or will add a ".save" suffix to the
-current filename. Nano will \fBnot\fP write this file if a previous one
-exists in the current directory.
+current filename. In multibuffer mode, nano will write all the open buffers to
+the respective emergency files. Nano will \fBnot\fP write this file if a
+previous one exists in the current directory.
 .SH BUGS
 Please send any comments or bug reports to
 .br
@@ -120,7 +132,8 @@ subject of "subscribe".
 .SH HOMEPAGE
 http://www.nano-editor.org
 .SH AUTHOR
-Chris Allegretta <chrisa@asty.org>, et al (see AUTHORS for details).
+Chris Allegretta <chrisa@asty.org>, et al (see AUTHORS and THANKS for
+details).
 This manual page was originally written by Jordi Mallach
 <jordi@sindominio.net>, for the Debian GNU/Linux system (but may be
 used by others).

nano.1.html

@@ -3,7 +3,7 @@ Content-type: text/html
 <HTML><HEAD><TITLE>Manpage of NANO</TITLE>
 </HEAD><BODY>
 <H1>NANO</H1>
-Section: User Commands  (1)<BR>Updated: April 30, 2001<BR><A HREF="#index">Index</A>
+Section: User Commands  (1)<BR>Updated: October 3, 2001<BR><A HREF="#index">Index</A>
 <A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR>
 
 
@@ -44,31 +44,44 @@ such as &quot;search and replace&quot; and &quot;goto line number&quot;.
 <H2>OPTIONS</H2>
 
 <DL COMPACT>
+<DT><B>-D (--dos)</B>
+
+<DD>
+Write file in DOS format.
 <DT><B>-F (--multibuffer)</B>
 
 <DD>
 Enable multiple file buffers (if available).
-<DT><B>-T (--tabsize)</B>
+<DT><B>-M (--mac)</B>
 
 <DD>
-Set the size (width) of a tab.
+Write file in Mac format.
 <DT><B>-R (--regexp)</B>
 
 <DD>
 Enable regular expression matching for search strings, as well as
 \n subexpression replacement for replace strings, if available.
+<DT><B>-S (--smooth)</B>
+
+<DD>
+Enable smooth scrolling. Text will scroll line-by-line, instead of the
+usual chunk-by-chunk behaviour.
+<DT><B>-T [num] (--tabsize=[num])</B>
+
+<DD>
+Set the size (width) of a tab.
 <DT><B>-V (--version)</B>
 
 <DD>
 Show the current version number and author.
-<DT><B>-h (--help)</B>
-
-<DD>
-Display a summary of command line options.
 <DT><B>-c (--const)</B>
 
 <DD>
 Constantly show the cursor position.
+<DT><B>-h (--help)</B>
+
+<DD>
+Display a summary of command line options.
 <DT><B>-i (--autoindent)</B>
 
 <DD>
@@ -87,20 +100,24 @@ a new file, do not follow it.  Good for editing files in /tmp, perhaps?
 
 <DD>
 Enable mouse support (if available for your system).
+<DT><B>-o [dir] (--operatingdir=[dir])</B>
+
+<DD>
+Set operating directory. Makes nano set up something similar to a chroot.
 <DT><B>-p (--pico)</B>
 
 <DD>
 Emulate Pico as closely as possible.  This affects both the &quot;shortcut list&quot;
 at the bottom of the screen, as well as the display and entry of previous
 search and replace strings.
-<DT><B>-r (--fill)</B>
+<DT><B>-r [#cols] (--fill=[#cols])</B>
 
 <DD>
 Wrap lines at column #cols.  By default, this is the width of the screen,
 less eight.  If this value is negative, wrapping will occur at #cols from
 the right of the screen, allowing it to vary along with the screen width
 if the screen is resized.
-<DT><B>-s (--speller)</B>
+<DT><B>-s [prog] (--speller=[prog])</B>
 
 <DD>
 Enable alternative spell checker command.
@@ -124,7 +141,7 @@ Disable help screen at bottom of editor.
 
 <DD>
 Enable suspend ability.
-<DT><B>-b, -e, -f</B>
+<DT><B>-a, -b, -e, -f, -g, -j</B>
 
 <DD>
 Ignored, for compatibility with Pico.
@@ -140,8 +157,9 @@ Nano will try to dump the buffer into an emergency file in some cases.
 Mainly, this will happen if Nano receives a SIGHUP or runs out of
 memory, when it will write the buffer into a file named &quot;nano.save&quot; if the
 buffer didn't have a name already, or will add a &quot;.save&quot; suffix to the
-current filename. Nano will <B>not</B> write this file if a previous one
-exists in the current directory.
+current filename. In multibuffer mode, nano will write all the open buffers to
+the respective emergency files. Nano will <B>not</B> write this file if a
+previous one exists in the current directory.
 <A NAME="lbAG">&nbsp;</A>
 <H2>BUGS</H2>
 
@@ -166,7 +184,8 @@ subject of &quot;subscribe&quot;.
 <A NAME="lbAI">&nbsp;</A>
 <H2>AUTHOR</H2>
 
-Chris Allegretta &lt;<A HREF="mailto:chrisa@asty.org">chrisa@asty.org</A>&gt;, et al (see AUTHORS for details).
+Chris Allegretta &lt;<A HREF="mailto:chrisa@asty.org">chrisa@asty.org</A>&gt;, et al (see AUTHORS and THANKS for
+details).
 This manual page was originally written by Jordi Mallach
 &lt;<A HREF="mailto:jordi@sindominio.net">jordi@sindominio.net</A>&gt;, for the Debian GNU/Linux system (but may be
 used by others).
@@ -188,6 +207,6 @@ used by others).
 This document was created by
 <A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
 using the manual pages.<BR>
-Time: 03:54:23 GMT, July 15, 2001
+Time: 01:18:43 GMT, October 04, 2001
 </BODY>
 </HTML>

nano.c

@@ -202,8 +202,9 @@ void clear_filename(void)
     filename[0] = 0;
 }
 
-/* Initialize global variables - no better way for now */
-void global_init(void)
+/* Initialize global variables - no better way for now.  If
+   save_cutbuffer is nonzero, don't set cutbuffer to NULL. */
+void global_init(int save_cutbuffer)
 {
     current_x = 0;
     current_y = 0;
@@ -212,11 +213,13 @@ void global_init(void)
 	die_too_small();
 
     fileage = NULL;
-    cutbuffer = NULL;
+    if (!save_cutbuffer)
+	cutbuffer = NULL;
     current = NULL;
     edittop = NULL;
     editbot = NULL;
     totlines = 0;
+    totsize = 0;
     placewewant = 0;
 
 #ifndef DISABLE_WRAPJUSTIFY
@@ -402,18 +405,31 @@ void usage(void)
     printf(_("Usage: nano [GNU long option] [option] +LINE <file>\n\n"));
     printf(_("Option		Long option		Meaning\n"));
 
+#ifndef NANO_SMALL
+    printf
+	(_
+	 (" -D 		--dos			Write file in DOS format\n"));
+#endif
 #ifdef ENABLE_MULTIBUFFER
     printf
 	(_
 	 (" -F 		--multibuffer		Enable multiple file buffers\n"));
 #endif
-
-    printf(_
-	   (" -T [num]	--tabsize=[num]		Set width of a tab to num\n"));
+#ifndef NANO_SMALL
+    printf
+	(_
+	 (" -M 		--mac			Write file in Mac format\n"));
+#endif
 #ifdef HAVE_REGEX_H
     printf(_
 	   (" -R		--regexp		Use regular expressions for search\n"));
 #endif
+#ifndef NANO_SMALL
+    printf(_
+	   (" -S		--smooth		Smooth scrolling\n"));
+#endif
+    printf(_
+	   (" -T [num]	--tabsize=[num]		Set width of a tab to num\n"));
     printf
 	(_
 	 (" -V 		--version		Print version information and exit\n"));
@@ -421,9 +437,9 @@ void usage(void)
 	   (" -c 		--const			Constantly show cursor position\n"));
     printf(_
 	   (" -h 		--help			Show this message\n"));
+#ifndef NANO_SMALL
     printf(_
 	   (" -i 		--autoindent		Automatically indent new lines\n"));
-#ifndef NANO_SMALL
     printf(_
 	   (" -k 		--cut			Let ^K cut from cursor to end of line\n"));
 #endif
@@ -434,8 +450,12 @@ void usage(void)
     printf(_(" -m 		--mouse			Enable mouse\n"));
 #endif
 #endif
+#ifndef DISABLE_OPERATINGDIR
     printf(_
-	   (" -p	 	--pico			Emulate Pico as closely as possible\n"));
+	   (" -o [dir] 	--operatingdir=[dir]	Set operating directory\n"));
+#endif
+    printf(_
+	   (" -p 		--pico			Emulate Pico as closely as possible\n"));
 
 #ifndef DISABLE_WRAPJUSTIFY
     printf
@@ -463,16 +483,25 @@ void usage(void)
 #else
     printf(_("Usage: nano [option] +LINE <file>\n\n"));
     printf(_("Option		Meaning\n"));
+#ifndef NANO_SMALL
+    printf(_(" -D 		Write file in DOS format\n"));
+#endif
 #ifdef ENABLE_MULTIBUFFER
     printf(_(" -F 		Enable multiple file buffers\n"));
+#endif
+#ifndef NANO_SMALL
+    printf(_(" -M 		Write file in Mac format\n"));
 #endif
     printf(_(" -T [num]	Set width of a tab to num\n"));
     printf(_(" -R		Use regular expressions for search\n"));
+#ifndef NANO_SMALL
+    printf(_(" -S		Smooth scrolling\n"));
+#endif
     printf(_(" -V 		Print version information and exit\n"));
     printf(_(" -c 		Constantly show cursor position\n"));
     printf(_(" -h 		Show this message\n"));
-    printf(_(" -i 		Automatically indent new lines\n"));
 #ifndef NANO_SMALL
+    printf(_(" -i 		Automatically indent new lines\n"));
     printf(_(" -k 		Let ^K cut from cursor to end of line\n"));
 #endif
     printf(_
@@ -481,6 +510,9 @@ void usage(void)
 #ifdef NCURSES_MOUSE_VERSION
     printf(_(" -m 		Enable mouse\n"));
 #endif
+#endif
+#ifndef DISABLE_OPERATINGDIR
+    printf(_(" -o [dir] 	Set operating directory\n"));
 #endif
     printf(_(" -p 		Emulate Pico as closely as possible\n"));
 
@@ -547,6 +579,9 @@ void version(void)
 #ifdef DISABLE_MOUSE
     printf(" --disable-mouse");
 #endif
+#ifdef DISABLE_OPERATINGDIR
+    printf(" --disable-operatingdir");
+#endif
 #endif /* NANO_SMALL */
 
 #ifdef DISABLE_WRAPPING
@@ -661,13 +696,17 @@ void do_char(char ch)
 int do_enter(filestruct * inptr)
 {
     filestruct *newnode;
-    char *tmp, *spc;
+    char *tmp;
+#ifndef NANO_SMALL
+    char *spc;
     int extra = 0;
+#endif
 
     newnode = make_new_node(inptr);
     tmp = &current->data[current_x];
     current_x = 0;
 
+#ifndef NANO_SMALL
     /* Do auto-indenting, like the neolithic Turbo Pascal editor */
     if (ISSET(AUTOINDENT)) {
 	spc = current->data;
@@ -682,7 +721,9 @@ int do_enter(filestruct * inptr)
 	    strncpy(newnode->data, current->data, extra);
 	    strcpy(&newnode->data[extra], tmp);
 	}
-    } else {
+    } else 
+#endif
+    {
 	newnode->data = charalloc(strlen(tmp) + 1);
 	strcpy(newnode->data, tmp);
     }
@@ -726,6 +767,7 @@ int do_enter_void(void)
     return do_enter(current);
 }
 
+#ifndef NANO_SMALL
 void do_next_word(void)
 {
     filestruct *fileptr, *old;
@@ -777,6 +819,7 @@ void do_next_word(void)
     }
 
 }
+#endif /* NANO_SMALL */
 
 #ifndef DISABLE_WRAPPING
 void do_wrap(filestruct * inptr, char input_char)
@@ -846,13 +889,10 @@ void do_wrap(filestruct * inptr, char input_char)
      *           it is all spaces between previous word and next word which appears after fill.
      *    b) cursor is at the word at the wrap point.
      *         - word at wrap point starts a new line.
-     *         1. pressed a space and at first character of wrap point word.
-     *            - white space on original line is kept to where cursor was.
-     *         2. pressed non space (or space elsewhere).
-     *            - white space at end of original line is cleared.
+     *         - white space on original line is kept to where cursor was.
      *    c) cursor is past the word at the wrap point.
      *         - word at wrap point starts a new line.
-     *            - white space at end of original line is cleared
+     *         - white space at end of original line is cleared
      */
 
     temp = nmalloc(sizeof(filestruct));
@@ -895,7 +935,12 @@ void do_wrap(filestruct * inptr, char input_char)
 	/* Inside word, remove it from original, and move cursor to right spot. */
 	if (current_x >= current_word_start) {
 	    right = current_x - current_word_start;
+
+	    /* Decrease totsize by the number of spaces we removed, less
+	       one for the new line we're replacing the spaces with. */
+	    totsize -= (current_word_start - 1);
 	    current_x = 0;
+#ifndef NANO_SMALL
 	    if (ISSET(AUTOINDENT)) {
 		int i = 0;
 		while ((inptr->next->data[i] == ' '
@@ -904,6 +949,7 @@ void do_wrap(filestruct * inptr, char input_char)
 		    right++;
 		}
 	    }
+#endif
 	    down = 1;
 	}
 
@@ -925,10 +971,16 @@ void do_wrap(filestruct * inptr, char input_char)
 
 	    if (!isspace((int) input_char)) {
 		i = current_word_start - 1;
+
+		/* Decrement totsize each time we remove a space. */
 		while (isspace((int) inptr->data[i])) {
 		    i--;
+		    totsize--;
 		    assert(i >= 0);
 		}
+		/* And increment it to account for the blank line we're
+		   replacing the spaces with. */
+		totsize++;
 	    } else if (current_x <= last_word_end)
 		i = last_word_end - 1;
 	    else
@@ -949,6 +1001,7 @@ void do_wrap(filestruct * inptr, char input_char)
 	    down = 1;
 
 	    right = current_x - current_word_start;
+#ifndef NANO_SMALL
 	    if (ISSET(AUTOINDENT)) {
 		int i = 0;
 		while ((inptr->next->data[i] == ' '
@@ -957,22 +1010,16 @@ void do_wrap(filestruct * inptr, char input_char)
 		    right++;
 		}
 	    }
-
+#endif
 	    i = current_word_start - 1;
-	    if (isspace((int) input_char)
-		&& (current_x == current_word_start)) {
-		current_x = current_word_start;
+	    current_x = current_word_start;
 
-		null_at(inptr->data, current_word_start);
-	    } else {
+	    null_at(inptr->data, current_word_start);
 
-		while (isspace((int) inptr->data[i])) {
-		    i--;
-		    assert(i >= 0);
-		}
-		inptr->data = nrealloc(inptr->data, i + 2);
-		inptr->data[i + 1] = 0;
-	    }
+	    /* Increment totsize to account for the new line that
+	       will be added below, so that it won't end up being
+	       short by one. */
+	    totsize++;
 	}
 
 
@@ -988,12 +1035,17 @@ void do_wrap(filestruct * inptr, char input_char)
 	    current_x = current_word_start;
 	    i = current_word_start - 1;
 
+	    /* Decrement totsize each time we remove a space. */
 	    while (isspace((int) inptr->data[i])) {
 		i--;
+		totsize--;
 		assert(i >= 0);
 		inptr->data = nrealloc(inptr->data, i + 2);
 		inptr->data[i + 1] = 0;
 	    }
+	    /* And increment it to account for the blank line we're
+	       replacing the spaces with. */
+	    totsize++;
 	}
     }
 
@@ -1005,6 +1057,12 @@ void do_wrap(filestruct * inptr, char input_char)
 	char *p =
 	    charalloc((strlen(temp->data) + strlen(inptr->next->data) + 2));
 
+	/* We're adding to an existing line instead of creating a new
+	   one; decrement totlines here so that when it gets incremented
+	   below, it won't end up being high by one. */
+	totlines--;
+
+#ifndef NANO_SMALL
 	if (ISSET(AUTOINDENT)) {
 	    int non = 0;
 
@@ -1023,7 +1081,9 @@ void do_wrap(filestruct * inptr, char input_char)
 	    /* Now tack on the rest of the next line after the spaces and
 	       tabs */
 	    strcat(p, &inptr->next->data[non]);
-	} else {
+	} else 
+#endif
+	{
 	    strcpy(p, temp->data);
 	    strcat(p, " ");
 	    strcat(p, inptr->next->data);
@@ -1053,6 +1113,7 @@ void do_wrap(filestruct * inptr, char input_char)
 
 	SET(SAMELINEWRAP);
 
+#ifndef NANO_SMALL
 	if (ISSET(AUTOINDENT)) {
 	    char *spc = inptr->data;
 	    char *t = NULL;
@@ -1070,6 +1131,7 @@ void do_wrap(filestruct * inptr, char input_char)
 		temp->data = t;
 	    }
 	}
+#endif
     }
 
 
@@ -1177,7 +1239,7 @@ int do_backspace(void)
 		current = previous->next;
 	    else
 		current = previous;
-	    page_up_center();
+	    page_up();
 	} else {
 	    if (previous->next)
 		current = previous->next;
@@ -1302,7 +1364,7 @@ int do_int_spell_fix(char *word)
     edit_update(fileage, TOP);
 
     /* make sure word is still mis-spelt (i.e. when multi-errors) */
-    if (findnextstr(TRUE, fileage, beginx_top, prevanswer) != NULL) {
+    if (findnextstr(TRUE, FALSE, fileage, beginx_top, prevanswer) != NULL) {
 	do_replace_highlight(TRUE, prevanswer);
 
 	/* allow replace word to be corrected */
@@ -1466,7 +1528,7 @@ int do_int_speller(char *tempfile_name)
 /* External spell checking */
 int do_alt_speller(char *file_name)
 {
-    int alt_spell_status;
+    int alt_spell_status, x_cur = current_x, y_cur = current_y, pww_cur = placewewant;
     pid_t pid_spell;
     char *ptr;
     long lineno_cur = current->lineno;
@@ -1516,19 +1578,15 @@ int do_alt_speller(char *file_name)
 
     refresh();
     free_filestruct(fileage);
-    global_init();
+    global_init(1);
     open_file(file_name, 0, 1);
 
-    do_gotoline(lineno_cur, 0);
+    /* go back to the old position, mark the file as modified, and make
+       sure that the titlebar is refreshed */
+    do_gotopos(lineno_cur, x_cur, y_cur, pww_cur);
     set_modified();
-
-#ifdef ENABLE_MULTIBUFFER
-    /* if we have multiple files open, the spell-checked (current) file
-       is now stored after the un-spell-checked file in the open_files
-       structure, so go back to the un-spell-checked file and close it */
-    open_prevfile(0);
-    close_open_file();
-#endif
+    clearok(topwin, FALSE);
+    titlebar(NULL);
 
     return TRUE;
 }
@@ -1555,6 +1613,14 @@ int do_spell(void)
 	return 0;
     }
 
+#ifdef ENABLE_MULTIBUFFER
+    /* update the current open_files entry before spell-checking, in case
+       any problems occur; the case of there being no open_files entries
+       is handled elsewhere (before we reach this point); no duplicate
+       checking is needed here */
+    add_open_file(1, 0);
+#endif
+
     if (alt_speller)
 	spell_res = do_alt_speller(temp);
     else
@@ -1706,7 +1772,13 @@ void do_mouse(void)
 	update_cursor();
 	edit_refresh();
     } else if (wenclose(bottomwin, mevent.y, mevent.x) && !ISSET(NO_HELP)) {
-	int k = COLS / 6, val = 0;
+
+	int k, val = 0;
+
+	if (currslen < 2)
+	    k = COLS / 6;
+	else 
+	    k = COLS / ((currslen + (currslen %2)) / 2);
 
 	/* Determine what shortcut list was clicked */
 	mevent.y -= (editwinrows + 3);
@@ -1722,6 +1794,11 @@ void do_mouse(void)
 
 	/* And ungetch that value */
 	ungetch(val);
+
+	/* And if it's an alt-key sequence, we should probably send alt
+	   too ;-) */
+	if (val >= 'a' && val <= 'z')
+	   ungetch(27);
     }
 }
 #endif
@@ -2211,7 +2288,10 @@ void help_init(void)
 
     /* Now add our shortcut info */
     for (i = 0; i <= MAIN_LIST_LEN - 1; i++) {
-	sofar = snprintf(buf, BUFSIZ, "^%c	", main_list[i].val + 64);
+	if (main_list[i].val > 0)
+	   sofar = snprintf(buf, BUFSIZ, "^%c	", main_list[i].val + 64);
+	else
+	   sofar = snprintf(buf, BUFSIZ, "	");
 
 	if (main_list[i].misc1 > KEY_F0 && main_list[i].misc1 <= KEY_F(64))
 	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "(F%d)	",
@@ -2219,9 +2299,12 @@ void help_init(void)
 	else
 	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "	");
 
-	if (main_list[i].altval > 0)
+	if (main_list[i].altval > 0 && main_list[i].altval < 91)
 	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "(M-%c)	",
 			      main_list[i].altval - 32);
+	else if (main_list[i].altval > 0)
+	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "(M-%c)	",
+			      main_list[i].altval);
 	else
 	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "	");
 
@@ -2267,12 +2350,20 @@ void do_toggle(int which)
     char *enabled = _("enabled");
     char *disabled = _("disabled");
 
+    switch (toggles[which].val) {
+    case TOGGLE_BACKWARDS_KEY:
+    case TOGGLE_CASE_KEY:
+    case TOGGLE_REGEXP_KEY:
+	return;
+    }
+
     /* Even easier! */
     TOGGLE(toggles[which].flag);
 
     switch (toggles[which].val) {
     case TOGGLE_PICOMODE_KEY:
 	shortcut_init(0);
+	SET(CLEAR_BACKUPSTRING);
 	display_main_list();
 	break;
     case TOGGLE_SUSPEND_KEY:
@@ -2289,7 +2380,12 @@ void do_toggle(int which)
 	edit_refresh();
 	display_main_list();
 	break;
-
+    case TOGGLE_DOS_KEY:
+	UNSET(MAC_FILE);
+	break;
+    case TOGGLE_MAC_KEY:
+	UNSET(DOS_FILE);
+	break;
     }
 
     if (!ISSET(toggles[which].flag)) {
@@ -2306,8 +2402,6 @@ void do_toggle(int which)
 	    statusbar("%s %s", toggles[which].desc, enabled);
     }
 
-    SET(DISABLE_CURPOS);
-
 #endif
 }
 
@@ -2354,6 +2448,8 @@ int main(int argc, char *argv[])
     int keyhandled;		/* Have we handled the keystroke yet? */
     int i, modify_control_seq;
     char *argv0;
+    long constcheck;	/* Check to constantly update */
+
 #ifdef _POSIX_VDISABLE
     struct termios term;
 #endif
@@ -2373,8 +2469,10 @@ int main(int argc, char *argv[])
 	{"view", 0, 0, 'v'},
 #ifndef NANO_SMALL
 	{"cut", 0, 0, 'k'},
-#endif
+	{"dos", 0, 0, 'D'},
+	{"mac", 0, 0, 'M'},
 	{"autoindent", 0, 0, 'i'},
+#endif
 	{"tempfile", 0, 0, 't'},
 #ifndef DISABLE_SPELLER
 	{"speller", 1, 0, 's'},
@@ -2384,14 +2482,19 @@ int main(int argc, char *argv[])
 	{"fill", 1, 0, 'r'},
 #endif
 	{"mouse", 0, 0, 'm'},
+#ifndef DISABLE_OPERATINGDIR
+	{"operatingdir", 1, 0, 'o'},
+#endif
 	{"pico", 0, 0, 'p'},
 	{"nofollow", 0, 0, 'l'},
 	{"tabsize", 1, 0, 'T'},
 
 #ifdef ENABLE_MULTIBUFFER
-	{"MULTIBUFFER", 0, 0, 'L'},
+	{"multibuffer", 0, 0, 'F'},
+#endif
+#ifndef NANO_SMALL
+	{"smooth", 0, 0, 'S'},
 #endif
-
 	{0, 0, 0, 0}
     };
 #endif
@@ -2412,21 +2515,30 @@ int main(int argc, char *argv[])
 #endif /* ENABLE_NANORC */
 
 #ifdef HAVE_GETOPT_LONG
-    while ((optchr = getopt_long(argc, argv, "h?LT:RVbcefgijklmpr:s:tvwxz",
+    while ((optchr = getopt_long(argc, argv, "h?DFMRST:Vabcefgijklmo:pr:s:tvwxz",
 				 long_options, &option_index)) != EOF) {
 #else
     while ((optchr =
-	    getopt(argc, argv, "h?LT:RVbcefgijklmpr:s:tvwxz")) != EOF) {
+	    getopt(argc, argv, "h?DFMRST:Vabcefgijklmo:pr:s:tvwxz")) != EOF) {
 #endif
 
 	switch (optchr) {
 
+#ifndef NANO_SMALL
+	case 'D':
+	    SET(DOS_FILE);
+	    break;
+#endif
 #ifdef ENABLE_MULTIBUFFER
-	case 'L':
+	case 'F':
 	    SET(MULTIBUFFER);
 	    break;
 #endif
-
+#ifndef NANO_SMALL
+	case 'M':
+	    SET(MAC_FILE);
+	    break;
+#endif
 	case 'T':
 	    tabsize = atoi(optarg);
 	    if (tabsize <= 0) {
@@ -2438,10 +2550,16 @@ int main(int argc, char *argv[])
 	case 'R':
 	    SET(USE_REGEXP);
 	    break;
+#endif
+#ifndef NANO_SMALL
+	case 'S':
+	    SET(SMOOTHSCROLL);
+	    break;
 #endif
 	case 'V':
 	    version();
 	    exit(0);
+	case 'a':
 	case 'b':
 	case 'e':
 	case 'f':
@@ -2456,10 +2574,10 @@ int main(int argc, char *argv[])
 	case '?':
 	    usage();
 	    exit(0);
+#ifndef NANO_SMALL
 	case 'i':
 	    SET(AUTOINDENT);
 	    break;
-#ifndef NANO_SMALL
 	case 'k':
 	    SET(CUT_TO_END);
 	    break;
@@ -2470,6 +2588,20 @@ int main(int argc, char *argv[])
 	case 'm':
 	    SET(USE_MOUSE);
 	    break;
+#ifndef DISABLE_OPERATINGDIR
+	case 'o':
+	    operating_dir = charalloc(strlen(optarg) + 1);
+	    strcpy(operating_dir, optarg);
+
+	    /* make sure we're inside the operating directory */
+	    if (check_operating_dir(".", 0)) {
+		if (chdir(operating_dir) == -1) {
+		    free(operating_dir);
+		    operating_dir = NULL;
+		}
+	    }
+	    break;
+#endif
 	case 'p':
 	    SET(PICO_MODE);
 	    break;
@@ -2564,7 +2696,7 @@ int main(int argc, char *argv[])
     noecho();
 
     /* Set up some global variables */
-    global_init();
+    global_init(0);
     shortcut_init(0);
 #ifndef DISABLE_HELP
     init_help_msg();
@@ -2619,6 +2751,7 @@ int main(int argc, char *argv[])
     reset_cursor();
 
     while (1) {
+	constcheck = current->lineno + current_x + totsize;
 
 #ifndef DISABLE_MOUSE
 	currshortcut = main_list;
@@ -2634,10 +2767,11 @@ int main(int argc, char *argv[])
 #ifdef DEBUG
 	fprintf(stderr, "AHA!  %c (%d)\n", kbinput, kbinput);
 #endif
+
 	if (kbinput == 27) {	/* Grab Alt-key stuff first */
 	    switch (kbinput = wgetch(edit)) {
 		/* Alt-O, suddenly very important ;) */
-	    case 79:
+	    case 'O':
 		kbinput = wgetch(edit);
 		if ((kbinput <= 'D' && kbinput >= 'A') ||
 			(kbinput <= 'd' && kbinput >= 'a'))
@@ -2660,7 +2794,7 @@ int main(int argc, char *argv[])
 		modify_control_seq = 1;
 		keyhandled = 1;
 		break;
-	    case 91:
+	    case '[':
 		switch (kbinput = wgetch(edit)) {
 		case '1':	/* Alt-[-1-[0-5,7-9] = F1-F8 in X at least */
 		    kbinput = wgetch(edit);
@@ -2670,7 +2804,7 @@ int main(int argc, char *argv[])
 		    } else if (kbinput >= '7' && kbinput <= '9') {
 			kbinput = KEY_F(kbinput - 49);
 			wgetch(edit);
-		    } else if (kbinput == 126)
+		    } else if (kbinput == '~')
 			kbinput = KEY_HOME;
 
 #ifdef DEBUG
@@ -2701,16 +2835,8 @@ int main(int argc, char *argv[])
 			kbinput = KEY_F(12);
 			wgetch(edit);
 			break;
-		    case 126:	/* Hack, make insert key do something 
-				   useful, like insert file */
-#ifdef ENABLE_MULTIBUFFER
-			do_insertfile(ISSET(MULTIBUFFER));
-#else
-			do_insertfile(0);
-#endif
-
-			keyhandled = 1;
-			break;
+		    case '~':
+			goto do_insertkey;
 #ifdef DEBUG
 		    default:
 			fprintf(stderr, _("I got Alt-[-2-%c! (%d)\n"),
@@ -2845,6 +2971,24 @@ int main(int argc, char *argv[])
 	    keyhandled = 1;
 	}
 
+
+#ifndef USE_SLANG
+	/* Hack, make insert key do something useful, like insert file */
+	if (kbinput == KEY_IC) {
+#else
+	if (0) {
+#endif
+	  do_insertkey:
+
+#ifdef ENABLE_MULTIBUFFER
+	    do_insertfile(ISSET(MULTIBUFFER));
+#else
+	    do_insertfile(0);
+#endif
+
+	    keyhandled = 1;
+	}
+
 	/* Last gasp, stuff that's not in the main lists */
 	if (!keyhandled)
 	    switch (kbinput) {
@@ -2855,12 +2999,14 @@ int main(int argc, char *argv[])
 		break;
 #endif
 #endif
+
+#ifndef NANO_SMALL
 	    case 0:		/* Erg */
 		do_next_word();
 		break;
+#endif
 
-	    case 331:		/* Stuff that we don't want to do squat */
-	    case -1:
+	    case -1:		/* Stuff that we don't want to do squat */
 	    case 410:		/* Must ignore this, it gets sent when we resize */
 #ifdef PDCURSES
 	    case 541:		/* ???? */
@@ -2884,12 +3030,11 @@ int main(int argc, char *argv[])
 		}
 		do_char(kbinput);
 	    }
-	if (ISSET(CONSTUPDATE)) {
-	    if (ISSET(DISABLE_CURPOS))
-		UNSET(DISABLE_CURPOS);
-	    else
+	if (ISSET(DISABLE_CURPOS))
+	    UNSET(DISABLE_CURPOS);
+	else if (ISSET(CONSTUPDATE))
+	if (constcheck != current->lineno + current_x + totsize)
 		do_cursorpos();
-	}
 
 	reset_cursor();
 	wrefresh(edit);

nano.h

@@ -137,9 +137,13 @@ typedef struct rcoption {
 #define REGEXP_COMPILED         (1<<15)
 #define TEMP_OPT         	(1<<16)
 #define CUT_TO_END         	(1<<17)
-#define DISABLE_CURPOS         	(1<<18)
-#define REVERSE_SEARCH		(1<<19)
-#define MULTIBUFFER		(1<<20)
+#define REVERSE_SEARCH		(1<<18)
+#define MULTIBUFFER		(1<<19)
+#define CLEAR_BACKUPSTRING	(1<<20)
+#define DOS_FILE		(1<<21)
+#define MAC_FILE		(1<<22)
+#define SMOOTHSCROLL		(1<<23)
+#define DISABLE_CURPOS		(1<<24)	/* Damn, we still need it */
 
 /* Control key sequences, changing these would be very very bad */
 
@@ -203,6 +207,7 @@ typedef struct rcoption {
 #define NANO_ALT_Z 'z'
 #define NANO_ALT_LCARAT ','
 #define NANO_ALT_RCARAT '.'
+#define NANO_ALT_BRACKET ']'
 
 /* Some semi-changeable keybindings; don't play with unless you're sure you
 know what you're doing */
@@ -260,6 +265,7 @@ know what you're doing */
 #define NANO_APPEND_KEY		NANO_ALT_A
 #define NANO_OPENPREV_KEY	NANO_ALT_LCARAT
 #define NANO_OPENNEXT_KEY	NANO_ALT_RCARAT
+#define NANO_BRACKET_KEY	NANO_ALT_BRACKET
 
 #define TOGGLE_CONST_KEY	NANO_ALT_C
 #define TOGGLE_AUTOINDENT_KEY	NANO_ALT_I
@@ -273,32 +279,47 @@ know what you're doing */
 #define TOGGLE_BACKWARDS_KEY	NANO_ALT_B
 #define TOGGLE_CASE_KEY		NANO_ALT_A
 #define TOGGLE_LOAD_KEY		NANO_ALT_F
+#define TOGGLE_DOS_KEY		NANO_ALT_D
+#define TOGGLE_MAC_KEY		NANO_ALT_O
+#define TOGGLE_SMOOTH_KEY	NANO_ALT_S
 
 /* Toggle stuff, these static lengths need to go away RSN */
 
+#ifndef HAVE_REGEX_H
+#define NO_REGEX 1
+#else 
+#define NO_REGEX 0
+#endif
+
+#ifdef DISABLE_BROWSER
+#define NO_BROWSER 1
+#else
+#define NO_BROWSER 0
+#endif
+
+#ifdef NANO_SMALL
 #ifdef HAVE_REGEX_H
+#define NO_TOGGLES 3
+#else
+#define NO_TOGGLES 2
+#endif /* HAVE_REGEX_H */
+#else
+#define NO_TOGGLES 0
+#endif /* NANO_SMALL */
 
 #ifdef ENABLE_MULTIBUFFER
-#define TOGGLE_LEN 14
+#define MULTI_TOGGLES 3
 #else
-#define TOGGLE_LEN 11
+#define MULTI_TOGGLES 0
 #endif
 
-#define WHEREIS_LIST_LEN 8
-#define REPLACE_LIST_LEN 8
-#else
-
-#ifdef ENABLE_MULTIBUFFER
-#define TOGGLE_LEN 13
-#else
-#define TOGGLE_LEN 10
-#endif
-
-#define WHEREIS_LIST_LEN 7
-#define REPLACE_LIST_LEN 7
-#endif
-
-#define MAIN_LIST_LEN 26
+#define WHEREIS_LIST_LEN (8 - NO_REGEX - NO_TOGGLES)
+#define REPLACE_LIST_LEN (8 - NO_REGEX - NO_TOGGLES)
+#define TOGGLE_LEN (14 - NO_REGEX + MULTI_TOGGLES)
+#define WRITEFILE_LIST_LEN (3 - NO_BROWSER)
+#define INSERTFILE_LIST_LEN (2 - NO_BROWSER)
+#define BROWSER_LIST_LEN 4
+#define MAIN_LIST_LEN (27 - NO_REGEX)
 #define MAIN_VISIBLE 12
 #define REPLACE_LIST_2_LEN 3
 #define GOTO_LIST_LEN 3
@@ -306,14 +327,8 @@ know what you're doing */
 #define HELP_LIST_LEN 3
 #define SPELL_LIST_LEN 1
 
-#ifndef DISABLE_BROWSER
-#define WRITEFILE_LIST_LEN 3
-#define INSERTFILE_LIST_LEN 2
-#define BROWSER_LIST_LEN 4
-#else
-#define WRITEFILE_LIST_LEN 3
-#define IMSERTFILE_LIST_LEN 1
-#endif
+
+
 
 #define VIEW 1
 #define NOVIEW 0

nano.info

@@ -1,411 +0,0 @@
-This is nano.info, produced by makeinfo version 4.0 from nano.texi.
-
-INFO-DIR-SECTION Editors
-START-INFO-DIR-ENTRY
-* Nano: (nano).                 Small and friendly text editor.
-END-INFO-DIR-ENTRY
-
-
-File: nano.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
-
-   This manual documents GNU nano, a small and friendly text editor.
-
-* Menu:
-
-* Introduction::
-* Editor Basics::
-* Online Help::
-* Feature Toggles::
-* The File Browser::
-* Pico Compatibility::
-* Building and Configure Options::
-
-
-File: nano.info,  Node: Introduction,  Next: Editor Basics,  Prev: Top,  Up: Top
-
-Introduction
-************
-
-   GNU `nano' is a small and friendly text editor.  Besides basic text
-editing, `nano' offers many extra features like an interactive search
-and replace, goto line number, auto-indentation, feature toggles,
-internationalization support, and filename tab completion.
-
-* Menu:
-
-* Overview::
-* Command Line Options::
-
-
-File: nano.info,  Node: Overview,  Next: Command Line Options,  Prev: Introduction,  Up: Introduction
-
-Overview
-========
-
-   `nano' [GNU long option] [option] +LINE [  FILE ... ]
-
-   The original goal for `nano' was a complete bug-for-bug compatible
-emulation of Pico, but consistency is now a slightly higher priority.
-There is a flag to implement (nearly) complete Pico emulation, (option
--p or GNU long option -pico).  This can also be toggled from within
-`nano' by typing Meta-P.  *Note Pico Compatibility::, for more info.
-
-   Email bug reports to <nano@nano-editor.org>.
-
-
-File: nano.info,  Node: Command Line Options,  Prev: Overview,  Up: Introduction
-
-Command Line Options
-====================
-
-   `nano' takes the following options from the command line:
-`-T [num, --tabsize=[num]'
-     Set the displayed tab length to [num] columns.
-
-`-R, --regexp'
-     Turns on regular expression search and search/replace.
-
-`-V, --version'
-     Print the version number and copyright and quit.
-
-`-c, --const'
-     Constantly display the cursor position and line number on the
-     statusbar.
-
-`-h, --help'
-     Print the usage and exit.
-
-`-i, --autoindent'
-     Automatically indent new lines to the same number of spaces and
-     tabs as the previous line.
-
-`-k, --cut'
-     Makes ^K cut from the current cursor position to the end of the
-     current line.
-
-`-l, --nofollow'
-     When writing files, if the given file is a symbolic link it is
-     removed and a new file is created.
-
-`-m, --mouse'
-     Enables the use of the mouse to select text (currently only useful
-     for running under the X window system).
-
-`-p, --pico'
-     Emulate Pico as closely as possible, sacrificing consistency for
-     correct emulation.  *Note Pico Compatibility::, for more info.
-
-`-r [#cols], --fill=[#cols].'
-     Wrap lines at column #cols.  By default this is the width of the
-     screen, less eight. If this value is negative, wrapping will occur
-     at #cols from the right of the screen, allowing it to vary along
-     with the screen width if the screen is resized.
-
-`-s [prog], --speller=[prog]'
-     Invoke [prog] as the spell checker.  By default, `nano' uses its
-     own interactive spell checker that requires the `spell' program be
-     installed on your system.
-
-`-t, --tempfile'
-     Do not ask whether or not to save the current contents of the file
-     when exiting, assume yes.  This is most useful when using `nano'
-     as the composer of a mailer program.
-
-`-x, --nohelp'
-     In Expert Mode, the Shortcut Lists will not appear at the bottom
-     of the screen.  This affects the location of the statusbar as
-     well, as in Expert Mode it is located at the very bottom of the
-     editor.
-
-     Note: When accessing the help system, Expert Mode is temporarily
-     disabled to display the help system navigation keys.
-
-`-v, --view'
-     Do not allow the contents of the file to be altered.  Note that
-     this flag should NOT be used in place of correct file permissions
-     to implement a read-only file.
-
-`-w, --nowrap'
-     Do not wrap long lines at any length. This option overrides any
-     value for -r.
-
-`-z, --suspend'
-     Enable suspend ability of `nano' using the system's suspend
-     keystroke (usually ^Z).
-
-`+LINE'
-     Start at line number LINE instead of the default of line 1.
-
-
-File: nano.info,  Node: Editor Basics,  Next: Online Help,  Prev: Introduction,  Up: Top
-
-Editor Basics
-*************
-
-* Menu:
-
-* Entering Text::
-* Special Functions::
-* The Titlebar::
-* The Statusbar::
-* Shortcut Lists::
-
-
-File: nano.info,  Node: Entering Text,  Next: Special Functions,  Prev: Editor Basics,  Up: Editor Basics
-
-Entering Text
-=============
-
-   All key sequences in `nano' are entered using the keyboard.  `nano'
-is a "modeless" editor, all keys with the exception of Control and Meta
-key sequences will enter text into the file being edited.
-
-
-File: nano.info,  Node: Special Functions,  Next: The Titlebar,  Prev: Entering Text,  Up: Editor Basics
-
-Special Functions
-=================
-
-   Special functions use the Control key (displayed in the help and
-shortcut lists as ^) or the Meta key (displayed as M).
-
-   * Control key sequences are entered by holding down the Control key
-     and pressing the desired letter.
-
-   * Meta key sequences can be entered in a number of possible ways:
-     Pressing the Escape key, then releasing it and pressing the
-     desired key, or holding down the Alt key while pressing the desired
-     key.  This varies from keyboard to keyboard, and certain commercial
-     operating systems "swallow" the Alt key so that it never reaches
-     the application. If your operating system does this, you should
-     use the Escape key to generate Meta key sequences.
-
-
-File: nano.info,  Node: The Titlebar,  Next: The Statusbar,  Prev: Special Functions,  Up: Editor Basics
-
-The Titlebar
-============
-
-   The titlebar is the line displayed at the top of the editor.  There
-are three sections: left, center and right. The section on the left
-displays the version of `nano' being used.  The center section displays
-the current file name, or "New Buffer" if the file has not yet been
-named.  The section on the right will display "Modified" if the file
-has been modified since it was last saved or opened.
-
-   Special modes: When nano is in "File browser" mode, the center
-section will display the current directory instead of the filename.
-*Note The File Browser::.
-
-
-File: nano.info,  Node: The Statusbar,  Next: Shortcut Lists,  Prev: The Titlebar,  Up: Editor Basics
-
-The Statusbar
-=============
-
-   The statusbar is located three lines from the bottom of the screen
-(or the bottom line in Expert Mode.  *Note Expert Mode::, for more info.
-
-   The Statusbar shows important and informational messages.  Any error
-messages that occur from using the editor will appear on the statusbar.
-Any questions that are asked of the user will be asked on the statusbar,
-and any user input (search strings, file names, etc) will be input on
-the statusbar.
-
-
-File: nano.info,  Node: Shortcut Lists,  Prev: The Statusbar,  Up: Editor Basics
-
-Shortcut Lists
-==============
-
-   The Shortcut Lists are the two lines at the bottom of the screen
-which show some of the more commonly used functions in the editor. The
-exact functions which are displayed depend on whether Pico
-Compatibility Mode mode is enabled. *Note Pico Compatibility::, for
-more info.
-
-
-File: nano.info,  Node: Online Help,  Next: Feature Toggles,  Prev: Editor Basics,  Up: Top
-
-Online Help
-***********
-
-   The online help system in `nano' is available by pressing ^G.  It is
-fairly self explanatory, documenting the various parts of the editor
-and available keystrokes.  Navigation is via the ^Y (Page Up) and ^V
-(Page Down) keys.  ^X exits the help system.
-
-
-File: nano.info,  Node: Feature Toggles,  Next: The File Browser,  Prev: Online Help,  Up: Top
-
-Feature Toggles
-***************
-
-   Toggles allow you to change certain aspects of the editor that would
-normally be done via command line flags. They are invoked via certain
-Meta key sequenced. *Note Special Functions::, for more info.  The
-following toggles are available:
-
-`Constant Update Toggle (Meta-C)'
-     toggles the -c (-const) command line flag.
-
-`Regular Expressions Toggle (Meta-E)'
-     toggles the -R (-regexp) command line flag.
-
-`AutoIndent Toggle (Meta-I)'
-     toggles the -i (-autoindent) command line flag.
-
-`Cut To End Toggle (Meta-K)'
-     toggles the -k (-cut) command line flag.
-
-`Cut To End Toggle (Meta-M)'
-     toggles the -m (-mouse) command line flag.
-
-`Pico Mode Toggle (Meta-P)'
-     toggles the -p (-pico) command line flag.  *Note Pico
-     Compatibility::, for more info.
-
-`AutoWrap Toggle (Meta-W)'
-     toggles the -w (-nowrap) command line flag.
-
-`Expert/Nohelp Toggle (Meta-X)'
-     toggles the -x (-nohelp) command line flag.
-
-`Suspend Toggle (Meta-Z)'
-     toggles the -z (-suspend) command line flag.
-
-
-File: nano.info,  Node: The File Browser,  Next: Pico Compatibility,  Prev: Feature Toggles,  Up: Top
-
-The File Browser
-****************
-
-   When reading or writing files, pressing ^T will invoke the file
-browser.  Here, one can navigate directories in a graphical manner in
-order to find the desired file.
-
-   Basic movement in the file browser is accomplished with he arrow keys
-and page up/down.  The behavior of the enter (or 's') key varies by what
-is currently selected.  If the currently selected object is a directory,
-the file browser will enter and display the contents of the directory.
-If the object is a file, this filename and path are copied to the
-statusbar and the file browser is exited.
-
-
-File: nano.info,  Node: Pico Compatibility,  Next: Building and Configure Options,  Prev: The File Browser,  Up: Top
-
-Pico Compatibility
-******************
-
-   Nano does not completely emulate Pico by default.  The following
-differences apply to the default mode and Pico Compatibility mode:
-
-`Displayed Shortcuts'
-     By default, the following shortcuts are displayed in the Shortcut
-     Lists:
-
-     ^G ^O ^\ ^Y ^K ^C
-     ^X ^R ^W ^V ^U ^T
-
-     Related functions are listed above or below each other by default.
-     The Justify function is not listed, instead the "Replace"
-     function is displayed. Also, he "Read File" and "WriteOut"
-     functions are aligned for consistency.
-
-     In Pico Compatibility mode, the default Pico shortcuts are
-     displayed:
-
-     ^G ^O ^R ^Y ^K ^C
-     ^X ^J ^W ^V ^U ^T
-
-`Previous String Text'
-     By default, previously entered string for a function (search
-     string, file name) will be placed on the statusbar, and is
-     editable.  This is done so there is consistency across all
-     functions.  For example: even if there is a previous replace
-     string, it can always be deleted if one wishes to perform an empty
-     string replace.
-
-     In Pico Compatibility Mode, the previously entered text in a
-     search or replace will appear in brackets, and is not editable.
-     It is not a simple matter to do an empty string replace when a
-     previous replace string exists, for example.  When writing a file,
-     the previous filename will be displayed in the editable text
-     portion of the editor.
-
-`Interactive Replace and Spell Checker'
-     It is worth noting that the `nano' replace function is interactive,
-     i.e. it does not stop after one search string is found and
-     automatically replace it.  The `nano' implementation will stop at
-     each search string found and query whether to replace this
-     instance or not.  The internal spell checker operates similarly.
-     Note that these is no way to force these functions to behave in
-     the Pico fashion.
-
-
-File: nano.info,  Node: Building and Configure Options,  Prev: Pico Compatibility,  Up: Top
-
-Building and Configure Options
-******************************
-
-   Building nano from source is fairly straightforward if you are
-familiar with compiling programs with autoconf support:
-
-   tar xvfz nano-x.y.z.tar.gz (where x.y.z is the version of nano) cd
-nano-x.y.z/ ./configure make make install
-
-   if you are looking to optimize nano for size, you may want to
-consider the following command line options:
-
-`--disable-tabcomp'
-     Disable the tab completion code when reading or writing files.
-
-`--disable-justify'
-     Disable the justify (^J)/unjustify (^U) functions in the editor.
-
-`--disable-speller'
-     Disables spell checker ability.
-
-`--disable-help'
-     Disables the help function (^G).  Disabling this option makes the
-     binary much smaller, but makes it difficult for new users to learn
-     more than very basic things about using the editor.
-
-`--disable-browser'
-     Disables the mini file browser (^O) when reading or writing files.
-
-`--enable-tiny'
-     This options disables all the above.  It also disables some of the
-     larger internals of the editor, like the marker code (^^) and the
-     cut to line (-k) option which it depends on to work properly.  It
-     also disables the function toggles and mouse support.
-
-`--disable-wrapping'
-     Disables all word wrapping in the editor.  This also eliminates the
-     -w command line flag, as nonwrapping is then the default behavior.
-
-`--disable-mouse'
-     Disables all mouse functionality.  This also disables the -m
-     commands line flag which enables the mouse functions.
-
-
-
-Tag Table:
-Node: Top199
-Node: Introduction507
-Node: Overview933
-Node: Command Line Options1513
-Ref: Expert Mode3405
-Node: Editor Basics4248
-Node: Entering Text4473
-Node: Special Functions4813
-Node: The Titlebar5668
-Node: The Statusbar6366
-Node: Shortcut Lists6947
-Node: Online Help7340
-Node: Feature Toggles7716
-Node: The File Browser8859
-Node: Pico Compatibility9568
-Node: Building and Configure Options11610
-
-End Tag Table

nano.texi

@@ -8,8 +8,8 @@
 @c Run `makeinfo' rather than `texinfo-format-buffer'.
 @smallbook
 @set EDITION 0.1
-@set VERSION 1.1.0
-@set UPDATED 12 Feb 2001
+@set VERSION 1.1.2
+@set UPDATED 3 Oct 2001
 
 @dircategory Editors
 @direntry
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 1.1.0
+@subtitle version 1.1.2
 
 @author Chris Allegretta
 @page
@@ -108,12 +108,24 @@ Email bug reports to @email{nano@@nano-editor.org}.
 @code{nano} takes the following options from the command line:
 @table @code
 
-@item -T [num, --tabsize=[num]
-Set the displayed tab length to [num] columns.
+@item -D, --dos
+Write file in DOS format.
+
+@item -F, --multibuffer
+Enable multiple file buffers.
+
+@item -M, --mac
+Write file in Mac format.
 
 @item -R, --regexp
 Turns on regular expression search and search/replace.
 
+@item -S, --smooth
+Enables smooth scrolling.
+
+@item -T [num], --tabsize=[num]
+Set the displayed tab length to [num] columns.
+
 @item -V, --version 
 Print the version number and copyright and quit.
 
@@ -139,6 +151,9 @@ and a new file is created.
 Enables the use of the mouse to select text (currently only useful for
 running under the X window system).
 
+@item -o [dir], --operatingdir=[dir]
+Set operating directory. Makes nano set up something similar to a chroot. 
+
 @item -p, --pico
 Emulate Pico as closely as possible, sacrificing consistency for correct
 emulation.  @xref{Pico Compatibility}, for more info.
@@ -181,6 +196,9 @@ Do not wrap long lines at any length. This option overrides any value for
 Enable suspend ability of @code{nano} using the system's suspend
 keystroke (usually ^Z).
 
+@item -a, -b, -e, -f, -g, -j
+Ignored, for compatibility with Pico.
+
 @item +LINE
 Start at line number LINE instead of the default of line 1.
 @end table
@@ -277,25 +295,43 @@ The following toggles are available:
 
 @table @code
 
+@item Case Sensitive Search Toggle (Meta-A)
+toggles case sensistive searching functionality on/off.
+
+@item Backwards Search Toggle (Meta-B)
+toggles backwards searching fuctionality on/off.
+
 @item Constant Update Toggle (Meta-C)
 toggles the -c (--const) command line flag.
 
+@item DOS Format Toggle (Meta-D)
+toggles the -D (--dos) command line flag.
+
 @item Regular Expressions Toggle (Meta-E)
 toggles the -R (--regexp) command line flag.
 
+@item Multiple Files Toggle (Meta-F)
+toggles the  -F (--multibuffer) command line flag.
+
 @item AutoIndent Toggle (Meta-I)
 toggles the -i (--autoindent) command line flag.
 
 @item Cut To End Toggle (Meta-K)
 toggles the -k (--cut) command line flag.
 
-@item Cut To End Toggle (Meta-M)
+@item Mouse Toggle (Meta-M)
 toggles the -m (--mouse) command line flag.
 
+@item Mac Format Toggle (Meta-O)
+toggles the -M (--mac) command line flag.
+
 @item Pico Mode Toggle (Meta-P)
 toggles the -p (--pico) command line flag.
 @xref{Pico Compatibility}, for more info.
 
+@item Smooth Scrolling Toggle (Meta-S)
+toggles the -s (--smooth) command line flag.
+
 @item AutoWrap Toggle (Meta-W)
 toggles the -w (--nowrap) command line flag.
 
@@ -305,6 +341,13 @@ toggles the -x (--nohelp) command line flag.
 @item Suspend Toggle (Meta-Z)
 toggles the -z (--suspend) command line flag.
 
+@item Open Previous File Toggle (Meta-<)
+changes buffer to previously loaded file.
+
+@item Open Next File Toggle (Meta->)
+changes buffer to next loaded file.
+
+
 @end table
 
 @node The File Browser, Pico Compatibility, Feature Toggles, Top
@@ -415,6 +458,18 @@ Disables all word wrapping in the editor.  This also eliminates the
 Disables all mouse functionality.  This also disables the -m commands line 
 flag which enables the mouse functions.
 
+@item --disable-operatingdir
+Disables setting of operating directory. This also disables the -o command
+line flag.
+
+@item --disable-nls
+Disables Native Language support. This will make the available GNU nano
+translations unusable.
+
+@item --with-slang
+Compiling GNU nano with Slang is supported, and will make the binary notably
+smaller than if compiled with ncurses or other curses libraries.
+
 @end table
 
 @contents

nanorc.sample

@@ -17,12 +17,18 @@
 # Don't follow symlinks when writing files
 # set nofollow
 
-# Use Pico Compatibility mode for ths shortcut lists and search text
+# Set operating directory (chroot of sorts)
+# set operatingdir "~"
+
+# Use Pico Compatibility mode for the shortcut lists and search text
 # set pico
 
 # Use this value instead of the default
 # set fill -8
 
+# Use this tab size instead of the default
+# set tabsize 8
+
 # Use this spelling checker instead of the default one
 # set speller aspell
 
@@ -38,10 +44,13 @@
 # Don't display the help lists at the bottom of the screen
 # set nohelp
 
-# Allow nano to be suepended with ^Z
+# Allow nano to be suspended with ^Z
 # set suspend
 
-# Load files upon inserting them, and allow switching between them
+# Use smooth scrolling as the default
+# set smooth
+
+# Allow multiple file buffers (using ^R inserts into separate buffer)
 # You must have configured with --enable-multibuffer or --enable-extra for
 # this to work
 #

proto.h

@@ -44,6 +44,9 @@ extern char *answer;
 extern char *hblank, *help_text;
 extern char *last_search;
 extern char *last_replace;
+#ifndef DISABLE_OPERATINGDIR
+extern char *operating_dir;
+#endif
 #ifndef DISABLE_SPELLER
 extern  char *alt_speller;
 #endif
@@ -100,10 +103,20 @@ int do_insertfile(int loading_file);
 int add_open_file(int update, int dup_fix);
 #endif
 
+#ifndef DISABLE_OPERATINGDIR
+int check_operating_dir(char *currpath, int allow_tabcomp);
+#endif
+
 int do_writeout(char *path, int exiting, int append);
 int do_gotoline(long line, int save_pos);
 int do_replace_loop(char *prevanswer, filestruct *begin, int *beginx,
 			int wholewords, int *i);
+int do_find_bracket(void);
+
+#if defined (ENABLE_MULTIBUFFER) || !defined (DISABLE_SPELLER)
+void do_gotopos(long line, int pos_x, int pos_y, int pos_placewewant);
+#endif
+
 /* Now in move.c */
 int do_up(void);
 int do_down(void);
@@ -152,7 +165,7 @@ void new_file(void);
 void new_magicline(void);
 void splice_node(filestruct *begin, filestruct *newnode, filestruct *end);
 void null_at(char *data, int index);
-void page_up_center(void);
+void page_up(void);
 void blank_edit(void);
 void search_init_globals(void);
 void replace_abort(void);
@@ -182,7 +195,7 @@ int do_insertfile_void(void), do_search(void);
 int load_open_file(void), close_open_file(void);
 #endif
 
-int page_up(void), page_down(void);
+int do_page_up(void), do_page_down(void);
 int do_cursorpos(void), do_spell(void);
 int do_up(void), do_down (void), do_right(void), do_left (void);
 int do_home(void), do_end(void), total_refresh(void), do_mark(void);
@@ -198,8 +211,8 @@ int open_prevfile(int closing_file), open_nextfile(int closing_file);
 
 char *charalloc (size_t howmuch);
 
-#ifdef ENABLE_MULTIBUFFER
-char *get_full_path(const char *origpath);
+#if defined (ENABLE_MULTIBUFFER) || !defined (ENABLE_OPERATINGDIR)
+char *get_full_path(char *origpath);
 #endif
 
 #ifndef DISABLE_BROWSER
@@ -221,9 +234,9 @@ RETSIGTYPE main_loop (int junk);
 filestruct *copy_node(filestruct * src);
 filestruct *copy_filestruct(filestruct * src);
 filestruct *make_new_node(filestruct * prevnode);
-filestruct *findnextstr(int quiet, filestruct * begin,
+filestruct *findnextstr(int quiet, int bracket_mode, filestruct * begin,
 			int beginx, char *needle);
 
 #ifdef ENABLE_MULTIBUFFER
-filestruct *open_file_dup_search(void);
+filestruct *open_file_dup_search(int update);
 #endif

rcfile.c

@@ -39,7 +39,7 @@
 #define _(string) (string)
 #endif
 
-#define NUM_RCOPTS 15
+#define NUM_RCOPTS 18
 /* Static stuff for the nanorc file */
 rcoption rcopts[NUM_RCOPTS] = 
 {
@@ -49,7 +49,9 @@ rcoption rcopts[NUM_RCOPTS] =
 {"cut", CUT_TO_END},
 {"nofollow", FOLLOW_SYMLINKS},
 {"mouse", USE_MOUSE},
+{"operatingdir", 0},
 {"pico", PICO_MODE},
+{"tabsize", 0},
 
 #ifndef DISABLE_WRAPJUSTIFY
 {"fill", 0},
@@ -61,7 +63,8 @@ rcoption rcopts[NUM_RCOPTS] =
 {"nowrap", NO_WRAP}, 
 {"nohelp", NO_HELP}, 
 {"suspend", SUSPEND},
-{"loadoninsert", LOADONINSERT}};
+{"multibuffer", MULTIBUFFER},
+{"smooth", SMOOTHSCROLL}};
 
 /* We have an error in some part of the rcfile; put it on stderr and
   make the user hit return to continue starting up nano */
@@ -166,6 +169,8 @@ void parse_rcfile(FILE *rcstream, char *filename)
 #endif
 		    if (set == 1 || rcopts[i].flag == FOLLOW_SYMLINKS) {
 			if (
+			    !strcasecmp(rcopts[i].name, "operatingdir") ||
+			    !strcasecmp(rcopts[i].name, "tabsize") ||
 #ifndef DISABLE_WRAPJUSTIFY
 			    !strcasecmp(rcopts[i].name, "fill") || 
 #endif
@@ -189,13 +194,20 @@ void parse_rcfile(FILE *rcstream, char *filename)
 				if ((i = atoi(option)) < MIN_FILL_LENGTH) {
 	    		 	    rcfile_msg(&errors, 
 		_("Error in %s on line %d: requested fill size %d too small"),
-						filename, lineno, option);
+						filename, lineno, i);
 				}
 				else
 				     fill = i;
 #endif
-			    } 
-			    else {
+			    } else if (!strcasecmp(rcopts[i].name, "tabsize")) {
+			    	if ((i = atoi(option)) <= 0) {
+			    		rcfile_msg(&errors,
+			    			_("Error in %s on line %d: requested tab size %d too small"),
+			    				filename, lineno, i);
+			    	} else {
+			    		tabsize = i;
+			    	}
+			    } else {
 #ifndef DISABLE_SPELLER
 				alt_speller = charalloc(strlen(option) + 1);
             			strcpy(alt_speller, option);

search.c

@@ -72,16 +72,27 @@ void search_init_globals(void)
 */
 int search_init(int replacing)
 {
-    int i = 0, j;
+    int i = 0;
     char *buf;
-    char *prompt;
     static char *backupstring = NULL;
+#ifndef NANO_SMALL
+    int j;
+#endif
 
     search_init_globals();
 
     buf = charalloc(strlen(last_search) + 5);
     buf[0] = 0;
 
+
+    /* Clear the backupstring if we've changed from Pico mode to regular
+	mode */
+    if (ISSET(CLEAR_BACKUPSTRING)) {
+	free(backupstring);
+	backupstring = NULL;
+	UNSET(CLEAR_BACKUPSTRING);
+    }
+	
      /* Okay, fun time.  backupstring is our holder for what is being 
 	returned from the statusq call.  Using answer for this would be tricky.
 	Here, if we're using PICO_MODE, we only want nano to put the
@@ -114,19 +125,24 @@ int search_init(int replacing)
     else
 	strcpy(buf, "");
 
-     /* Instead of having a million if statements here to determine
-	the prompt, we instead just have a hundred "? :" calls in
-	the statusq call.  I hope no one ever has to modify this :-) */
-    prompt = "%s%s%s%s%s%s";
-
     /* This is now one simple call.  It just does a lot */
     i = statusq(0, replacing ? replace_list : whereis_list,
 	replacing ? REPLACE_LIST_LEN : WHEREIS_LIST_LEN, backupstring,
-	prompt, 
-	ISSET(CASE_SENSITIVE) ? _("Case Sensitive ") : "",
-	ISSET(USE_REGEXP) ? _("Regexp ") : "",
+	"%s%s%s%s%s%s", 
 	_("Search"),
-	ISSET(REVERSE_SEARCH) ? _(" Backwards") : "",
+
+	/* This string is just a modifier for the search prompt,
+	   no grammar is implied */
+	ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") : "",
+
+	/* This string is just a modifier for the search prompt,
+	   no grammar is implied */
+	ISSET(USE_REGEXP) ? _(" [Regexp]") : "",
+
+	/* This string is just a modifier for the search prompt,
+	   no grammar is implied */
+	ISSET(REVERSE_SEARCH) ? _(" [Backwards]") : "",
+
 	replacing ? _(" (to replace)") : "",
 	buf);
 
@@ -170,25 +186,16 @@ int search_init(int replacing)
 	backupstring = NULL;
 	backupstring = mallocstrcpy(backupstring, answer);
 
+#ifndef NANO_SMALL
 	for (j = 0; j <= TOGGLE_LEN - 1; j++)
 	    if (i == toggles[j].val)
 		TOGGLE(toggles[j].flag);
+#endif
 
 	return 1;
     case NANO_OTHERSEARCH_KEY:
 	backupstring = mallocstrcpy(backupstring, answer);
 	return -2;		/* Call the opposite search function */
-/*
-    } else if (i == NANO_REVERSESEARCH_KEY) {
-	free(backupstring);
-	backupstring = NULL;
-	backupstring = mallocstrcpy(backupstring, answer);
-
-	TOGGLE(REVERSE_SEARCH);
-
-	return 1;
-    } else if (i == NANO_FROMSEARCHTOGOTO_KEY) {
-*/
     case NANO_FROMSEARCHTOGOTO_KEY:
 	free(backupstring);
 	backupstring = NULL;
@@ -219,23 +226,27 @@ void not_found_msg(char *str)
     }
 }
 
-filestruct *findnextstr(int quiet, filestruct * begin, int beginx,
+int past_editbuff;	/* search is now looking through lines not displayed */
+
+filestruct *findnextstr(int quiet, int bracket_mode, filestruct * begin, int beginx,
 			char *needle)
 {
     filestruct *fileptr;
     char *searchstr, *rev_start = NULL, *found = NULL;
-    int past_editbot = 0, current_x_find;
+    int current_x_find = 0;
 
     fileptr = current;
 
+    past_editbuff = 0;
+
     if (!ISSET(REVERSE_SEARCH)) {		/* forward search */
 
 	current_x_find = current_x + 1;
-
-	/* Are we now back to the line where the search started) */
-	if ((fileptr == begin) && (current_x_find < beginx))
+#if 0
+	/* Are we now back to the place where the search started) */
+	if ((fileptr == begin) && (beginx > current_x_find))
 	    search_last_line = 1;
-
+#endif
 	/* Make sure we haven't passed the end of the string */
 	if (strlen(fileptr->data) < current_x_find)
 	    current_x_find--;
@@ -254,15 +265,19 @@ filestruct *findnextstr(int quiet, filestruct * begin, int beginx,
 
 	    fileptr = fileptr->next;
 
-	    if (!past_editbot && (fileptr == editbot))
-		past_editbot = 1;
+	    if (fileptr == editbot)
+		past_editbuff = 1;
 
 	    /* EOF reached ?, wrap around once */
 	    if (fileptr == NULL) {
+		if (bracket_mode)		/* don't wrap if looking for bracket match */
+		   return NULL;
 		fileptr = fileage;
-		past_editbot = 1;
-		if (!quiet)
-		    statusbar(_("Search Wrapped"));
+		past_editbuff = 1;
+		if (!quiet) {
+		   statusbar(_("Search Wrapped"));
+		SET(DISABLE_CURPOS);
+		}
 	    }
 
 	    /* Original start line reached */
@@ -274,19 +289,21 @@ filestruct *findnextstr(int quiet, filestruct * begin, int beginx,
 
 	/* We found an instance */
 	current_x_find = found - fileptr->data;
-
+#if 0
 	/* Ensure we haven't wrapped around again! */
 	if ((search_last_line) && (current_x_find >= beginx)) {
 	    if (!quiet)
 		not_found_msg(needle);
 	    return NULL;
 	}
-
-    } else {	/* reverse search */
+#endif
+    } 
+#ifndef NANO_SMALL
+    else {	/* reverse search */
 
 	current_x_find = current_x - 1;
 
-	/* Are we now back to the line where the search started) */
+	/* Are we now back to the place where the search started) */
 	if ((fileptr == begin) && (current_x_find > beginx))
 	    search_last_line = 1;
 
@@ -310,15 +327,19 @@ filestruct *findnextstr(int quiet, filestruct * begin, int beginx,
 
 	    fileptr = fileptr->prev;
 
-/* ? */	    if (!past_editbot && (fileptr == edittop->prev))
-		past_editbot = 1;
+	    if (fileptr == edittop->prev)
+		past_editbuff = 1;
 
 	    /* SOF reached ?, wrap around once */
 /* ? */	    if (fileptr == NULL) {
+		if (bracket_mode)
+		   return NULL;
 		fileptr = filebot;
-		past_editbot = 1;
-		if (!quiet)
+		past_editbuff = 1;
+		if (!quiet) {
 		    statusbar(_("Search Wrapped"));
+		    SET(DISABLE_CURPOS);
+		}
 	    }
 
 	    /* Original start line reached */
@@ -331,26 +352,30 @@ filestruct *findnextstr(int quiet, filestruct * begin, int beginx,
 
 	/* We found an instance */
 	current_x_find = found - fileptr->data;
-
+#if 0
 	/* Ensure we haven't wrapped around again! */
 	if ((search_last_line) && (current_x_find < beginx)) {
 	    if (!quiet)
 		not_found_msg(needle);
 	    return NULL;
 	}
+#endif
     }
+#endif /* NANO_SMALL */
 
     /* Set globals now that we are sure we found something */
     current = fileptr;
     current_x = current_x_find;
 
-    if (past_editbot)
-	edit_update(fileptr, CENTER);
-    else
-	update_line(current, current_x);
+    if (!bracket_mode) {
+	if (past_editbuff)
+	   edit_update(fileptr, CENTER);
+	else
+	   update_line(current, current_x);
 
-    placewewant = xplustabs();
-    reset_cursor();
+	placewewant = xplustabs();
+	reset_cursor();
+    }
 
     return fileptr;
 }
@@ -410,7 +435,7 @@ int do_search(void)
 	last_search = mallocstrcpy(last_search, answer);
 
     search_last_line = 0;
-    findnextstr(0, current, current_x, answer);
+    findnextstr(FALSE, FALSE, current, current_x, answer);
     search_abort();
     return 1;
 }
@@ -579,7 +604,7 @@ int do_replace_loop(char *prevanswer, filestruct *begin, int *beginx,
     while (1) {
 
 	/* Sweet optimization by Rocco here */
-	fileptr = findnextstr(replaceall, begin, *beginx, prevanswer);
+	fileptr = findnextstr(replaceall, FALSE, begin, *beginx, prevanswer);
 
 	/* No more matches.  Done! */
 	if (!fileptr)
@@ -788,3 +813,89 @@ int do_gotoline_void(void)
 {
     return do_gotoline(0, 0);
 }
+
+#if (defined ENABLE_MULTIBUFFER || !defined DISABLE_SPELLER)
+void do_gotopos(long line, int pos_x, int pos_y, int pos_placewewant)
+{
+
+    /* since do_gotoline() resets the x-coordinate but not the
+       y-coordinate, set the coordinates up this way */
+    current_y = pos_y;
+    do_gotoline(line, 1);
+    current_x = pos_x;
+    placewewant = pos_placewewant;
+    update_line(current, pos_x);
+}
+#endif
+
+#if !defined(NANO_SMALL) && defined(HAVE_REGEX_H)
+
+int do_find_bracket(void)
+{
+    char ch_under_cursor, wanted_ch;
+    char *pos, *brackets = "([{<>}])";
+    char regexp_pat[] = "[  ]";
+    int offset, have_past_editbuff = 0, flagsave, current_x_save, count = 1;
+    filestruct *current_save;
+
+    ch_under_cursor = current->data[current_x];
+ 
+    if ((!(pos = strchr(brackets, ch_under_cursor))) || (!((offset = pos - brackets) < 8))) {
+	statusbar(_("Not a bracket"));
+	return 1;
+    }
+
+    blank_statusbar_refresh();
+
+    wanted_ch = *(brackets + ((strlen(brackets) - (offset + 1))));
+
+    current_x_save = current_x;
+    current_save = current;
+    flagsave = flags;
+    SET(USE_REGEXP);
+
+/* apparent near redundancy with regexp_pat[] here is needed, [][] works, [[]] doesn't */ 
+
+    if (offset < (strlen(brackets) / 2)) {			/* on a left bracket */
+	regexp_pat[1] = wanted_ch;
+	regexp_pat[2] = ch_under_cursor;
+	UNSET(REVERSE_SEARCH);
+    } else {							/* on a right bracket */
+	regexp_pat[1] = ch_under_cursor;
+	regexp_pat[2] = wanted_ch;
+	SET(REVERSE_SEARCH);
+    }
+
+    regexp_init(regexp_pat);
+
+    while (1) {
+	search_last_line = 0;
+	if (findnextstr(1, 1, current, current_x, regexp_pat)) {
+	    have_past_editbuff |= past_editbuff;
+	    if (current->data[current_x] == ch_under_cursor)	/* found identical bracket  */
+		count++;
+	    else {						/* found complementary bracket */
+		if (!(--count)) {
+		    if (have_past_editbuff)
+			edit_update(current, CENTER);
+		    else
+			update_line(current, current_x);
+		    placewewant = xplustabs();
+		    reset_cursor();
+		    break ;
+		}
+	    }
+	} else {						/* didn't find either left or right bracket */
+	    statusbar(_("No matching bracket"));
+	    current_x = current_x_save;
+	    current = current_save;
+	    break;
+	}
+    }
+
+    if (ISSET(REGEXP_COMPILED))
+	regexp_cleanup();
+    flags = flagsave;
+    return 0;
+}
+#endif

utils.c

@@ -47,6 +47,8 @@ void lowercase(char *src)
     }
 }
 
+/* None of this is needed if we're using NANO_SMALL! */
+#ifndef NANO_SMALL
 char *revstrstr(char *haystack, char *needle, char *rev_start)
 {
     char *p, *q, *r;
@@ -93,6 +95,7 @@ char *strcasestr(char *haystack, char *needle)
     }
     return NULL;
 }
+#endif /* NANO_SMALL */
 
 char *strstrwrapper(char *haystack, char *needle, char *rev_start)
 {
@@ -103,11 +106,13 @@ char *strstrwrapper(char *haystack, char *needle, char *rev_start)
     char *i, *j;
 
     if (ISSET(USE_REGEXP)) {
+#ifndef NANO_SMALL
 	if (!ISSET(REVERSE_SEARCH)) {
 	    result = regexec(&search_regexp, haystack, 10, regmatches, 0);
 	    if (!result)
 		return haystack + regmatches[0].rm_so;
 	} else {
+#endif
 	    /* do quick check first */
 	    if (!(regexec(&search_regexp, haystack, 10, regmatches, 0))) {
 		/* there is a match */
@@ -117,22 +122,30 @@ char *strstrwrapper(char *haystack, char *needle, char *rev_start)
 			if (j <= rev_start)
 			    return j;
 		    }
+
 	    }
+#ifndef NANO_SMALL
 	}
+#endif
 	return 0;
     }
 #endif
+#ifndef NANO_SMALL
     if (ISSET(CASE_SENSITIVE)) {
-	if (!ISSET(REVERSE_SEARCH))
-	    return strstr(haystack,needle);
-        else
+	if (ISSET(REVERSE_SEARCH))
 	    return revstrstr(haystack, needle, rev_start);
+        else
+	    return strstr(haystack,needle);
+
     } else {
-	if (!ISSET(REVERSE_SEARCH))
-	    return strcasestr(haystack, needle);
-	else
+	if (ISSET(REVERSE_SEARCH))
 	    return revstrcasestr(haystack, needle, rev_start);
+	else
+#endif
+	    return strcasestr(haystack, needle);
+#ifndef NANO_SMALL
     }
+#endif
 }
 
 /* Thanks BG, many ppl have been asking for this... */

winio.c

@@ -330,12 +330,10 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
 	case NANO_HOME_KEY:
 	case KEY_HOME:
 	    x = x_left;
-	    nanoget_repaint(buf, inputbuf, x);
 	    break;
 	case NANO_END_KEY:
 	case KEY_END:
 	    x = x_left + strlen(inputbuf);
-	    nanoget_repaint(buf, inputbuf, x);
 	    break;
 	case KEY_RIGHT:
 	case NANO_FORWARD_KEY:
@@ -351,16 +349,13 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
 			strlen(inputbuf) - (x - x_left) - 1);
 		inputbuf[strlen(inputbuf) - 1] = 0;
 	    }
-	    nanoget_repaint(buf, inputbuf, x);
 	    break;
 	case NANO_CONTROL_K:
 	case NANO_CONTROL_U:
 	    *inputbuf = 0;
 	    x = x_left;
-	    nanoget_repaint(buf, inputbuf, x);
 	    break;
 	case KEY_BACKSPACE:
-	case KEY_DC:
 	case 127:
 	case NANO_CONTROL_H:
 	    if (strlen(inputbuf) > 0) {
@@ -375,7 +370,6 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
 	    }
 	    if (x > strlen(buf))
 		x--;
-	    nanoget_repaint(buf, inputbuf, x);
 	    break;
 #ifndef DISABLE_TABCOMP
 	case NANO_CONTROL_I:
@@ -386,7 +380,6 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
 		x += shift;
 		if (x - x_left > strlen(inputbuf))
 		    x = strlen(inputbuf) + x_left;
-		nanoget_repaint(buf, inputbuf, x);
 	    }
 	    break;
 #endif
@@ -400,21 +393,22 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
 	case KEY_DOWN:
 	    break;
 
+	case KEY_DC:
+	    goto do_deletekey;
+
 	case 27:
 	    switch (kbinput = wgetch(edit)) {
-	    case 79:
+	    case 'O':
 		switch (kbinput = wgetch(edit)) {
-		case 70:
+		case 'F':
 		    x = x_left + strlen(inputbuf);
-		    nanoget_repaint(buf, inputbuf, x);
 		    break;
-		case 72:
+		case 'H':
 		    x = x_left;
-		    nanoget_repaint(buf, inputbuf, x);
 		    break;
 		}
 		break;
-	    case 91:
+	    case '[':
 		switch (kbinput = wgetch(edit)) {
 		case 'C':
 		    if (x < xend)
@@ -426,11 +420,12 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
 			x--;
 		    wmove(bottomwin, 0, x);
 		    break;
-		case 49:
+		case '1':
+		case '7':
 		    x = x_left;
-		    nanoget_repaint(buf, inputbuf, x);
-		    goto skip_126;
-		case 51:
+		    goto skip_tilde;
+		case '3':
+		  do_deletekey:
 		    if (strlen(inputbuf) > 0
 			&& (x - x_left) != strlen(inputbuf)) {
 			memmove(inputbuf + (x - x_left),
@@ -438,16 +433,15 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
 				strlen(inputbuf) - (x - x_left) - 1);
 			inputbuf[strlen(inputbuf) - 1] = 0;
 		    }
-		    nanoget_repaint(buf, inputbuf, x);
-		    goto skip_126;
-		case 52:
+		    goto skip_tilde;
+		case '4':
+		case '8':
 		    x = x_left + strlen(inputbuf);
-		    nanoget_repaint(buf, inputbuf, x);
-		    goto skip_126;
-		  skip_126:
+		    goto skip_tilde;
+		  skip_tilde:
 		    nodelay(edit, TRUE);
 		    kbinput = wgetch(edit);
-		    if (kbinput == 126 || kbinput == ERR)
+		    if (kbinput == '~' || kbinput == ERR)
 			kbinput = -1;
 		    nodelay(edit, FALSE);
 		    break;
@@ -470,7 +464,6 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
 		}
 
 	    }
-	    nanoget_repaint(buf, inputbuf, x);
 	    break;
 
 	default:
@@ -488,21 +481,19 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
 
 	    x++;
 
-	    nanoget_repaint(buf, inputbuf, x);
 #ifdef DEBUG
 	    fprintf(stderr, _("input \'%c\' (%d)\n"), kbinput, kbinput);
 #endif
 	}
+	nanoget_repaint(buf, inputbuf, x);
 	wrefresh(bottomwin);
     }
 
     answer = mallocstrcpy(answer, inputbuf);
     free(inputbuf);
 
-    /* Now that the text is editable instead of bracketed, we have to 
-       check for answer == def, instead of answer == "" */
-    if  (((ISSET(PICO_MODE)) && !strcmp(answer, "")) || 
-	((!ISSET(PICO_MODE)) && !strcmp(answer, def)))
+    /* In pico mode, just check for a blank answer here */
+    if  (((ISSET(PICO_MODE)) && !strcmp(answer, "")))
 	return -2;
     else
 	return 0;
@@ -602,12 +593,16 @@ void bottombars(shortcut s[], int slen)
 #endif
 
     /* Determine how many extra spaces are needed to fill the bottom of the screen */
-    k = COLS / 6 - 13;
+    if (slen < 2)
+	k = COLS / 6 - 13;
+    else
+	k = COLS / ((slen + (slen %2)) / 2) - 13;
+
 
     clear_bottomwin();
     wmove(bottomwin, 1, 0);
 
-    for (i = 0; i <= slen - 2; i += 2) {
+    for (i = 0; i <= slen - 1; i += 2) {
 
 	if (s[i].val < 97)
 	    snprintf(keystr, 10, "^%c", s[i].val + 64);
@@ -1655,7 +1650,7 @@ void do_replace_highlight(int highlight_flag, char *word)
 }
 
 #ifdef NANO_EXTRA
-#define CREDIT_LEN 47
+#define CREDIT_LEN 48
 void do_credits(void)
 {
     int i, j = 0, k, place = 0, start_x;
@@ -1694,6 +1689,7 @@ void do_credits(void)
 			"Joshua Jensen",
 			"Ryan Krebs",
 			"Albert Chin",
+			"David Lawrence Ramsey",
 			"",
 			specialthx,
 			"Plattsburgh State University",