Skip to content

Commit 0227559

Browse files
committed
Merge from gnulib
This merges some getopt fixes from Zack Weinberg, and affects only non-GNUish platforms. It incorporates: 2017-04-06 getopt-gnu: omit some duplicate code 2017-04-06 getopt-posix: use angle-bracket include 2017-04-06 getopt: annotate files with relationship to glibc 2017-04-06 getopt: split up getopt.in.h and eliminate __need_getopt 2017-04-06 getopt: better handling of ambiguous options 2017-04-06 getopt: refactor long-option handling 2017-04-06 getopt: tidy up _getopt_initialize a bit 2017-04-06 getopt: merge from glibc: repetition reduction 2017-04-06 getopt: clean up error reporting 2017-04-06 getopt: fix fencepost error in ambiguous-W-option handling 2017-04-06 getopt: clean up getopt.c and getopt1.c file headers 2017-04-06 getopt: harmonize comments with glibc 2017-04-06 getopt: remove USE_NONOPTION_FLAGS 2017-04-06 getopt: tabify, in preparation for merge with glibc 2017-04-06 md5, sha1, sha256, sha512: Add comments re correctness * build-aux/config.sub, doc/misc/texinfo.tex, lib/getopt.c: * lib/getopt.in.h, lib/getopt1.c, lib/getopt_int.h, lib/md5.c: * lib/md5.h, lib/sha1.c, lib/sha1.h, lib/sha256.c, lib/sha256.h: * lib/sha512.c, lib/sha512.h, lib/unistd.in.h, m4/getopt.m4: Copy from gnulib. * lib/getopt_cdefs.in.h, lib/getopt_core.h, lib/getopt_ext.h: * lib/getopt_pfx_core.h, lib/getopt_pfx_ext.h: New files, taken from gnulib. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
1 parent 451a0c8 commit 0227559

23 files changed

+1049
-1377
lines changed

build-aux/config.sub

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Configuration validation subroutine script.
33
# Copyright 1992-2017 Free Software Foundation, Inc.
44

5-
timestamp='2017-03-21'
5+
timestamp='2017-04-02'
66

77
# This file is free software; you can redistribute it and/or modify it
88
# under the terms of the GNU General Public License as published by
@@ -263,7 +263,7 @@ case $basic_machine in
263263
| fido | fr30 | frv | ft32 \
264264
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
265265
| hexagon \
266-
| i370 | i860 | i960 | ia64 \
266+
| i370 | i860 | i960 | ia16 | ia64 \
267267
| ip2k | iq2000 \
268268
| k1om \
269269
| le32 | le64 \
@@ -389,7 +389,7 @@ case $basic_machine in
389389
| h8300-* | h8500-* \
390390
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
391391
| hexagon-* \
392-
| i*86-* | i860-* | i960-* | ia64-* \
392+
| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
393393
| ip2k-* | iq2000-* \
394394
| k1om-* \
395395
| le32-* | le64-* \

doc/misc/texinfo.tex

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
% Load plain if necessary, i.e., if running under initex.
44
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
55
%
6-
\def\texinfoversion{2017-03-07.20}
6+
\def\texinfoversion{2017-03-25.14}
77
%
88
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
99
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
10-
% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
10+
% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
1111
% Free Software Foundation, Inc.
1212
%
1313
% This texinfo.tex file is free software: you can redistribute it and/or
@@ -11312,7 +11312,6 @@
1131211312
%
1131311313
\lispnarrowing = 0.3in
1131411314
\tolerance = 700
11315-
\hfuzz = 1pt
1131611315
\contentsrightmargin = 0pt
1131711316
\defbodyindent = .5cm
1131811317
}}
@@ -11330,7 +11329,6 @@
1133011329
%
1133111330
\lispnarrowing = 0.25in
1133211331
\tolerance = 700
11333-
\hfuzz = 1pt
1133411332
\contentsrightmargin = 0pt
1133511333
\defbodyindent = .4cm
1133611334
}}
@@ -11356,7 +11354,6 @@
1135611354
{297mm}{210mm}%
1135711355
%
1135811356
\tolerance = 700
11359-
\hfuzz = 1pt
1136011357
\contentsrightmargin = 0pt
1136111358
\defbodyindent = 5mm
1136211359
}}
@@ -11375,7 +11372,6 @@
1137511372
%
1137611373
\lispnarrowing = 0.2in
1137711374
\tolerance = 800
11378-
\hfuzz = 1.2pt
1137911375
\contentsrightmargin = 0pt
1138011376
\defbodyindent = 2mm
1138111377
\tableindent = 12mm
@@ -11431,6 +11427,9 @@
1143111427
%
1143211428
\letterpaper
1143311429
11430+
% Default value of \hfuzz, for suppressing warnings about overfull hboxes.
11431+
\hfuzz = 1pt
11432+
1143411433
1143511434
\message{and turning on texinfo input format.}
1143611435

0 commit comments

Comments
 (0)