Update.

1998-01-26 00:57  Ulrich Drepper  <drepper@cygnus.com>

	* db2/Makefile (routines): Add os_alloc.
	* db2/db.h: Update from db-2.3.16.
	* db2/db_185.h: Likewise.
	* db2/db_int.h: Likewise.
	* db2/btree/bt_close.c: Likewise.
	* db2/btree/bt_cursor.c: Likewise.
	* db2/btree/bt_delete.c: Likewise.
	* db2/btree/bt_open.c: Likewise.
	* db2/btree/bt_page.c: Likewise.
	* db2/btree/bt_put.c: Likewise.
	* db2/btree/bt_rec.c: Likewise.
	* db2/btree/bt_recno.c: Likewise.
	* db2/btree/btree_auto.c: Likewise.
	* db2/common/db_appinit.c: Likewise.
	* db2/common/db_apprec.c: Likewise.
	* db2/common/db_err.c: Likewise.
	* db2/common/db_region.c: Likewise.
	* db2/common/db_shash.c: Likewise.
	* db2/db/db.c: Likewise.
	* db2/db/db_auto.c: Likewise.
	* db2/db/db_conv.c: Likewise.
	* db2/db/db_dispatch.c: Likewise.
	* db2/db/db_dup.c: Likewise.
	* db2/db/db_pr.c: Likewise.
	* db2/db/db_rec.c: Likewise.
	* db2/db185/db185.c: Likewise.
	* db2/dbm/dbm.c: Likewise.
	* db2/hash/hash.c: Likewise.
	* db2/hash/hash_auto.c: Likewise.
	* db2/hash/hash_dup.c: Likewise.
	* db2/hash/hash_page.c: Likewise.
	* db2/hash/hash_rec.c: Likewise.
	* db2/include/btree_ext.h: Likewise.
	* db2/include/clib_ext.h: Likewise.
	* db2/include/common_ext.h: Likewise.
	* db2/include/db.h.src: Likewise.
	* db2/include/db_185.h.src: Likewise.
	* db2/include/db_am.h: Likewise.
	* db2/include/db_ext.h: Likewise.
	* db2/include/db_int.h.src: Likewise.
	* db2/include/hash_ext.h: Likewise.
	* db2/include/lock_ext.h: Likewise.
	* db2/include/log.h: Likewise.
	* db2/include/log_auto.h: Likewise.
	* db2/include/log_ext.h: Likewise.
	* db2/include/mp.h: Likewise.
	* db2/include/mp_ext.h: Likewise.
	* db2/include/mutex_ext.h: Likewise.
	* db2/include/os_ext.h: Likewise.
	* db2/include/os_func.h: Likewise.
	* db2/include/txn_ext.h: Likewise.
	* db2/lock/lock.c: Likewise.
	* db2/lock/lock_util.c: Likewise.
	* db2/log/log.c: Likewise.
	* db2/log/log.src: Likewise.
	* db2/log/log_archive.c: Likewise.
	* db2/log/log_auto.c: Likewise.
	* db2/log/log_get.c: Likewise.
	* db2/log/log_put.c: Likewise.
	* db2/log/log_rec.c: Likewise.
	* db2/log/log_register.c: Likewise.
	* db2/mp/mp_bh.c: Likewise.
	* db2/mp/mp_fget.c: Likewise.
	* db2/mp/mp_fopen.c: Likewise.
	* db2/mp/mp_fput.c: Likewise.
	* db2/mp/mp_pr.c: Likewise.
	* db2/mp/mp_sync.c: Likewise.
	* db2/mutex/mutex.c: Likewise.
	* db2/os/os_alloc.c: Likewise.
	* db2/os/os_config.c: Likewise.
	* db2/os/os_stat.c: Likewise.
	* db2/progs/db_checkpoint/db_checkpoint.c: Likewise.
	* db2/progs/db_deadlock/db_deadlock.c: Likewise.
	* db2/progs/db_load/db_load.c: Likewise.
	* db2/progs/db_printlog/db_printlog.c: Likewise.
	* db2/progs/db_recover/db_recover.c: Likewise.
	* db2/progs/db_stat/db_stat.c: Likewise.
	* db2/txn/txn.c: Likewise.

	* elf/dl-close.c (_dl_close): Rename inner variable named map to imap.
	Unmap memory blocks in reverse order of allocation.
	Call munmap with load address added to offset.
	Bug reported by Miguel de Icaza.

	* locale/programs/ld-collate.c (collate_end_weight): Correctly fill
	up weight array.

	* localedata/locales/cs_CZ: Update by Michael Mraka
	<michael@informatics.muni.cz>.

	* misc/sys/syslog.h: Reformat a bit.  Don't declare vsyslog unless
	__USE_BSD.

	* nis/nss_compat/compat-grp.c: Correctly handle buffer overflow while
	reading line with fgets.
	* nis/nss_compat/compat-pwd.c: Likewise.
	* nis/nss_compat/compat-spwd.c: Likewise.
	* nss/nss_files/files-XXX.c: Likewise.
	* nss/nss_files/files-alias.c: Likewise.
	* shadow/fgetspent_r.c: Likewise.

	* string/strerror_r.c: Correct comment.  Patch by Andreas Jaeger.

	* sysdeps/unix/sysv/linux/bits/stat.h: Define _STATBUF_ST_RDEV.
	* sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise.

	* sysdeps/unix/sysv/linux/i386/sys/ucontext.h: Allocate room for
	FP register content in ucontext_t.

1998-01-22  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/libm-ieee754/s_modfl.c (modf): Correct
	calculation.  Patch by Markus Schoder
	<Markus.Schoder@dresdner-bank.de>.

	* math/libm-test.c (modf_test): Add more tests for modf.

	* sysdeps/unix/sysv/linux/sys/mman.h: Add const to mlock and
	munlock according to Unix98.

1998-01-25  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* nss/nss_files/files-network.c (LINE_PARSER): Set n_addrtype to
	AF_INET.

1998-01-21 07:22  H.J. Lu  <hjl@gnu.org>

	* sysdeps/posix/ttyname.c: Handle symbolic links.
	* sysdeps/posix/ttyname_r.c: Ditto.

1998-01-25 19:39  Ulrich Drepper  <drepper@cygnus.com>

	* db2/makedb.c (process_input): Write terminating \0 for value.
	(print_database): Simply print value string, don't use length.

1998-01-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* nss/nsswitch.c (__nss_configure_lookup): Correct test for early
	exit of loop.

1998-01-25  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>

	* nis/ypclnt.c: Don't set dom_client to NULL, or we will not
	close all sockets.

1998-01-25 14:54  Ulrich Drepper  <drepper@cygnus.com>

	* signal/Makefile (routines): Add sighold, sigrelse, sigignore, and
	sigset.
	* signal/sighold.c: New file.
	* signal/sigrelse.c: New file.
	* sysdeps/generic/sigignore.c: New file.
	* sysdeps/generic/sigset.c: New file.
	* sysdeps/posix/sigignore.c: New file.
	* sysdeps/posix/sigset.c: New file.
	* signal/signal.h: Add prototypes for new functions.

	* sysdeps/unix/sysv/linux/alpha/bits/signum.h: Define SIG_HOLD.
	* sysdeps/unix/sysv/linux/bits/signum.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/signum.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/signum.h: Likewise.

1998-01-23 00:16  Tim Waugh  <tim@cyberelk.demon.co.uk>

	* posix/wordexp.c: Added IFS field-splitting in parameter and
	command substitution.  Fixed an IFS-related bug that caused an
	infinite loop.

1998-01-25 12:38  Ulrich Drepper  <drepper@cygnus.com>

	* stdlib/Makefile (routines): Add getcontext, setcontext, makecontext,
	and swapcontext.
	* stdlib/ucontext.h: Correct prototypes.
	* sysdeps/generic/getcontext.c: New file.
	* sysdeps/generic/setcontext.c: New file.
	* sysdeps/generic/makecontext.c: New file.
	* sysdeps/generic/swapcontext.c: New file.
	* sysdeps/unix/sysv/linux/sparc/sparc64/Makefile: Removed.

1998-01-25 04:07  Ulrich Drepper  <drepper@cygnus.com>

	* resource/sys/resource.h: Remove #include of ulimit.h which is
	not allowed by SUSv2 and not available on other systems.
	* sysdeps/unix/sysv/linux/ulimit.c: Include ulimit.h.

	* streams/Makefile: New file.
	* streams/stropts.h: New file.
	* sysdeps/generic/bits/stropts.h: New file.
	* sysdeps/generic/isastream.c: New file.
	* sysdeps/generic/getmsg.c: New file.
	* sysdeps/generic/getpmsg.c: New file.
	* sysdeps/generic/putmsg.c: New file.
	* sysdeps/generic/putpmsg.c: New file.
	* sysdeps/generic/fattach.c: New file.
	* sysdeps/generic/fdetach.c: New file.
	* sysdeps/unix/inet/Subdirs: Add streams.
	* sysdeps/generic/bits/types.h: Add definition of __t_scalar_t and
	__t_uscalar_t.
	* sysdeps/unix/sysv/linux/bits/types.h: Likewise.
	* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise.

	* sysdeps/mach/_strerror.c: Follow changes of generic version to
	handle small buffers correctly.

1998-01-24 17:31  H.J. Lu  <hjl@gnu.org>

	* sysdeps/alpha/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE):
	Remove the 3rd arg and add declaration for _dl_runtime_resolve
	and _dl_runtime_profile.

1998-01-25 02:42  Ulrich Drepper  <drepper@cygnus.com>

	* include/cpio.h: New file.  Mainly copied from GNU cpio.
	* posix/Makefile (headers): Add cpio.h.

2 files changed, 195 insertions, 79 deletions

diff --git a/posix/Makefile b/posix/Makefile
index b8fbbd2..2d69711 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@ headers	:= sys/utsname.h sys/times.h sys/wait.h sys/types.h unistd.h	      \
 	   bits/posix1_lim.h bits/posix2_lim.h bits/posix_opt.h 	      \
 	   bits/local_lim.h tar.h bits/utsname.h bits/confname.h	      \
 	   bits/waitflags.h bits/waitstatus.h sys/unistd.h sched.h	      \
-	   bits/sched.h re_comp.h wait.h bits/environments.h
+	   bits/sched.h re_comp.h wait.h bits/environments.h cpio.h
 
 distribute := confstr.h TESTS TESTS2C.sed testcases.h \
 	      globtest.c globtest.sh
diff --git a/posix/wordexp.c b/posix/wordexp.c
index 42b22ec..abd55a5 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -1,5 +1,5 @@
 /* POSIX.2 wordexp implementation.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Tim Waugh <tim@cyberelk.demon.co.uk>.
 
@@ -51,11 +51,13 @@
 /* Some forward declarations */
 static int parse_dollars (char **word, size_t *word_length, size_t *max_length,
 			  const char *words, size_t *offset, int flags,
-			  wordexp_t *pwordexp)
+			  wordexp_t *pwordexp, const char *ifs,
+			  const char *ifs_white)
      internal_function;
 static int parse_backtick (char **word, size_t *word_length,
 			   size_t *max_length, const char *words,
-			   size_t *offset, int flags, wordexp_t *pwordexp)
+			   size_t *offset, int flags, wordexp_t *pwordexp,
+			   const char *ifs, const char *ifs_white)
      internal_function;
 static int eval_expr (char *expr, int *result) internal_function;
 
@@ -315,7 +317,7 @@ static int
 internal_function
 parse_glob (char **word, size_t *word_length, size_t *max_length,
 	    const char *words, size_t *offset, int flags,
-	    wordexp_t *pwordexp, char *ifs)
+	    wordexp_t *pwordexp, const char *ifs, const char *ifs_white)
 {
   /* We are poised just after a '*' or a '{'. */
   int error;
@@ -332,7 +334,7 @@ parse_glob (char **word, size_t *word_length, size_t *max_length,
 
       case '$':
 	error = parse_dollars (word, word_length, max_length, words, offset,
-			       flags, pwordexp);
+			       flags, pwordexp, ifs, ifs_white);
 	if (error)
 	  return error;
 
@@ -583,8 +585,8 @@ parse_arith (char **word, size_t *word_length, size_t *max_length,
 	{
 	case '$':
 	  error = parse_dollars (&expr, &expr_length, &expr_maxlen,
-				 words, offset, flags, NULL);
-	  /* The NULL here is to tell parse_dollars not to
+				 words, offset, flags, NULL, NULL, NULL);
+	  /* The first NULL here is to tell parse_dollars not to
 	   * split the fields.
 	   */
 	  if (error)
@@ -597,8 +599,8 @@ parse_arith (char **word, size_t *word_length, size_t *max_length,
 	case '`':
 	  (*offset)++;
 	  error = parse_backtick (&expr, &expr_length, &expr_maxlen,
-				  words, offset, flags, NULL);
-	  /* The NULL here is to tell parse_backtick not to
+				  words, offset, flags, NULL, NULL, NULL);
+	  /* The first NULL here is to tell parse_backtick not to
 	   * split the fields.
 	   */
 	  if (error)
@@ -696,20 +698,15 @@ parse_arith (char **word, size_t *word_length, size_t *max_length,
 static int
 internal_function
 exec_comm (char *comm, char **word, size_t *word_length, size_t *max_length,
-	   int flags, wordexp_t *pwordexp)
+	   int flags, wordexp_t *pwordexp, const char *ifs,
+	   const char *ifs_white)
 {
   int fildes[2];
   int bufsize = 128;
   int buflen;
-  int state = 0;
   int i;
   char *buffer;
   pid_t pid;
-  /* 'state' is:
-   *  0 until first non-(whitespace-ifs)
-   *  1 after a non-ifs
-   *  2 after non-(whitespace-ifs)
-   */
 
   /* Don't fork() unless necessary */
   if (!comm || !*comm)
@@ -775,49 +772,99 @@ exec_comm (char *comm, char **word, size_t *word_length, size_t *max_length,
       close (fildes[0]);
       return 0;
     }
-
-  /* Not quoted - split fields.
-   * NB. This isn't done properly yet.
-   */
-  while (1)
+  else
+    /* Not quoted - split fields */
     {
-      if ((buflen = read (fildes[0], buffer, bufsize)) < 1)
-	{
-	  if (__waitpid (pid, NULL, WNOHANG) == 0)
-	    continue;
-	  if ((read (fildes[0], buffer, bufsize)) < 1)
-	    break;
-	}
+      int copying = 0;
+      /* 'copying' is:
+       *  0 when searching for first character in a field not IFS white space
+       *  1 when copying the text of a field
+       *  2 when searching for possible non-whitespace IFS
+       */
 
-      for (i = 0; i < buflen; ++i)
+      while (1)
 	{
-	  /* What if these aren't field separators? FIX */
-	  if (buffer[i] == ' ' || buffer[i] == '\t' || buffer[i] == '\n')
+	  if ((buflen = read (fildes[0], buffer, bufsize)) < 1)
 	    {
-	      if (state != 0)
-		state = 2;
-	      continue;
+	      if (__waitpid (pid, NULL, WNOHANG) == 0)
+		continue;
+	      if ((read (fildes[0], buffer, bufsize)) < 1)
+		break;
 	    }
 
-	  if (state == 2)
+	  for (i = 0; i < buflen; ++i)
 	    {
-	      /* End of word */
-	      if (w_addword (pwordexp, *word) == WRDE_NOSPACE)
+	      if (strchr (ifs, buffer[i]) != NULL)
 		{
-		  close (fildes[0]);
-		  return WRDE_NOSPACE;
-		}
+		  /* Current character is IFS */
+		  if (strchr (ifs_white, buffer[i]) == NULL)
+		    {
+		      /* Current character is IFS but not whitespace */
+		      if (copying == 2)
+			{
+			  /*            current character
+			   *                   |
+			   *                   V
+			   * eg: text<space><comma><space>moretext
+			   *
+			   * So, strip whitespace IFS (like at the start)
+			   */
+			  copying = 0;
+			  continue;
+			}
+
+		      copying = 0;
+		      /* fall through and delimit field.. */
+		    }
+		  else
+		    {
+		      /* Current character is IFS white space */
 
-	      *word = NULL;
-	      *word_length = 0;
-	    }
+		      /* If not copying a field, ignore it */
+		      if (copying != 1)
+			continue;
 
-	  state = 1;
-	  *word = w_addchar (*word, word_length, max_length, buffer[i]);
-	  if (*word == NULL)
-	    {
-	      close (fildes[0]);
-	      return WRDE_NOSPACE;
+		      /* End of field (search for non-IFS afterwards) */
+		      copying = 2;
+		    }
+
+		  /* First IFS white space, or IFS non-whitespace.
+		   * Delimit the field. */
+		  if (!*word)
+		    {
+		      /* This field is null, so make it an empty string */
+		      *word = w_addchar (*word, word_length, max_length, 0);
+		      if (*word == NULL)
+			{
+			  close (fildes[0]);
+			  return WRDE_NOSPACE;
+			}
+		    }
+
+		  if (w_addword (pwordexp, *word) == WRDE_NOSPACE)
+		    {
+		      /* Should do __waitpid? */
+		      close (fildes[0]);
+		      return WRDE_NOSPACE;
+		    }
+
+		  *word = NULL;
+		  *word_length = 0;
+		  *max_length = 0;
+		  /* fall back round the loop.. */
+		}
+	      else
+		{
+		  /* Not IFS character */
+		  copying = 1;
+		  *word = w_addchar (*word, word_length, max_length,
+				     buffer[i]);
+		  if (*word == NULL)
+		    {
+		      close (fildes[0]);
+		      return WRDE_NOSPACE;
+		    }
+		}
 	    }
 	}
     }
@@ -828,7 +875,8 @@ exec_comm (char *comm, char **word, size_t *word_length, size_t *max_length,
 
 static int
 parse_comm (char **word, size_t *word_length, size_t *max_length,
-	    const char *words, size_t *offset, int flags, wordexp_t *pwordexp)
+	    const char *words, size_t *offset, int flags, wordexp_t *pwordexp,
+	    const char *ifs, const char *ifs_white)
 {
   /* We are poised just after "$(" */
   int paren_depth = 1;
@@ -846,7 +894,7 @@ parse_comm (char **word, size_t *word_length, size_t *max_length,
 	    {
 	      /* Go -- give script to the shell */
 	      error = exec_comm (comm, word, word_length, max_length, flags,
-				 pwordexp);
+				 pwordexp, ifs, ifs_white);
 	      free (comm);
 	      return error;
 	    }
@@ -877,7 +925,8 @@ parse_comm (char **word, size_t *word_length, size_t *max_length,
 static int
 internal_function
 parse_param (char **word, size_t *word_length, size_t *max_length,
-	     const char *words, size_t *offset, int flags, wordexp_t *pwordexp)
+	     const char *words, size_t *offset, int flags, wordexp_t *pwordexp,
+	     const char *ifs, const char *ifs_white)
 {
   /* We are poised just after "$" */
   enum remove_pattern_enum
@@ -1264,8 +1313,65 @@ envsubst:
     /* Quoted - no field split */
     *word = w_addstr (*word, word_length, max_length, value);
   else
-    /* Should field-split here - FIX */
-    *word = w_addstr (*word, word_length, max_length, value);
+    {
+      /* Need to field-split */
+      char *field_begin = value;
+      int seen_nonws_ifs = 0;
+
+      do
+	{
+	  char *field_end = field_begin;
+	  char *field;
+	  char *next_field;
+	  char ch;
+
+	  /* Skip IFS whitespace before the field */
+	  while (*field_begin && strchr (ifs_white, *field_begin) != NULL)
+	    field_begin++;
+
+	  if (!seen_nonws_ifs && *field_begin == 0)
+	    /* Nothing but whitespace */
+	    return 0;
+
+	  /* Search for the end of the field */
+	  field_end = field_begin;
+	  while (*field_end && strchr (ifs, *field_end) == NULL)
+	    field_end++;
+
+	  /* Set up pointer to the character after end of field */
+	  ch = *field_end;
+	  next_field = ch ? field_end : NULL;
+
+	  /* Skip whitespace IFS after the field */
+	  while (next_field && *next_field && strchr (ifs_white, *next_field))
+	    next_field++;
+
+	  /* Skip at most one non-whitespace IFS character after the field */
+	  seen_nonws_ifs = 0;
+	  if (next_field && *next_field && strchr (ifs, *next_field))
+	    {
+	      seen_nonws_ifs = 1;
+	      next_field++;
+	    }
+
+	  /* Null-terminate it and make a copy */
+	  *field_end = 0;
+	  field = __strdup (field_begin);
+	  if (field == NULL)
+	    goto no_space;
+
+	  /* Tag the field onto the word list */
+	  if (w_addword (pwordexp, field) == WRDE_NOSPACE)
+	    return WRDE_NOSPACE;
+
+	  *word = NULL;
+	  *word_length = *max_length = 0;
+
+	  field_begin = next_field;
+	} while (seen_nonws_ifs || (field_begin && *field_begin));
+
+      return 0;
+    }
 
   return *word ? 0 : WRDE_NOSPACE;
 
@@ -1292,7 +1398,7 @@ static int
 internal_function
 parse_dollars (char **word, size_t *word_length, size_t *max_length,
 	       const char *words, size_t *offset, int flags,
-	       wordexp_t *pwordexp)
+	       wordexp_t *pwordexp, const char *ifs, const char *ifs_white)
 {
   /* We are poised _at_ "$" */
   switch (words[1 + *offset])
@@ -1317,7 +1423,7 @@ parse_dollars (char **word, size_t *word_length, size_t *max_length,
 
       (*offset) += 2;
       return parse_comm (word, word_length, max_length, words, offset, flags,
-			 pwordexp);
+			 pwordexp, ifs, ifs_white);
 
     case '[':
       (*offset) += 2;
@@ -1329,14 +1435,14 @@ parse_dollars (char **word, size_t *word_length, size_t *max_length,
     default:
       ++(*offset);	/* parse_param needs to know if "{" is there */
       return parse_param (word, word_length, max_length, words, offset, flags,
-			  pwordexp);
+			  pwordexp, ifs, ifs_white);
     }
 }
 
 static int
 parse_backtick (char **word, size_t *word_length, size_t *max_length,
 		const char *words, size_t *offset, int flags,
-		wordexp_t *pwordexp)
+		wordexp_t *pwordexp, const char *ifs, const char *ifs_white)
 {
   /* We are poised just after "`" */
   int error;
@@ -1352,7 +1458,7 @@ parse_backtick (char **word, size_t *word_length, size_t *max_length,
 	case '`':
 	  /* Go -- give the script to the shell */
 	  error = exec_comm (comm, word, word_length, max_length, flags,
-			     pwordexp);
+			     pwordexp, ifs, ifs_white);
 	  free (comm);
 	  return error;
 
@@ -1414,8 +1520,8 @@ parse_dquote (char **word, size_t *word_length, size_t *max_length,
 
 	case '$':
 	  error = parse_dollars (word, word_length, max_length, words, offset,
-				 flags, NULL);
-	  /* The NULL here is to tell parse_dollars not to
+				 flags, NULL, NULL, NULL);
+	  /* The first NULL here is to tell parse_dollars not to
 	   * split the fields.
 	   */
 	  if (error)
@@ -1429,8 +1535,8 @@ parse_dquote (char **word, size_t *word_length, size_t *max_length,
 
 	  ++(*offset);
 	  error = parse_backtick (word, word_length, max_length, words,
-				  offset, flags, NULL);
-	  /* The NULL here is to tell parse_backtick not to
+				  offset, flags, NULL, NULL, NULL);
+	  /* The first NULL here is to tell parse_backtick not to
 	   * split the fields.
 	   */
 	  if (error)
@@ -1527,25 +1633,33 @@ wordexp (const char *words, wordexp_t *pwordexp, int flags)
   ifs = getenv ("IFS");
 
   if (!ifs)
-    ifs = strcpy (ifs_white, " \t\n");
+    /* NULL IFS means no field-splitting is to be performed */
+    ifs = strcpy (ifs_white, "");
   else
     {
       char *ifsch = ifs;
       char *whch = ifs_white;
 
+      /* Start off with no whitespace IFS characters */
+      ifs_white[0] = '\0';
+
       while (*ifsch != '\0')
-	if ((*ifsch == ' ') || (*ifsch == '\t') || (*ifsch == '\n'))
-	  {
-	    /* White space IFS.  See first whether it is already in our
-	       collection.  */
-	    char *runp = ifs_white;
+	{
+	  if ((*ifsch == ' ') || (*ifsch == '\t') || (*ifsch == '\n'))
+	    {
+	      /* Whitespace IFS.  See first whether it is already in our
+		 collection.  */
+	      char *runp = ifs_white;
 
-	    while (runp < whch && *runp != '\0' && *runp != *ifsch)
-	      ++runp;
+	      while (runp < whch && *runp != '\0' && *runp != *ifsch)
+		++runp;
 
-	    if (runp == whch)
-	      *whch++ = *ifsch;
-	  }
+	      if (runp == whch)
+		*whch++ = *ifsch;
+	    }
+
+	  ifsch++;
+	}
       *whch = '\0';
     }
 
@@ -1578,7 +1692,7 @@ wordexp (const char *words, wordexp_t *pwordexp, int flags)
 
       case '$':
 	error = parse_dollars (&word, &word_length, &max_length, words,
-			       &words_offset, flags, pwordexp);
+			       &words_offset, flags, pwordexp, ifs, ifs_white);
 
 	if (error)
 	  goto do_error;
@@ -1591,7 +1705,8 @@ wordexp (const char *words, wordexp_t *pwordexp, int flags)
 
 	++words_offset;
 	error = parse_backtick (&word, &word_length, &max_length, words,
-				&words_offset, flags, pwordexp);
+				&words_offset, flags, pwordexp, ifs,
+				ifs_white);
 
 	if (error)
 	  goto do_error;
@@ -1630,7 +1745,7 @@ wordexp (const char *words, wordexp_t *pwordexp, int flags)
       case '*':
       case '{':
 	error = parse_glob (&word, &word_length, &max_length, words,
-			    &words_offset, flags, pwordexp, ifs);
+			    &words_offset, flags, pwordexp, ifs, ifs_white);
 
 	if (error)
 	  goto do_error;
@@ -1670,6 +1785,7 @@ wordexp (const char *words, wordexp_t *pwordexp, int flags)
 
 	    word = NULL;
 	    word_length = 0;
+	    max_length = 0;
 	    break;
 	  }