Update.

1998-09-09 09:32  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/powerpc/dl-machine.h (elf_machine_rela): Make function
	inline.

1998-09-07  Paul Eggert  <eggert@twinsun.com>

	* time/mktime.c (__EXTENSIONS__): Define if not defined.
	(_REENTRANT): Remove.  It has undesirable consequences in
	Solaris 2.6 (e.g. it turns off the putc macro).  Defining
	__EXTENSIONS__ makes localtime_r and gmtime_r visible, which
	is what we want.
	* time/strftime.c: Likewise.

1998-09-08  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/dl-error.c: Fix spelling.

1998-09-08  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* stdlib/strfmon.c: Quiet -Wparentheses warnings.
	* stdio-common/_itoa.c: Likewise.
	* stdio-common/printf_fp.c: Likewise.
	* stdio-common/vfscanf.c: Likewise.
	* wcsmbs/wcstok.c: Likewise.
	* sysdeps/generic/glob.c: Likewise.
	* posix/getopt.c: Likewise.
	* sysdeps/posix/getaddrinfo.c: Likewise.
	* posix/wordexp.c: Likewise.
	* io/ftw.c: Likewise.
	* io/fts.c: Likewise.
	* misc/getpass.c: Likewise.
	* iconv/gconv_conf.c: Likewise.
	* argp/argp-fmtstream.c: Likewise.
	* argp/argp-help.c: Likewise.
	* elf/dl-load.c: Likewise.
	* locale/programs/stringtrans.c: Likewise.
	* catgets/gencat.c: Likewise.
	* posix/getconf.c: Likewise.
	* iconv/gconv_conf.c: Likewise.
	* iconv/iconv_prog.c: Likewise.

	* string/strcoll.c: Optimize a few expressions.
	* string/strxfrm.c: Likewise.

1998-09-08  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/dl-open.c (dl_open_worker): Move decl of new_global up one
	level to avoid uninit variable warning.

1998-09-09 10:34  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
	instead of _dl_default_scope[2] as argument to _dl_init_next.
	Fix compatibility problems introduced in last change.

3 files changed, 33 insertions, 25 deletions

diff --git a/posix/getconf.c b/posix/getconf.c
index 7219c8d5a5..f0b8c910ab 100644
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -662,11 +662,13 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 	      usage ();
 	    value = sysconf (c->call_name);
 	    if (value == -1l)
-	      if (c->call_name == _SC_UINT_MAX
-		  || c->call_name == _SC_ULONG_MAX)
-		printf ("%lu\n", value);
-	      else
-		puts (_("undefined"));
+	      {
+		if (c->call_name == _SC_UINT_MAX
+		    || c->call_name == _SC_ULONG_MAX)
+		  printf ("%lu\n", value);
+		else
+		  puts (_("undefined"));
+	      }
 	    else
 	      printf ("%ld\n", value);
 	    exit (0);
diff --git a/posix/getopt.c b/posix/getopt.c
index 4d837c041a..81cef23f9b 100644
--- a/posix/getopt.c
+++ b/posix/getopt.c
@@ -695,16 +695,18 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	      else
 		{
 		  if (opterr)
-		   if (argv[optind - 1][1] == '-')
-		    /* --option */
-		    fprintf (stderr,
-		     _("%s: option `--%s' doesn't allow an argument\n"),
-		     argv[0], pfound->name);
-		   else
-		    /* +option or -option */
-		    fprintf (stderr,
-		     _("%s: option `%c%s' doesn't allow an argument\n"),
-		     argv[0], argv[optind - 1][0], pfound->name);
+		    {
+		      if (argv[optind - 1][1] == '-')
+			/* --option */
+			fprintf (stderr,
+				 _("%s: option `--%s' doesn't allow an argument\n"),
+				 argv[0], pfound->name);
+		      else
+			/* +option or -option */
+			fprintf (stderr,
+				 _("%s: option `%c%s' doesn't allow an argument\n"),
+				 argv[0], argv[optind - 1][0], pfound->name);
+		    }
 
 		  nextchar += strlen (nextchar);
 
diff --git a/posix/wordexp.c b/posix/wordexp.c
index dff5d30dad..0eb0721230 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -426,6 +426,7 @@ parse_glob (char **word, size_t *word_length, size_t *max_length,
 
       /* Sort out quoting */
       if (words[*offset] == '\'')
+	{
 	  if (quoted == 0)
 	    {
 	      quoted = 1;
@@ -436,17 +437,20 @@ parse_glob (char **word, size_t *word_length, size_t *max_length,
 	      quoted = 0;
 	      continue;
 	    }
+	}
       else if (words[*offset] == '"')
-	if (quoted == 0)
-	  {
-	    quoted = 2;
-	    continue;
-	  }
-	else if (quoted == 2)
-	  {
-	    quoted = 0;
-	    continue;
-	  }
+	{
+	  if (quoted == 0)
+	    {
+	      quoted = 2;
+	      continue;
+	    }
+	  else if (quoted == 2)
+	    {
+	      quoted = 0;
+	      continue;
+	    }
+	}
 
       /* Sort out other special characters */
       if (quoted != 1 && words[*offset] == '$')