diff options
| author | Juergen Kahrs <Juergen.Kahrs@googlemail.com> | 2013-04-28 19:30:52 +0200 |
|---|---|---|
| committer | Juergen Kahrs <Juergen.Kahrs@googlemail.com> | 2013-04-28 19:30:52 +0200 |
| commit | 11c996c675afa475d46834b2b09039097e25afb5 (patch) | |
| tree | 8e720e41b15affe811b21d74bddba14c302612fa /getopt.c | |
| parent | 74db9f3cb12c4c45487b8646473daad7d0df641f (diff) | |
| parent | 1dd19986291bdd1129ac08eec40d963a65170422 (diff) | |
| download | egawk-11c996c675afa475d46834b2b09039097e25afb5.tar.gz egawk-11c996c675afa475d46834b2b09039097e25afb5.tar.bz2 egawk-11c996c675afa475d46834b2b09039097e25afb5.zip | |
Merge remote-tracking branch 'origin/master' into cmake
Conflicts:
README_d/ChangeLog
Diffstat (limited to 'getopt.c')
| -rw-r--r-- | getopt.c | 25 |
1 files changed, 12 insertions, 13 deletions
@@ -2,8 +2,7 @@ NOTE: getopt is part of the C library, so if you don't know what "Keep this file name-space clean" means, talk to drepper@gnu.org before changing it! - Copyright (C) 1987-1996,1998-2004,2008,2009,2010,2011 - Free Software Foundation, Inc. + Copyright (C) 1987-2013 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 @@ -614,19 +613,19 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, fputc_unlocked ('\n', fp); if (__builtin_expect (fclose (fp) != EOF, 1)) - { - _IO_flockfile (stderr); + { + _IO_flockfile (stderr); - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; - __fxprintf (NULL, "%s", buf); + __fxprintf (NULL, "%s", buf); - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); + ((_IO_FILE *) stderr)->_flags2 = old_flags2; + _IO_funlockfile (stderr); - free (buf); - } + free (buf); + } } #else fprintf (stderr, @@ -1106,8 +1105,8 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, } no_longs: - d->__nextchar = NULL; - return 'W'; /* Let the application handle it. */ + d->__nextchar = NULL; + return 'W'; /* Let the application handle it. */ } if (temp[1] == ':') { |