From 5e0f3ebb5f985a9ad8fa3d57ab8c1f0669056630 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Mon, 30 May 2016 17:53:23 -0400 Subject: Update getopt from GLIBC. --- ChangeLog | 2 ++ getopt.c | 4 ++-- getopt.h | 2 +- getopt1.c | 2 +- getopt_int.h | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77119e0d..3e2d8d2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ * field.c (set_FS): Handle FS = "\0" if RS = "". Thanks to Janis Papanagnou for the report. + * getopt.c, getopt.h, getopt1.c, getopt_int.h: Sync with GLIBC. + 2016-05-26 Andrew J. Schorr * awk.h (get_actual_argument): Remove unused "optional" argument. diff --git a/getopt.c b/getopt.c index 4de0b9a0..8bc59610 100644 --- a/getopt.c +++ b/getopt.c @@ -2,7 +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-2015 Free Software Foundation, Inc. + Copyright (C) 1987-2016 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 @@ -597,7 +597,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, char *buf = NULL; size_t buflen = 0; - FILE *fp = open_memstream (&buf, &buflen); + FILE *fp = __open_memstream (&buf, &buflen); if (fp != NULL) { fprintf (fp, diff --git a/getopt.h b/getopt.h index 75cd5e8d..8393569d 100644 --- a/getopt.h +++ b/getopt.h @@ -1,5 +1,5 @@ /* Declarations for getopt. - Copyright (C) 1989-2015 Free Software Foundation, Inc. + Copyright (C) 1989-2016 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 diff --git a/getopt1.c b/getopt1.c index b61041db..438fe52b 100644 --- a/getopt1.c +++ b/getopt1.c @@ -1,5 +1,5 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987-2015 Free Software Foundation, Inc. + Copyright (C) 1987-2016 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 diff --git a/getopt_int.h b/getopt_int.h index 03d62277..514a1beb 100644 --- a/getopt_int.h +++ b/getopt_int.h @@ -1,5 +1,5 @@ /* Internal declarations for getopt. - Copyright (C) 1989-2015 Free Software Foundation, Inc. + Copyright (C) 1989-2016 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 -- cgit v1.2.3