From 2b2290caba9fa19a80c5b4e79881768fc45bac77 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Wed, 13 Nov 2013 20:04:18 +0000
Subject: [PATCH] 	* newlib/libc/stdlib/getopt.c (getopt_internal): Add
 missing braces.

---
 newlib/ChangeLog            |  4 ++++
 newlib/libc/stdlib/getopt.c | 28 ++++++++++++++++------------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index f0e82c6d6..42d1add16 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-13  Gregory Pietsch <gpietsch@comcast.net>
+
+	* newlib/libc/stdlib/getopt.c (getopt_internal): Add missing braces.
+
 2013-11-13  Freddie Chopin  <freddie_chopin@op.pl>
 
 	* newlib/libc/include/getopt.h (struct option): name field should be
diff --git a/newlib/libc/stdlib/getopt.c b/newlib/libc/stdlib/getopt.c
index 2ab53aa6d..109474764 100644
--- a/newlib/libc/stdlib/getopt.c
+++ b/newlib/libc/stdlib/getopt.c
@@ -317,14 +317,16 @@ getopt_internal (int argc, char *const argv[], const char *shortopts,
 		    {
 		      /* we have ambiguous options */
 		      if (data->opterr)
-			fputs (argv[0], stderr);
-			fputs (": option `", stderr);
-			fputs (argv[data->optind], stderr);
-			fputs ("' is ambiguous (could be `--", stderr);
-			fputs (longopts[longopt_match].name, stderr);
-			fputs ("' or `--", stderr);
-			fputs (longopts[optindex].name, stderr);
-			fputs ("')\n", stderr);
+			{
+			  fputs (argv[0], stderr);
+			  fputs (": option `", stderr);
+			  fputs (argv[data->optind], stderr);
+			  fputs ("' is ambiguous (could be `--", stderr);
+			  fputs (longopts[longopt_match].name, stderr);
+			  fputs ("' or `--", stderr);
+			  fputs (longopts[optindex].name, stderr);
+			  fputs ("')\n", stderr);
+			}
 		      return (data->optopt = '?');
 		    }
 		}
@@ -342,10 +344,12 @@ getopt_internal (int argc, char *const argv[], const char *shortopts,
 	{
 	  /* couldn't find option in shortopts */
 	  if (data->opterr)
-	    fputs (argv[0], stderr);
-	    fputs (": invalid option -- `-", stderr);
-	    fputc (argv[data->optind][data->optwhere], stderr);
-	    fputs ("'\n", stderr);
+	    {
+	      fputs (argv[0], stderr);
+	      fputs (": invalid option -- `-", stderr);
+	      fputc (argv[data->optind][data->optwhere], stderr);
+	      fputs ("'\n", stderr);
+	    }
 	  data->optwhere++;
 	  if (argv[data->optind][data->optwhere] == '\0')
 	    {