diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:55:47 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:55:47 +0000 |
| commit | cd10ccf4d1b4671883a0d45f6769947a6cdb45d0 (patch) | |
| tree | b14481899a2c6c4dd53beed82f0f61c6f77254d1 | |
| parent | Adding upstream version 1.21.4. (diff) | |
| download | wget-upstream.tar.xz wget-upstream.zip | |
Adding upstream version 1.24.5.upstream/1.24.5upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
1099 files changed, 35328 insertions, 15570 deletions
diff --git a/.tarball-version b/.tarball-version index 20a1265..6521720 100644 --- a/.tarball-version +++ b/.tarball-version @@ -1 +1 @@ -1.21.4 +1.24.5 @@ -1 +1 @@ -1.21.4 +1.24.5 @@ -1,62 +1,366 @@ Authors of GNU Wget. +Thank you very much for spending your time ! -[ Note that this file does not attempt to list all the contributors to - Wget; look at the ChangeLogs for that. This is a list of people who - contributed sizeable amounts of code and assigned the copyright to - the FSF. ] -Hrvoje Niksic. Designed and implemented Wget. +This list of contributors is maintained in +(more or less) the order of date of first commit. +Those with the "ASSGN" tag have assigned the copyrights +of their patches to the FSF. -Gordon Matzigkeit. Wrote netrc.c and netrc.h. +The list was generated on 14.05.23 by parsing the ChangeLog +file until 2014 and the git commit history after that. -Darko Budor. Wrote initial support for Windows, wrote wsstartup.c, -wsstartup.h and windecl.h. (The files were later renamed, but his -code and ideas remained present.) +Current Maintainers: -Junio Hamano. Added support for FTP Opie and HTTP digest -authentication. +[ASSGN] Darshit Shah *darnir [at] gnu.org* +[ASSGN] Tim Rühsen *tim.ruehsen [at] gmx.de* -Dan Harkless. Added --backup-converted, --follow-tags, --html-extension, ---ignore-tags, and --page-requisites; improved documentation; etc. Was -the principle maintainer of GNU Wget for some time. +Contributors: -Christian Fraenkel. Initially implemented SSL support. -Thomas Lussnig. Initially implemented IPv6 support. - -Ian Abbott. Contributed bugfixes, Windows-related fixes, provided a -prototype implementation of the new recursive code, and more. -Co-maintained Wget during the 1.8 release cycle. - -Gisle Vanem. Contributed Windows and MS-DOS improvements, including a -port of run_with_timeout to Windows, additions to Makefiles, and many -bug reports and fixes. - -Mauro Tortonesi. Improved IPv6 support, adding support for dual -family systems. Refactored and enhanced FTP IPv6 code. Maintained GNU -Wget from 2004-2007. - -Nicolas Schodet. Contributed to cookie code and documentation. - -Daniel Stenberg. NTLM authentication in http-ntlm.c and http-ntlm.h -originally written for curl donated for use in GNU Wget. - -Micah Cowan. Maintained Wget from mid-2007 to mid-2010. - -Ralf Wildenhues. Contributed patches to convert Wget to use Automake as -part of its build process, and various bugfixes. - -Steven Schubiger. Many helpful patches, bugfixes and improvements. -Notably, conversion of Wget to use the Gnulib quotes and quoteargs -modules, and the addition of password prompts at the console, via the -Gnulib getpasswd-gnu module. - -Ted Mielczarek. Support for parsing links from CSS. - -Saint Xavier. Support for IRIs (RFC 3987). - -Giuseppe Scrivano. Added support for HTTP/1.1. Active Wget Maintainer from 2010-2015. - -Tim Ruehsen. Active Wget Maintainer / Developer from 2012-2020. - -Darshit Shah. Active Wget Maintainer / Developer from 2013-2020. +[ASSGN] Hrvoje Niksic *hniksic [at] srce.hr* + Designed and implemented Wget. +[ ] Hrvoje Lacko *hlacko [at] fly.cc.fer.hr* +[ ] Antonio Rosella *antonio.rosella [at] agip.it* +[ ] Drazen Kacar *dave [at] fly.cc.fer.hr* +[ ] Tage Stabell-Kulo *tage [at] acm.org* +[ ] Shawn McHorse *riffraff [at] txdirect.net* +[ ] Mark Boyns *boyns [at] sdsu.edu* +[ ] Dieter Baron *dillo [at] danbala.tuwien.ac.at* +[ ] Gregor Hoffleit *flight [at] mathi.uni-heidelberg.DE* +[ ] Kaveh R. Ghazi *ghazi [at] caip.rutgers.edu* +[ASSGN] Gordon Matzigkeit *gord [at] gnu.ai.mit.edu* + Wrote netrc.c and netrc.h. +[ASSGN] Darko Budor *dbudor [at] zems.fer.hr* + Wrote initial support for Windows, wrote wsstartup.c, + wsstartup.h and windecl.h.(The files were later renamed, + but his code and ideas remained present.) +[ ] Roger Beeman *beeman [at] cisco.com* +[ ] Marin Purgar *pmc [at] asgard.hr* +[ ] gilles Cedoc *gilles [at] cedocar.fr* +[ ] Karl Eichwalder *ke [at] ke.Central.DE* +[ ] Fila Kolodny *fila [at] ibi.com* +[ ] Andreas Schwab *schwab [at] issan.informatik.uni-dortmund.de* +[ ] Mike Thomas *mthomas [at] reality.ctron.com* +[ ] Francois Pinard *pinard [at] iro.umontreal.ca* +[ ] Jordan Mendelson *jordy [at] wserv.com* +[ ] Karl Heuer *kwzh [at] gnu.org* +[ ] Andy Eskilsson *andy.eskilsson [at] telelogic.se* +[ ] Karl Eichwalder *ke [at] suse.de* +[ ] Simon Josefsson *jas [at] pdc.kth.se* +[ ] Karl Eichwalder *karl [at] suse.de* +[ASSGN] Junio Hamano *junio [at] twinsun.com* + Added support for FTP Opie and HTTP digest authentication. +[ ] Tim Adam *tma [at] osa.com.au* +[ ] Wanderlei Cavassin *cavassin [at] conectiva.com.br* +[ASSGN] Jan Prikryl *prikryl [at] cg.tuwien.ac.at* +[ ] John *john [at] futuresguide.com* +[ ] Tim Charron *tcharron [at] interlog.com* +[ ] Robert Schmidt *rsc [at] vingmed.no* +[ ] Stefan Hornburg *racke [at] gundel.han.de* +[ ] Giovanni Bortolozzo *borto [at] dei.unipd.it* +[ ] Gregor Hoffleit *flight [at] mathi.uni-heidelberg.de* +[ ] Douglas E. Wegscheid *wegscd [at] whirlpool.com* +[ ] Toomas Soome *tsoome [at] ut.ee* +[ ] Simos KSenitellis *simos [at] teiath.gr* +[ ] Juan Jose Rodriguez *jcnsoft [at] jal1.telmex.net.mx* +[ ] Dominique Delamarre *dominique.delamarre [at] hol.fr* +[ ] Martin Kraemer *Martin.Kraemer [at] mch.sni.de* +[ ] Mathieu Guillaume *mat [at] cythere.com* +[ ] Alexander Kourakos *awk [at] bnt.com* +[ ] Dave Love *d.love [at] dl.ac.uk* +[ ] Heinz Salzmann *heinz.salzmann [at] intermetall.de* +[ ] Adam D. Moss *adam [at] foxbox.org* +[ ] Howard Gayle *howard [at] fjst.com* +[ ] Hans Grobler *grobh [at] conde.ee.sun.ac.za* +[ ] Szakacsits Szabolcs *szaka [at] sienet.hu* +[ ] Simon Munton *simonm [at] m4data.co.uk* +[ ] Edward J. Sabol *sabol [at] alderaan.gsfc.nasa.gov* +[ ] "R. K. Owen" *rkowen [at] Nersc.GOV* +[ ] Alexander V. Lukyanov *lav [at] yars.free.net* +[ ] andrew deryabin *djsf [at] softhome.net* +[ ] Heiko Herold *Heiko.Herold [at] previnet.it* +[ ] Dan Berger *dberger [at] ix.netcom.com* +[ ] Charles G Waldman *cgw [at] fnal.gov* +[ ] Damir Dzeko *ddzeko [at] zesoi.fer.hr* +[ASSGN] Dan Harkless *wget [at] harkless.org* + Added --backup-converted, --follow-tags, --html-extension, + --ignore-tags, and --page-requisites; + improved documentation; etc. Was the principle maintainer + of GNU Wget for some time. +[ ] Daniel S. Lewart *d-lewart [at] uiuc.edu* +[ ] HIROSE Masaaki *hirose31 [at] t3.rim.or.jp* +[ ] Const Kaplinsky *const [at] ce.cctpu.edu.ru* +[ ] John Daily *jdaily [at] cyberdude.com* +[ ] Adrian Aichner *adrian [at] xemacs.org* +[ ] Matthew Seaman *m.seaman [at] inpharmatica.co.uk* +[ ] Tyler Riddle *triddle [at] liquidmarket.com* +[ ] John Summerfield *summer [at] OS2.ami.com.au* +[ ] Csaba Raduly *csaba.raduly [at] sophos.com* +[ ] Igor Khristophorov *igor [at] atdot.org* +[ ] Adrian Aichner *Adrian.Aichner [at] t-online.de* +[ ] Jonas Jensen *bones [at] huleboer.dk* +[ ] Tim Mooney *mooney [at] dogbert.cc.ndsu.NoDak.edu* +[ ] Hack Kampbjørn *hack [at] hackdata.com* +[ ] Philipp Thomas *pthomas [at] suse.de* +[ ] Nicolas Lichtmaier *nick [at] debian.org* +[ ] KOJIMA Hajime *kjm [at] rins.ryukoku.ac.jp* +[ ] Paul Bludov *paul [at] ozero.net* +[ ] Trond Eivind Glomsrod *teg [at] redhat.com* +[ASSGN] Ian Abbott *abbotti [at] mev.co.uk* + Contributed bugfixes, Windows-related fixes, provided a + prototype implementation of the new recursive code, and more. + Co-maintained Wget during the 1.8 release cycle. +[ASSGN] Maciej W. Rozycki *macro [at] ds2.pg.gda.pl* +[ ] R.I.P. Deaddog *maddog [at] linuxhall.org* +[ ] Adam J. Richter *adam [at] yggdrasil.com* +[ ] Dave Turner *dct25 [at] hermes.cam.ac.uk* +[ASSGN] Christian Fraenkel *c.fraenkel [at] gmx.net* + Initially implemented SSL support. +[ ] Daniel BODEA *dali [at] dali-designs.com* +[ ] Alan Eldridge *alane [at] geeksrus.net* +[ ] Chris Seawood *cls [at] seawood.org* +[ ] Peter Farmer *peter.farmer [at] zveno.com* +[ ] Jochen Hein *jochen [at] jochen.org* +[ ] Lemble Gregory *gregory.lemble [at] st.com* +[ ] Ingo T. Storm *tux-sparc [at] computerbild.de* +[ ] T. Bharath *TBharath [at] responsenetworks.com* +[ ] Andre Majorel *amajorel [at] teaser.fr* +[ ] Christian Lackas *delta [at] lackas.net* +[ ] Andreas Damm *andreas-sourceforge [at] radab.org* +[ ] Chin-yuan Kuo *sr1111111 [at] yahoo.com.tw* +[ASSGN] Thomas Lussnig *thomas.lussnig [at] bewegungsmelder.de* + Initially implemented IPv6 support. +[ ] Bill Richardson *bill [at] riverstonenet.com* +[ASSGN] Nicolas Schodet *contact [at] ni.fr.eu.org* + Contributed to cookie code and documentation. +[ ] Ahmon Dancy *dancy [at] dancysoft.com* +[ ] Noel Kothe *noel [at] debian.org* +[ ] Aurelien Marchand *artaxerxes [at] users.sf.net* +[ ] Aaron S. Hawley *Aaron.Hawley [at] uvm.edu* +[ ] Bertrand Demiddelaer *bert [at] b3rt.org* +[ ] Matthew J. Mellon *mellon [at] tymenet.com* +[ASSGN] Gisle Vanem *giva [at] bgnett.no* + Contributed Windows and MS-DOS improvements, including a + port of run_with_timeout to Windows, additions to Makefiles, + and many bug reports and fixes. +[ ] Philip Stadermann *philip.stadermann [at] credativ.de* +[ ] Dennis Smit *ds [at] nerds-incorporated.org* +[ ] Christian Biere *christianbiere [at] gmx.de* +[ ] David Fritz *zeroxdf [at] att.net* +[ ] Jens Roesner *jens.roesner [at] gmx.de* +[ ] Nico R. *n-roeser [at] gmx.net* +[ ] Larry Jones *lawrence.jones [at] ugsplm.com* +[ ] YAMAZAKI Makoto *Yamazaki.Makoto [at] fujixerox.co.jp* +[ ] Hans-Andreas Engel *engel [at] node.ch* +[ ] Leonid Petrov *nouser [at] lpetrov.net* +[ ] Ulf Harnhammar *ulf.harnhammar.9485 [at] student.uu.se* +[ASSGN] Mauro Tortonesi *mauro [at] ferrara.linux.it* + Improved IPv6 support, adding support for dual + family systems. Refactored and enhanced FTP IPv6 code. + Maintained GNU Wget from 2004-2007. +[ ] Marco Colombo *m.colombo [at] ed.ac.uk* +[ ] Joseph Caretto *jcaretto [at] pitt.edu* +[ ] FUJISHIMA Satsuki *sf [at] FreeBSD.org* +[ ] Charles C.Fu *ccwf [at] bacchus.com* +[ ] Andreas Beckmann *debian [at] abeckmann.de* +[ ] Keith Moore *keithmo [at] exmsft.com* +[ ] Benno Schulenberg *benno [at] nietvergeten.nl* +[ ] Giuseppe Bonacci *g.bonacci [at] libero.it* +[ ] Vasil Dimov *vd [at] datamax.bg* +[ ] Albert Chin *wget [at] mlists.thewrittenword.com* +[ ] Jeremy Shapiro *jnshapiro [at] gmail.com* +[ ] Stepan Kasal *kasal [at] ucw.cz* +[ ] Russ Allbery *rra [at] stanford.edu* +[ASSGN] Daniel Stenberg *daniel [at] haxx.se* + NTLM authentication in http-ntlm.c and http-ntlm.h + originally written for curl donated for use in GNU Wget. +[ ] Lawrence Jones *lawrence.jones [at] ugs.com* +[ ] CHEN Peng *chenpeng [at] alumni.nus.edu.sg* +[ASSGN] Tony Lewis *tlewis [at] exelana.com* +[ ] KJKHyperion *hackbunny [at] reactos.com* +[ ] Daniel Richard G. *skunk [at] iSKUNK.ORG* +[ ] Mike Grant *mggr [at] pml.ac.uk* +[ASSGN] Micah Cowan *micah [at] cowan.name* + Maintained Wget from mid-2007 to mid-2010. +[ASSGN] Joshua David Williams *yurimxpxman [at] gmail.com* +[ASSGN] Ralf Wildenhues *Ralf.Wildenhues [at] gmx.de* + Contributed patches to convert Wget to use Automake as + part of its build process, and various bugfixes. +[ ] Jochen Roderburg *roderburg [at] uni-koeln.de* +[ ] Stephen Gildea *stepheng+wget [at] gildea.com* +[ ] Benno Schulenberg *bensberg [at] justemail.net* +[ ] Alexander Dergachev *cy6erbr4in [at] gmail.com* +[ASSGN] Rabin Vincent *rabin [at] rab.in* +[ASSGN] Steven Schubiger *schubiger [at] gmail.com* + Many helpful patches, bugfixes and improvements. + Notably, conversion of Wget to use the Gnulib quotes and + quoteargs modules, and the addition of password prompts + at the console, via the Gnulib getpasswd-gnu module. +[ ] Alain Guibert *alguibert+bts [at] free.fr* +[ ] Jim Paris *jim [at] jtan.com* +[ASSGN] Mike Frysinger *vapier [at] gentoo.org* +[ ] Pranab Shenoy *pranab.loosinit.shenoy [at] gmail.com* +[ASSGN] Ted Mielczarek *ted.mielczarek [at] gmail.com* + Support for parsing links from CSS. +[ASSGN] Joao Ferreira *joao [at] joaoff.com* +[ ] Kenny Parnell *k.parnell [at] gmail.com* +[ ] Henri Häkkinen *henux [at] users.sourceforge.net* +[ASSGN] Madhusudan Hosaagrahara *com.gmail.hrmadhu* +[ASSGN] Xavier Saint *wget [at] sxav.eu* + Support for IRIs (RFC 3987). +[ ] Michael Kessler *kessler.michael [at] aon.at* +[ ] Alexander Drozdov *dzal_mail [at] mtu-net.ru* +[ ] Alexander Belopolsky *alexander.belopolsky [at] gmail.com* +[ASSGN] Gerardo E. Gidoni *gerel [at] gnu.org* +[ ] Benjamin Wolsey *bwy [at] benjaminwolsey.de* +[ ] Xin Zou *zouxin2008 [at] gmail.com* +[ ] Julien Pichon *julienpichon7 [at] gmail.com* +[ ] Phil Pennock *mutt-dev [at] spodhuis.org* +[ ] Jay Krell *jay.krell [at] cornell.edu* +[ASSGN] Steven Schweda *sms [at] antinode.info* +[ASSGN] Petr Pisar *petr.pisar [at] atlas.cz* +[ ] Marcel Telka *marcel [at] telka.sk* +[ ] Michael Baeuerle *michael.baeuerle [at] gmx.net* +[ASSGN] Arvind Jamuna Dixit *ardsrk [at] gmail.com* +[ ] Peter Rosin *peda [at] lysator.liu.se* +[ ] David Holman *holman.david [at] gmail.com* +[ ] Jeremy Olexa *darkside [at] gentoo.org* +[ ] Paul Townsend *aab [at] purdue.edu* +[ASSGN] Giuseppe Scrivano *gscrivano [at] gnu.org* + Added support for HTTP/1.1. + Active Wget Maintainer from 2010-2015. +[ ] Muthu Subramanian K *muthusuba [at] gmail.com* +[ ] Alan Jenkins *alan-jenkins [at] tuffmail.co.uk* +[ ] John Trengrove *jtrengrove [at] gmail.com* +[ ] Alon Bar-Lev *alon.barlev [at] gmail.com* +[ASSGN] Reza Snowdon *vivi [at] mage.me.uk* +[ASSGN] Dennis, CHENG Renquan *crquan [at] fedoraproject.org* +[ASSGN] Merinov Nikolay *kim.roader [at] gmail.com* +[ ] Ivanov Anton *x86mail [at] gmail.com* +[ ] Manfred Koizar *mkoi-pg [at] aon.at* +[ASSGN] Jessica McKellar *jesstess [at] mit.edu* +[ ] Filipe Brandenburger *filbranden [at] gmail.com* +[ ] Evgeniy Philippov *egphilippov [at] googlemail.com* +[ ] Adrien Nader *adrien [at] notk.org* +[ ] Gilles Carry *gilles.carry [at] st.com* +[ ] Tomasz Buchert *tomek.buchert [at] gmail.com* +[ASSGN] Ray Satiro *raysatiro [at] yahoo.com* +[ ] Cristian RodrÃguez *crrodriguez [at] opensuse.org* +[ASSGN] Daniel Manrique *roadmr [at] tomechangosubanana.com* +[ ] Carlos MartÃn Nieto *carlos [at] cmartin.tk* +[ ] Jochen Roderburg *Roderburg [at] Uni-Koeln.DE* +[ ] Mojca Miklavec *mojca.miklavec.lists [at] gmail.com* +[ ] Alan Hourihane *alanh [at] fairlite.co.uk* +[ ] Christian Jullien *eligis [at] orange.fr* +[ ] Jakob Matthes *jakob.matthes [at] gmail.com* +[ ] Karl Berry *karl [at] freefriends.org* +[ ] Henrik Holst *henrik.holst [at] millistream.com* +[ASSGN] Gijs van Tulder *gvtulder [at] gmail.com* +[ASSGN] Sasikantha Babu *sasikanth.v19 [at] gmail.com* +[ ] Ãngel González *keisial [at] gmail.com* +[ ] Daniel Kahn Gillmor *dkg [at] fifthhorseman.net* +[ ] illusionoflife *illusion.of.life92 [at] gmail.com* +[ ] mancha *mancha [at] mac.hush.com* +[ ] *y-iida [at] secom.co.jp* +[ ] Rohit Mathulla *rohit_mathulla [at] yahoo.com* +[ ] Nguyá»…n Thái Ngá»c Duy *pclouds [at] gmail.com* +[ ] Stefano Lattarini *stefano.lattarini [at] gmail.com* +[ ] Michael Stapelberg *michael [at] stapelberg.de* +[ ] Pavel Mateja *pavel [at] netsafe.cz* +[ASSGN] Darshit Shah *darnir [at] gnu.org* +[ ] Tomas Hozza *thozza [at] redhat.com* +[ ] mancha *mancha1 [at] hush.com* +[ASSGN] Bykov Aleksey *gnfalex [at] rambler.ru* +[ ] Dave Reisner *dreisner [at] archlinux.org* +[ ] Ciprian Vieru *devel.php [at] gmail.com* +[ ] Karsten Hopp *karsten [at] redhat.com* +[ ] Will Dietz *w [at] wdtz.org* +[ ] Andrea Urbani *matfanjol [at] mail.com* +[ ] HÃ¥kon VÃ¥gsether *hauk142 [at] gmail.com* +[ ] Lars Wendler *polynomial-c [at] gentoo.org* +[ASSGN] Yousong Zhou *yszhou4tech [at] gmail.com* +[ ] VladimÃr Pýcha *vpycha [at] gmail.com* +[ASSGN] Zihang Chen *chsc4698 [at] gmail.com* +[ ] Benjamin Goose *gans+wget [at] tngtech.com* +[ ] Nikita Vetrov *admin [at] kanaria.ru* +[ ] Nikolay Morozov *n.morozov [at] securitycode.ru* +[ ] Matthew Atkinson *mutley456 [at] ntlworld.com* +[ ] Peter Meiser *meiser [at] gmx-topmail.de* +[ ] Pär Karlsson *feinorgh [at] gmail.com* +[ ] Jakub ÄŒajka *jcajka [at] redhat.com* +[ ] Witchakorn Kamolpornwijit *witchakk [at] mit.edu* +[ ] Tom Li *biergaizi2009 [at] gmail.com* +[ ] Jérémie Courrèges-Anglas *jca [at] wxcvbn.org* +[ ] Cong Ma *cma [at] pmo.ac.cn* +[ ] Yuriy M. Kaminskiy *yumkam [at] gmail.com* +[ASSGN] Eli Zaretskii *eliz [at] gnu.org* +[ ] Mathieu Parent *math.parent [at] gmail.com* +[ ] Dagobert Michelsen *dam [at] opencsw.org* +[ ] Gisle Vanem *gvanem [at] yahoo.no* +[ ] Anderson Goulart *global [at] kokre.com* +[ASSGN] Ander Juaristi Alamos *ajuaristi [at] gmx.es* +[ ] Rohan Prinja *rohan.prinja [at] gmail.com* +[ASSGN] Hubert Tarasiuk *hubert.tarasiuk [at] gmail.com* +[ASSGN] Miquel Llobet *mllobet.cm [at] gmail.com* +[ ] Romain Bentz *romain.bentz [at] dataiku.com* +[ ] Alex Henrie *alexhenrie24 [at] gmail.com* +[ASSGN] Jookia *166291 [at] gmail.com* +[ ] Daniele Calore *daniele.calore [at] tin.it* +[ ] Christian Neukirchen *chneukirchen [at] gmail.com* +[ ] christian fafard *cfaf [at] hotmail.com* +[ ] Ikey Doherty *michael.i.doherty [at] intel.com* +[ ] Ygal Blum *ygal.blum [at] technicolor.com* +[ ] Jernej SimonÄiÄ *jernej|s-wget [at] eternallybored.org* +[ ] Maks Orlovich *morlovich [at] google.com* +[ASSGN] moparisthebest *admin [at] moparisthebest.com* +[ ] Sergio Gelato *sergio.gelato [at] astro.su.se* +[ ] Sean Burford *sburford [at] google.com* +[ASSGN] Matthew White *mehw.is.me [at] inventati.org* +[ ] Jeffery To *jeffery.to [at] gmail.com* +[ ] Tobias Stoeckmann *tobias [at] stoeckmann.org* +[ASSGN] Dale R. Worley *worley [at] ariadne.com* +[ ] Liam R. Howlett *Liam.Howlett [at] WindRiver.com* +[ ] losgrandes *pwajda [at] gmail.net.pl* +[ ] Rahul Bedarkar *rahul.bedarkar [at] imgtec.com* +[ ] Nikos Mavrogiannopoulos *nmav [at] gnutls.org* +[ASSGN] vijeth-aradhya *vijthaaa [at] gmail.com* +[ASSGN] Tom Szilagyi *tomszilagyi [at] gmail.com* +[ASSGN] YX Hao *lifenjoiner [at] 163.com* +[ ] Benjamin Esham *benjamin [at] esham.io* +[ ] Christof Horschitz *christof [at] nimbusec.com* +[ASSGN] Vijo Cherian *codervijo [at] gmail.com* +[ ] klemens *ka7 [at] github.com* +[ ] Anton Yuzhaninov *citrin+github [at] citrin.ru* +[ASSGN] Tim Schlueter *schlueter.tim [at] linux.com* +[ASSGN] Josef Moellers *jmoellers [at] suse.de* +[ ] Peter Wu *peter [at] lekensteyn.nl* +[ ] Reiji *gey3dr [at] gmail.com* +[ ] Loganaden Velvindron *logan [at] hackers.mu* +[ ] ethus3h *kolubat [at] gmail.com* +[ ] Tomas Korbar *tkorbar [at] redhat.com* +[ ] Nikos Mavrogiannopoulos *nmav [at] redhat.com* +[ ] Luiz Angelo Daros de Luca *luizluca [at] gmail.com* +[ ] Kapus, Timotej *timotej.kapus13 [at] imperial.ac.uk* +[ ] Rosen Penev *rosenp [at] gmail.com* +[ ] André Wolski *andre [at] dena-design.de* +[ ] Leon Klingele *git [at] leonklingele.de* +[ASSGN] Jeffrey Walton *noloader [at] gmail.com* +[ ] raminfp *ramin.blackhat [at] gmail.com* +[ ] Leif Ryge *leif [at] synthesize.us* +[ ] Eneas U de Queiroz *cote2004-github [at] yahoo.com* +[ ] AviSoomirtee *avi [at] cyberstorm.mu* +[ASSGN] sulfastor *torresmoisesa [at] gmail.com* +[ ] Lauri Nurmi *lanurmi [at] iki.fi* +[ASSGN] Ð’ÑчеÑлав Петрищев *vyachemail [at] gmail.com* +[ ] Matt Whitlock *gentoo [at] mattwhitlock.name* +[ ] Shamil Gumirov *shamil [at] gumirov.com* +[ ] Nils *nils [at] nilsand.re* +[ ] Nekun *nekokun [at] firemail.cc* +[ ] jmoellers *josef.moellers [at] suse.com* +[ ] WB *3572564-wadersgeek [at] users.noreply.gitlab.com* +[ ] Thomas Niederberger *thomas [at] niederb.ch* +[ ] Nik Soggia *wget [at] niksoggia.it* +[ ] Aarni Koskela *akx [at] iki.fi* +[ ] jinfuchiang *jinfuchiang [at] outlook.com* +[ ] Jan-Michael Brummer *jan-michael.brummer1 [at] volkswagen.de* @@ -1,5 +1,186 @@ +2024-03-10 Darshit Shah <darnir@gnu.org> + + version 1.24.5 + * NEWS: Record release date. + + * contrib/make-release: Some more release management + + * NEWS: Update the noteworthy NEWS + + * bootstrap.conf: Organize alphabetically + + * gnulib: Update to the latest version + +2024-03-03 Tim Rühsen <tim.ruehsen@gmx.de> + + Remove obsolete Travis CI files + * .travis.yml: Remove. + * contrib/travis-ci: Remove. + +2024-02-24 Tim Rühsen <tim.ruehsen@gmx.de> + + Fix HSTS matching + * src/hsts.c (hsts_find_entry): Check for includeSubdomains, + (test_hsts_new_entry): Fix test, + (test_hsts_url_rewrite_superdomain): Improve test. + + Reported-by: Hanno Böck <hanno@hboeck.de + +2024-02-19 Darshit Shah <darnir@gnu.org> + + Delete some redundant tests + * tests/Makefile.am: Remove some tests that are redundant with the + Python testenv + * tests/Test-auth-basic.px: Delete file + * tests/Test-auth-no-challenge.px: Same + * tests/Test-auth-no-challenge-url.px: Same + * tests/Test-auth-retcode.px: Same + * tests/Test-auth-with-content-disposition.px: Same + * tests/Test-k.px: Same + + * Makefile.am: Ignore some lcov errors, allowing the tests to run through + + * README: Add a link to the COPYING file to meet the GNU Coding Standards + + * bootstrap: Update script from gnulib + + * gnulib: Update gnulib + + * Update copyright year to 2024 + +2024-02-19 Darshit Shah <git@darnir.net> + + Add tests for --convert-links option + * testenv/Makefile.am: Add two new tests, Test-k.py and Test-https-k.py + * testenv/Test-k.py: New file. Add a test based on tests/Test-k.px + * testenv/Test-https-k.py: New file. Add a new test to ensure that the + protocol of the original host URL is retained when creatign absolute + links. + + This test is added as a result of an issue reported on StackExchange: + https://superuser.com/questions/1348940/making-wgets-convert-links-respect-http-vs-https + +2024-02-19 Darshit Shah <git@darnir.net> + + * testenv/conf/expected_files.py: Aesthetic changes only. Format file with black + + * testenv/conf/expected_files.py: Nicer diff printing on error + +2024-02-18 Darshit Shah <darnir@gnu.org> + + * SECURITY.md: Add a file stating how to report security issues + +2024-01-27 Tim Rühsen <tim.ruehsen@gmx.de> + + Parse 'srcset' HTML attr for 'source' HTML tag. + * src/html-url.c (struct known_tag): Use tag_handle_img() for 'source' tag. + * testenv/Test-recursive-include.py: Extend test. + +2023-11-26 Tim Rühsen <tim.ruehsen@gmx.de> + + * src/netrc.c (parse_netrc_fp): Add fetchmail compatibility (user and passwd) + Reported-by: Gerald Pfeifer <gerald@pfeifer.com> + +2023-10-22 Tim Rühsen <tim.ruehsen@gmx.de> + + Fix confusing 'Cannot write to ... (Success)' message + * src/http.c (gethttp): Store/restore errno value. + + Reported-by: Christian Rosentreter, Andries E. Brouwer + +2023-10-20 Jan-Michael Brummer <jan-michael.brummer1@volkswagen.de> (tiny change) + + Add libproxy support + Add support for libproxy, which is capable to extract desktop + environment proxy configurations from dozens of systems and platforms. + This also enables wget to handle pac/wpad proxy server. + + * configure.ac: Add check for libbproxy. + * src/retr.c (getproxy): Retrieve proxy via libproxy. + +2023-08-03 Tim Rühsen <tim.ruehsen@gmx.de> + + * src/retr.c: Fix sc_prohibit_empty_lines_at_EOF + +2023-08-03 Tim Rühsen <tim.ruehsen@gmx.de> + + Fix crash when printing download rate + If the download rate is TB/s, a read buffer overflow happended + that either caused a crash or printed whatever string was pointed to. + + * src/retr.c (retr_rate): Add missing array entrie for TB/s and Tb/s, + (test_retr_rate): New test function. + * tests/unit-tests.c (all_tests): Run test 'test_retr_rate'. + * tests/unit-tests.h: Add prototype for test_retr_rate. + + Reported-by: Wiebe Cazemier <wiebe@halfgaar.net> + +2023-08-03 Christian Weisgerber <naddy@mips.inka.de> (tiny change) + + * tests/Makefile.am: Remove './' from for portability (OpenBSD) + +2023-07-16 Yaakov Selkowitz <yselkowi@redhat.com> (tiny change) + + testenv: fix for Python 3.12 + * testenv/server/http/http_server.py (HTTPSServer): Update for + ssl.SSLContext APIs instead of deprecated ssl.wrap_socket(). + + ssl.wrap_socket() was deprecated in 3.7 and removed in 3.12. + This should be compatible back to 3.6 (RHEL 8 and newer). + +2023-07-01 Tim Rühsen <tim.ruehsen@gmx.de> + + * src/url.c (test_uri_merge): Fix check + + Add new unit test test_uri_merge() + * src/url.c: New test function test_uri_merge(). + * tests/unit-tests.c (tests/unit-tests.c): Call test_uri_merge(). + * tests/unit-tests.h (tests/unit-tests.h): Declare test_uri_merge(). + +2023-05-16 Darshit Shah <darnir@gnu.org> + + Ensure that spaces are quoted when converting links + * src/convert.c(convert_links): Print the actual quoted newname when printing DEBUG output + (local_quote_string): Also quote the ' ' charcter as %20. While it is okay + to leave the characted as-is, quoting it covers more edge cases. + And it should resolve a >10 year old bug with CSS url() parameters not being quoted + + Bug-Id: 64082 + Reported-By: Ethan Gibbs <ethan@snowsign.net> + Discussed-At: https://stackoverflow.com/q/13300017 + +2023-05-16 Darshit Shah <darnir@gnu.org> + + Add new test to ensure CSS url() encoding + url() parameters in CSS cannot have spaces in them. Ensure that Wget does not do that + when using --convert-links + + * testenv/test_css_url.py: New file + * testenv/Makefile: Add test_css_url.py to tests + + Bug-Id: 64082 + +2023-05-14 Darshit Shah <darnir@gnu.org> + + Automatically verify if commit author has assigned copyrights in the past + * contrib/commit-check: Add new script + * .gitlab-ci.yml: Add new test in the CI pipeline + +2023-05-14 Jan Palus <jpalus@fastmail.com> (tiny change) + + * testenv/conf/expected_files.py: Ignore common.conf + +2023-05-14 Darshit Shah <darnir@gnu.org> + + * AUTHORS: Rework file to prepare for autmated testing + 2023-05-11 Darshit Shah <darnir@gnu.org> + maint: post-release administrivia + * NEWS: Add header line for next release. + * .prev-version: Record previous version. + * cfg.mk (old_NEWS_hash): Auto-update. + contrib/make-release: Update regexes to match the NEWS file 2023-05-11 Darshit Shah <git@darnir.net> @@ -6334,10 +6515,6 @@ Add support for older versions of flex (tiny change) E.g. flex 2.5.4 (Solaris 10) does not like a space after -o. -2014-12-10 Tim Rühsen <tim.ruehsen@gmx.de> - - Check for pcre.h in configure.ac - 2014-12-11 Tim Ruehsen <tim.ruehsen@gmx.de> * src/Makefile.am: Support older versions of flex diff --git a/GNUmakefile b/GNUmakefile index 07b331f..0f469c8 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -5,7 +5,7 @@ # It is necessary if you want to build targets usually of interest # only to the maintainer. -# Copyright (C) 2001, 2003, 2006-2023 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2006-2024 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Makefile.am b/Makefile.am index 214fbb0..96b6acf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # Makefile for `Wget' utility -# Copyright (C) 1995-1997, 2006-2023 Free Software Foundation, Inc. +# Copyright (C) 1995-1997, 2006-2024 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -92,8 +92,8 @@ check-coverage: clean clean-lcov lcov --capture --initial --directory src/ --output-file $(LCOV_INFO) $(MAKE) CFLAGS="$(CFLAGS) --coverage" LDFLAGS="$(LDFLAGS) --coverage" VALGRIND_TESTS=0 check lcov --capture --directory src/ --output-file $(LCOV_INFO) - lcov --remove $(LCOV_INFO) '/usr/include/*' '*/lib/*' -o $(LCOV_INFO) - genhtml --prefix . --ignore-errors source $(LCOV_INFO) --legend --title "Wget" --output-directory=lcov + lcov --remove $(LCOV_INFO) --ignore-errors unused '/usr/include/*' '*/lib/*' -o $(LCOV_INFO) + genhtml --prefix . --ignore-errors source --ignore-errors unmapped $(LCOV_INFO) --legend --title "Wget" --output-directory=lcov @echo @echo "You can now view the coverage report with 'xdg-open lcov/index.html'" diff --git a/Makefile.in b/Makefile.in index dc45ca8..8aa05d8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for `Wget' utility -# Copyright (C) 1995-1997, 2006-2023 Free Software Foundation, Inc. +# Copyright (C) 1995-1997, 2006-2024 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -127,7 +127,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 \ $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/base32.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 \ $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/clock_time.m4 \ @@ -175,7 +176,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \ $(top_srcdir)/m4/isblank.m4 $(top_srcdir)/m4/iswblank.m4 \ - $(top_srcdir)/m4/iswdigit.m4 $(top_srcdir)/m4/iswxdigit.m4 \ + $(top_srcdir)/m4/iswctype.m4 $(top_srcdir)/m4/iswdigit.m4 \ + $(top_srcdir)/m4/iswpunct.m4 $(top_srcdir)/m4/iswxdigit.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 \ @@ -189,15 +191,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbrtoc32.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ + $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -255,18 +258,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timegm.m4 $(top_srcdir)/m4/timespec.m4 \ $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tmpdir.m4 \ - $(top_srcdir)/m4/ungetc.m4 $(top_srcdir)/m4/unicase_h.m4 \ - $(top_srcdir)/m4/unictype_h.m4 $(top_srcdir)/m4/uninorm_h.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utime_h.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/uchar_h.m4 $(top_srcdir)/m4/ungetc.m4 \ + $(top_srcdir)/m4/unicase_h.m4 $(top_srcdir)/m4/unictype_h.m4 \ + $(top_srcdir)/m4/uninorm_h.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ + $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wctype_h.m4 \ $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ $(top_srcdir)/m4/wget_manywarnings.m4 \ $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/wmemchr.m4 \ @@ -431,6 +435,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ +CXX_HAS_CHAR8_TYPE = @CXX_HAS_CHAR8_TYPE@ +CXX_HAS_UCHAR_TYPES = @CXX_HAS_UCHAR_TYPES@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -446,7 +452,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ @@ -468,7 +473,33 @@ GL_GNULIB_ALIGNED_ALLOC = @GL_GNULIB_ALIGNED_ALLOC@ GL_GNULIB_ALPHASORT = @GL_GNULIB_ALPHASORT@ GL_GNULIB_ATOLL = @GL_GNULIB_ATOLL@ GL_GNULIB_BIND = @GL_GNULIB_BIND@ +GL_GNULIB_BTOC32 = @GL_GNULIB_BTOC32@ GL_GNULIB_BTOWC = @GL_GNULIB_BTOWC@ +GL_GNULIB_C32ISALNUM = @GL_GNULIB_C32ISALNUM@ +GL_GNULIB_C32ISALPHA = @GL_GNULIB_C32ISALPHA@ +GL_GNULIB_C32ISBLANK = @GL_GNULIB_C32ISBLANK@ +GL_GNULIB_C32ISCNTRL = @GL_GNULIB_C32ISCNTRL@ +GL_GNULIB_C32ISDIGIT = @GL_GNULIB_C32ISDIGIT@ +GL_GNULIB_C32ISGRAPH = @GL_GNULIB_C32ISGRAPH@ +GL_GNULIB_C32ISLOWER = @GL_GNULIB_C32ISLOWER@ +GL_GNULIB_C32ISPRINT = @GL_GNULIB_C32ISPRINT@ +GL_GNULIB_C32ISPUNCT = @GL_GNULIB_C32ISPUNCT@ +GL_GNULIB_C32ISSPACE = @GL_GNULIB_C32ISSPACE@ +GL_GNULIB_C32ISUPPER = @GL_GNULIB_C32ISUPPER@ +GL_GNULIB_C32ISXDIGIT = @GL_GNULIB_C32ISXDIGIT@ +GL_GNULIB_C32RTOMB = @GL_GNULIB_C32RTOMB@ +GL_GNULIB_C32SNRTOMBS = @GL_GNULIB_C32SNRTOMBS@ +GL_GNULIB_C32SRTOMBS = @GL_GNULIB_C32SRTOMBS@ +GL_GNULIB_C32STOMBS = @GL_GNULIB_C32STOMBS@ +GL_GNULIB_C32SWIDTH = @GL_GNULIB_C32SWIDTH@ +GL_GNULIB_C32TOB = @GL_GNULIB_C32TOB@ +GL_GNULIB_C32TOLOWER = @GL_GNULIB_C32TOLOWER@ +GL_GNULIB_C32TOUPPER = @GL_GNULIB_C32TOUPPER@ +GL_GNULIB_C32WIDTH = @GL_GNULIB_C32WIDTH@ +GL_GNULIB_C32_APPLY_MAPPING = @GL_GNULIB_C32_APPLY_MAPPING@ +GL_GNULIB_C32_APPLY_TYPE_TEST = @GL_GNULIB_C32_APPLY_TYPE_TEST@ +GL_GNULIB_C32_GET_MAPPING = @GL_GNULIB_C32_GET_MAPPING@ +GL_GNULIB_C32_GET_TYPE_TEST = @GL_GNULIB_C32_GET_TYPE_TEST@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ @@ -575,6 +606,7 @@ GL_GNULIB_ISBLANK = @GL_GNULIB_ISBLANK@ GL_GNULIB_ISWBLANK = @GL_GNULIB_ISWBLANK@ GL_GNULIB_ISWCTYPE = @GL_GNULIB_ISWCTYPE@ GL_GNULIB_ISWDIGIT = @GL_GNULIB_ISWDIGIT@ +GL_GNULIB_ISWPUNCT = @GL_GNULIB_ISWPUNCT@ GL_GNULIB_ISWXDIGIT = @GL_GNULIB_ISWXDIGIT@ GL_GNULIB_LCHMOD = @GL_GNULIB_LCHMOD@ GL_GNULIB_LCHOWN = @GL_GNULIB_LCHOWN@ @@ -582,13 +614,15 @@ GL_GNULIB_LINK = @GL_GNULIB_LINK@ GL_GNULIB_LINKAT = @GL_GNULIB_LINKAT@ GL_GNULIB_LISTEN = @GL_GNULIB_LISTEN@ GL_GNULIB_LOCALECONV = @GL_GNULIB_LOCALECONV@ -GL_GNULIB_LOCALENAME = @GL_GNULIB_LOCALENAME@ +GL_GNULIB_LOCALENAME_UNSAFE = @GL_GNULIB_LOCALENAME_UNSAFE@ GL_GNULIB_LOCALTIME = @GL_GNULIB_LOCALTIME@ GL_GNULIB_LSEEK = @GL_GNULIB_LSEEK@ GL_GNULIB_LSTAT = @GL_GNULIB_LSTAT@ GL_GNULIB_MALLOC_GNU = @GL_GNULIB_MALLOC_GNU@ GL_GNULIB_MALLOC_POSIX = @GL_GNULIB_MALLOC_POSIX@ GL_GNULIB_MBRLEN = @GL_GNULIB_MBRLEN@ +GL_GNULIB_MBRTOC16 = @GL_GNULIB_MBRTOC16@ +GL_GNULIB_MBRTOC32 = @GL_GNULIB_MBRTOC32@ GL_GNULIB_MBRTOWC = @GL_GNULIB_MBRTOWC@ GL_GNULIB_MBSCASECMP = @GL_GNULIB_MBSCASECMP@ GL_GNULIB_MBSCASESTR = @GL_GNULIB_MBSCASESTR@ @@ -598,16 +632,20 @@ GL_GNULIB_MBSINIT = @GL_GNULIB_MBSINIT@ GL_GNULIB_MBSLEN = @GL_GNULIB_MBSLEN@ GL_GNULIB_MBSNCASECMP = @GL_GNULIB_MBSNCASECMP@ GL_GNULIB_MBSNLEN = @GL_GNULIB_MBSNLEN@ +GL_GNULIB_MBSNRTOC32S = @GL_GNULIB_MBSNRTOC32S@ GL_GNULIB_MBSNRTOWCS = @GL_GNULIB_MBSNRTOWCS@ GL_GNULIB_MBSPBRK = @GL_GNULIB_MBSPBRK@ GL_GNULIB_MBSPCASECMP = @GL_GNULIB_MBSPCASECMP@ GL_GNULIB_MBSRCHR = @GL_GNULIB_MBSRCHR@ +GL_GNULIB_MBSRTOC32S = @GL_GNULIB_MBSRTOC32S@ GL_GNULIB_MBSRTOWCS = @GL_GNULIB_MBSRTOWCS@ GL_GNULIB_MBSSEP = @GL_GNULIB_MBSSEP@ GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@ GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@ +GL_GNULIB_MBSTOC32S = @GL_GNULIB_MBSTOC32S@ GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@ GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@ +GL_GNULIB_MBSZERO = @GL_GNULIB_MBSZERO@ GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@ GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@ GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@ @@ -721,6 +759,7 @@ GL_GNULIB_PUTS = @GL_GNULIB_PUTS@ GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@ GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@ GL_GNULIB_RAISE = @GL_GNULIB_RAISE@ +GL_GNULIB_RAND = @GL_GNULIB_RAND@ GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@ GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@ GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@ @@ -783,6 +822,7 @@ GL_GNULIB_STRSEP = @GL_GNULIB_STRSEP@ GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@ GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@ GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@ +GL_GNULIB_STRTOF = @GL_GNULIB_STRTOF@ GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@ GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@ GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@ @@ -896,6 +936,9 @@ GL_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_H GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@ @@ -921,6 +964,7 @@ GL_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYP GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@ @@ -996,6 +1040,7 @@ GL_GNULIB_WCTOMB = @GL_GNULIB_WCTOMB@ GL_GNULIB_WCTRANS = @GL_GNULIB_WCTRANS@ GL_GNULIB_WCTYPE = @GL_GNULIB_WCTYPE@ GL_GNULIB_WCWIDTH = @GL_GNULIB_WCWIDTH@ +GL_GNULIB_WGETCWD = @GL_GNULIB_WGETCWD@ GL_GNULIB_WMEMCHR = @GL_GNULIB_WMEMCHR@ GL_GNULIB_WMEMCMP = @GL_GNULIB_WMEMCMP@ GL_GNULIB_WMEMCPY = @GL_GNULIB_WMEMCPY@ @@ -1006,8 +1051,10 @@ GL_GNULIB_WRITE = @GL_GNULIB_WRITE@ GL_GNULIB__EXIT = @GL_GNULIB__EXIT@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIBHEADERS_OVERRIDE_CHAR16_T = @GNULIBHEADERS_OVERRIDE_CHAR16_T@ +GNULIBHEADERS_OVERRIDE_CHAR32_T = @GNULIBHEADERS_OVERRIDE_CHAR32_T@ +GNULIBHEADERS_OVERRIDE_CHAR8_T = @GNULIBHEADERS_OVERRIDE_CHAR8_T@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ @@ -1024,6 +1071,7 @@ HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C32RTOMB = @HAVE_C32RTOMB@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ @@ -1157,6 +1205,8 @@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOC16 = @HAVE_MBRTOC16@ +HAVE_MBRTOC32 = @HAVE_MBRTOC32@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ HAVE_MBSINIT = @HAVE_MBSINIT@ HAVE_MBSLEN = @HAVE_MBSLEN@ @@ -1247,6 +1297,7 @@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOF = @HAVE_STRTOF@ HAVE_STRTOL = @HAVE_STRTOL@ HAVE_STRTOLD = @HAVE_STRTOLD@ HAVE_STRTOLL = @HAVE_STRTOLL@ @@ -1280,6 +1331,7 @@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_UCHAR_H = @HAVE_UCHAR_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ @@ -1332,6 +1384,7 @@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ +HAVE_WORKING_MBRTOC32 = @HAVE_WORKING_MBRTOC32@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__EXIT = @HAVE__EXIT@ @@ -1351,6 +1404,10 @@ INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LCOV = @LCOV@ +LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@ +LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@ +LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@ +LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -1366,6 +1423,8 @@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPROXY_CFLAGS = @LIBPROXY_CFLAGS@ +LIBPROXY_LIBS = @LIBPROXY_LIBS@ LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ LIBPSL_LIBS = @LIBPSL_LIBS@ LIBPTHREAD = @LIBPTHREAD@ @@ -1462,6 +1521,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ +NEXT_AS_FIRST_DIRECTIVE_UCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_UCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ @@ -1501,6 +1561,7 @@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ +NEXT_UCHAR_H = @NEXT_UCHAR_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ @@ -1542,6 +1603,7 @@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ +REPLACE_C32RTOMB = @REPLACE_C32RTOMB@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ @@ -1568,6 +1630,7 @@ REPLACE_EXECVE = @REPLACE_EXECVE@ REPLACE_EXECVP = @REPLACE_EXECVP@ REPLACE_EXECVPE = @REPLACE_EXECVPE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ @@ -1625,6 +1688,7 @@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWPUNCT = @REPLACE_ISWPUNCT@ REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_ITOLD = @REPLACE_ITOLD@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ @@ -1638,6 +1702,8 @@ REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MALLOC_FOR_MALLOC_GNU = @REPLACE_MALLOC_FOR_MALLOC_GNU@ REPLACE_MALLOC_FOR_MALLOC_POSIX = @REPLACE_MALLOC_FOR_MALLOC_POSIX@ REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOC16 = @REPLACE_MBRTOC16@ +REPLACE_MBRTOC32 = @REPLACE_MBRTOC32@ REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ @@ -1649,6 +1715,7 @@ REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ +REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ @@ -1687,6 +1754,7 @@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_QSORT_R = @REPLACE_QSORT_R@ REPLACE_RAISE = @REPLACE_RAISE@ +REPLACE_RAND = @REPLACE_RAND@ REPLACE_RANDOM = @REPLACE_RANDOM@ REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ REPLACE_READ = @REPLACE_READ@ @@ -1729,6 +1797,7 @@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ +REPLACE_STRTOF = @REPLACE_STRTOF@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_STRTOL = @REPLACE_STRTOL@ @@ -1739,11 +1808,13 @@ REPLACE_STRTOULL = @REPLACE_STRTOULL@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ +REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ +REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1772,6 +1843,8 @@ REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ +REPLACE_WCTRANS = @REPLACE_WCTRANS@ +REPLACE_WCTYPE = @REPLACE_WCTYPE@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WMEMCMP = @REPLACE_WMEMCMP@ REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ @@ -1786,6 +1859,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ +SMALL_WCHAR_T = @SMALL_WCHAR_T@ STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ @@ -1862,6 +1936,8 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -2417,8 +2493,8 @@ check-coverage: clean clean-lcov lcov --capture --initial --directory src/ --output-file $(LCOV_INFO) $(MAKE) CFLAGS="$(CFLAGS) --coverage" LDFLAGS="$(LDFLAGS) --coverage" VALGRIND_TESTS=0 check lcov --capture --directory src/ --output-file $(LCOV_INFO) - lcov --remove $(LCOV_INFO) '/usr/include/*' '*/lib/*' -o $(LCOV_INFO) - genhtml --prefix . --ignore-errors source $(LCOV_INFO) --legend --title "Wget" --output-directory=lcov + lcov --remove $(LCOV_INFO) --ignore-errors unused '/usr/include/*' '*/lib/*' -o $(LCOV_INFO) + genhtml --prefix . --ignore-errors source --ignore-errors unmapped $(LCOV_INFO) --legend --title "Wget" --output-directory=lcov @echo @echo "You can now view the coverage report with 'xdg-open lcov/index.html'" @@ -1,6 +1,22 @@ GNU Wget NEWS -- history of user-visible changes. -* Noteworthy changes in release ?.? (????-??-??) [?] +* Noteworthy changes in release 1.24.5 (2024-03-10) [stable] + +** Fix how subdomain matches are checked for HSTS. + Fixes a minor issue where cookies may be leaked to the wrong domain + +** Wget will now also parse the srcset attribute in <source> HTML tags + +** Support reading fetchmail style "user" and "passwd" fields from netrc + +** In some cases, prevent the confusing "Cannot write to... (success)" error messages + +** Support extremely fast download speeds (TB/s). + Previously this would cause Wget to crash when printing the speed + +** Improve portability on OpenBSD to run the test suite + +** Ensure that CSS URLs are corectly quoted (Bug: 64082) * Noteworthy changes in release 1.21.4 (2023-05-11) @@ -1199,7 +1215,7 @@ geturl -vo log http://fly.cc.fer.hr/ ---------------------------------------------------------------------- Copyright information: -Copyright (C) 1997-2023 Free Software Foundation, Inc. +Copyright (C) 1997-2024 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that @@ -55,12 +55,15 @@ Wget's home page is at <https://www.gnu.org/software/wget/>. If you would like to contribute code for Wget, please read CONTRIBUTING.md. +Wget is offered under the terms of the GNU GPLv3 license. Please see the +COPYING file for a full text of the license terms. + Wget was originally written and mainained by Hrvoje Niksic. Please see the file AUTHORS for a list of major contributors, and the ChangeLogs for a detailed listing of all contributions. -Copyright (C) 1995-2023 Free Software Foundation, Inc. +Copyright (C) 1995-2024 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,8 +14,8 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, -[m4_warning([this file was generated for autoconf 2.71. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],, +[m4_warning([this file was generated for autoconf 2.72. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) @@ -968,8 +968,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], AC_SUBST(GPGME_GLIB_LIBS) ]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 11 (pkg-config-0.29.1) +# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> @@ -1011,7 +1011,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -1056,7 +1056,7 @@ dnl Check to see whether a particular set of modules exists. Similar to dnl PKG_CHECK_MODULES(), but does not set variables or print errors. dnl dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place +dnl only at the first occurrence in configure.ac, so if the first place dnl it's called might be skipped (such as if it is within an "if", you dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], @@ -1112,7 +1112,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -1122,17 +1122,17 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -1143,8 +1143,8 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -1154,10 +1154,10 @@ _PKG_TEXT To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl ]) else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - $3 + $3 fi[]dnl ])dnl PKG_CHECK_MODULES @@ -2832,6 +2832,7 @@ m4_include([m4/asm-underscore.m4]) m4_include([m4/assert_h.m4]) m4_include([m4/base32.m4]) m4_include([m4/btowc.m4]) +m4_include([m4/build-to-host.m4]) m4_include([m4/builtin-expect.m4]) m4_include([m4/byteswap.m4]) m4_include([m4/c-bool.m4]) @@ -2918,7 +2919,9 @@ m4_include([m4/inttypes_h.m4]) m4_include([m4/ioctl.m4]) m4_include([m4/isblank.m4]) m4_include([m4/iswblank.m4]) +m4_include([m4/iswctype.m4]) m4_include([m4/iswdigit.m4]) +m4_include([m4/iswpunct.m4]) m4_include([m4/iswxdigit.m4]) m4_include([m4/langinfo_h.m4]) m4_include([m4/largefile.m4]) @@ -2943,6 +2946,7 @@ m4_include([m4/malloc.m4]) m4_include([m4/malloca.m4]) m4_include([m4/mbchar.m4]) m4_include([m4/mbiter.m4]) +m4_include([m4/mbrtoc32.m4]) m4_include([m4/mbrtowc.m4]) m4_include([m4/mbsinit.m4]) m4_include([m4/mbsrtowcs.m4]) @@ -3065,6 +3069,7 @@ m4_include([m4/timegm.m4]) m4_include([m4/timespec.m4]) m4_include([m4/tm_gmtoff.m4]) m4_include([m4/tmpdir.m4]) +m4_include([m4/uchar_h.m4]) m4_include([m4/ungetc.m4]) m4_include([m4/unicase_h.m4]) m4_include([m4/unictype_h.m4]) @@ -3088,6 +3093,7 @@ m4_include([m4/warnings.m4]) m4_include([m4/wchar_h.m4]) m4_include([m4/wchar_t.m4]) m4_include([m4/wcrtomb.m4]) +m4_include([m4/wctype.m4]) m4_include([m4/wctype_h.m4]) m4_include([m4/wcwidth.m4]) m4_include([m4/wget.m4]) diff --git a/build-aux/announce-gen b/build-aux/announce-gen index 850619a..f9e2012 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -3,7 +3,7 @@ # Generate a release announcement message. -# Copyright (C) 2002-2023 Free Software Foundation, Inc. +# Copyright (C) 2002-2024 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -35,7 +35,7 @@ eval 'exec perl -wSx "$0" "$@"' if 0; -my $VERSION = '2023-02-26 17:15'; # UTC +my $VERSION = '2023-12-29 18:26'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -545,7 +545,7 @@ EOF my $v0 = $prev_version; my $v1 = $curr_version; - (my $first_name = `git config --global user.name|cut -d' ' -f1`) + (my $first_name = `git config user.name|cut -d' ' -f1`) =~ m{\S} or die "no name? set user.name in ~/.gitconfig\n"; chomp (my $n_ci = `git rev-list "v$v0..v$v1" | wc -l`); @@ -570,10 +570,10 @@ $first_name [on behalf of the $package_name maintainers] ================================================================== Here is the GNU $package_name home page: - http://gnu.org/s/$package_name/ + https://gnu.org/s/$package_name/ For a summary of changes and contributors, see: - http://git.sv.gnu.org/gitweb/?p=$package_name.git;a=shortlog;h=v$v1 + https://git.sv.gnu.org/gitweb/?p=$package_name.git;a=shortlog;h=v$v1 or run this command from a git-cloned $package_name directory: git shortlog v$v0..v$v1 diff --git a/build-aux/build_info.pl b/build-aux/build_info.pl index 60e98c9..9f9b330 100755 --- a/build-aux/build_info.pl +++ b/build-aux/build_info.pl @@ -2,7 +2,7 @@ # Generate build_info.c. -# Copyright (C) 2009-2011, 2018-2023 Free Software Foundation, Inc. +# Copyright (C) 2009-2011, 2018-2024 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/config.guess b/build-aux/config.guess index e81d3ae..cdfc439 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,14 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2021-06-03' +timestamp='2023-08-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -47,7 +47,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] -Output the configuration name of the system \`$me' is run on. +Output the configuration name of the system '$me' is run on. Options: -h, --help print this help, then exit @@ -60,13 +60,13 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2021 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -102,8 +102,8 @@ GUESS= # temporary files to be created and, as you can see below, it is a # headache to deal with in a portable fashion. -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. +# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still +# use 'HOST_CC' if defined, but it is deprecated. # Portable tmp directory creation inspired by the Autoconf team. @@ -155,6 +155,9 @@ Linux|GNU|GNU/*) set_cc_for_build cat <<-EOF > "$dummy.c" + #if defined(__ANDROID__) + LIBC=android + #else #include <features.h> #if defined(__UCLIBC__) LIBC=uclibc @@ -169,6 +172,7 @@ Linux|GNU|GNU/*) LIBC=musl #endif #endif + #endif EOF cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` eval "$cc_set_libc" @@ -437,7 +441,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # This test works for both compilers. if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 @@ -459,7 +463,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in UNAME_RELEASE=`uname -v` ;; esac - # Japanese Language versions have a version number like `4.1.3-JL'. + # Japanese Language versions have a version number like '4.1.3-JL'. SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` GUESS=sparc-sun-sunos$SUN_REL ;; @@ -904,7 +908,7 @@ EOF fi ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` + UNAME_PROCESSOR=`uname -p` case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; @@ -929,6 +933,9 @@ EOF i*:PW*:*) GUESS=$UNAME_MACHINE-pc-pw32 ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; *:Interix*:*) case $UNAME_MACHINE in x86) @@ -963,11 +970,37 @@ EOF GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; *:Minix:*:*) GUESS=$UNAME_MACHINE-unknown-minix ;; aarch64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + set_cc_for_build + CPU=$UNAME_MACHINE + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __ARM_EABI__ + #ifdef __ARM_PCS_VFP + ABI=eabihf + #else + ABI=eabi + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;; + esac + fi + GUESS=$CPU-unknown-linux-$LIBCABI ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be @@ -1033,7 +1066,16 @@ EOF k1om:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + kvx:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + kvx:cos:*:*) + GUESS=$UNAME_MACHINE-unknown-cos + ;; + kvx:mbr:*:*) + GUESS=$UNAME_MACHINE-unknown-mbr + ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; m32r*:Linux:*:*) @@ -1148,16 +1190,27 @@ EOF ;; x86_64:Linux:*:*) set_cc_for_build + CPU=$UNAME_MACHINE LIBCABI=$LIBC if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI=${LIBC}x32 - fi + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac fi - GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI + GUESS=$CPU-pc-linux-$LIBCABI ;; xtensa*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC @@ -1177,7 +1230,7 @@ EOF GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION ;; i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility + # If we were able to find 'uname', then EMX Unix compatibility # is probably installed. GUESS=$UNAME_MACHINE-pc-os2-emx ;; @@ -1318,7 +1371,7 @@ EOF GUESS=ns32k-sni-sysv fi ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel@ccMail.Census.GOV> GUESS=i586-unisys-sysv4 ;; @@ -1364,8 +1417,11 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. GUESS=i586-pc-haiku ;; - x86_64:Haiku:*:*) - GUESS=x86_64-unknown-haiku + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku ;; SX-4:SUPER-UX:*:*) GUESS=sx4-nec-superux$UNAME_RELEASE @@ -1522,6 +1578,9 @@ EOF i*86:rdos:*:*) GUESS=$UNAME_MACHINE-pc-rdos ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; *:AROS:*:*) GUESS=$UNAME_MACHINE-unknown-aros ;; diff --git a/build-aux/config.rpath b/build-aux/config.rpath index 1e1ab67..1e2595f 100755 --- a/build-aux/config.rpath +++ b/build-aux/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2022 Free Software Foundation, Inc. +# Copyright 1996-2023 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # diff --git a/build-aux/config.sub b/build-aux/config.sub index d74fb6d..defe52c 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,14 +1,14 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2021-08-14' +timestamp='2023-09-19' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -76,13 +76,13 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2021 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -130,7 +130,7 @@ IFS=$saved_IFS # Separate into logical components for further validation case $1 in *-*-*-*-*) - echo Invalid configuration \`"$1"\': more than four components >&2 + echo "Invalid configuration '$1': more than four components" >&2 exit 1 ;; *-*-*-*) @@ -145,7 +145,8 @@ case $1 in nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \ + | windows-* ) basic_machine=$field1 basic_os=$maybe_os ;; @@ -943,7 +944,7 @@ $basic_machine EOF IFS=$saved_IFS ;; - # We use `pc' rather than `unknown' + # We use 'pc' rather than 'unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. i*86 | x86_64) @@ -1020,6 +1021,11 @@ case $cpu-$vendor in ;; # Here we normalize CPU types with a missing or matching vendor + armh-unknown | armh-alt) + cpu=armv7l + vendor=alt + basic_os=${basic_os:-linux-gnueabihf} + ;; dpx20-unknown | dpx20-bull) cpu=rs6000 vendor=bull @@ -1070,7 +1076,7 @@ case $cpu-$vendor in pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 ;; - pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) + pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*) cpu=i686 ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) @@ -1121,7 +1127,7 @@ case $cpu-$vendor in xscale-* | xscalee[bl]-*) cpu=`echo "$cpu" | sed 's/^xscale/arm/'` ;; - arm64-*) + arm64-* | aarch64le-*) cpu=aarch64 ;; @@ -1175,7 +1181,7 @@ case $cpu-$vendor in case $cpu in 1750a | 580 \ | a29k \ - | aarch64 | aarch64_be \ + | aarch64 | aarch64_be | aarch64c | arm64ec \ | abacus \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ @@ -1194,45 +1200,23 @@ case $cpu-$vendor in | d10v | d30v | dlx | dsp16xx \ | e2k | elxsi | epiphany \ | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | javascript \ | h8300 | h8500 \ | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i*86 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ + | kvx \ | le32 | le64 \ | lm32 \ - | loongarch32 | loongarch64 | loongarchx32 \ + | loongarch32 | loongarch64 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ | m88110 | m88k | maxq | mb | mcore | mep | metag \ | microblaze | microblazeel \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64eb | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r3 | mipsisa32r3el \ - | mipsisa32r5 | mipsisa32r5el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r3 | mipsisa64r3el \ - | mipsisa64r5 | mipsisa64r5el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ + | mips* \ | mmix \ | mn10200 | mn10300 \ | moxie \ @@ -1280,7 +1264,7 @@ case $cpu-$vendor in ;; *) - echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2 exit 1 ;; esac @@ -1301,11 +1285,12 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if test x$basic_os != x +if test x"$basic_os" != x then -# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just +# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just # set os. +obj= case $basic_os in gnu/linux*) kernel=linux @@ -1336,6 +1321,10 @@ EOF kernel=linux os=`echo "$basic_os" | sed -e 's|linux|gnu|'` ;; + managarm*) + kernel=managarm + os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'` + ;; *) kernel= os=$basic_os @@ -1501,10 +1490,16 @@ case $os in os=eabi ;; *) - os=elf + os= + obj=elf ;; esac ;; + aout* | coff* | elf* | pe*) + # These are machine code file formats, not OSes + obj=$os + os= + ;; *) # No normalization, but not necessarily accepted, that comes below. ;; @@ -1523,12 +1518,15 @@ else # system, and we'll never get to this point. kernel= +obj= case $cpu-$vendor in score-*) - os=elf + os= + obj=elf ;; spu-*) - os=elf + os= + obj=elf ;; *-acorn) os=riscix1.2 @@ -1538,28 +1536,35 @@ case $cpu-$vendor in os=gnu ;; arm*-semi) - os=aout + os= + obj=aout ;; c4x-* | tic4x-*) - os=coff + os= + obj=coff ;; c8051-*) - os=elf + os= + obj=elf ;; clipper-intergraph) os=clix ;; hexagon-*) - os=elf + os= + obj=elf ;; tic54x-*) - os=coff + os= + obj=coff ;; tic55x-*) - os=coff + os= + obj=coff ;; tic6x-*) - os=coff + os= + obj=coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1581,19 +1586,24 @@ case $cpu-$vendor in os=sunos3 ;; m68*-cisco) - os=aout + os= + obj=aout ;; mep-*) - os=elf + os= + obj=elf ;; mips*-cisco) - os=elf + os= + obj=elf ;; mips*-*) - os=elf + os= + obj=elf ;; or32-*) - os=coff + os= + obj=coff ;; *-tti) # must be before sparc entry or we get the wrong os. os=sysv3 @@ -1602,7 +1612,8 @@ case $cpu-$vendor in os=sunos4.1.1 ;; pru-*) - os=elf + os= + obj=elf ;; *-be) os=beos @@ -1683,10 +1694,12 @@ case $cpu-$vendor in os=uxpv ;; *-rom68k) - os=coff + os= + obj=coff ;; *-*bug) - os=coff + os= + obj=coff ;; *-apple) os=macos @@ -1704,7 +1717,8 @@ esac fi -# Now, validate our (potentially fixed-up) OS. +# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ). + case $os in # Sometimes we do "kernel-libc", so those need to count as OSes. musl* | newlib* | relibc* | uclibc*) @@ -1715,6 +1729,9 @@ case $os in # VxWorks passes extra cpu info in the 4th filed. simlinux | simwindows | spe) ;; + # See `case $cpu-$os` validation below + ghcjs) + ;; # Now accept the basic system types. # The portable systems comes first. # Each alternative MUST end in a * to match a version number. @@ -1723,7 +1740,7 @@ case $os in | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ | hiux* | abug | nacl* | netware* | windows* \ - | os9* | macos* | osx* | ios* \ + | os9* | macos* | osx* | ios* | tvos* | watchos* \ | mpw* | magic* | mmixware* | mon960* | lnews* \ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ | aos* | aros* | cloudabi* | sortix* | twizzler* \ @@ -1732,11 +1749,11 @@ case $os in | mirbsd* | netbsd* | dicos* | openedition* | ose* \ | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ - | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ - | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | bosx* | nextstep* | cxux* | oabi* \ + | ptx* | ecoff* | winnt* | domain* | vsta* \ | udi* | lites* | ieee* | go32* | aux* | hcos* \ | chorusrdb* | cegcc* | glidix* | serenity* \ - | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | cygwin* | msys* | moss* | proelf* | rtems* \ | midipix* | mingw32* | mingw64* | mint* \ | uxpv* | beos* | mpeix* | udk* | moxiebox* \ | interix* | uwin* | mks* | rhapsody* | darwin* \ @@ -1748,7 +1765,8 @@ case $os in | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ - | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*) + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ + | fiwix* | mlibc* | cos* | mbr* ) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) @@ -1756,41 +1774,99 @@ case $os in ;; none) ;; + kernel* | msvc* ) + # Restricted further below + ;; + '') + if test x"$obj" = x + then + echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2 + fi + ;; + *) + echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2 + exit 1 + ;; +esac + +case $obj in + aout* | coff* | elf* | pe*) + ;; + '') + # empty is fine + ;; *) - echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2 + exit 1 + ;; +esac + +# Here we handle the constraint that a (synthetic) cpu and os are +# valid only in combination with each other and nowhere else. +case $cpu-$os in + # The "javascript-unknown-ghcjs" triple is used by GHC; we + # accept it here in order to tolerate that, but reject any + # variations. + javascript-ghcjs) + ;; + javascript-* | *-ghcjs) + echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2 exit 1 ;; esac # As a final step for OS-related things, validate the OS-kernel combination # (given a valid OS), if there is a kernel. -case $kernel-$os in - linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* ) +case $kernel-$os-$obj in + linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \ + | linux-musl*- | linux-relibc*- | linux-uclibc*- | linux-mlibc*- ) + ;; + uclinux-uclibc*- ) + ;; + managarm-mlibc*- | managarm-kernel*- ) ;; - uclinux-uclibc* ) + windows*-msvc*-) ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + -dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- ) # These are just libc implementations, not actual OSes, and thus # require a kernel. - echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 exit 1 ;; - kfreebsd*-gnu* | kopensolaris*-gnu*) + -kernel*- ) + echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2 + exit 1 ;; - vxworks-simlinux | vxworks-simwindows | vxworks-spe) + *-kernel*- ) + echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2 + exit 1 ;; - nto-qnx*) + *-msvc*- ) + echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2 + exit 1 ;; - os2-emx) + kfreebsd*-gnu*- | kopensolaris*-gnu*-) + ;; + vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-) + ;; + nto-qnx*-) + ;; + os2-emx-) ;; - *-eabi* | *-gnueabi*) + *-eabi*- | *-gnueabi*-) ;; - -*) + none--*) + # None (no kernel, i.e. freestanding / bare metal), + # can be paired with an machine code file format + ;; + -*-) # Blank kernel with real OS is always fine. ;; - *-*) - echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + --*) + # Blank kernel and OS with real machine code file format is always fine. + ;; + *-*-*) + echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2 exit 1 ;; esac @@ -1873,7 +1949,7 @@ case $vendor in ;; esac -echo "$cpu-$vendor-${kernel:+$kernel-}$os" +echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}" exit # Local variables: diff --git a/build-aux/do-release-commit-and-tag b/build-aux/do-release-commit-and-tag new file mode 100755 index 0000000..6876fe0 --- /dev/null +++ b/build-aux/do-release-commit-and-tag @@ -0,0 +1,179 @@ +#!/bin/sh +# In a git/autoconf/automake-enabled project with a NEWS file and a version- +# controlled .prev-version file, automate the procedure by which we record +# the date, release-type and version string in the NEWS file. That commit +# will serve to identify the release, so apply a signed tag to it as well. +VERSION=2018-03-07.03 # UTC + +# Note: this is a bash script (could be zsh or dash) + +# Copyright (C) 2009-2024 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + +# Written by Jim Meyering + +ME=$(basename "$0") +warn() { printf '%s: %s\n' "$ME" "$*" >&2; } +die() { warn "$*"; exit 1; } + +help() +{ + cat <<EOF +Usage: $ME [OPTION...] VERSION RELEASE_TYPE + +Run this script from top_srcdir to perform the final pre-release NEWS +update in which the date, release-type and version string are +recorded. Commit that result with a log entry marking the release, +and apply a signed tag. Run it from your project's top-level +directory. + +Requirements: +- you use git for version-control +- a version-controlled .prev-version file +- a NEWS file, with line 3 identical to this: +$noteworthy_stub + +Options: + --branch=BRANCH set release branch (default: $branch) + -C, --builddir=DIR location of (configured) Makefile (default: $builddir) + --help print this help, then exit + --version print version number, then exit + +EXAMPLE: +To update NEWS and tag the beta 8.1 release of coreutils, I would run this: + + $ME 8.1 beta + +Report bugs and patches to <bug-gnulib@gnu.org>. +EOF + exit +} + +version() +{ + year=$(echo "$VERSION" | sed 's/[^0-9].*//') + cat <<EOF +$ME $VERSION +Copyright (C) $year Free Software Foundation, Inc, +License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html> +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law. +EOF + exit +} + +## ------ ## +## Main. ## +## ------ ## + +# Constants. +noteworthy='* Noteworthy changes in release' +noteworthy_stub="$noteworthy ?.? (????-??-??) [?]" + +# Variables. +branch=$(git branch | sed -ne '/^\* /{s///;p;q;}') +builddir=. + +while test $# != 0 +do + # Handle --option=value by splitting apart and putting back on argv. + case $1 in + --*=*) + opt=$(echo "$1" | sed -e 's/=.*//') + val=$(echo "$1" | sed -e 's/[^=]*=//') + shift + set dummy "$opt" "$val" "$@"; shift + ;; + esac + + case $1 in + --help|--version) ${1#--};; + --branch) shift; branch=$1; shift ;; + -C|--builddir) shift; builddir=$1; shift ;; + --*) die "unrecognized option: $1";; + *) break;; + esac +done + +test $# = 2 \ + || die "Usage: $ME [OPTION...] VERSION TYPE" + +ver=$1 +type=$2 + + +## ---------------------- ## +## First, sanity checks. ## +## ---------------------- ## + +# Verify that $ver looks like a version number, and... +echo "$ver"|grep -E '^[0-9][0-9.]*[0-9]$' > /dev/null \ + || die "invalid version: $ver" +prev_ver=$(cat .prev-version) \ + || die 'failed to determine previous version number from .prev-version' + +# Verify that $ver is sensible (> .prev-version). +case $(printf "%s\n%s\n" "$prev_ver" "$ver"|sort -V -u|tr '\n' ':') in + "$prev_ver:$ver:") ;; + *) die "invalid version: $ver (<= $prev_ver)";; +esac + +case $type in + alpha|beta|stable) ;; + *) die "invalid release type: $type";; +esac + +# No local modifications allowed. +case $(git diff-index --name-only HEAD) in + '') ;; + *) die 'this tree is dirty; commit your changes first';; +esac + +# Ensure the current branch name is correct: +curr_br=$(git rev-parse --symbolic-full-name HEAD) +test "$curr_br" = "refs/heads/$branch" || die not on branch $branch + +# Extract package name from Makefile. +Makefile=$builddir/Makefile +pkg=$(sed -n 's/^PACKAGE = \(.*\)/\1/p' "$Makefile") \ + || die "failed to determine package name from $Makefile" + +# Check that line 3 of NEWS is the stub line about to be replaced. +test "$(sed -n 3p NEWS)" = "$noteworthy_stub" \ + || die "line 3 of NEWS must be exactly '$noteworthy_stub'" + +## --------------- ## +## Then, changes. ## +## --------------- ## + +# Update NEWS to have today's date, plus desired version number and $type. +perl -MPOSIX -ni -e 'my $today = strftime "%F", localtime time;' \ + -e 'my ($type, $ver) = qw('"$type $ver"');' \ + -e 'my $pfx = "'"$noteworthy"'";' \ + -e 'print $.==3 ? "$pfx $ver ($today) [$type]\n" : $_' \ + NEWS || die 'failed to update NEWS' + +printf "version %s\n\n* NEWS: Record release date.\n" "$ver" \ + | git commit -F - -a || die 'git commit failed' +git tag -s -m "$pkg $ver" v$ver HEAD || die 'git tag failed' + +# Local variables: +# indent-tabs-mode: nil +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-start: "VERSION=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: " # UTC" +# End: diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh index 1ad5cf4..60447d4 100755 --- a/build-aux/gendocs.sh +++ b/build-aux/gendocs.sh @@ -2,9 +2,9 @@ # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -scriptversion=2023-01-21.00 +scriptversion=2024-01-27.16 -# Copyright 2003-2023 Free Software Foundation, Inc. +# Copyright 2003-2024 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -66,14 +66,14 @@ generate_html=true generate_info=true generate_tex=true outdir=manual -source_extra= +unset source_extra split=node srcfile= texarg="-t @finalout" version="gendocs.sh $scriptversion -Copyright 2023 Free Software Foundation, Inc. +Copyright 2024 Free Software Foundation, Inc. There is NO warranty. You may redistribute this software under the terms of the GNU General Public License. For more information about these matters, see the files named COPYING." @@ -167,7 +167,7 @@ while test $# -gt 0; do --html) shift; default_htmlarg=false; htmlarg=$1;; --info) shift; infoarg=$1;; --no-ascii) generate_ascii=false;; - --no-html) generate_ascii=false;; + --no-html) generate_html=false;; --no-info) generate_info=false;; --no-tex) generate_tex=false;; --source) shift; source_extra=$1;; @@ -416,11 +416,49 @@ fi # end html printf "\nMaking .tar.gz for sources...\n" d=`dirname $srcfile` ( - cd "$d" - srcfiles=`ls -d *.texinfo *.texi *.txi *.eps $source_extra 2>/dev/null` || true - tar czfh "$abs_outdir/$PACKAGE.texi.tar.gz" $srcfiles - ls -l "$abs_outdir/$PACKAGE.texi.tar.gz" -) + cd "$d" || exit + + # Set PATS to a list of globbing patterns that expand to + # file names to be put into the .tar.gz for sources. + # Omit patterns that do not expand to file names. + pats= + + if case `$MAKEINFO --version | sed -e 's/^[^0-9]*//' -e 1q` in \ + [1-6]* | 7.[01]*) false;; \ + *) true;; \ + esac \ + ; then + + for pat in '*.eps'; do + for file in $pat; do + test "$file" = "$pat" && test ! -e "$file" || pats="$pats $pat" + break + done + done + + # if $MAKEINFO is recent enough, use --trace-includes on the + # $srcfile to get the included files of the targetted manual only + base=`basename "$srcfile"` + + cmd="$SETLANG $MAKEINFO $commonarg --trace-includes \"$base\"" + eval "$cmd" \ + | tar -czhf "$abs_outdir/$PACKAGE.texi.tar.gz" \ + --verbatim-files-from -T- -- "$base" $pats \ + ${source_extra+"$source_extra"} \ + && ls -l "$abs_outdir/$PACKAGE.texi.tar.gz" + else + for pat in '*.texinfo' '*.texi' '*.txi' '*.eps'; do + for file in $pat; do + test "$file" = "$pat" && test ! -e "$file" || pats="$pats $pat" + break + done + done + + tar -czhf "$abs_outdir/$PACKAGE.texi.tar.gz" \ + -- $pats ${source_extra+"$source_extra"} \ + && ls -l "$abs_outdir/$PACKAGE.texi.tar.gz" + fi +) || exit texi_tgz_size=`calcsize "$outdir/$PACKAGE.texi.tar.gz"` # @@ -466,11 +504,25 @@ fi # printf "\nMaking index.html for %s...\n" "$PACKAGE" if test -z "$use_texi2html"; then - CONDS="/%%IF *HTML_SECTION%%/,/%%ENDIF *HTML_SECTION%%/d;\ - /%%IF *HTML_CHAPTER%%/,/%%ENDIF *HTML_CHAPTER%%/d" + if test x$split = xnode; then + CONDS="/%%IF *HTML_NODE%%/d;/%%ENDIF *HTML_NODE%%/d;\ + /%%IF *HTML_CHAPTER%%/,/%%ENDIF *HTML_CHAPTER%%/d;\ + /%%IF *HTML_SECTION%%/,/%%ENDIF *HTML_SECTION%%/d;" + elif test x$split = xchapter; then + CONDS="/%%IF *HTML_CHAPTER%%/d;/%%ENDIF *HTML_CHAPTER%%/d;\ + /%%IF *HTML_SECTION%%/,/%%ENDIF *HTML_SECTION%%/d;\ + /%%IF *HTML_NODE%%/,/%%ENDIF *HTML_NODE%%/d;" + elif test x$split = xsection; then + CONDS="/%%IF *HTML_SECTION%%/d;/%%ENDIF *HTML_SECTION%%/d;\ + /%%IF *HTML_CHAPTER%%/,/%%ENDIF *HTML_CHAPTER%%/d;\ + /%%IF *HTML_NODE%%/,/%%ENDIF *HTML_NODE%%/d;" + else + CONDS="/%%IF.*%%/d;/%%ENDIF.*%%/d;" # invalid split argument + fi else - # should take account of --split here. - CONDS="/%%ENDIF.*%%/d;/%%IF *HTML_SECTION%%/d;/%%IF *HTML_CHAPTER%%/d" + # for texi2html, we do not take account of --split and simply output + # all variants + CONDS="/%%IF.*%%/d;/%%ENDIF.*%%/d;" fi curdate=`$SETLANG date '+%B %d, %Y'` diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index a72057b..aa168e1 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -2,7 +2,7 @@ # Print a version string. scriptversion=2022-07-09.08; # UTC -# Copyright (C) 2007-2023 Free Software Foundation, Inc. +# Copyright (C) 2007-2024 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 4678bad..16a9405 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -3,7 +3,7 @@ # Convert git log output to ChangeLog format. -# Copyright (C) 2008-2023 Free Software Foundation, Inc. +# Copyright (C) 2008-2024 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ # # Written by Jim Meyering -# This is a prologue that allows to run a perl script as an executable +# This is a prologue that allows running a perl script as an executable # on systems that are compliant to a POSIX version before POSIX:2017. # On such systems, the usual invocation of an executable through execlp() # or execvp() fails with ENOEXEC if it is a script that does not start @@ -35,7 +35,7 @@ eval 'exec perl -wSx "$0" "$@"' if 0; -my $VERSION = '2022-01-27 18:49'; # UTC +my $VERSION = '2023-06-24 21:59'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -355,7 +355,7 @@ sub git_dir_option($) . "(expected date/author/email):\n$author_line\n"; # Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog - # `(tiny change)' annotation. + # '(tiny change)' annotation. my $tiny = (grep (/^(?:Copyright-paperwork-exempt|Tiny-change):\s+[Yy]es$/, @line) ? ' (tiny change)' : ''); diff --git a/build-aux/gnu-web-doc-update b/build-aux/gnu-web-doc-update index a804031..b51fc10 100755 --- a/build-aux/gnu-web-doc-update +++ b/build-aux/gnu-web-doc-update @@ -2,9 +2,9 @@ # Run this after each non-alpha release, to update the web documentation at # https://www.gnu.org/software/$pkg/manual/ -VERSION=2023-03-23.02; # UTC +VERSION=2023-09-11.20; # UTC -# Copyright (C) 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2009-2024 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -182,7 +182,7 @@ $RSYNC -avP "$builddir"/doc/manual/ $tmp/$pkg/manual cd $tmp/$pkg test -d manual/CVS || $dryrun $CVS add -ko manual - cd $tmp/$pkg/manual + cd manual # Add all the files. This is simpler than trying to add only the # new ones because of new directories diff --git a/build-aux/gnupload b/build-aux/gnupload index 3e8f102..298a676 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -3,7 +3,7 @@ scriptversion=2022-01-27.18; # UTC -# Copyright (C) 2004-2023 Free Software Foundation, Inc. +# Copyright (C) 2004-2024 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/install-sh b/build-aux/install-sh index ec298b5..7c56c9c 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2020-11-14.01; # UTC +scriptversion=2023-11-23.18; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -124,9 +124,9 @@ it's up to you to specify -f if you want it. If -S is not specified, no backups are attempted. -Email bug reports to bug-automake@gnu.org. -Automake home page: https://www.gnu.org/software/automake/ -" +Report bugs to <bug-automake@gnu.org>. +GNU Automake home page: <https://www.gnu.org/software/automake/>. +General help using GNU software: <https://www.gnu.org/gethelp/>." while test $# -ne 0; do case $1 in diff --git a/build-aux/update-copyright b/build-aux/update-copyright index 99196fc..ea3e46f 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright @@ -3,7 +3,7 @@ # Update an FSF copyright year list to include the current year. -# Copyright (C) 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2009-2024 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -98,7 +98,8 @@ # 6. Blank lines, even if preceded by the prefix, do not appear # within the FSF copyright statement. # 7. Each copyright year is 2 or 4 digits, and years are separated by -# commas, "-", or "--". Whitespace may appear after commas. +# commas, "-", "--", or "\(en" (for troff). Whitespace may appear +# after commas. # # Environment variables: # @@ -122,7 +123,7 @@ # 5. Set UPDATE_COPYRIGHT_HOLDER if the copyright holder is other # than "Free Software Foundation, Inc.". -# This is a prologue that allows to run a perl script as an executable +# This is a prologue that allows running a perl script as an executable # on systems that are compliant to a POSIX version before POSIX:2017. # On such systems, the usual invocation of an executable through execlp() # or execvp() fails with ENOEXEC if it is a script that does not start @@ -137,7 +138,7 @@ eval 'exec perl -wSx -0777 -pi "$0" "$@"' if 0; -my $VERSION = '2023-01-11.04:24'; # UTC +my $VERSION = '2024-01-15.18:30'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -145,9 +146,11 @@ my $VERSION = '2023-01-11.04:24'; # UTC use strict; use warnings; +use re 'eval'; my $copyright_re = 'Copyright'; my $circle_c_re = '(?:\([cC]\)|@copyright\{}|\\\\\(co|©|©)'; +my $ndash_re = '(?:--?|\\\\\(en)'; my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER}; $holder ||= 'Free Software Foundation, Inc.'; my $prefix_max = 5; @@ -167,14 +170,13 @@ if (!$this_year || $this_year !~ m/^\d{4}$/) # Unless the file consistently uses "\r\n" as the EOL, use "\n" instead. my $eol = /(?:^|[^\r])\n/ ? "\n" : "\r\n"; -my $leading; -my $prefix; -my $ws_re; my $stmt_re; -while (/(^|\n)(.{0,$prefix_max})$copyright_re/g) +my $found; +while (/(^|\n)(.{0,$prefix_max})$copyright_re/cg) { - $leading = "$1$2"; - $prefix = $2; + my $pos=pos(); + my $leading = "$1$2"; + my $prefix = $2; if ($prefix =~ /^(\s*\/)\*(\s*)$/) { $prefix =~ s,/, ,; @@ -185,105 +187,108 @@ while (/(^|\n)(.{0,$prefix_max})$copyright_re/g) $prefix = $prefix_ws; } } - $ws_re = '[ \t\r\f]'; # \s without \n + my $ws_re = '[ \t\r\f]'; # \s without \n $ws_re = "(?:$ws_re*(?:$ws_re|\\n" . quotemeta($prefix) . ")$ws_re*)"; my $holder_re = $holder; $holder_re =~ s/\s/$ws_re/g; my $stmt_remainder_re = "(?:$ws_re$circle_c_re)?" - . "$ws_re(?:(?:\\d\\d)?\\d\\d(?:,$ws_re?|--?))*" + . "$ws_re(?:(?:\\d\\d)?\\d\\d(?:,$ws_re?|$ndash_re))*" . "((?:\\d\\d)?\\d\\d)$ws_re$holder_re"; if (/\G$stmt_remainder_re/) { + $found = 1; $stmt_re = quotemeta($leading) . "($copyright_re$stmt_remainder_re)"; - last; - } - } -if (defined $stmt_re) - { - /$stmt_re/ or die; # Should never die. - my $stmt = $1; - my $final_year_orig = $2; - # Handle two-digit year numbers like "98" and "99". - my $final_year = $final_year_orig; - $final_year <= 99 - and $final_year += 1900; + /$stmt_re/ or die; # Should never die. + my $stmt = $1; + my $final_year_orig = $2; - if ($final_year != $this_year) - { - # Update the year. - $stmt =~ s/\b$final_year_orig\b/$final_year, $this_year/; - } - if ($final_year != $this_year || $ENV{'UPDATE_COPYRIGHT_FORCE'}) - { - # Normalize all whitespace including newline-prefix sequences. - $stmt =~ s/$ws_re/ /g; + # Handle two-digit year numbers like "98" and "99". + my $final_year = $final_year_orig; + $final_year <= 99 + and $final_year += 1900; - # Put spaces after commas. - $stmt =~ s/, ?/, /g; - - # Convert 2-digit to 4-digit years. - $stmt =~ s/(\b\d\d\b)/19$1/g; - - # Make the use of intervals consistent. - if (!$ENV{UPDATE_COPYRIGHT_USE_INTERVALS}) + if ($final_year != $this_year) { - $stmt =~ s/(\d{4})--?(\d{4})/join(', ', $1..$2)/eg; + # Update the year. + $stmt =~ s/(^|[^\d])$final_year_orig\b/$1$final_year, $this_year/; } - else + if ($final_year != $this_year || $ENV{'UPDATE_COPYRIGHT_FORCE'}) { - my $ndash = $ARGV =~ /\.tex(i(nfo)?)?$/ ? "--" : "-"; + # Normalize all whitespace including newline-prefix sequences. + $stmt =~ s/$ws_re/ /g; - $stmt =~ - s/ - (\d{4}) - (?: - (,\ |--?) - ((??{ - if ($2 ne ', ') { '\d{4}'; } - elsif (!$3) { $1 + 1; } - else { $3 + 1; } - })) - )+ - /$1$ndash$3/gx; + # Put spaces after commas. + $stmt =~ s/, ?/, /g; - # When it's 2, emit a single range encompassing all year numbers. - $ENV{UPDATE_COPYRIGHT_USE_INTERVALS} == 2 - and $stmt =~ s/\b(\d{4})\b.*\b(\d{4})\b/$1$ndash$2/; - } + # Convert 2-digit to 4-digit years. + $stmt =~ s/(\b\d\d\b)/19$1/g; - # Format within margin. - my $stmt_wrapped; - my $text_margin = $margin - length($prefix); - if ($prefix =~ /^(\t+)/) - { - $text_margin -= length($1) * ($tab_width - 1); - } - while (length $stmt) - { - if (($stmt =~ s/^(.{1,$text_margin})(?: |$)//) - || ($stmt =~ s/^([\S]+)(?: |$)//)) + # Make the use of intervals consistent. + if (!$ENV{UPDATE_COPYRIGHT_USE_INTERVALS}) { - my $line = $1; - $stmt_wrapped .= $stmt_wrapped ? "$eol$prefix" : $leading; - $stmt_wrapped .= $line; + $stmt =~ s/(\d{4})$ndash_re(\d{4})/join(', ', $1..$2)/eg; } else { - # Should be unreachable, but we don't want an infinite - # loop if it can be reached. - die; + my $ndash = ($ARGV =~ /\.tex(i(nfo)?)?$/ ? "--" + : $ARGV =~ /\.(\d[a-z]*|man)$/ ? "\\(en" + : "-"); + + $stmt =~ + s/ + (\d{4}) + (?: + (,\ |$ndash_re) + ((??{ + if ($2 ne ', ') { '\d{4}'; } + elsif (!$3) { $1 + 1; } + else { $3 + 1; } + })) + )+ + /$1$ndash$3/gx; + + # When it's 2, emit a single range encompassing all year numbers. + $ENV{UPDATE_COPYRIGHT_USE_INTERVALS} == 2 + and $stmt =~ s/(^|[^\d])(\d{4})\b.*(?:[^\d])(\d{4})\b/$1$2$ndash$3/; } - } - # Replace the old copyright statement. - s/$stmt_re/$stmt_wrapped/g; + # Format within margin. + my $stmt_wrapped; + my $text_margin = $margin - length($prefix); + if ($prefix =~ /^(\t+)/) + { + $text_margin -= length($1) * ($tab_width - 1); + } + while (length $stmt) + { + if (($stmt =~ s/^(.{1,$text_margin})(?: |$)//) + || ($stmt =~ s/^([\S]+)(?: |$)//)) + { + my $line = $1; + $stmt_wrapped .= $stmt_wrapped ? "$eol$prefix" : $leading; + $stmt_wrapped .= $line; + } + else + { + # Should be unreachable, but we don't want an infinite + # loop if it can be reached. + die; + } + } + + # Replace the old copyright statement. + my $p = pos(); + s/$stmt_re/$stmt_wrapped/g; + pos() = $p; + } } } -else + +if (!$found) { print STDERR "$ARGV: warning: copyright statement not found\n"; } diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free index f4908ba..ac9c890 100755 --- a/build-aux/useless-if-before-free +++ b/build-aux/useless-if-before-free @@ -4,7 +4,7 @@ # Detect instances of "if (p) free (p);". # Likewise "if (p != 0)", "if (0 != p)", or with NULL; and with braces. -# Copyright (C) 2008-2023 Free Software Foundation, Inc. +# Copyright (C) 2008-2024 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files index 5ed2b14..7036576 100755 --- a/build-aux/vc-list-files +++ b/build-aux/vc-list-files @@ -4,7 +4,7 @@ # Print a version string. scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2006-2023 Free Software Foundation, Inc. +# Copyright (C) 2006-2024 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for wget 1.21.4. +# Generated by GNU Autoconf 2.72 for wget 1.24.5. # # Report bugs to <bug-wget@gnu.org>. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, # Inc. # # @@ -17,7 +17,6 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -26,12 +25,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -103,7 +103,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -133,15 +133,14 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -149,12 +148,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else \$as_nop - case \`(set -o) 2>/dev/null\` in #( +else case e in #( + e) case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi " @@ -172,8 +172,9 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else \$as_nop - exitcode=1; echo positional parameters were not saved. +else case e in #( + e) exitcode=1; echo positional parameters were not saved. ;; +esac fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -187,14 +188,15 @@ test \$(( 1 + 1 )) = 2 || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else $as_nop - as_have_required=no +else case e in #( + e) as_have_required=no ;; +esac fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else $as_nop - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -227,12 +229,13 @@ IFS=$as_save_IFS if $as_found then : -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else case e in #( + e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi +fi ;; +esac fi @@ -254,7 +257,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -274,7 +277,8 @@ $0: manually run the script under such a shell if you do $0: have one." fi exit 1 -fi +fi ;; +esac fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -313,14 +317,6 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -389,11 +385,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -407,21 +404,14 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -495,6 +485,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' + t clear + :clear s/[$]LINENO.*/&-/ t lineno b @@ -543,7 +535,6 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -555,9 +546,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -582,10 +573,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated test -n "$DJDIR" || exec 7<&0 </dev/null @@ -611,8 +604,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wget' PACKAGE_TARNAME='wget' -PACKAGE_VERSION='1.21.4' -PACKAGE_STRING='wget 1.21.4' +PACKAGE_VERSION='1.24.5' +PACKAGE_STRING='wget 1.24.5' PACKAGE_BUGREPORT='bug-wget@gnu.org' PACKAGE_URL='' @@ -687,6 +680,8 @@ WITH_SSL_FALSE WITH_SSL_TRUE WITH_IRI_FALSE WITH_IRI_TRUE +LIBPROXY_LIBS +LIBPROXY_CFLAGS GPGME_CONFIG GPGRT_CONFIG GPGME_LIBS @@ -765,6 +760,8 @@ GL_COND_OBJ_WINDOWS_MUTEX_FALSE GL_COND_OBJ_WINDOWS_MUTEX_TRUE GL_COND_OBJ_WCWIDTH_FALSE GL_COND_OBJ_WCWIDTH_TRUE +GL_COND_OBJ_WCTYPE_FALSE +GL_COND_OBJ_WCTYPE_TRUE GL_COND_OBJ_WCRTOMB_FALSE GL_COND_OBJ_WCRTOMB_TRUE NEXT_AS_FIRST_DIRECTIVE_WCHAR_H @@ -794,6 +791,16 @@ LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_FALSE LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE LIBUNISTRING_COMPILE_UNISTR_U8_CPY_FALSE LIBUNISTRING_COMPILE_UNISTR_U8_CPY_TRUE +LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_FALSE +LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_TRUE +LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT_FALSE +LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT_TRUE +LIBUNISTRING_COMPILE_UNISTR_U32_PCPY_FALSE +LIBUNISTRING_COMPILE_UNISTR_U32_PCPY_TRUE +LIBUNISTRING_COMPILE_UNISTR_U32_CPY_FALSE +LIBUNISTRING_COMPILE_UNISTR_U32_CPY_TRUE +LIBUNISTRING_COMPILE_UNISTR_U32_CHR_FALSE +LIBUNISTRING_COMPILE_UNISTR_U32_CHR_TRUE LIBUNISTRING_UNISTR_H HAVE_UNISTD_H NEXT_AS_FIRST_DIRECTIVE_UNISTD_H @@ -807,6 +814,30 @@ GL_GNULIB_UNINORM_NFD_DLL_VARIABLE LIBUNISTRING_UNINORM_H LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SOFT_DOTTED_FALSE LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SOFT_DOTTED_TRUE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT_FALSE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT_TRUE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER_FALSE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER_TRUE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_FALSE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_TRUE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT_FALSE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT_TRUE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT_FALSE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT_TRUE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER_FALSE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER_TRUE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH_FALSE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH_TRUE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT_FALSE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT_TRUE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL_FALSE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL_TRUE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK_FALSE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK_TRUE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_FALSE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_TRUE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM_FALSE +LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM_TRUE LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_FALSE LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_TRUE GL_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE @@ -830,6 +861,7 @@ GL_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE +GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE @@ -843,6 +875,7 @@ GL_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE +GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE @@ -872,6 +905,8 @@ GL_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE GL_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE @@ -1047,6 +1082,7 @@ GL_COND_OBJ_SOCKET_TRUE GL_COND_OBJ_SIGPROCMASK_FALSE GL_COND_OBJ_SIGPROCMASK_TRUE ASM_SYMBOL_PREFIX +EGREP NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H NEXT_SIGNAL_H GL_COND_OBJ_SIGACTION_FALSE @@ -1226,10 +1262,8 @@ GL_GNULIB_NANOSLEEP GL_GNULIB_LOCALTIME GL_GNULIB_MKTIME GL_GNULIB_CTIME -REPLACE_LOCALTIME -REPLACE_GMTIME -GNULIB_GETTIMEOFDAY REPLACE_TZSET +REPLACE_TIMESPEC_GETRES REPLACE_TIMESPEC_GET REPLACE_TIMEGM REPLACE_TIME @@ -1237,6 +1271,8 @@ REPLACE_STRFTIME REPLACE_NANOSLEEP REPLACE_MKTIME REPLACE_LOCALTIME_R +REPLACE_LOCALTIME +REPLACE_GMTIME REPLACE_CTIME HAVE_TIMEZONE_T HAVE_TIMESPEC_GETRES @@ -1302,6 +1338,7 @@ GL_GNULIB_EXPLICIT_BZERO GL_COND_OBJ_MEMCHR_FALSE GL_COND_OBJ_MEMCHR_TRUE UNDEFINE_STRTOK_R +REPLACE_STRVERSCMP REPLACE_STRSIGNAL REPLACE_STRERRORNAME_NP REPLACE_STRERROR_R @@ -1316,6 +1353,7 @@ REPLACE_STRDUP REPLACE_STRCHRNUL REPLACE_STPNCPY REPLACE_STPCPY +REPLACE_MEMSET_EXPLICIT REPLACE_MEMPCPY REPLACE_MEMMEM REPLACE_MEMCHR @@ -1351,12 +1389,15 @@ GL_COND_OBJ_MBSRTOWCS_FALSE GL_COND_OBJ_MBSRTOWCS_TRUE GL_COND_OBJ_MBSINIT_FALSE GL_COND_OBJ_MBSINIT_TRUE -HAVE_VISIBILITY -CFLAG_VISIBILITY GL_COND_OBJ_MBRTOWC_FALSE GL_COND_OBJ_MBRTOWC_TRUE LIB_MBRTOWC MBRTOWC_LIB +HAVE_VISIBILITY +CFLAG_VISIBILITY +GL_COND_OBJ_MBRTOC32_FALSE +GL_COND_OBJ_MBRTOC32_TRUE +GREP GL_COND_OBJ_LSTAT_FALSE GL_COND_OBJ_LSTAT_TRUE GL_COND_OBJ_LSEEK_FALSE @@ -1368,7 +1409,7 @@ LIBTHREAD LIBSTDTHREAD GL_COND_OBJ_LOCALECONV_FALSE GL_COND_OBJ_LOCALECONV_TRUE -GL_GNULIB_LOCALENAME +GL_GNULIB_LOCALENAME_UNSAFE GL_GNULIB_DUPLOCALE GL_GNULIB_SETLOCALE_NULL GL_GNULIB_SETLOCALE @@ -1416,16 +1457,18 @@ REPLACE_NL_LANGINFO HAVE_NL_LANGINFO GL_COND_OBJ_ISWXDIGIT_FALSE GL_COND_OBJ_ISWXDIGIT_TRUE +GL_COND_OBJ_ISWPUNCT_FALSE +GL_COND_OBJ_ISWPUNCT_TRUE GL_COND_OBJ_ISWDIGIT_FALSE GL_COND_OBJ_ISWDIGIT_TRUE -LOCALE_ZH_CN -LOCALE_FR_UTF8 -LOCALE_JA +GL_COND_OBJ_ISWCTYPE_FALSE +GL_COND_OBJ_ISWCTYPE_TRUE GL_GNULIB_TOWCTRANS GL_GNULIB_WCTRANS GL_GNULIB_ISWCTYPE GL_GNULIB_WCTYPE GL_GNULIB_ISWXDIGIT +GL_GNULIB_ISWPUNCT GL_GNULIB_ISWDIGIT GL_GNULIB_ISWBLANK GL_COND_OBJ_ISWBLANK_FALSE @@ -1438,7 +1481,10 @@ NEXT_WCTYPE_H HAVE_CRTDEFS_H HAVE_WINT_T HAVE_ISWCNTRL +REPLACE_WCTYPE +REPLACE_WCTRANS REPLACE_ISWXDIGIT +REPLACE_ISWPUNCT REPLACE_ISWDIGIT REPLACE_ISWBLANK HAVE_WCTRANS_T @@ -1483,7 +1529,6 @@ HAVE_SIGNED_WINT_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_SIG_ATOMIC_T BITSIZEOF_WINT_T -BITSIZEOF_WCHAR_T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_PTRDIFF_T @@ -1810,9 +1855,6 @@ HAVE_OPENAT HAVE_FCNTL GL_COND_OBJ_FCHDIR_FALSE GL_COND_OBJ_FCHDIR_TRUE -GL_GENERATE_ERROR_H_FALSE -GL_GENERATE_ERROR_H_TRUE -ERROR_H GL_COND_OBJ_ERROR_FALSE GL_COND_OBJ_ERROR_TRUE REPLACE_ERROR_AT_LINE @@ -1884,6 +1926,24 @@ GL_COND_OBJ_CHDIR_LONG_FALSE GL_COND_OBJ_CHDIR_LONG_TRUE GL_COND_OBJ_CANONICALIZE_LGPL_FALSE GL_COND_OBJ_CANONICALIZE_LGPL_TRUE +HAVE_WORKING_MBRTOC32 +LOCALE_ZH_CN +LC_MONETARY_IMPLEMENTED +LC_TIME_IMPLEMENTED +LC_NUMERIC_IMPLEMENTED +LC_COLLATE_IMPLEMENTED +LOCALE_FR_UTF8 +LOCALE_JA +SMALL_WCHAR_T +BITSIZEOF_WCHAR_T +CXX_HAS_CHAR8_TYPE +CXX_HAS_UCHAR_TYPES +GNULIBHEADERS_OVERRIDE_CHAR32_T +GNULIBHEADERS_OVERRIDE_CHAR16_T +GNULIBHEADERS_OVERRIDE_CHAR8_T +HAVE_UCHAR_H +NEXT_AS_FIRST_DIRECTIVE_UCHAR_H +NEXT_UCHAR_H GL_GENERATE_BYTESWAP_H_FALSE GL_GENERATE_BYTESWAP_H_TRUE BYTESWAP_H @@ -1894,6 +1954,7 @@ REPLACE_STRTOUL REPLACE_STRTOLL REPLACE_STRTOLD REPLACE_STRTOL +REPLACE_STRTOF REPLACE_STRTOD REPLACE_SETSTATE REPLACE_SETENV @@ -1903,6 +1964,7 @@ REPLACE_REALLOC_FOR_REALLOC_POSIX REPLACE_REALLOC_FOR_REALLOC_GNU REPLACE_RANDOM_R REPLACE_RANDOM +REPLACE_RAND REPLACE_QSORT_R REPLACE_PUTENV REPLACE_PTSNAME_R @@ -1936,6 +1998,7 @@ HAVE_STRTOUL HAVE_STRTOLL HAVE_STRTOLD HAVE_STRTOL +HAVE_STRTOF HAVE_STRTOD HAVE_DECL_SETSTATE HAVE_SETSTATE @@ -1987,6 +2050,7 @@ GL_GNULIB_STRTOUL GL_GNULIB_STRTOLL GL_GNULIB_STRTOLD GL_GNULIB_STRTOL +GL_GNULIB_STRTOF GL_GNULIB_STRTOD GL_GNULIB_SETENV GL_GNULIB_SECURE_GETENV @@ -1997,6 +2061,7 @@ GL_GNULIB_REALLOC_GNU GL_GNULIB_REALLOCARRAY GL_GNULIB_RANDOM_R GL_GNULIB_RANDOM +GL_GNULIB_RAND GL_GNULIB_QSORT_R GL_GNULIB_PUTENV GL_GNULIB_PTSNAME_R @@ -2024,6 +2089,7 @@ GL_GNULIB_ATOLL GL_GNULIB_ALIGNED_ALLOC GL_GNULIB__EXIT GL_GNULIB_MDA_WCSDUP +GL_GNULIB_WGETCWD GL_GNULIB_WCSFTIME GL_GNULIB_WCSWIDTH GL_GNULIB_WCSTOK @@ -2062,6 +2128,7 @@ GL_GNULIB_MBSNRTOWCS GL_GNULIB_MBSRTOWCS GL_GNULIB_MBRLEN GL_GNULIB_MBRTOWC +GL_GNULIB_MBSZERO GL_GNULIB_MBSINIT GL_GNULIB_WCTOB GL_GNULIB_BTOWC @@ -2130,6 +2197,43 @@ HAVE_MBRLEN HAVE_MBRTOWC HAVE_MBSINIT HAVE_BTOWC +REPLACE_MBRTOC32 +REPLACE_MBRTOC16 +REPLACE_C32RTOMB +HAVE_MBRTOC32 +HAVE_MBRTOC16 +HAVE_C32RTOMB +GL_GNULIB_MBSTOC32S +GL_GNULIB_MBSRTOC32S +GL_GNULIB_MBSNRTOC32S +GL_GNULIB_MBRTOC32 +GL_GNULIB_MBRTOC16 +GL_GNULIB_C32_GET_TYPE_TEST +GL_GNULIB_C32_GET_MAPPING +GL_GNULIB_C32_APPLY_TYPE_TEST +GL_GNULIB_C32_APPLY_MAPPING +GL_GNULIB_C32TOB +GL_GNULIB_C32SWIDTH +GL_GNULIB_C32STOMBS +GL_GNULIB_C32SRTOMBS +GL_GNULIB_C32SNRTOMBS +GL_GNULIB_C32RTOMB +GL_GNULIB_C32WIDTH +GL_GNULIB_C32TOUPPER +GL_GNULIB_C32TOLOWER +GL_GNULIB_C32ISXDIGIT +GL_GNULIB_C32ISUPPER +GL_GNULIB_C32ISSPACE +GL_GNULIB_C32ISPUNCT +GL_GNULIB_C32ISPRINT +GL_GNULIB_C32ISLOWER +GL_GNULIB_C32ISGRAPH +GL_GNULIB_C32ISDIGIT +GL_GNULIB_C32ISCNTRL +GL_GNULIB_C32ISBLANK +GL_GNULIB_C32ISALPHA +GL_GNULIB_C32ISALNUM +GL_GNULIB_BTOC32 GL_COND_OBJ_BIND_FALSE GL_COND_OBJ_BIND_TRUE GL_GENERATE_ASSERT_H_FALSE @@ -2296,6 +2400,7 @@ REPLACE_GETCWD REPLACE_FTRUNCATE REPLACE_FDATASYNC REPLACE_FCHOWNAT +REPLACE_FCHDIR REPLACE_FACCESSAT REPLACE_EXECVPE REPLACE_EXECVP @@ -2380,6 +2485,8 @@ ICONV_CONST LEXLIB LEX_OUTPUT_ROOT LEX +localedir_c_make +localedir_c POSUB LTLIBINTL LIBINTL @@ -2412,8 +2519,6 @@ PYTHON RANLIB ARFLAGS AR -EGREP -GREP CPP VALGRIND_TESTS HAVE_VALGRIND @@ -2563,6 +2668,7 @@ with_libuuid enable_pcre2 enable_pcre with_gpgme_prefix +enable_libproxy enable_xattr enable_year2038 ' @@ -2602,7 +2708,9 @@ CARES_LIBS METALINK_CFLAGS METALINK_LIBS GPGME_CFLAGS -GPGME_LIBS' +GPGME_LIBS +LIBPROXY_CFLAGS +LIBPROXY_LIBS' # Initialize some variables set by options. @@ -2711,7 +2819,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -2737,7 +2845,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -2950,7 +3058,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -2966,7 +3074,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -2996,8 +3104,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: '$ac_option' +Try '$0 --help' for more information" ;; *=*) @@ -3005,7 +3113,7 @@ Try \`$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: '$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -3055,7 +3163,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: `$host' +# There might be people who depend on the old broken behavior: '$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -3123,7 +3231,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -3151,7 +3259,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wget 1.21.4 to adapt to many kinds of systems. +'configure' configures wget 1.24.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -3165,11 +3273,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print 'checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' + -C, --config-cache alias for '--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] + --srcdir=DIR find the sources in DIR [configure dir or '..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -3177,10 +3285,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. +By default, 'make install' will install all the files in +'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify +an installation prefix other than '$ac_default_prefix' using '--prefix', +for instance '--prefix=\$HOME'. For better control, use the options below. @@ -3222,7 +3330,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wget 1.21.4:";; + short | recursive ) echo "Configuration of wget 1.24.5:";; esac cat <<\_ACEOF @@ -3266,6 +3374,7 @@ Optional Features: --disable-iri disable IDN/IRIs support --disable-pcre2 Disable PCRE2 style regular expressions --disable-pcre Disable PCRE style regular expressions + --enable-libproxy libproxy support for system wide proxy configuration --disable-xattr disable support for POSIX Extended Attributes --enable-year2038 support timestamps after 2038 @@ -3371,8 +3480,12 @@ Some influential environment variables: GPGME_CFLAGS C compiler flags for GPGME, overriding pkg-config GPGME_LIBS linker flags for GPGME, overriding pkg-config + LIBPROXY_CFLAGS + C compiler flags for LIBPROXY, overriding pkg-config + LIBPROXY_LIBS + linker flags for LIBPROXY, overriding pkg-config -Use these variables to override the choices made by `configure' or to help +Use these variables to override the choices made by 'configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to <bug-wget@gnu.org>. @@ -3439,10 +3552,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wget configure 1.21.4 -generated by GNU Autoconf 2.71 +wget configure 1.24.5 +generated by GNU Autoconf 2.72 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -3481,11 +3594,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -3504,8 +3618,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -3513,10 +3627,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -3556,11 +3672,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -3599,11 +3716,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -3640,12 +3758,13 @@ printf "%s\n" "$ac_try_echo"; } >&5 test $ac_status = 0; }; } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: program exited with status $ac_status" >&5 +else case e in #( + e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5 printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=$ac_status + ac_retval=$ac_status ;; +esac fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno @@ -3698,18 +3817,19 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_hi=$ac_mid; break -else $as_nop - as_fn_arith $ac_mid + 1 && ac_lo=$as_val +else case e in #( + e) as_fn_arith $ac_mid + 1 && ac_lo=$as_val if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= break fi - as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int @@ -3744,20 +3864,23 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_lo=$ac_mid; break -else $as_nop - as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val +else case e in #( + e) as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= break fi - as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else $as_nop - ac_lo= ac_hi= +else case e in #( + e) ac_lo= ac_hi= ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # Binary search between lo and hi bounds. @@ -3780,8 +3903,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_hi=$ac_mid -else $as_nop - as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +else case e in #( + e) as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done @@ -3829,8 +3953,9 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : echo >>conftest.val; read $3 <conftest.val; ac_retval=0 -else $as_nop - ac_retval=1 +else case e in #( + e) ac_retval=1 ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -3854,8 +3979,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 @@ -3885,12 +4010,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - eval "$3=yes" +else case e in #( + e) eval "$3=yes" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -3905,7 +4032,7 @@ printf "%s\n" "$ac_res" >&6; } # accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. ac_fn_check_decl () { - ac_save_ac_compile="$ac_compile" + ac_saved_ac_compile="$ac_compile" if test -n "$ac_compile_for_check_decl"; then ac_compile="$ac_compile_for_check_decl" fi @@ -3916,8 +4043,8 @@ printf %s "checking whether $as_decl_name is declared... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` +else case e in #( + e) as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` eval ac_save_FLAGS=\$$6 as_fn_append $6 " $5" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3941,18 +4068,20 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext eval $6=\$ac_save_FLAGS - + ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - ac_compile="$ac_save_ac_compile" + ac_compile="$ac_saved_ac_compile" } # ac_fn_check_decl @@ -3967,15 +4096,15 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case <limits.h> declares $2. For example, HP-UX 11i <limits.h> declares gettimeofday. */ #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. */ + which can conflict with char $2 (void); below. */ #include <limits.h> #undef $2 @@ -3986,7 +4115,7 @@ else $as_nop #ifdef __cplusplus extern "C" #endif -char $2 (); +char $2 (void); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ @@ -4005,11 +4134,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -4030,8 +4161,8 @@ printf %s "checking for $2.$3... " >&6; } if eval test \${$4+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int @@ -4047,8 +4178,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$4=yes" -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int @@ -4064,12 +4195,15 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$4=yes" -else $as_nop - eval "$4=no" +else case e in #( + e) eval "$4=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$4 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -4101,8 +4235,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wget $as_me 1.21.4, which was -generated by GNU Autoconf 2.71. Invocation command line was +It was created by wget $as_me 1.24.5, which was +generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -4348,10 +4482,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } fi done @@ -4388,9 +4522,7 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; +static char *e (char **p, int i) { return p[i]; } @@ -4404,6 +4536,21 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } +/* C89 style stringification. */ +#define noexpand_stringify(a) #a +const char *stringified = noexpand_stringify(arbitrary+token=sequence); + +/* C89 style token pasting. Exercises some of the corner cases that + e.g. old MSVC gets wrong, but not very hard. */ +#define noexpand_concat(a,b) a##b +#define expand_concat(a,b) noexpand_concat(a,b) +extern int vA; +extern int vbee; +#define aye A +#define bee B +int *pvA = &expand_concat(v,aye); +int *pvbee = &noexpand_concat(v,bee); + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -4431,16 +4578,19 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? +/* Does the compiler advertise C99 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif +// See if C++-style comments work. + #include <stdbool.h> extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); +extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -4490,7 +4640,6 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { - // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -4556,6 +4705,8 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; + // Work around memory leak warnings. + free (ia); // Check named initializers. struct named_init ni = { @@ -4577,7 +4728,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? +/* Does the compiler advertise C11 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -4693,13 +4844,15 @@ as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" gt_needs="$gt_needs need-ngettext" as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H" +as_fn_append ac_func_c_list " lstat HAVE_LSTAT" as_fn_append ac_header_c_list " arpa/inet.h arpa_inet_h HAVE_ARPA_INET_H" as_fn_append ac_header_c_list " features.h features_h HAVE_FEATURES_H" as_fn_append ac_func_c_list " btowc HAVE_BTOWC" as_fn_append ac_func_c_list " mbrtowc HAVE_MBRTOWC" +as_fn_append ac_header_c_list " uchar.h uchar_h HAVE_UCHAR_H" +as_fn_append ac_func_c_list " mbsinit HAVE_MBSINIT" as_fn_append ac_func_c_list " canonicalize_file_name HAVE_CANONICALIZE_FILE_NAME" as_fn_append ac_func_c_list " realpath HAVE_REALPATH" -as_fn_append ac_func_c_list " lstat HAVE_LSTAT" as_fn_append ac_header_c_list " sys/param.h sys_param_h HAVE_SYS_PARAM_H" as_fn_append ac_func_c_list " _set_invalid_parameter_handler HAVE__SET_INVALID_PARAMETER_HANDLER" as_fn_append ac_func_c_list " fchdir HAVE_FCHDIR" @@ -4737,13 +4890,11 @@ as_fn_append ac_header_c_list " wctype.h wctype_h HAVE_WCTYPE_H" as_fn_append ac_header_c_list " langinfo.h langinfo_h HAVE_LANGINFO_H" as_fn_append ac_func_c_list " link HAVE_LINK" as_fn_append ac_header_c_list " xlocale.h xlocale_h HAVE_XLOCALE_H" -as_fn_append ac_func_c_list " mbsinit HAVE_MBSINIT" as_fn_append ac_header_c_list " sys/mman.h sys_mman_h HAVE_SYS_MMAN_H" as_fn_append ac_func_c_list " mprotect HAVE_MPROTECT" as_fn_append ac_func_c_list " mkstemp HAVE_MKSTEMP" as_fn_append ac_func_c_list " openat HAVE_OPENAT" as_fn_append ac_func_c_list " pipe HAVE_PIPE" -as_fn_append ac_func_c_list " posix_spawn_file_actions_addchdir_np HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP" as_fn_append ac_func_c_list " posix_spawn_file_actions_addchdir HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR" as_fn_append ac_header_c_list " sys/select.h sys_select_h HAVE_SYS_SELECT_H" as_fn_append ac_func_c_list " pselect HAVE_PSELECT" @@ -4856,8 +5007,9 @@ IFS=$as_save_IFS if $as_found then : -else $as_nop - as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +else case e in #( + e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;; +esac fi @@ -4885,12 +5037,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -4899,18 +5051,18 @@ printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -4926,11 +5078,11 @@ printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -4978,8 +5130,8 @@ if test -z "$INSTALL"; then if test ${ac_cv_path_install+y} then : printf %s "(cached) " >&6 -else $as_nop - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS @@ -5033,7 +5185,8 @@ esac IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir - + ;; +esac fi if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install @@ -5129,7 +5282,7 @@ test "$program_prefix" != NONE && test "$program_suffix" != NONE && program_transform_name="s&\$&$program_suffix&;$program_transform_name" # Double any \ or $. -# By default was `s,x,x', remove it if useless. +# By default was 's,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` @@ -5172,8 +5325,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_STRIP+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$STRIP"; then +else case e in #( + e) if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5195,7 +5348,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then @@ -5217,8 +5371,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_STRIP+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_STRIP"; then +else case e in #( + e) if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5240,7 +5394,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then @@ -5276,8 +5431,8 @@ if test -z "$MKDIR_P"; then if test ${ac_cv_path_mkdir+y} then : printf %s "(cached) " >&6 -else $as_nop - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS @@ -5291,7 +5446,7 @@ do as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir ('*'coreutils) '* | \ - 'BusyBox '* | \ + *'BusyBox '* | \ 'mkdir (fileutils) '4.1*) ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext break 3;; @@ -5300,18 +5455,17 @@ do done done IFS=$as_save_IFS - + ;; +esac fi test -d ./--version && rmdir ./--version if test ${ac_cv_path_mkdir+y}; then MKDIR_P="$ac_cv_path_mkdir -p" else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - MKDIR_P="$ac_install_sh -d" + # As a last resort, use plain mkdir -p, + # in the hope it doesn't have the bugs of ancient mkdir. + MKDIR_P='mkdir -p' fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 @@ -5326,8 +5480,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_AWK+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$AWK"; then +else case e in #( + e) if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5349,7 +5503,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then @@ -5371,8 +5526,8 @@ ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` if eval test \${ac_cv_prog_make_${ac_make}_set+y} then : printf %s "(cached) " >&6 -else $as_nop - cat >conftest.make <<\_ACEOF +else case e in #( + e) cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' @@ -5384,7 +5539,8 @@ case `${MAKE-make} -f conftest.make 2>/dev/null` in *) eval ac_cv_prog_make_${ac_make}_set=no;; esac -rm -f conftest.make +rm -f conftest.make ;; +esac fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -5422,8 +5578,8 @@ printf %s "checking whether $am_make supports nested variables... " >&6; } if test ${am_cv_make_support_nested_variables+y} then : printf %s "(cached) " >&6 -else $as_nop - if printf "%s\n" 'TRUE=$(BAR$(V)) +else case e in #( + e) if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -5433,7 +5589,8 @@ am__doit: am_cv_make_support_nested_variables=yes else am_cv_make_support_nested_variables=no -fi +fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } @@ -5468,7 +5625,7 @@ fi # Define the identity of the package. PACKAGE='wget' - VERSION='1.21.4' + VERSION='1.24.5' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -5658,8 +5815,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5681,7 +5838,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5703,8 +5861,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5726,7 +5884,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -5761,8 +5920,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5784,7 +5943,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5806,8 +5966,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -5846,7 +6006,8 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5870,8 +6031,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5893,7 +6054,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5919,8 +6081,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5942,7 +6104,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -5980,8 +6143,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -6003,7 +6166,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -6025,8 +6189,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -6048,7 +6212,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -6077,10 +6242,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -6152,8 +6317,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. +# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -6173,7 +6338,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' + # safe: cross compilers may not add the suffix if given an '-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -6184,8 +6349,9 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop - ac_file='' +else case e in #( + e) ac_file='' ;; +esac fi if test -z "$ac_file" then : @@ -6194,13 +6360,14 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -6224,10 +6391,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. + # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) +# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will +# work properly (i.e., refer to 'conftest.exe'), while it won't with +# 'rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -6237,11 +6404,12 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -6257,6 +6425,8 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); + if (!f) + return 1; return ferror (f) || fclose (f) != 0; ; @@ -6296,26 +6466,27 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use '--host'. +See 'config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext \ + conftest.o conftest.obj conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6347,16 +6518,18 @@ then : break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext +rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -6367,8 +6540,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6385,12 +6558,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -6408,8 +6583,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_c_werror_flag=$ac_c_werror_flag +else case e in #( + e) ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -6427,8 +6602,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else $as_nop - CFLAGS="" +else case e in #( + e) CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6443,8 +6618,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - ac_c_werror_flag=$ac_save_c_werror_flag +else case e in #( + e) ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6461,12 +6636,15 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag + ac_c_werror_flag=$ac_save_c_werror_flag ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -6493,8 +6671,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no +else case e in #( + e) ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6511,25 +6689,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" + CC="$CC $ac_cv_prog_cc_c11" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 + ac_prog_cc_stdc=c11 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -6539,8 +6720,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no +else case e in #( + e) ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6557,25 +6738,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" + CC="$CC $ac_cv_prog_cc_c99" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 + ac_prog_cc_stdc=c99 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -6585,8 +6769,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no +else case e in #( + e) ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6603,25 +6787,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" + CC="$CC $ac_cv_prog_cc_c89" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 + ac_prog_cc_stdc=c89 ;; +esac fi fi @@ -6642,8 +6829,8 @@ printf %s "checking whether $CC understands -c and -o together... " >&6; } if test ${am_cv_prog_cc_c_o+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6673,7 +6860,8 @@ _ACEOF fi done rm -f core conftest* - unset am_i + unset am_i ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } @@ -6698,8 +6886,8 @@ printf %s "checking whether the compiler is clang... " >&6; } if test ${gl_cv_compiler_clang+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __clang__ @@ -6718,11 +6906,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_compiler_clang=no -else $as_nop - gl_cv_compiler_clang=yes +else case e in #( + e) gl_cv_compiler_clang=yes ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5 printf "%s\n" "$gl_cv_compiler_clang" >&6; } @@ -6733,9 +6923,9 @@ printf %s "checking for compiler option needed when checking for declarations... if test ${gl_cv_compiler_check_decl_option+y} then : printf %s "(cached) " >&6 -else $as_nop - if test $gl_cv_compiler_clang = yes; then - save_ac_compile="$ac_compile" +else case e in #( + e) if test $gl_cv_compiler_clang = yes; then + saved_ac_compile="$ac_compile" ac_compile="$ac_compile -Werror=implicit-function-declaration" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6751,15 +6941,17 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration' -else $as_nop - gl_cv_compiler_check_decl_option=none +else case e in #( + e) gl_cv_compiler_check_decl_option=none ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_compile="$save_ac_compile" + ac_compile="$saved_ac_compile" else gl_cv_compiler_check_decl_option=none fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5 printf "%s\n" "$gl_cv_compiler_check_decl_option" >&6; } @@ -6777,8 +6969,8 @@ printf %s "checking dependency style of $depcc... " >&6; } if test ${am_cv_CC_dependencies_compiler_type+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +else case e in #( + e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up @@ -6882,7 +7074,8 @@ else $as_nop else am_cv_CC_dependencies_compiler_type=none fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } @@ -6940,8 +7133,8 @@ printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } if test ${ac_cv_safe_to_define___extensions__+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # define __EXTENSIONS__ 1 @@ -6957,10 +7150,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_safe_to_define___extensions__=yes -else $as_nop - ac_cv_safe_to_define___extensions__=no +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } @@ -6970,8 +7165,8 @@ printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } if test ${ac_cv_should_define__xopen_source+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_should_define__xopen_source=no +else case e in #( + e) ac_cv_should_define__xopen_source=no if test $ac_cv_header_wchar_h = yes then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6990,8 +7185,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _XOPEN_SOURCE 500 @@ -7009,10 +7204,12 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_should_define__xopen_source=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } @@ -7058,8 +7255,9 @@ then : printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h -else $as_nop - MINIX= +else case e in #( + e) MINIX= ;; +esac fi if test $ac_cv_safe_to_define___extensions__ = yes then : @@ -7085,8 +7283,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7108,7 +7306,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -7130,8 +7329,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7153,7 +7352,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -7188,8 +7388,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7211,7 +7411,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -7233,8 +7434,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -7273,7 +7474,8 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -7297,8 +7499,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7320,7 +7522,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -7346,8 +7549,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7369,7 +7572,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -7407,8 +7611,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7430,7 +7634,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -7452,8 +7657,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7475,7 +7680,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -7504,10 +7710,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -7539,8 +7745,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7557,12 +7763,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -7580,8 +7788,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_c_werror_flag=$ac_c_werror_flag +else case e in #( + e) ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -7599,8 +7807,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else $as_nop - CFLAGS="" +else case e in #( + e) CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7615,8 +7823,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - ac_c_werror_flag=$ac_save_c_werror_flag +else case e in #( + e) ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7633,12 +7841,15 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag + ac_c_werror_flag=$ac_save_c_werror_flag ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -7665,8 +7876,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no +else case e in #( + e) ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7683,25 +7894,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" + CC="$CC $ac_cv_prog_cc_c11" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 + ac_prog_cc_stdc=c11 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -7711,8 +7925,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no +else case e in #( + e) ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7729,25 +7943,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" + CC="$CC $ac_cv_prog_cc_c99" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 + ac_prog_cc_stdc=c99 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -7757,8 +7974,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no +else case e in #( + e) ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7775,25 +7992,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" + CC="$CC $ac_cv_prog_cc_c89" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 + ac_prog_cc_stdc=c89 ;; +esac fi fi @@ -7814,8 +8034,8 @@ printf %s "checking whether $CC understands -c and -o together... " >&6; } if test ${am_cv_prog_cc_c_o+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7845,7 +8065,8 @@ _ACEOF fi done rm -f core conftest* - unset am_i + unset am_i ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } @@ -7870,8 +8091,8 @@ printf %s "checking whether the compiler is clang... " >&6; } if test ${gl_cv_compiler_clang+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __clang__ @@ -7890,11 +8111,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_compiler_clang=no -else $as_nop - gl_cv_compiler_clang=yes +else case e in #( + e) gl_cv_compiler_clang=yes ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5 printf "%s\n" "$gl_cv_compiler_clang" >&6; } @@ -7905,9 +8128,9 @@ printf %s "checking for compiler option needed when checking for declarations... if test ${gl_cv_compiler_check_decl_option+y} then : printf %s "(cached) " >&6 -else $as_nop - if test $gl_cv_compiler_clang = yes; then - save_ac_compile="$ac_compile" +else case e in #( + e) if test $gl_cv_compiler_clang = yes; then + saved_ac_compile="$ac_compile" ac_compile="$ac_compile -Werror=implicit-function-declaration" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7923,15 +8146,17 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration' -else $as_nop - gl_cv_compiler_check_decl_option=none +else case e in #( + e) gl_cv_compiler_check_decl_option=none ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_compile="$save_ac_compile" + ac_compile="$saved_ac_compile" else gl_cv_compiler_check_decl_option=none fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5 printf "%s\n" "$gl_cv_compiler_check_decl_option" >&6; } @@ -7949,8 +8174,8 @@ printf %s "checking dependency style of $depcc... " >&6; } if test ${am_cv_CC_dependencies_compiler_type+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +else case e in #( + e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up @@ -8054,7 +8279,8 @@ else $as_nop else am_cv_CC_dependencies_compiler_type=none fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } @@ -8083,15 +8309,16 @@ printf %s "checking build system type... " >&6; } if test ${ac_cv_build+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_build_alias=$build_alias +else case e in #( + e) ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 printf "%s\n" "$ac_cv_build" >&6; } @@ -8118,14 +8345,15 @@ printf %s "checking host system type... " >&6; } if test ${ac_cv_host+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "x$host_alias" = x; then +else case e in #( + e) if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 printf "%s\n" "$ac_cv_host" >&6; } @@ -8168,8 +8396,8 @@ printf %s "checking whether $am_make supports nested variables... " >&6; } if test ${am_cv_make_support_nested_variables+y} then : printf %s "(cached) " >&6 -else $as_nop - if printf "%s\n" 'TRUE=$(BAR$(V)) +else case e in #( + e) if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -8179,7 +8407,8 @@ am__doit: am_cv_make_support_nested_variables=yes else am_cv_make_support_nested_variables=no -fi +fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } @@ -8231,8 +8460,9 @@ fi if test ${with_cares+y} then : withval=$with_cares; with_cares=$withval -else $as_nop - with_cares=no +else case e in #( + e) with_cares=no ;; +esac fi @@ -8246,8 +8476,9 @@ then : printf "%s\n" "#define FUZZING 1" >>confdefs.h -else $as_nop - enable_fuzzing=no; LIB_FUZZING_ENGINE="" +else case e in #( + e) enable_fuzzing=no; LIB_FUZZING_ENGINE="" ;; +esac fi if test "$enable_fuzzing" = "yes"; then @@ -8265,15 +8496,21 @@ printf %s "checking for library containing dlopen... " >&6; } if test ${ac_cv_search_dlopen+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char dlopen (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (void); int main (void) { @@ -8304,11 +8541,13 @@ done if test ${ac_cv_search_dlopen+y} then : -else $as_nop - ac_cv_search_dlopen=no +else case e in #( + e) ac_cv_search_dlopen=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 printf "%s\n" "$ac_cv_search_dlopen" >&6; } @@ -8330,8 +8569,9 @@ LIBS="$OLD_LIBS" if test ${enable_fsanitize_ubsan+y} then : enableval=$enable_fsanitize_ubsan; gl_cc_sanitize_ubsan=yes -else $as_nop - gl_cc_sanitize_ubsan=no +else case e in #( + e) gl_cc_sanitize_ubsan=no ;; +esac fi @@ -8339,8 +8579,9 @@ fi if test ${enable_fsanitize_asan+y} then : enableval=$enable_fsanitize_asan; gl_cc_sanitize_asan=yes -else $as_nop - gl_cc_sanitize_asan=no +else case e in #( + e) gl_cc_sanitize_asan=no ;; +esac fi @@ -8348,8 +8589,9 @@ fi if test ${enable_fsanitize_msan+y} then : enableval=$enable_fsanitize_msan; gl_cc_sanitize_msan=yes -else $as_nop - gl_cc_sanitize_msan=no +else case e in #( + e) gl_cc_sanitize_msan=no ;; +esac fi @@ -8373,9 +8615,9 @@ printf %s "checking whether C compiler handles -Werror -Wunknown-warning-option. if test ${gl_cv_warn_c__Werror__Wunknown_warning_option+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror -Wunknown-warning-option" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8391,21 +8633,24 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__Werror__Wunknown_warning_option=yes -else $as_nop - gl_cv_warn_c__Werror__Wunknown_warning_option=no +else case e in #( + e) gl_cv_warn_c__Werror__Wunknown_warning_option=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror__Wunknown_warning_option" >&5 printf "%s\n" "$gl_cv_warn_c__Werror__Wunknown_warning_option" >&6; } if test "x$gl_cv_warn_c__Werror__Wunknown_warning_option" = xyes then : gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror' -else $as_nop - gl_unknown_warnings_are_errors= +else case e in #( + e) gl_unknown_warnings_are_errors= ;; +esac fi ac_ext=c @@ -8422,9 +8667,9 @@ printf %s "checking whether C compiler handles -fsanitize=undefined... " >&6; } if test ${gl_cv_warn_c__fsanitize_undefined+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fsanitize=undefined" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8440,13 +8685,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__fsanitize_undefined=yes -else $as_nop - gl_cv_warn_c__fsanitize_undefined=no +else case e in #( + e) gl_cv_warn_c__fsanitize_undefined=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fsanitize_undefined" >&5 printf "%s\n" "$gl_cv_warn_c__fsanitize_undefined" >&6; } @@ -8463,9 +8710,9 @@ printf %s "checking whether C compiler handles -fno-sanitize-recover=undefined.. if test ${gl_cv_warn_c__fno_sanitize_recover_undefined+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fno-sanitize-recover=undefined" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8481,13 +8728,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__fno_sanitize_recover_undefined=yes -else $as_nop - gl_cv_warn_c__fno_sanitize_recover_undefined=no +else case e in #( + e) gl_cv_warn_c__fno_sanitize_recover_undefined=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fno_sanitize_recover_undefined" >&5 printf "%s\n" "$gl_cv_warn_c__fno_sanitize_recover_undefined" >&6; } @@ -8506,9 +8755,9 @@ printf %s "checking whether C compiler handles -fsanitize=integer... " >&6; } if test ${gl_cv_warn_c__fsanitize_integer+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fsanitize=integer" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8524,13 +8773,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__fsanitize_integer=yes -else $as_nop - gl_cv_warn_c__fsanitize_integer=no +else case e in #( + e) gl_cv_warn_c__fsanitize_integer=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fsanitize_integer" >&5 printf "%s\n" "$gl_cv_warn_c__fsanitize_integer" >&6; } @@ -8547,9 +8798,9 @@ printf %s "checking whether C compiler handles -fsanitize=nullability... " >&6; if test ${gl_cv_warn_c__fsanitize_nullability+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fsanitize=nullability" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8565,13 +8816,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__fsanitize_nullability=yes -else $as_nop - gl_cv_warn_c__fsanitize_nullability=no +else case e in #( + e) gl_cv_warn_c__fsanitize_nullability=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fsanitize_nullability" >&5 printf "%s\n" "$gl_cv_warn_c__fsanitize_nullability" >&6; } @@ -8588,9 +8841,9 @@ printf %s "checking whether C compiler handles -fno-sanitize-recover=nullability if test ${gl_cv_warn_c__fno_sanitize_recover_nullability+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fno-sanitize-recover=nullability" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8606,13 +8859,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__fno_sanitize_recover_nullability=yes -else $as_nop - gl_cv_warn_c__fno_sanitize_recover_nullability=no +else case e in #( + e) gl_cv_warn_c__fno_sanitize_recover_nullability=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fno_sanitize_recover_nullability" >&5 printf "%s\n" "$gl_cv_warn_c__fno_sanitize_recover_nullability" >&6; } @@ -8632,9 +8887,9 @@ printf %s "checking whether C compiler handles -fsanitize=address... " >&6; } if test ${gl_cv_warn_c__fsanitize_address+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fsanitize=address" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8650,13 +8905,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__fsanitize_address=yes -else $as_nop - gl_cv_warn_c__fsanitize_address=no +else case e in #( + e) gl_cv_warn_c__fsanitize_address=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fsanitize_address" >&5 printf "%s\n" "$gl_cv_warn_c__fsanitize_address" >&6; } @@ -8673,9 +8930,9 @@ printf %s "checking whether C compiler handles -fno-omit-frame-pointer... " >&6; if test ${gl_cv_warn_c__fno_omit_frame_pointer+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fno-omit-frame-pointer" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8691,13 +8948,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__fno_omit_frame_pointer=yes -else $as_nop - gl_cv_warn_c__fno_omit_frame_pointer=no +else case e in #( + e) gl_cv_warn_c__fno_omit_frame_pointer=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fno_omit_frame_pointer" >&5 printf "%s\n" "$gl_cv_warn_c__fno_omit_frame_pointer" >&6; } @@ -8716,9 +8975,9 @@ printf %s "checking whether C compiler handles -fsanitize-address-use-after-scop if test ${gl_cv_warn_c__fsanitize_address_use_after_scope+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fsanitize-address-use-after-scope" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8734,13 +8993,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__fsanitize_address_use_after_scope=yes -else $as_nop - gl_cv_warn_c__fsanitize_address_use_after_scope=no +else case e in #( + e) gl_cv_warn_c__fsanitize_address_use_after_scope=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fsanitize_address_use_after_scope" >&5 printf "%s\n" "$gl_cv_warn_c__fsanitize_address_use_after_scope" >&6; } @@ -8761,9 +9022,9 @@ printf %s "checking whether C compiler handles -fsanitize=memory... " >&6; } if test ${gl_cv_warn_c__fsanitize_memory+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fsanitize=memory" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8779,13 +9040,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__fsanitize_memory=yes -else $as_nop - gl_cv_warn_c__fsanitize_memory=no +else case e in #( + e) gl_cv_warn_c__fsanitize_memory=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fsanitize_memory" >&5 printf "%s\n" "$gl_cv_warn_c__fsanitize_memory" >&6; } @@ -8802,9 +9065,9 @@ printf %s "checking whether C compiler handles -fsanitize-memory-track-origins.. if test ${gl_cv_warn_c__fsanitize_memory_track_origins+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fsanitize-memory-track-origins" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8820,13 +9083,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__fsanitize_memory_track_origins=yes -else $as_nop - gl_cv_warn_c__fsanitize_memory_track_origins=no +else case e in #( + e) gl_cv_warn_c__fsanitize_memory_track_origins=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fsanitize_memory_track_origins" >&5 printf "%s\n" "$gl_cv_warn_c__fsanitize_memory_track_origins" >&6; } @@ -8846,9 +9111,9 @@ printf %s "checking whether C compiler handles -fsanitize=leak... " >&6; } if test ${gl_cv_warn_c__fsanitize_leak+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fsanitize=leak" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8864,13 +9129,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__fsanitize_leak=yes -else $as_nop - gl_cv_warn_c__fsanitize_leak=no +else case e in #( + e) gl_cv_warn_c__fsanitize_leak=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fsanitize_leak" >&5 printf "%s\n" "$gl_cv_warn_c__fsanitize_leak" >&6; } @@ -8889,9 +9156,9 @@ printf %s "checking whether C compiler handles -fno-omit-frame-pointer... " >&6; if test ${gl_cv_warn_c__fno_omit_frame_pointer+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fno-omit-frame-pointer" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8907,13 +9174,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__fno_omit_frame_pointer=yes -else $as_nop - gl_cv_warn_c__fno_omit_frame_pointer=no +else case e in #( + e) gl_cv_warn_c__fno_omit_frame_pointer=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fno_omit_frame_pointer" >&5 printf "%s\n" "$gl_cv_warn_c__fno_omit_frame_pointer" >&6; } @@ -8930,9 +9199,9 @@ printf %s "checking whether C compiler handles -fPIE... " >&6; } if test ${gl_cv_warn_c__fPIE+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_compiler_FLAGS="$CFLAGS" +else case e in #( + e) + gl_saved_compiler_FLAGS="$CFLAGS" as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fPIE" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8948,13 +9217,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_warn_c__fPIE=yes -else $as_nop - gl_cv_warn_c__fPIE=no +else case e in #( + e) gl_cv_warn_c__fPIE=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$gl_save_compiler_FLAGS" - + CFLAGS="$gl_saved_compiler_FLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fPIE" >&5 printf "%s\n" "$gl_cv_warn_c__fPIE" >&6; } @@ -8971,8 +9242,9 @@ fi if test ${enable_opie+y} then : enableval=$enable_opie; ENABLE_OPIE=$enableval -else $as_nop - ENABLE_OPIE=yes +else case e in #( + e) ENABLE_OPIE=yes ;; +esac fi @@ -8988,8 +9260,9 @@ fi if test ${enable_digest+y} then : enableval=$enable_digest; ENABLE_DIGEST=$enableval -else $as_nop - ENABLE_DIGEST=yes +else case e in #( + e) ENABLE_DIGEST=yes ;; +esac fi @@ -9005,9 +9278,10 @@ fi if test ${enable_ntlm+y} then : enableval=$enable_ntlm; ENABLE_NTLM=$enableval -else $as_nop - ENABLE_NTLM=auto - +else case e in #( + e) ENABLE_NTLM=auto + ;; +esac fi @@ -9016,8 +9290,9 @@ fi if test ${enable_debug+y} then : enableval=$enable_debug; ENABLE_DEBUG=$enableval -else $as_nop - ENABLE_DEBUG=yes +else case e in #( + e) ENABLE_DEBUG=yes ;; +esac fi @@ -9032,8 +9307,9 @@ fi if test ${enable_valgrind_tests+y} then : enableval=$enable_valgrind_tests; ENABLE_VALGRIND=$enableval -else $as_nop - ENABLE_VALGRIND=no +else case e in #( + e) ENABLE_VALGRIND=no ;; +esac fi @@ -9047,8 +9323,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_HAVE_VALGRIND+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$HAVE_VALGRIND"; then +else case e in #( + e) if test -n "$HAVE_VALGRIND"; then ac_cv_prog_HAVE_VALGRIND="$HAVE_VALGRIND" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9071,7 +9347,8 @@ done IFS=$as_save_IFS test -z "$ac_cv_prog_HAVE_VALGRIND" && ac_cv_prog_HAVE_VALGRIND="no" -fi +fi ;; +esac fi HAVE_VALGRIND=$ac_cv_prog_HAVE_VALGRIND if test -n "$HAVE_VALGRIND"; then @@ -9096,25 +9373,28 @@ then : VALGRIND_INFO="Test suite will be run under Valgrind" -else $as_nop - +else case e in #( + e) VALGRIND_INFO="Valgrind not found" - + ;; +esac fi -else $as_nop - +else case e in #( + e) VALGRIND_INFO="Valgrind testing not enabled" - + ;; +esac fi # Check whether --enable-assert was given. if test ${enable_assert+y} then : enableval=$enable_assert; ENABLE_ASSERTION=$enableval -else $as_nop - ENABLE_ASSERTION=no - +else case e in #( + e) ENABLE_ASSERTION=no + ;; +esac fi @@ -9156,8 +9436,8 @@ if test -z "$CPP"; then if test ${ac_cv_prog_CPP+y} then : printf %s "(cached) " >&6 -else $as_nop - # Double quotes because $CC needs to be expanded +else case e in #( + e) # Double quotes because $CC needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp do ac_preproc_ok=false @@ -9175,9 +9455,10 @@ _ACEOF if ac_fn_c_try_cpp "$LINENO" then : -else $as_nop - # Broken: fails on valid input. -continue +else case e in #( + e) # Broken: fails on valid input. +continue ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -9191,15 +9472,16 @@ if ac_fn_c_try_cpp "$LINENO" then : # Broken: success on invalid input. continue -else $as_nop - # Passes both tests. +else case e in #( + e) # Passes both tests. ac_preproc_ok=: -break +break ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok then : @@ -9208,7 +9490,8 @@ fi done ac_cv_prog_CPP=$CPP - + ;; +esac fi CPP=$ac_cv_prog_CPP else @@ -9231,9 +9514,10 @@ _ACEOF if ac_fn_c_try_cpp "$LINENO" then : -else $as_nop - # Broken: fails on valid input. -continue +else case e in #( + e) # Broken: fails on valid input. +continue ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -9247,24 +9531,26 @@ if ac_fn_c_try_cpp "$LINENO" then : # Broken: success on invalid input. continue -else $as_nop - # Passes both tests. +else case e in #( + e) # Passes both tests. ac_preproc_ok=: -break +break ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok then : -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi ac_ext=c @@ -9274,14 +9560,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -printf %s "checking for grep that handles long lines and -e... " >&6; } -if test ${ac_cv_path_GREP+y} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5 +printf %s "checking for egrep -e... " >&6; } +if test ${ac_cv_path_EGREP_TRADITIONAL+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -z "$GREP"; then - ac_path_GREP_found=false +else case e in #( + e) if test -z "$EGREP_TRADITIONAL"; then + ac_path_EGREP_TRADITIONAL_found=false # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin @@ -9295,13 +9581,14 @@ do for ac_prog in grep ggrep do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in + ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue +# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found. + # Check for GNU $ac_path_EGREP_TRADITIONAL +case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #( *GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; + ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;; +#( *) ac_count=0 printf %s 0123456789 >"conftest.in" @@ -9310,14 +9597,14 @@ case `"$ac_path_GREP" --version 2>&1` in cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl" + "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then + if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count + ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" + ac_path_EGREP_TRADITIONAL_max=$ac_count fi # 10*(2^10) chars as input seems more than enough test $ac_count -gt 10 && break @@ -9325,35 +9612,24 @@ case `"$ac_path_GREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - $ac_path_GREP_found && break 3 + $ac_path_EGREP_TRADITIONAL_found && break 3 done done done IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then + : fi else - ac_cv_path_GREP=$GREP + ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL fi -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -printf "%s\n" "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -printf %s "checking for egrep... " >&6; } -if test ${ac_cv_path_EGREP+y} + if test "$ac_cv_path_EGREP_TRADITIONAL" then : - printf %s "(cached) " >&6 -else $as_nop - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false + ac_cv_path_EGREP_TRADITIONAL="$ac_cv_path_EGREP_TRADITIONAL -E" +else case e in #( + e) if test -z "$EGREP_TRADITIONAL"; then + ac_path_EGREP_TRADITIONAL_found=false # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin @@ -9367,13 +9643,14 @@ do for ac_prog in egrep do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in + ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue +# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found. + # Check for GNU $ac_path_EGREP_TRADITIONAL +case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #( *GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; + ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;; +#( *) ac_count=0 printf %s 0123456789 >"conftest.in" @@ -9382,14 +9659,14 @@ case `"$ac_path_EGREP" --version 2>&1` in cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl" + "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then + if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count + ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" + ac_path_EGREP_TRADITIONAL_max=$ac_count fi # 10*(2^10) chars as input seems more than enough test $ac_count -gt 10 && break @@ -9397,24 +9674,25 @@ case `"$ac_path_EGREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_TRADITIONAL_found && break 3 done done done IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then + if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else - ac_cv_path_EGREP=$EGREP + ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL fi - - fi + ;; +esac +fi ;; +esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -printf "%s\n" "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5 +printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; } + EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL @@ -9424,8 +9702,8 @@ printf %s "checking for Minix Amsterdam compiler... " >&6; } if test ${gl_cv_c_amsterdam_compiler+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9435,15 +9713,17 @@ Amsterdam _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Amsterdam" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Amsterdam" >/dev/null 2>&1 then : gl_cv_c_amsterdam_compiler=yes -else $as_nop - gl_cv_c_amsterdam_compiler=no +else case e in #( + e) gl_cv_c_amsterdam_compiler=no ;; +esac fi rm -rf conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5 printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; } @@ -9467,8 +9747,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_AR+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$AR"; then +else case e in #( + e) if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9490,7 +9770,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi AR=$ac_cv_prog_AR if test -n "$AR"; then @@ -9512,8 +9793,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_AR+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_AR"; then +else case e in #( + e) if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9535,7 +9816,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then @@ -9579,8 +9861,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_RANLIB+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$RANLIB"; then +else case e in #( + e) if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9602,7 +9884,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then @@ -9624,8 +9907,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_RANLIB+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_RANLIB"; then +else case e in #( + e) if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9647,7 +9930,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then @@ -9679,84 +9963,6 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -printf %s "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } -if test ${ac_cv_sys_largefile_source+y} -then : - printf %s "(cached) " >&6 -else $as_nop - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> /* for off_t */ - #include <stdio.h> -int -main (void) -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_sys_largefile_source=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _LARGEFILE_SOURCE 1 -#include <sys/types.h> /* for off_t */ - #include <stdio.h> -int -main (void) -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_sys_largefile_source=1; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - ac_cv_sys_largefile_source=unknown - break -done -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 -printf "%s\n" "$ac_cv_sys_largefile_source" >&6; } -case $ac_cv_sys_largefile_source in #( - no | unknown) ;; - *) -printf "%s\n" "#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source" >>confdefs.h -;; -esac -rm -rf conftest* - -# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug -# in glibc 2.1.3, but that breaks too many other things. -# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -if test $ac_cv_sys_largefile_source != unknown; then - -printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h - -fi - - case "$host_os" in - hpux*) - -printf "%s\n" "#define _LARGEFILE_SOURCE 1" >>confdefs.h - - ;; - esac - - # Check whether --enable-largefile was given. if test ${enable_largefile+y} then : @@ -9769,8 +9975,8 @@ printf %s "checking for $CC option to enable large file support... " >&6; } if test ${ac_cv_sys_largefile_opts+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_CC="$CC" +else case e in #( + e) ac_save_CC="$CC" ac_opt_found=no for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do if test x"$ac_opt" != x"none needed" @@ -9780,13 +9986,16 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, +#ifndef FTYPE +# define FTYPE off_t +#endif + /* Check that FTYPE can represent 2**63 - 1 correctly. + We can't simply define LARGE_FTYPE to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) +#define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31)) + int FTYPE_is_large[(LARGE_FTYPE % 2147483629 == 721 + && LARGE_FTYPE % 2147483647 == 1) ? 1 : -1]; int main (void) @@ -9798,7 +10007,25 @@ main (void) _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sys_largefile_opts="$ac_opt" + if test x"$ac_opt" = x"none needed" +then : + # GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t. + CC="$CC -DFTYPE=ino_t" + if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) CC="$CC -D_FILE_OFFSET_BITS=64" + if ac_fn_c_try_compile "$LINENO" +then : + ac_opt='-D_FILE_OFFSET_BITS=64' +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam +fi + ac_cv_sys_largefile_opts=$ac_opt ac_opt_found=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -9809,7 +10036,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test $ac_opt_found != yes; then case $host_os in #( - mingw*) : + mingw* | windows*) : ac_cv_sys_largefile_opts="supported through gnulib" ac_opt_found=yes ;; #( @@ -9818,7 +10045,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext esac fi - test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" + test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5 printf "%s\n" "$ac_cv_sys_largefile_opts" >&6; } @@ -9852,8 +10080,8 @@ printf %s "checking for $CC option for timestamps after 2038... " >&6; } if test ${ac_cv_sys_year2038_opts+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_CPPFLAGS="$CPPFLAGS" +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" ac_opt_found=no for ac_opt in "none needed" "-D_TIME_BITS=64" "-D__MINGW_USE_VC2005_COMPAT" "-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"; do if test x"$ac_opt" != x"none needed" @@ -9888,7 +10116,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test $ac_opt_found = no || break done CPPFLAGS="$ac_save_CPPFLAGS" - test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" + test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5 printf "%s\n" "$ac_cv_sys_year2038_opts" >&6; } @@ -9908,12 +10137,12 @@ printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h ;; #( "-U_USE_32_BIT_TIME_T"*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "the 'time_t' type is currently forced to be 32-bit. It will stop working after mid-January 2038. Remove _USE_32BIT_TIME_T from the compiler flags. -See \`config.log' for more details" "$LINENO" 5; } ;; #( +See 'config.log' for more details" "$LINENO" 5; } ;; #( *) : as_fn_error $? "internal error: bad value for \$ac_cv_sys_year2038_opts" "$LINENO" 5 ;; esac @@ -9931,8 +10160,8 @@ fi if test ${enable_threads+y} then : enableval=$enable_threads; gl_use_threads=$enableval -else $as_nop - if test -n "$gl_use_threads_default"; then +else case e in #( + e) if test -n "$gl_use_threads_default"; then gl_use_threads="$gl_use_threads_default" else case "$host_os" in @@ -9943,7 +10172,7 @@ else $as_nop *) gl_use_threads=yes ;; esac ;; - mingw*) + mingw* | windows*) case "$gl_use_winpthreads_default" in yes) gl_use_threads=posix ;; no) gl_use_threads=windows ;; @@ -9953,7 +10182,8 @@ else $as_nop *) gl_use_threads=yes ;; esac fi - + ;; +esac fi if test "$gl_use_threads" = yes \ @@ -10011,6 +10241,7 @@ fi # Code from module binary-io: # Code from module bind: # Code from module bitrotate: + # Code from module btoc32: # Code from module btowc: # Code from module builtin-expect: # Code from module byteswap: @@ -10018,6 +10249,22 @@ fi # Code from module c-strcase: # Code from module c-strcaseeq: # Code from module c-strcasestr: + # Code from module c32_apply_type_test: + # Code from module c32_get_type_test: + # Code from module c32isalnum: + # Code from module c32isalpha: + # Code from module c32isblank: + # Code from module c32iscntrl: + # Code from module c32isdigit: + # Code from module c32isgraph: + # Code from module c32islower: + # Code from module c32isprint: + # Code from module c32ispunct: + # Code from module c32isspace: + # Code from module c32isupper: + # Code from module c32isxdigit: + # Code from module c32tolower: + # Code from module c32width: # Code from module c99: # Code from module calloc-gnu: # Code from module calloc-posix: @@ -10050,6 +10297,7 @@ fi # Code from module dirfd: # Code from module dirname: # Code from module dirname-lgpl: + # Code from module do-release-commit-and-tag: # Code from module double-slash-root: # Code from module dup: # Code from module dup2: @@ -10142,7 +10390,9 @@ fi # Code from module ioctl: # Code from module isblank: # Code from module iswblank: + # Code from module iswctype: # Code from module iswdigit: + # Code from module iswpunct: # Code from module iswxdigit: # Code from module langinfo: # Code from module largefile: @@ -10164,9 +10414,12 @@ fi # Code from module malloca: # Code from module mbchar: # Code from module mbiter: + # Code from module mbrtoc32: # Code from module mbrtowc: # Code from module mbsinit: + # Code from module mbsrtoc32s: # Code from module mbsrtowcs: + # Code from module mbszero: # Code from module mbtowc: # Code from module memchr: # Code from module mempcpy: @@ -10233,6 +10486,7 @@ fi # Code from module send: # Code from module servent: # Code from module setlocale-null: + # Code from module setlocale-null-unlocked: # Code from module setsockopt: # Code from module sh-filename: # Code from module sigaction: @@ -10307,6 +10561,7 @@ fi # Code from module timespec: # Code from module tmpdir: # Code from module u64: + # Code from module uchar: # Code from module unicase/base: # Code from module unicase/cased: # Code from module unicase/empty-prefix-context: @@ -10318,6 +10573,18 @@ fi # Code from module unicase/u8-tolower: # Code from module unictype/base: # Code from module unictype/combining-class: + # Code from module unictype/ctype-alnum: + # Code from module unictype/ctype-alpha: + # Code from module unictype/ctype-blank: + # Code from module unictype/ctype-cntrl: + # Code from module unictype/ctype-digit: + # Code from module unictype/ctype-graph: + # Code from module unictype/ctype-lower: + # Code from module unictype/ctype-print: + # Code from module unictype/ctype-punct: + # Code from module unictype/ctype-space: + # Code from module unictype/ctype-upper: + # Code from module unictype/ctype-xdigit: # Code from module unictype/property-soft-dotted: # Code from module uninorm/base: # Code from module uninorm/decompose-internal: @@ -10325,6 +10592,11 @@ fi # Code from module unistd: # Code from module unistd-safer: # Code from module unistr/base: + # Code from module unistr/u32-chr: + # Code from module unistr/u32-cpy: + # Code from module unistr/u32-pcpy: + # Code from module unistr/u32-strcat: + # Code from module unistr/u32-strlen: # Code from module unistr/u8-cpy: # Code from module unistr/u8-mbtouc-unsafe: # Code from module unistr/u8-strlen: @@ -10351,6 +10623,7 @@ fi # Code from module warnings: # Code from module wchar: # Code from module wcrtomb: + # Code from module wctype: # Code from module wctype-h: # Code from module wcwidth: # Code from module windows-mutex: @@ -10396,10 +10669,11 @@ sys.exit(sys.hexversion < minverhex)" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - as_fn_error $? "Python interpreter is too old" "$LINENO" 5 + as_fn_error $? "Python interpreter is too old" "$LINENO" 5 ;; +esac fi am_display_PYTHON=$PYTHON else @@ -10410,8 +10684,8 @@ printf %s "checking for a Python interpreter with version >= 3.0... " >&6; } if test ${am_cv_pathless_PYTHON+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys @@ -10431,7 +10705,8 @@ sys.exit(sys.hexversion < minverhex)" then : break fi - done + done ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 printf "%s\n" "$am_cv_pathless_PYTHON" >&6; } @@ -10446,8 +10721,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PYTHON+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PYTHON in +else case e in #( + e) case $PYTHON in [\\/]* | ?:[\\/]*) ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. ;; @@ -10472,6 +10747,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PYTHON=$ac_cv_path_PYTHON @@ -10498,8 +10774,9 @@ printf %s "checking for $am_display_PYTHON version... " >&6; } if test ${am_cv_python_version+y} then : printf %s "(cached) " >&6 -else $as_nop - am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[:2])"` +else case e in #( + e) am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[:2])"` ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 printf "%s\n" "$am_cv_python_version" >&6; } @@ -10511,8 +10788,9 @@ printf %s "checking for $am_display_PYTHON platform... " >&6; } if test ${am_cv_python_platform+y} then : printf %s "(cached) " >&6 -else $as_nop - am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` +else case e in #( + e) am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 printf "%s\n" "$am_cv_python_platform" >&6; } @@ -10532,8 +10810,9 @@ printf "%s\n" "$am_cv_python_platform" >&6; } if test ${with_python_sys_prefix+y} then : withval=$with_python_sys_prefix; am_use_python_sys=: -else $as_nop - am_use_python_sys=false +else case e in #( + e) am_use_python_sys=false ;; +esac fi @@ -10548,8 +10827,8 @@ then : printf %s "checking for explicit $am_display_PYTHON prefix... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5 printf "%s\n" "$am_cv_python_prefix" >&6; } -else $as_nop - +else case e in #( + e) if $am_use_python_sys; then # using python sys.prefix value, not GNU { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python default $am_display_PYTHON prefix" >&5 @@ -10557,8 +10836,9 @@ printf %s "checking for python default $am_display_PYTHON prefix... " >&6; } if test ${am_cv_python_prefix+y} then : printf %s "(cached) " >&6 -else $as_nop - am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"` +else case e in #( + e) am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"` ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5 printf "%s\n" "$am_cv_python_prefix" >&6; } @@ -10579,7 +10859,8 @@ printf "%s\n" "$am_cv_python_prefix" >&6; } printf %s "checking for GNU default $am_display_PYTHON prefix... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_python_prefix" >&5 printf "%s\n" "$am_python_prefix" >&6; } - fi + fi ;; +esac fi # Substituting python_prefix_subst value. @@ -10598,8 +10879,8 @@ then : printf %s "checking for explicit $am_display_PYTHON exec_prefix... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5 printf "%s\n" "$am_cv_python_exec_prefix" >&6; } -else $as_nop - +else case e in #( + e) # no explicit --with-python_exec_prefix, but if # --with-python_prefix was given, use its value for python_exec_prefix too. if test -n "$with_python_prefix" @@ -10610,8 +10891,8 @@ then : printf %s "checking for python_prefix-given $am_display_PYTHON exec_prefix... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5 printf "%s\n" "$am_cv_python_exec_prefix" >&6; } -else $as_nop - +else case e in #( + e) # Set am__usable_exec_prefix whether using GNU or Python values, # since we use that variable for pyexecdir. if test "x$exec_prefix" = xNONE; then @@ -10626,8 +10907,9 @@ printf %s "checking for python default $am_display_PYTHON exec_prefix... " >&6; if test ${am_cv_python_exec_prefix+y} then : printf %s "(cached) " >&6 -else $as_nop - am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"` +else case e in #( + e) am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"` ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5 printf "%s\n" "$am_cv_python_exec_prefix" >&6; } @@ -10647,8 +10929,10 @@ printf "%s\n" "$am_cv_python_exec_prefix" >&6; } printf %s "checking for GNU default $am_display_PYTHON exec_prefix... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_python_exec_prefix" >&5 printf "%s\n" "$am_python_exec_prefix" >&6; } - fi -fi + fi ;; +esac +fi ;; +esac fi # Substituting python_exec_prefix_subst. @@ -10681,8 +10965,8 @@ printf %s "checking for $am_display_PYTHON script directory (pythondir)... " >&6 if test ${am_cv_python_pythondir+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "x$am_cv_python_prefix" = x; then +else case e in #( + e) if test "x$am_cv_python_prefix" = x; then am_py_prefix=$am__usable_prefix else am_py_prefix=$am_cv_python_prefix @@ -10709,7 +10993,8 @@ sys.stdout.write(sitedir)"` esac ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 printf "%s\n" "$am_cv_python_pythondir" >&6; } @@ -10724,8 +11009,8 @@ printf %s "checking for $am_display_PYTHON extension module directory (pyexecdir if test ${am_cv_python_pyexecdir+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "x$am_cv_python_exec_prefix" = x; then +else case e in #( + e) if test "x$am_cv_python_exec_prefix" = x; then am_py_exec_prefix=$am__usable_exec_prefix else am_py_exec_prefix=$am_cv_python_exec_prefix @@ -10752,7 +11037,8 @@ sys.stdout.write(sitedir)"` esac ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 printf "%s\n" "$am_cv_python_pyexecdir" >&6; } @@ -10779,8 +11065,8 @@ printf %s "checking for a sed that does not truncate output... " >&6; } if test ${ac_cv_path_SED+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +else case e in #( + e) ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" done @@ -10805,9 +11091,10 @@ do as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in +case `"$ac_path_SED" --version 2>&1` in #( *GNU*) ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +#( *) ac_count=0 printf %s 0123456789 >"conftest.in" @@ -10842,7 +11129,8 @@ IFS=$as_save_IFS else ac_cv_path_SED=$SED fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 printf "%s\n" "$ac_cv_path_SED" >&6; } @@ -10856,8 +11144,9 @@ printf %s "checking whether NLS is requested... " >&6; } if test ${enable_nls+y} then : enableval=$enable_nls; USE_NLS=$enableval -else $as_nop - USE_NLS=yes +else case e in #( + e) USE_NLS=yes ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 @@ -10877,8 +11166,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_MSGFMT+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$MSGFMT" in +else case e in #( + e) case "$MSGFMT" in /*) ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ;; @@ -10897,6 +11186,7 @@ else $as_nop IFS="$ac_save_ifs" test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" ;; +esac ;; esac fi MSGFMT="$ac_cv_path_MSGFMT" @@ -10915,8 +11205,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_GMSGFMT+y} then : printf %s "(cached) " >&6 -else $as_nop - case $GMSGFMT in +else case e in #( + e) case $GMSGFMT in [\\/]* | ?:[\\/]*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; @@ -10942,6 +11232,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; +esac ;; esac fi GMSGFMT=$ac_cv_path_GMSGFMT @@ -10968,8 +11259,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_XGETTEXT+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$XGETTEXT" in +else case e in #( + e) case "$XGETTEXT" in /*) ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; @@ -10988,6 +11279,7 @@ else $as_nop IFS="$ac_save_ifs" test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" ;; +esac ;; esac fi XGETTEXT="$ac_cv_path_XGETTEXT" @@ -11014,8 +11306,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_MSGMERGE+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$MSGMERGE" in +else case e in #( + e) case "$MSGMERGE" in /*) ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. ;; @@ -11033,6 +11325,7 @@ else $as_nop IFS="$ac_save_ifs" test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" ;; +esac ;; esac fi MSGMERGE="$ac_cv_path_MSGMERGE" @@ -11073,10 +11366,10 @@ fi else acl_final_exec_prefix="$exec_prefix" fi - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" + prefix="$acl_saved_prefix" @@ -11084,8 +11377,9 @@ fi if test ${with_gnu_ld+y} then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else $as_nop - with_gnu_ld=no +else case e in #( + e) with_gnu_ld=no ;; +esac fi # Prepare PATH_SEPARATOR. @@ -11121,14 +11415,14 @@ else if test ${acl_cv_path_LD+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) acl_cv_path_LD= # Final result of this test ac_prog=ld # Program to search in $PATH if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. case $host in - *-*-mingw*) + *-*-mingw* | windows*) # gcc leaves a trailing carriage return which upsets mingw acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) @@ -11158,9 +11452,9 @@ else $as_nop fi if test -n "$ac_prog"; then # Search for $ac_prog in $PATH. - acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$acl_save_ifs" + IFS="$acl_saved_IFS" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" @@ -11177,7 +11471,7 @@ else $as_nop esac fi done - IFS="$acl_save_ifs" + IFS="$acl_saved_IFS" fi case $host in *-*-aix*) @@ -11215,19 +11509,21 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - # The compiler produces 32-bit code. Add option '-m elf32_sparc' +else case e in #( + e) # The compiler produces 32-bit code. Add option '-m elf32_sparc' # so that the linker groks 32-bit object files. case "$acl_cv_path_LD " in *" -m elf32_sparc "*) ;; *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;; esac - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac - + ;; +esac fi LD="$acl_cv_path_LD" @@ -11245,8 +11541,8 @@ printf %s "checking if the linker ($LD) is GNU ld... " >&6; } if test ${acl_cv_prog_gnu_ld+y} then : printf %s "(cached) " >&6 -else $as_nop - # I'd rather use --version here, but apparently some GNU lds only accept -v. +else case e in #( + e) # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) acl_cv_prog_gnu_ld=yes @@ -11254,6 +11550,7 @@ case `$LD -v 2>&1 </dev/null` in *) acl_cv_prog_gnu_ld=no ;; +esac ;; esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5 @@ -11269,14 +11566,15 @@ printf %s "checking for shared library run path origin... " >&6; } if test ${acl_cv_rpath+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh . ./conftest.sh rm -f ./conftest.sh acl_cv_rpath=done - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 printf "%s\n" "$acl_cv_rpath" >&6; } @@ -11293,8 +11591,9 @@ printf "%s\n" "$acl_cv_rpath" >&6; } if test ${enable_rpath+y} then : enableval=$enable_rpath; : -else $as_nop - enable_rpath=yes +else case e in #( + e) enable_rpath=yes ;; +esac fi @@ -11305,263 +11604,67 @@ printf %s "checking 32-bit host C ABI... " >&6; } if test ${gl_cv_host_cpu_c_abi_32bit+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$gl_cv_host_cpu_c_abi"; then - case "$gl_cv_host_cpu_c_abi" in - i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) - gl_cv_host_cpu_c_abi_32bit=yes ;; - x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) - gl_cv_host_cpu_c_abi_32bit=no ;; - *) - gl_cv_host_cpu_c_abi_32bit=unknown ;; - esac - else - case "$host_cpu" in - - # CPUs that only support a 32-bit ABI. - arc \ - | bfin \ - | cris* \ - | csky \ - | epiphany \ - | ft32 \ - | h8300 \ - | m68k \ - | microblaze | microblazeel \ - | nds32 | nds32le | nds32be \ - | nios2 | nios2eb | nios2el \ - | or1k* \ - | or32 \ - | sh | sh1234 | sh1234elb \ - | tic6x \ - | xtensa* ) - gl_cv_host_cpu_c_abi_32bit=yes - ;; - - # CPUs that only support a 64-bit ABI. - alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ - | mmix ) - gl_cv_host_cpu_c_abi_32bit=no - ;; - - i[34567]86 ) - gl_cv_host_cpu_c_abi_32bit=yes - ;; - - x86_64 ) - # On x86_64 systems, the C compiler may be generating code in one of - # these ABIs: - # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64. - # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64 - # with native Windows (mingw, MSVC). - # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32. - # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if (defined __x86_64__ || defined __amd64__ \ - || defined _M_X64 || defined _M_AMD64) \ - && !(defined __ILP32__ || defined _ILP32) - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_host_cpu_c_abi_32bit=no -else $as_nop - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; - - arm* | aarch64 ) - # Assume arm with EABI. - # On arm64 systems, the C compiler may be generating code in one of - # these ABIs: - # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64. - # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32. - # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32) - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_host_cpu_c_abi_32bit=no -else $as_nop - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; - - hppa1.0 | hppa1.1 | hppa2.0* | hppa64 ) - # On hppa, the C compiler may be generating 32-bit code or 64-bit - # code. In the latter case, it defines _LP64 and __LP64__. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __LP64__ - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_host_cpu_c_abi_32bit=no -else $as_nop - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; - - ia64* ) - # On ia64 on HP-UX, the C compiler may be generating 64-bit code or - # 32-bit code. In the latter case, it defines _ILP32. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef _ILP32 - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_host_cpu_c_abi_32bit=yes -else $as_nop - gl_cv_host_cpu_c_abi_32bit=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; - - mips* ) - # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this - # at 32. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64) - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_host_cpu_c_abi_32bit=no -else $as_nop - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; - - powerpc* ) - # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD. - # No need to distinguish them here; the caller may distinguish - # them based on the OS. - # On powerpc64 systems, the C compiler may still be generating - # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may - # be generating 64-bit code. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined __powerpc64__ || defined __LP64__ - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_host_cpu_c_abi_32bit=no -else $as_nop - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; - - rs6000 ) - gl_cv_host_cpu_c_abi_32bit=yes - ;; - - riscv32 | riscv64 ) - # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d. - # Size of 'long' and 'void *': - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined __LP64__ - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_host_cpu_c_abi_32bit=no -else $as_nop - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; - - s390* ) - # On s390x, the C compiler may be generating 64-bit (= s390x) code - # or 31-bit (= s390) code. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined __LP64__ || defined __s390x__ - int ok; - #else - error fail - #endif +else case e in #( + e) case "$host_cpu" in + + # CPUs that only support a 32-bit ABI. + arc \ + | bfin \ + | cris* \ + | csky \ + | epiphany \ + | ft32 \ + | h8300 \ + | m68k \ + | microblaze | microblazeel \ + | nds32 | nds32le | nds32be \ + | nios2 | nios2eb | nios2el \ + | or1k* \ + | or32 \ + | sh | sh1234 | sh1234elb \ + | tic6x \ + | xtensa* ) + gl_cv_host_cpu_c_abi_32bit=yes + ;; -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_host_cpu_c_abi_32bit=no -else $as_nop - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; + # CPUs that only support a 64-bit ABI. + alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ + | mmix ) + gl_cv_host_cpu_c_abi_32bit=no + ;; - sparc | sparc64 ) - # UltraSPARCs running Linux have `uname -m` = "sparc64", but the - # C compiler still generates 32-bit code. + *) + if test -n "$gl_cv_host_cpu_c_abi"; then + case "$gl_cv_host_cpu_c_abi" in + i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) + gl_cv_host_cpu_c_abi_32bit=yes ;; + x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + gl_cv_host_cpu_c_abi_32bit=no ;; + *) + gl_cv_host_cpu_c_abi_32bit=unknown ;; + esac + else + gl_cv_host_cpu_c_abi_32bit=unknown + fi + if test $gl_cv_host_cpu_c_abi_32bit = unknown; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#if defined __sparcv9 || defined __arch64__ - int ok; - #else - error fail - #endif +int test_pointer_size[sizeof (void *) - 5]; _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_host_cpu_c_abi_32bit=no -else $as_nop - gl_cv_host_cpu_c_abi_32bit=yes +else case e in #( + e) gl_cv_host_cpu_c_abi_32bit=yes ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; - - *) - gl_cv_host_cpu_c_abi_32bit=unknown - ;; - esac - fi - + fi + ;; + esac + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5 printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; } @@ -11577,8 +11680,8 @@ printf %s "checking for ELF binary format... " >&6; } if test ${gl_cv_elf+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined __ELF__ || (defined __linux__ && defined __EDG__) Extensible Linking Format @@ -11586,15 +11689,17 @@ else $as_nop _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Extensible Linking Format" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1 then : gl_cv_elf=yes -else $as_nop - gl_cv_elf=no +else case e in #( + e) gl_cv_elf=no ;; +esac fi rm -rf conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5 printf "%s\n" "$gl_cv_elf" >&6; } @@ -11653,8 +11758,8 @@ printf %s "checking for the common suffixes of directories in the library search if test ${acl_cv_libdirstems+y} then : printf %s "(cached) " >&6 -else $as_nop - acl_libdirstem=lib +else case e in #( + e) acl_libdirstem=lib acl_libdirstem2= acl_libdirstem3= case "$host_os" in @@ -11667,6 +11772,13 @@ else $as_nop esac fi ;; + netbsd*) + if test $HOST_CPU_C_ABI_32BIT != no; then + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparc ;; + esac + fi + ;; *) searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \ | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` @@ -11683,7 +11795,7 @@ else $as_nop fi fi if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" + acl_saved_IFS="${IFS= }"; IFS=":" for searchdir in $searchpath; do if test -d "$searchdir"; then case "$searchdir" in @@ -11700,7 +11812,7 @@ else $as_nop esac fi done - IFS="$acl_save_IFS" + IFS="$acl_saved_IFS" if test $HOST_CPU_C_ABI_32BIT = yes; then # 32-bit ABI. acl_libdirstem3= @@ -11715,7 +11827,8 @@ else $as_nop test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem" acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3" - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5 printf "%s\n" "$acl_cv_libdirstems" >&6; } @@ -11735,9 +11848,9 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; } use_additional=yes - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -11745,8 +11858,8 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; } eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" # Check whether --with-libiconv-prefix was given. @@ -11758,9 +11871,9 @@ then : else if test "X$withval" = "X"; then - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -11768,8 +11881,8 @@ then : eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" else additional_includedir="$withval/include" @@ -11881,13 +11994,13 @@ fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIBICONV; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" case "$x" in -L*) @@ -11975,13 +12088,13 @@ fi haveit= for x in $LDFLAGS $LIBICONV; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$found_dir"; then haveit=yes @@ -12043,13 +12156,13 @@ fi if test -z "$haveit"; then for x in $CPPFLAGS $INCICONV; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-I$additional_includedir"; then haveit=yes @@ -12065,12 +12178,12 @@ fi fi fi if test -n "$found_la"; then - save_libdir="$libdir" + saved_libdir="$libdir" case "$found_la" in */* | *\\*) . "$found_la" ;; *) . "./$found_la" ;; esac - libdir="$save_libdir" + libdir="$saved_libdir" for dep in $dependency_libs; do case "$dep" in -L*) @@ -12092,13 +12205,13 @@ fi haveit= for x in $LDFLAGS $LIBICONV; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -12113,13 +12226,13 @@ fi haveit= for x in $LDFLAGS $LTLIBICONV; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -12193,17 +12306,17 @@ fi for found_dir in $rpathdirs; do alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" else for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$found_dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" done fi @@ -12220,6 +12333,15 @@ fi + gl_sed_double_backslashes='s/\\/\\\\/g' + gl_sed_escape_doublequotes='s/"/\\"/g' + gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g" + gl_sed_escape_for_make_2='s,\$,\\$$,g' + case `echo r | tr -d '\r'` in + '') gl_tr_cr='\015' ;; + *) gl_tr_cr='\r' ;; + esac + @@ -12247,8 +12369,8 @@ printf %s "checking for CFPreferencesCopyAppValue... " >&6; } if test ${gt_cv_func_CFPreferencesCopyAppValue+y} then : printf %s "(cached) " >&6 -else $as_nop - gt_save_LIBS="$LIBS" +else case e in #( + e) gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12264,12 +12386,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gt_cv_func_CFPreferencesCopyAppValue=yes -else $as_nop - gt_cv_func_CFPreferencesCopyAppValue=no +else case e in #( + e) gt_cv_func_CFPreferencesCopyAppValue=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" + LIBS="$gt_save_LIBS" ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } @@ -12283,8 +12407,8 @@ printf %s "checking for CFLocaleCopyPreferredLanguages... " >&6; } if test ${gt_cv_func_CFLocaleCopyPreferredLanguages+y} then : printf %s "(cached) " >&6 -else $as_nop - gt_save_LIBS="$LIBS" +else case e in #( + e) gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12300,12 +12424,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gt_cv_func_CFLocaleCopyPreferredLanguages=yes -else $as_nop - gt_cv_func_CFLocaleCopyPreferredLanguages=no +else case e in #( + e) gt_cv_func_CFLocaleCopyPreferredLanguages=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" + LIBS="$gt_save_LIBS" ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5 printf "%s\n" "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; } @@ -12317,7 +12443,7 @@ printf "%s\n" "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h INTL_MACOSX_LIBS= if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices" fi @@ -12362,8 +12488,8 @@ printf %s "checking for GNU gettext in libc... " >&6; } if eval test \${$gt_func_gnugettext_libc+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <libintl.h> @@ -12390,11 +12516,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : eval "$gt_func_gnugettext_libc=yes" -else $as_nop - eval "$gt_func_gnugettext_libc=no" +else case e in #( + e) eval "$gt_func_gnugettext_libc=no" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi eval ac_res=\$$gt_func_gnugettext_libc { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -12406,19 +12534,19 @@ printf "%s\n" "$ac_res" >&6; } - am_save_CPPFLAGS="$CPPFLAGS" + gl_saved_CPPFLAGS="$CPPFLAGS" for element in $INCICONV; do haveit= for x in $CPPFLAGS; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X$element"; then haveit=yes @@ -12436,8 +12564,8 @@ printf %s "checking for iconv... " >&6; } if test ${am_cv_func_iconv+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12463,7 +12591,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12488,9 +12616,10 @@ then : fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$am_save_LIBS" + LIBS="$gl_saved_LIBS" fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 printf "%s\n" "$am_cv_func_iconv" >&6; } @@ -12500,9 +12629,9 @@ printf %s "checking for working iconv... " >&6; } if test ${am_cv_func_iconv_works+y} then : printf %s "(cached) " >&6 -else $as_nop - - am_save_LIBS="$LIBS" +else case e in #( + e) + gl_saved_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi @@ -12514,8 +12643,8 @@ then : aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; *) am_cv_func_iconv_works="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <iconv.h> @@ -12644,13 +12773,15 @@ then : am_cv_func_iconv_works=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi test "$am_cv_func_iconv_works" = no || break done - LIBS="$am_save_LIBS" - + LIBS="$gl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 printf "%s\n" "$am_cv_func_iconv_works" >&6; } @@ -12672,7 +12803,7 @@ printf %s "checking how to link with libiconv... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 printf "%s\n" "$LIBICONV" >&6; } else - CPPFLAGS="$am_save_CPPFLAGS" + CPPFLAGS="$gl_saved_CPPFLAGS" LIBICONV= LTLIBICONV= fi @@ -12688,9 +12819,9 @@ printf "%s\n" "$LIBICONV" >&6; } use_additional=yes - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -12698,8 +12829,8 @@ printf "%s\n" "$LIBICONV" >&6; } eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" # Check whether --with-libintl-prefix was given. @@ -12711,9 +12842,9 @@ then : else if test "X$withval" = "X"; then - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -12721,8 +12852,8 @@ then : eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" else additional_includedir="$withval/include" @@ -12834,13 +12965,13 @@ fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIBINTL; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" case "$x" in -L*) @@ -12928,13 +13059,13 @@ fi haveit= for x in $LDFLAGS $LIBINTL; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$found_dir"; then haveit=yes @@ -12996,13 +13127,13 @@ fi if test -z "$haveit"; then for x in $CPPFLAGS $INCINTL; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-I$additional_includedir"; then haveit=yes @@ -13018,12 +13149,12 @@ fi fi fi if test -n "$found_la"; then - save_libdir="$libdir" + saved_libdir="$libdir" case "$found_la" in */* | *\\*) . "$found_la" ;; *) . "./$found_la" ;; esac - libdir="$save_libdir" + libdir="$saved_libdir" for dep in $dependency_libs; do case "$dep" in -L*) @@ -13045,13 +13176,13 @@ fi haveit= for x in $LDFLAGS $LIBINTL; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -13066,13 +13197,13 @@ fi haveit= for x in $LDFLAGS $LTLIBINTL; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -13146,17 +13277,17 @@ fi for found_dir in $rpathdirs; do alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" else for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$found_dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" done fi @@ -13176,8 +13307,8 @@ printf %s "checking for GNU gettext in libintl... " >&6; } if eval test \${$gt_func_gnugettext_libintl+y} then : printf %s "(cached) " >&6 -else $as_nop - gt_save_CPPFLAGS="$CPPFLAGS" +else case e in #( + e) gt_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCINTL" gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" @@ -13212,13 +13343,20 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : eval "$gt_func_gnugettext_libintl=yes" -else $as_nop - eval "$gt_func_gnugettext_libintl=no" +else case e in #( + e) eval "$gt_func_gnugettext_libintl=no" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then - LIBS="$LIBS $LIBICONV" + gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS" + + case "$host_os" in + aix*) gt_LIBINTL_EXTRA="-lpthread" ;; + esac + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \ + && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then + LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13249,8 +13387,8 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION _ACEOF if ac_fn_c_try_link "$LINENO" then : - LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" + LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA" + LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA" eval "$gt_func_gnugettext_libintl=yes" fi @@ -13258,7 +13396,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS" + LIBS="$gt_save_LIBS" ;; +esac fi eval ac_res=\$$gt_func_gnugettext_libintl { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -13268,7 +13407,8 @@ printf "%s\n" "$ac_res" >&6; } if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then + && test "$PACKAGE" != gettext-tools \ + && test "$PACKAGE" != libintl; }; then gt_use_preinstalled_gnugettext=yes else LIBINTL= @@ -13329,13 +13469,13 @@ printf "%s\n" "$LIBINTL" >&6; } haveit= for x in $CPPFLAGS; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X$element"; then haveit=yes @@ -13362,8 +13502,8 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h - INTLLIBS="$LIBINTL" + INTLLIBS="$LIBINTL" @@ -13371,6 +13511,44 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h + gt_save_prefix="${prefix}" + gt_save_datarootdir="${datarootdir}" + gt_save_localedir="${localedir}" + if test "X$prefix" = "XNONE"; then + prefix="$ac_default_prefix" + fi + eval datarootdir="$datarootdir" + eval localedir="$localedir" + + + + + + gl_final_localedir="$localedir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw* | windows*) + gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;; + esac + ;; + esac + localedir_c=`printf '%s\n' "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"` + localedir_c='"'"$localedir_c"'"' + + + localedir_c_make=`printf '%s\n' "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"` + if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then + localedir_c_make='\"$(localedir)\"' + fi + + + localedir="${gt_save_localedir}" + datarootdir="${gt_save_datarootdir}" + prefix="${gt_save_prefix}" + + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. @@ -13380,8 +13558,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_RANLIB+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$RANLIB"; then +else case e in #( + e) if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -13403,7 +13581,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then @@ -13425,8 +13604,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_RANLIB+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_RANLIB"; then +else case e in #( + e) if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -13448,7 +13627,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then @@ -13484,8 +13664,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_LEX+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$LEX"; then +else case e in #( + e) if test -n "$LEX"; then ac_cv_prog_LEX="$LEX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -13507,7 +13687,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi LEX=$ac_cv_prog_LEX if test -n "$LEX"; then @@ -13565,8 +13746,8 @@ printf %s "checking for lex output file root... " >&6; } if test ${ac_cv_prog_lex_root+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) ac_cv_prog_lex_root=unknown { { ac_try="$LEX conftest.l" case "(($ac_try" in @@ -13583,7 +13764,8 @@ if test -f lex.yy.c; then ac_cv_prog_lex_root=lex.yy elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy -fi +fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 printf "%s\n" "$ac_cv_prog_lex_root" >&6; } @@ -13598,15 +13780,15 @@ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root if test ${LEXLIB+y} then : -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex library" >&5 printf %s "checking for lex library... " >&6; } if test ${ac_cv_lib_lex+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) ac_save_LIBS="$LIBS" ac_found=false for ac_cv_lib_lex in 'none needed' -lfl -ll 'not found'; do @@ -13636,7 +13818,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ fi done LIBS="$ac_save_LIBS" - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 printf "%s\n" "$ac_cv_lib_lex" >&6; } @@ -13648,10 +13831,12 @@ printf "%s\n" "$as_me: WARNING: required lex library not found; giving up on $LE elif test "$ac_cv_lib_lex" = 'none needed' then : LEXLIB='' -else $as_nop - LEXLIB=$ac_cv_lib_lex +else case e in #( + e) LEXLIB=$ac_cv_lib_lex ;; +esac fi - + ;; +esac fi @@ -13663,8 +13848,8 @@ printf %s "checking whether yytext is a pointer... " >&6; } if test ${ac_cv_prog_lex_yytext_pointer+y} then : printf %s "(cached) " >&6 -else $as_nop - # POSIX says lex can declare yytext either as a pointer or an array; the +else case e in #( + e) # POSIX says lex can declare yytext either as a pointer or an array; the # default is implementation-dependent. Figure out which it is, since # not all implementations provide the %pointer and %array declarations. ac_cv_prog_lex_yytext_pointer=no @@ -13679,7 +13864,8 @@ then : ac_cv_prog_lex_yytext_pointer=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 printf "%s\n" "$ac_cv_prog_lex_yytext_pointer" >&6; } @@ -13711,8 +13897,8 @@ printf %s "checking for an ANSI C-conforming const... " >&6; } if test ${ac_cv_c_const+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -13776,10 +13962,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_c_const=yes -else $as_nop - ac_cv_c_const=no +else case e in #( + e) ac_cv_c_const=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 printf "%s\n" "$ac_cv_c_const" >&6; } @@ -13794,8 +13982,8 @@ printf %s "checking for inline... " >&6; } if test ${ac_cv_c_inline+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_c_inline=no +else case e in #( + e) ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13813,7 +14001,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test "$ac_cv_c_inline" != no && break done - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 printf "%s\n" "$ac_cv_c_inline" >&6; } @@ -13838,8 +14027,8 @@ printf %s "checking for working volatile... " >&6; } if test ${ac_cv_c_volatile+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -13856,10 +14045,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_c_volatile=yes -else $as_nop - ac_cv_c_volatile=no +else case e in #( + e) ac_cv_c_volatile=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5 printf "%s\n" "$ac_cv_c_volatile" >&6; } @@ -13882,8 +14073,8 @@ printf %s "checking for $CC option to enable large file support... " >&6; } if test ${ac_cv_sys_largefile_opts+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_CC="$CC" +else case e in #( + e) ac_save_CC="$CC" ac_opt_found=no for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do if test x"$ac_opt" != x"none needed" @@ -13893,13 +14084,16 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, +#ifndef FTYPE +# define FTYPE off_t +#endif + /* Check that FTYPE can represent 2**63 - 1 correctly. + We can't simply define LARGE_FTYPE to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) +#define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31)) + int FTYPE_is_large[(LARGE_FTYPE % 2147483629 == 721 + && LARGE_FTYPE % 2147483647 == 1) ? 1 : -1]; int main (void) @@ -13911,7 +14105,25 @@ main (void) _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sys_largefile_opts="$ac_opt" + if test x"$ac_opt" = x"none needed" +then : + # GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t. + CC="$CC -DFTYPE=ino_t" + if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) CC="$CC -D_FILE_OFFSET_BITS=64" + if ac_fn_c_try_compile "$LINENO" +then : + ac_opt='-D_FILE_OFFSET_BITS=64' +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam +fi + ac_cv_sys_largefile_opts=$ac_opt ac_opt_found=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -13922,7 +14134,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test $ac_opt_found != yes; then case $host_os in #( - mingw*) : + mingw* | windows*) : ac_cv_sys_largefile_opts="supported through gnulib" ac_opt_found=yes ;; #( @@ -13931,7 +14143,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext esac fi - test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" + test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5 printf "%s\n" "$ac_cv_sys_largefile_opts" >&6; } @@ -13965,8 +14178,8 @@ printf %s "checking for $CC option for timestamps after 2038... " >&6; } if test ${ac_cv_sys_year2038_opts+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_CPPFLAGS="$CPPFLAGS" +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" ac_opt_found=no for ac_opt in "none needed" "-D_TIME_BITS=64" "-D__MINGW_USE_VC2005_COMPAT" "-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"; do if test x"$ac_opt" != x"none needed" @@ -14001,7 +14214,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test $ac_opt_found = no || break done CPPFLAGS="$ac_save_CPPFLAGS" - test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" + test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5 printf "%s\n" "$ac_cv_sys_year2038_opts" >&6; } @@ -14021,12 +14235,12 @@ printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h ;; #( "-U_USE_32_BIT_TIME_T"*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "the 'time_t' type is currently forced to be 32-bit. It will stop working after mid-January 2038. Remove _USE_32BIT_TIME_T from the compiler flags. -See \`config.log' for more details" "$LINENO" 5; } ;; #( +See 'config.log' for more details" "$LINENO" 5; } ;; #( *) : as_fn_error $? "internal error: bad value for \$ac_cv_sys_year2038_opts" "$LINENO" 5 ;; esac @@ -14036,28 +14250,30 @@ fi fi # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 printf %s "checking size of off_t... " >&6; } if test ${ac_cv_sizeof_off_t+y} then : printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default" +else case e in #( + e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default" then : -else $as_nop - if test "$ac_cv_type_off_t" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) if test "$ac_cv_type_off_t" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (off_t) -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_off_t=0 - fi + fi ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 printf "%s\n" "$ac_cv_sizeof_off_t" >&6; } @@ -14077,25 +14293,25 @@ printf "%s\n" "#define HAVE__BOOL 1" >>confdefs.h fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 -printf %s "checking for stdbool.h that conforms to C99... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99 or later" >&5 +printf %s "checking for stdbool.h that conforms to C99 or later... " >&6; } if test ${ac_cv_header_stdbool_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdbool.h> - #ifndef __bool_true_false_are_defined - #error "__bool_true_false_are_defined is not defined" - #endif - char a[__bool_true_false_are_defined == 1 ? 1 : -1]; + /* "true" and "false" should be usable in #if expressions and + integer constant expressions, and "bool" should be a valid + type name. - /* Regardless of whether this is C++ or "_Bool" is a - valid type name, "true" and "false" should be usable - in #if expressions and integer constant expressions, - and "bool" should be a valid type name. */ + Although C99 requires bool, true, and false to be macros, + C23 and C++11 overrule that, so do not test for that. + Although C99 requires __bool_true_false_are_defined and + _Bool, C23 says they are obsolescent, so do not require + them. */ #if !true #error "'true' is not true" @@ -14129,43 +14345,12 @@ else $as_nop char n[sizeof m == h * sizeof m[0] ? 1 : -1]; char o[-1 - (bool) 0 < 0 ? 1 : -1]; /* Catch a bug in an HP-UX C compiler. See - https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - https://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html */ bool p = true; bool *pp = &p; - /* C 1999 specifies that bool, true, and false are to be - macros, but C++ 2011 and later overrule this. */ - #if __cplusplus < 201103 - #ifndef bool - #error "bool is not defined" - #endif - #ifndef false - #error "false is not defined" - #endif - #ifndef true - #error "true is not defined" - #endif - #endif - - /* If _Bool is available, repeat with it all the tests - above that used bool. */ - #ifdef HAVE__BOOL - struct sB { _Bool s: 1; _Bool t; } t; - - char q[(_Bool) 0.5 == true ? 1 : -1]; - char r[(_Bool) 0.0 == false ? 1 : -1]; - char u[sizeof (_Bool) > 0 ? 1 : -1]; - char v[sizeof t.t > 0 ? 1 : -1]; - - _Bool w[h]; - char x[sizeof m == h * sizeof m[0] ? 1 : -1]; - char y[-1 - (_Bool) 0 < 0 ? 1 : -1]; - _Bool z = true; - _Bool *pz = &p; - #endif - int main (void) { @@ -14174,20 +14359,10 @@ main (void) *pp |= p; *pp |= ! p; - #ifdef HAVE__BOOL - _Bool pt = &t; - *pz |= z; - *pz |= ! z; - #endif - /* Refer to every declared value, so they cannot be discarded as unused. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !j + !k - + !l + !m + !n + !o + !p + !pp + !ps - #ifdef HAVE__BOOL - + !q + !r + !u + !v + !w + !x + !y + !z + !pt - #endif - ); + return (!b + !c + !d + !e + !f + !g + !h + !i + !j + !k + + !l + !m + !n + !o + !p + !pp + !ps); ; return 0; @@ -14196,10 +14371,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_header_stdbool_h=yes -else $as_nop - ac_cv_header_stdbool_h=no +else case e in #( + e) ac_cv_header_stdbool_h=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 printf "%s\n" "$ac_cv_header_stdbool_h" >&6; } @@ -14279,8 +14456,8 @@ printf %s "checking for $CC options needed to detect all undeclared functions... if test ${ac_cv_c_undeclared_builtin_options+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_CFLAGS=$CFLAGS +else case e in #( + e) ac_save_CFLAGS=$CFLAGS ac_cv_c_undeclared_builtin_options='cannot detect' for ac_arg in '' -fno-builtin; do CFLAGS="$ac_save_CFLAGS $ac_arg" @@ -14299,8 +14476,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - # This test program should compile successfully. +else case e in #( + e) # This test program should compile successfully. # No library function is consistently available on # freestanding implementations, so test against a dummy # declaration. Include always-available headers on the @@ -14328,26 +14505,29 @@ then : if test x"$ac_arg" = x then : ac_cv_c_undeclared_builtin_options='none needed' -else $as_nop - ac_cv_c_undeclared_builtin_options=$ac_arg +else case e in #( + e) ac_cv_c_undeclared_builtin_options=$ac_arg ;; +esac fi break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done CFLAGS=$ac_save_CFLAGS - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } case $ac_cv_c_undeclared_builtin_options in #( 'cannot detect') : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot make $CC report undeclared builtins -See \`config.log' for more details" "$LINENO" 5; } ;; #( +See 'config.log' for more details" "$LINENO" 5; } ;; #( 'none needed') : ac_c_undeclared_builtin_options='' ;; #( *) : @@ -14359,36 +14539,39 @@ ac_fn_check_decl "$LINENO" "h_errno" "ac_cv_have_decl_h_errno" "#include <netdb. if test "x$ac_cv_have_decl_h_errno" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_H_ERRNO $ac_have_decl" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 printf %s "checking size of long... " >&6; } if test ${ac_cv_sizeof_long+y} then : printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default" +else case e in #( + e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default" then : -else $as_nop - if test "$ac_cv_type_long" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) if test "$ac_cv_type_long" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long) -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long=0 - fi + fi ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 printf "%s\n" "$ac_cv_sizeof_long" >&6; } @@ -14403,10 +14586,11 @@ ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" if test "x$ac_cv_type_size_t" = xyes then : -else $as_nop - +else case e in #( + e) printf "%s\n" "#define size_t unsigned int" >>confdefs.h - + ;; +esac fi @@ -14415,8 +14599,8 @@ fi if test "x$ac_cv_type_pid_t" = xyes then : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined _WIN64 && !defined __CYGWIN__ @@ -14435,14 +14619,16 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_pid_type='int' -else $as_nop - ac_pid_type='__int64' +else case e in #( + e) ac_pid_type='__int64' ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h - + ;; +esac fi @@ -14513,19 +14699,19 @@ fi - am_save_CPPFLAGS="$CPPFLAGS" + gl_saved_CPPFLAGS="$CPPFLAGS" for element in $INCICONV; do haveit= for x in $CPPFLAGS; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X$element"; then haveit=yes @@ -14543,8 +14729,8 @@ printf %s "checking for iconv... " >&6; } if test ${am_cv_func_iconv+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14570,7 +14756,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14595,9 +14781,10 @@ then : fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$am_save_LIBS" + LIBS="$gl_saved_LIBS" fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 printf "%s\n" "$am_cv_func_iconv" >&6; } @@ -14607,9 +14794,9 @@ printf %s "checking for working iconv... " >&6; } if test ${am_cv_func_iconv_works+y} then : printf %s "(cached) " >&6 -else $as_nop - - am_save_LIBS="$LIBS" +else case e in #( + e) + gl_saved_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi @@ -14621,8 +14808,8 @@ then : aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; *) am_cv_func_iconv_works="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <iconv.h> @@ -14751,13 +14938,15 @@ then : am_cv_func_iconv_works=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi test "$am_cv_func_iconv_works" = no || break done - LIBS="$am_save_LIBS" - + LIBS="$gl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 printf "%s\n" "$am_cv_func_iconv_works" >&6; } @@ -14779,7 +14968,7 @@ printf %s "checking how to link with libiconv... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 printf "%s\n" "$LIBICONV" >&6; } else - CPPFLAGS="$am_save_CPPFLAGS" + CPPFLAGS="$gl_saved_CPPFLAGS" LIBICONV= LTLIBICONV= fi @@ -14792,8 +14981,8 @@ printf %s "checking whether iconv is compatible with its POSIX signature... " >& if test ${gl_cv_iconv_nonconst+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -14815,11 +15004,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_iconv_nonconst=yes -else $as_nop - gl_cv_iconv_nonconst=no +else case e in #( + e) gl_cv_iconv_nonconst=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5 printf "%s\n" "$gl_cv_iconv_nonconst" >&6; } @@ -14874,8 +15065,9 @@ printf "%s\n" "$as_me: WARNING: invalid argument supplied to --enable-cross-gues enableval=conservative fi gl_cross_guesses="$enableval" -else $as_nop - gl_cross_guesses=conservative +else case e in #( + e) gl_cross_guesses=conservative ;; +esac fi if test $gl_cross_guesses = risky; then @@ -14915,8 +15107,8 @@ printf %s "checking whether the preprocessor supports include_next... " >&6; } if test ${gl_cv_have_include_next+y} then : printf %s "(cached) " >&6 -else $as_nop - rm -rf conftestd1a conftestd1b conftestd2 +else case e in #( + e) rm -rf conftestd1a conftestd1b conftestd2 mkdir conftestd1a conftestd1b conftestd2 cat <<EOF > conftestd1a/conftest.h #define DEFINED_IN_CONFTESTD1 @@ -14943,8 +15135,8 @@ EOF #endif #define DEFINED_IN_CONFTESTD2 EOF - gl_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2" + gl_saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$gl_saved_CPPFLAGS -Iconftestd1b -Iconftestd2" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <conftest.h> @@ -14952,8 +15144,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_have_include_next=yes -else $as_nop - CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2" +else case e in #( + e) CPPFLAGS="$gl_saved_CPPFLAGS -Iconftestd1a -Iconftestd2" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <conftest.h> @@ -14961,16 +15153,19 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_have_include_next=buggy -else $as_nop - gl_cv_have_include_next=no +else case e in #( + e) gl_cv_have_include_next=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CPPFLAGS="$gl_save_CPPFLAGS" + CPPFLAGS="$gl_saved_CPPFLAGS" rm -rf conftestd1a conftestd1b conftestd2 - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5 printf "%s\n" "$gl_cv_have_include_next" >&6; } @@ -14999,8 +15194,8 @@ printf %s "checking whether source code line length is unlimited... " >&6; } if test ${gl_cv_source_line_length_unlimited+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __TANDEM @@ -15009,15 +15204,17 @@ choke me _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "choke me" >/dev/null 2>&1 + $EGREP_TRADITIONAL "choke me" >/dev/null 2>&1 then : gl_cv_source_line_length_unlimited=no -else $as_nop - gl_cv_source_line_length_unlimited=yes +else case e in #( + e) gl_cv_source_line_length_unlimited=yes ;; +esac fi rm -rf conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5 printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; } @@ -15092,6 +15289,7 @@ printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; } REPLACE_EXECVP=0; REPLACE_EXECVPE=0; REPLACE_FACCESSAT=0; + REPLACE_FCHDIR=0; REPLACE_FCHOWNAT=0; REPLACE_FDATASYNC=0; REPLACE_FTRUNCATE=0; @@ -15142,8 +15340,8 @@ printf %s "checking for C/C++ restrict keyword... " >&6; } if test ${ac_cv_c_restrict+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_c_restrict=no +else case e in #( + e) ac_cv_c_restrict=no # Put '__restrict__' first, to avoid problems with glibc and non-GCC; see: # https://lists.gnu.org/archive/html/bug-autoconf/2016-02/msg00006.html # Put 'restrict' last, because C++ lacks it. @@ -15174,7 +15372,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test "$ac_cv_c_restrict" != no && break done - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 printf "%s\n" "$ac_cv_c_restrict" >&6; } @@ -15205,8 +15404,8 @@ printf %s "checking whether <sys/socket.h> is self-contained... " >&6; } if test ${gl_cv_header_sys_socket_h_selfcontained+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/socket.h> @@ -15221,11 +15420,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_sys_socket_h_selfcontained=yes -else $as_nop - gl_cv_header_sys_socket_h_selfcontained=no +else case e in #( + e) gl_cv_header_sys_socket_h_selfcontained=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_socket_h_selfcontained" >&5 printf "%s\n" "$gl_cv_header_sys_socket_h_selfcontained" >&6; } @@ -15243,8 +15444,8 @@ printf %s "checking whether <sys/socket.h> defines the SHUT_* macros... " >&6; } if test ${gl_cv_header_sys_socket_h_shut+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/socket.h> @@ -15259,11 +15460,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_sys_socket_h_shut=yes -else $as_nop - gl_cv_header_sys_socket_h_shut=no +else case e in #( + e) gl_cv_header_sys_socket_h_shut=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_socket_h_shut" >&5 printf "%s\n" "$gl_cv_header_sys_socket_h_shut" >&6; } @@ -15292,8 +15495,8 @@ printf %s "checking absolute name of <sys/socket.h>... " >&6; } if test ${gl_cv_next_sys_socket_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_sys_socket_h = yes; then @@ -15309,7 +15512,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -15335,7 +15538,8 @@ _ACEOF gl_cv_next_sys_socket_h='<'sys/socket.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_socket_h" >&5 printf "%s\n" "$gl_cv_next_sys_socket_h" >&6; } @@ -15437,8 +15641,9 @@ then : printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1" >>confdefs.h -else $as_nop - HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=0 +else case e in #( + e) HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=0 ;; +esac fi fi @@ -15537,6 +15742,19 @@ fi +ac_func= +for ac_item in $ac_func_c_list +do + if test $ac_func; then + ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func + if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then + echo "#define $ac_item 1" >> confdefs.h + fi + ac_func= + else + ac_func=$ac_item + fi +done GL_GNULIB_ACCESS=0 @@ -15882,8 +16100,8 @@ printf %s "checking for working alloca.h... " >&6; } if test ${ac_cv_working_alloca_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <alloca.h> int @@ -15898,11 +16116,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_working_alloca_h=yes -else $as_nop - ac_cv_working_alloca_h=no +else case e in #( + e) ac_cv_working_alloca_h=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 printf "%s\n" "$ac_cv_working_alloca_h" >&6; } @@ -15917,10 +16137,10 @@ printf %s "checking for alloca... " >&6; } if test ${ac_cv_func_alloca_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test $ac_cv_working_alloca_h = yes; then - ac_cv_func_alloca_works=yes -else +else case e in #( + e) ac_cv_func_alloca_works=$ac_cv_working_alloca_h +if test "$ac_cv_func_alloca_works" != yes +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -15951,15 +16171,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_func_alloca_works=yes -else $as_nop - ac_cv_func_alloca_works=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext +fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 printf "%s\n" "$ac_cv_func_alloca_works" >&6; } -fi if test $ac_cv_func_alloca_works = yes; then @@ -15985,12 +16204,12 @@ printf %s "checking stack direction for C alloca... " >&6; } if test ${ac_cv_c_stack_direction+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : ac_cv_c_stack_direction=0 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -16013,13 +16232,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_c_stack_direction=1 -else $as_nop - ac_cv_c_stack_direction=-1 +else case e in #( + e) ac_cv_c_stack_direction=-1 ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 printf "%s\n" "$ac_cv_c_stack_direction" >&6; } @@ -16072,8 +16294,8 @@ printf %s "checking absolute name of <arpa/inet.h>... " >&6; } if test ${gl_cv_next_arpa_inet_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_arpa_inet_h = yes; then @@ -16089,7 +16311,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -16115,7 +16337,8 @@ _ACEOF gl_cv_next_arpa_inet_h='<'arpa/inet.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_arpa_inet_h" >&5 printf "%s\n" "$gl_cv_next_arpa_inet_h" >&6; } @@ -16166,6 +16389,140 @@ printf "%s\n" "$gl_cv_next_arpa_inet_h" >&6; } + + GL_GNULIB_BTOC32=0 + + + + GL_GNULIB_C32ISALNUM=0 + + + + GL_GNULIB_C32ISALPHA=0 + + + + GL_GNULIB_C32ISBLANK=0 + + + + GL_GNULIB_C32ISCNTRL=0 + + + + GL_GNULIB_C32ISDIGIT=0 + + + + GL_GNULIB_C32ISGRAPH=0 + + + + GL_GNULIB_C32ISLOWER=0 + + + + GL_GNULIB_C32ISPRINT=0 + + + + GL_GNULIB_C32ISPUNCT=0 + + + + GL_GNULIB_C32ISSPACE=0 + + + + GL_GNULIB_C32ISUPPER=0 + + + + GL_GNULIB_C32ISXDIGIT=0 + + + + GL_GNULIB_C32TOLOWER=0 + + + + GL_GNULIB_C32TOUPPER=0 + + + + GL_GNULIB_C32WIDTH=0 + + + + GL_GNULIB_C32RTOMB=0 + + + + GL_GNULIB_C32SNRTOMBS=0 + + + + GL_GNULIB_C32SRTOMBS=0 + + + + GL_GNULIB_C32STOMBS=0 + + + + GL_GNULIB_C32SWIDTH=0 + + + + GL_GNULIB_C32TOB=0 + + + + GL_GNULIB_C32_APPLY_MAPPING=0 + + + + GL_GNULIB_C32_APPLY_TYPE_TEST=0 + + + + GL_GNULIB_C32_GET_MAPPING=0 + + + + GL_GNULIB_C32_GET_TYPE_TEST=0 + + + + GL_GNULIB_MBRTOC16=0 + + + + GL_GNULIB_MBRTOC32=0 + + + + GL_GNULIB_MBSNRTOC32S=0 + + + + GL_GNULIB_MBSRTOC32S=0 + + + + GL_GNULIB_MBSTOC32S=0 + + + + + HAVE_C32RTOMB=1; + HAVE_MBRTOC16=1; + HAVE_MBRTOC32=1; + REPLACE_C32RTOMB=0; + REPLACE_MBRTOC16=0; + REPLACE_MBRTOC32=0; + + HAVE_BTOWC=1; HAVE_MBSINIT=1; HAVE_MBRTOWC=1; @@ -16236,8 +16593,8 @@ printf %s "checking whether <wchar.h> uses 'inline' correctly... " >&6; } if test ${gl_cv_header_wchar_h_correct_inline+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_cv_header_wchar_h_correct_inline=yes +else case e in #( + e) gl_cv_header_wchar_h_correct_inline=yes case "$host_os" in *-gnu* | gnu*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16250,8 +16607,8 @@ else $as_nop int main () { return zero(); } _ACEOF - save_ac_compile="$ac_compile" - ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/` + saved_ac_compile="$ac_compile" + ac_compile=`echo "$saved_ac_compile" | sed s/conftest/conftest1/` if echo '#include "conftest.c"' >conftest1.c \ && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -16267,7 +16624,7 @@ _ACEOF int zero (void) { return 0; } _ACEOF - ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` + ac_compile=`echo "$saved_ac_compile" | sed s/conftest/conftest2/` if echo '#include "conftest.c"' >conftest2.c \ && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -16281,11 +16638,12 @@ _ACEOF fi fi fi - ac_compile="$save_ac_compile" + ac_compile="$saved_ac_compile" rm -f conftest12.c conftest12.$ac_objext conftest$ac_exeext ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5 printf "%s\n" "$gl_cv_header_wchar_h_correct_inline" >&6; } @@ -16301,27 +16659,15 @@ C99 mode. You have four options: Configuration aborted." "$LINENO" 5 fi -ac_func= -for ac_item in $ac_func_c_list -do - if test $ac_func; then - ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func - if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then - echo "#define $ac_item 1" >> confdefs.h - fi - ac_func= - else - ac_func=$ac_item - fi -done + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 printf %s "checking for nl_langinfo and CODESET... " >&6; } if test ${am_cv_langinfo_codeset+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <langinfo.h> int @@ -16335,12 +16681,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : am_cv_langinfo_codeset=yes -else $as_nop - am_cv_langinfo_codeset=no +else case e in #( + e) am_cv_langinfo_codeset=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5 printf "%s\n" "$am_cv_langinfo_codeset" >&6; } @@ -16358,8 +16706,8 @@ printf %s "checking for a traditional french locale... " >&6; } if test ${gt_cv_locale_fr+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16441,7 +16789,7 @@ _ACEOF # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", # "ja" as "Japanese" or "Japanese_Japan.932", # and similar. - mingw*) + mingw* | windows*) # Test for the native Windows locale name. if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_fr=French_France.1252 @@ -16471,7 +16819,7 @@ _ACEOF if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_fr=fr_FR.iso88591 else - # Test for the Solaris 7 locale name. + # Test for the Solaris 10 locale name. if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_fr=fr else @@ -16486,11 +16834,18 @@ _ACEOF esac fi rm -fr conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5 printf "%s\n" "$gt_cv_locale_fr" >&6; } LOCALE_FR=$gt_cv_locale_fr + case $LOCALE_FR in #( + '' | *[[:space:]\"\$\'*[]*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: invalid locale \"$LOCALE_FR\"; assuming \"none\"" >&5 +printf "%s\n" "$as_me: WARNING: invalid locale \"$LOCALE_FR\"; assuming \"none\"" >&2;} + LOCALE_FR=none;; + esac @@ -16508,6 +16863,10 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } + GL_GNULIB_MBSZERO=0 + + + GL_GNULIB_MBRTOWC=0 @@ -16660,6 +17019,10 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } + GL_GNULIB_WGETCWD=0 + + + GL_GNULIB_MDA_WCSDUP=1 @@ -16770,6 +17133,10 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } + GL_GNULIB_RAND=0 + + + GL_GNULIB_RANDOM=0 @@ -16810,6 +17177,10 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } + GL_GNULIB_STRTOF=0 + + + GL_GNULIB_STRTOL=0 @@ -16904,6 +17275,7 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } HAVE_SETSTATE=1; HAVE_DECL_SETSTATE=1; HAVE_STRTOD=1; + HAVE_STRTOF=1; HAVE_STRTOL=1; HAVE_STRTOLD=1; HAVE_STRTOLL=1; @@ -16937,6 +17309,7 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } REPLACE_PTSNAME_R=0; REPLACE_PUTENV=0; REPLACE_QSORT_R=0; + REPLACE_RAND=0; REPLACE_RANDOM=0; REPLACE_RANDOM_R=0; REPLACE_REALLOC_FOR_REALLOC_GNU=0; @@ -16946,6 +17319,7 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } REPLACE_SETENV=0; REPLACE_SETSTATE=0; REPLACE_STRTOD=0; + REPLACE_STRTOF=0; REPLACE_STRTOL=0; REPLACE_STRTOLD=0; REPLACE_STRTOLL=0; @@ -16955,13 +17329,1247 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } REPLACE_WCTOMB=0; + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether char8_t is correctly defined" >&5 +printf %s "checking whether char8_t is correctly defined... " >&6; } +if test ${gl_cv_type_char8_t_works+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + int verify[(char8_t)(-1) >= 0 && sizeof (char8_t) == sizeof (unsigned char) ? 1 : -1]; + +int +main (void) +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_type_char8_t_works=yes +else case e in #( + e) gl_cv_type_char8_t_works=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_char8_t_works" >&5 +printf "%s\n" "$gl_cv_type_char8_t_works" >&6; } + if test $gl_cv_type_char8_t_works = no; then + GNULIBHEADERS_OVERRIDE_CHAR8_T=1 + else + GNULIBHEADERS_OVERRIDE_CHAR8_T=0 + fi + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether char16_t is correctly defined" >&5 +printf %s "checking whether char16_t is correctly defined... " >&6; } +if test ${gl_cv_type_char16_t_works+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + /* For simplicity, assume that uint16_least_t is equivalent to + 'unsigned short'. */ + int verify[(char16_t)(-1) >= 0 && sizeof (char16_t) == sizeof (unsigned short) ? 1 : -1]; + +int +main (void) +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_type_char16_t_works=yes +else case e in #( + e) gl_cv_type_char16_t_works=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_char16_t_works" >&5 +printf "%s\n" "$gl_cv_type_char16_t_works" >&6; } + if test $gl_cv_type_char16_t_works = no; then + GNULIBHEADERS_OVERRIDE_CHAR16_T=1 + else + GNULIBHEADERS_OVERRIDE_CHAR16_T=0 + fi + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether char32_t is correctly defined" >&5 +printf %s "checking whether char32_t is correctly defined... " >&6; } +if test ${gl_cv_type_char32_t_works+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + /* For simplicity, assume that uint32_least_t is equivalent to + 'unsigned int'. */ + int verify[(char32_t)(-1) >= 0 && sizeof (char32_t) == sizeof (unsigned int) ? 1 : -1]; + +int +main (void) +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_type_char32_t_works=yes +else case e in #( + e) gl_cv_type_char32_t_works=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_char32_t_works" >&5 +printf "%s\n" "$gl_cv_type_char32_t_works" >&6; } + if test $gl_cv_type_char32_t_works = no; then + GNULIBHEADERS_OVERRIDE_CHAR32_T=1 + else + GNULIBHEADERS_OVERRIDE_CHAR32_T=0 + fi + + + + + + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_uchar_h='<'uchar.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <uchar.h>" >&5 +printf %s "checking absolute name of <uchar.h>... " >&6; } +if test ${gl_cv_next_uchar_h+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + if test $ac_cv_header_uchar_h = yes; then + + + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <uchar.h> +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw* | windows*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'uchar.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_uchar_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_uchar_h + gl_cv_next_uchar_h='"'$gl_header'"' + else + gl_cv_next_uchar_h='<'uchar.h'>' + fi + + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_uchar_h" >&5 +printf "%s\n" "$gl_cv_next_uchar_h" >&6; } + fi + NEXT_UCHAR_H=$gl_cv_next_uchar_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'uchar.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_uchar_h + fi + NEXT_AS_FIRST_DIRECTIVE_UCHAR_H=$gl_next_as_first_directive + + + + + if test $ac_cv_header_uchar_h = yes; then + HAVE_UCHAR_H=1 + else + HAVE_UCHAR_H=0 + fi + + + + + + + + CXX_HAS_UCHAR_TYPES=0 + if test $HAVE_UCHAR_H = 0; then + if test "$CXX" != no; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler predefines the <uchar.h> types" >&5 +printf %s "checking whether the C++ compiler predefines the <uchar.h> types... " >&6; } +if test ${gl_cv_cxx_has_uchar_types+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat > conftest.cpp <<\EOF +#include <stddef.h> +char16_t a; +char32_t b; +EOF + gl_command="$CXX $CXXFLAGS $CPPFLAGS -c conftest.cpp" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gl_command\""; } >&5 + (eval $gl_command) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + gl_cv_cxx_has_uchar_types=yes + else + gl_cv_cxx_has_uchar_types=no + fi + rm -fr conftest* + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cxx_has_uchar_types" >&5 +printf "%s\n" "$gl_cv_cxx_has_uchar_types" >&6; } + if test $gl_cv_cxx_has_uchar_types = yes; then + CXX_HAS_UCHAR_TYPES=1 + fi + fi + fi + + CXX_HAS_CHAR8_TYPE=0 + if test $HAVE_UCHAR_H = 0; then + if test "$CXX" != no; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler predefines the char8_t types" >&5 +printf %s "checking whether the C++ compiler predefines the char8_t types... " >&6; } +if test ${gl_cv_cxx_has_char8_type+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat > conftest.cpp <<\EOF +#include <stddef.h> +char8_t a; +EOF + gl_command="$CXX $CXXFLAGS $CPPFLAGS -c conftest.cpp" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gl_command\""; } >&5 + (eval $gl_command) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + gl_cv_cxx_has_char8_type=yes + else + gl_cv_cxx_has_char8_type=no + fi + rm -fr conftest* + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cxx_has_char8_type" >&5 +printf "%s\n" "$gl_cv_cxx_has_char8_type" >&6; } + if test $gl_cv_cxx_has_char8_type = yes; then + CXX_HAS_CHAR8_TYPE=1 + fi + fi + fi + + + + + for gltype in wchar_t ; do + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5 +printf %s "checking for bit size of $gltype... " >&6; } +if eval test \${gl_cv_bitsizeof_${gltype}+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" " + #include <stddef.h> + #include <signal.h> + #if HAVE_WCHAR_H + # include <wchar.h> + #endif + +#include <limits.h>" +then : + +else case e in #( + e) result=unknown ;; +esac +fi + + eval gl_cv_bitsizeof_${gltype}=\$result + ;; +esac +fi +eval ac_res=\$gl_cv_bitsizeof_${gltype} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval result=\$gl_cv_bitsizeof_${gltype} + if test $result = unknown; then + result=0 + fi + GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` + printf "%s\n" "#define BITSIZEOF_${GLTYPE} $result" >>confdefs.h + + eval BITSIZEOF_${GLTYPE}=\$result + done + + + if test $BITSIZEOF_WCHAR_T -lt 32; then + SMALL_WCHAR_T=1 + else + SMALL_WCHAR_T=0 + fi + + + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 +printf %s "checking for mbstate_t... " >&6; } +if test ${ac_cv_type_mbstate_t+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default + #include <wchar.h> +int +main (void) +{ +mbstate_t x; return sizeof x; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_type_mbstate_t=yes +else case e in #( + e) ac_cv_type_mbstate_t=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5 +printf "%s\n" "$ac_cv_type_mbstate_t" >&6; } + if test $ac_cv_type_mbstate_t = yes; then + +printf "%s\n" "#define HAVE_MBSTATE_T 1" >>confdefs.h + + else + +printf "%s\n" "#define mbstate_t int" >>confdefs.h + + fi + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5 +printf %s "checking for a traditional japanese locale... " >&6; } +if test ${gt_cv_locale_ja+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <locale.h> +#include <time.h> +#if HAVE_LANGINFO_CODESET +# include <langinfo.h> +#endif +#include <stdlib.h> +#include <string.h> +struct tm t; +char buf[16]; +int main () +{ + /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl + imitates locale dependent behaviour by looking at the environment + variables, and all locales use the UTF-8 encoding. */ +#if defined __BEOS__ || defined __HAIKU__ + return 1; +#else + /* Check whether the given locale name is recognized by the system. */ +# if defined _WIN32 && !defined __CYGWIN__ + /* On native Windows, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; +# else + if (setlocale (LC_ALL, "") == NULL) return 1; +# endif + /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + is empty, and the behaviour of Tcl 8.4 in this locale is not useful. + On OpenBSD 4.0, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "646". In this situation, + some unit tests fail. + On MirBSD 10, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "UTF-8". */ +# if HAVE_LANGINFO_CODESET + { + const char *cs = nl_langinfo (CODESET); + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 + || strcmp (cs, "UTF-8") == 0) + return 1; + } +# endif +# ifdef __CYGWIN__ + /* On Cygwin, avoid locale names without encoding suffix, because the + locale_charset() function relies on the encoding suffix. Note that + LC_ALL is set on the command line. */ + if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; +# endif + /* Check whether MB_CUR_MAX is > 1. This excludes the dysfunctional locales + on Cygwin 1.5.x. */ + if (MB_CUR_MAX == 1) + return 1; + /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. + This excludes the UTF-8 encoding (except on MirBSD). */ + { + const char *p; + t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; + if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; + for (p = buf; *p != '\0'; p++) + if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0) + return 1; + } + return 0; +#endif +} + +_ACEOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest$ac_exeext; then + case "$host_os" in + # Handle native Windows specially, because there setlocale() interprets + # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", + # "fr" or "fra" as "French" or "French_France.1252", + # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", + # "ja" as "Japanese" or "Japanese_Japan.932", + # and similar. + mingw* | windows*) + # Note that on native Windows, the Japanese locale is + # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we + # cannot use it here. + gt_cv_locale_ja=none + ;; + *) + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the AIX locale name. + if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.EUC-JP + else + # Test for the HP-UX, OSF/1, NetBSD locale name. + if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.eucJP + else + # Test for the IRIX, FreeBSD locale name. + if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.EUC + else + # Test for the Solaris 10 locale name. + if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja + else + # Special test for NetBSD 1.6. + if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then + gt_cv_locale_ja=ja_JP.eucJP + else + # None found. + gt_cv_locale_ja=none + fi + fi + fi + fi + fi + fi + ;; + esac + fi + rm -fr conftest* + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5 +printf "%s\n" "$gt_cv_locale_ja" >&6; } + LOCALE_JA=$gt_cv_locale_ja + case $LOCALE_JA in #( + '' | *[[:space:]\"\$\'*[]*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: invalid locale \"$LOCALE_JA\"; assuming \"none\"" >&5 +printf "%s\n" "$as_me: WARNING: invalid locale \"$LOCALE_JA\"; assuming \"none\"" >&2;} + LOCALE_JA=none;; + esac + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5 +printf %s "checking for a french Unicode locale... " >&6; } +if test ${gt_cv_locale_fr_utf8+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + case "$host_os" in + *-musl* | midipix*) + gt_cv_locale_fr_utf8=fr_FR.UTF-8 + ;; + *) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <locale.h> +#include <time.h> +#if HAVE_LANGINFO_CODESET +# include <langinfo.h> +#endif +#include <stdlib.h> +#include <string.h> +struct tm t; +char buf[16]; +int main () { + /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl + imitates locale dependent behaviour by looking at the environment + variables, and all locales use the UTF-8 encoding. */ +#if !(defined __BEOS__ || defined __HAIKU__) + /* Check whether the given locale name is recognized by the system. */ +# if defined _WIN32 && !defined __CYGWIN__ + /* On native Windows, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; +# else + if (setlocale (LC_ALL, "") == NULL) return 1; +# endif + /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + is empty, and the behaviour of Tcl 8.4 in this locale is not useful. + On OpenBSD 4.0, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "646". In this situation, + some unit tests fail. */ +# if HAVE_LANGINFO_CODESET + { + const char *cs = nl_langinfo (CODESET); + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) + return 1; + } +# endif +# ifdef __CYGWIN__ + /* On Cygwin, avoid locale names without encoding suffix, because the + locale_charset() function relies on the encoding suffix. Note that + LC_ALL is set on the command line. */ + if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; +# endif + /* Check whether in the abbreviation of the second month, the second + character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is + two bytes long, with UTF-8 encoding. */ + t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; + if (strftime (buf, sizeof (buf), "%b", &t) < 4 + || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v') + return 1; +#endif +#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ + /* Check whether the decimal separator is a comma. + On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point + are nl_langinfo(RADIXCHAR) are both ".". */ + if (localeconv () ->decimal_point[0] != ',') return 1; +#endif + return 0; +} + +_ACEOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest$ac_exeext; then + case "$host_os" in + # Handle native Windows specially, because there setlocale() interprets + # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", + # "fr" or "fra" as "French" or "French_France.1252", + # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", + # "ja" as "Japanese" or "Japanese_Japan.932", + # and similar. + mingw* | windows*) + # Test for the hypothetical native Windows locale name. + if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=French_France.65001 + else + # None found. + gt_cv_locale_fr_utf8=none + fi + ;; + *) + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the usual locale name. + if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR.UTF-8 + else + # Test for the Solaris 10 locale name. + if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr.UTF-8 + else + # None found. + gt_cv_locale_fr_utf8=none + fi + fi + fi + ;; + esac + fi + rm -fr conftest* + ;; + esac + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5 +printf "%s\n" "$gt_cv_locale_fr_utf8" >&6; } + LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8 + case $LOCALE_FR_UTF8 in #( + '' | *[[:space:]\"\$\'*[]*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: invalid locale \"$LOCALE_FR_UTF8\"; assuming \"none\"" >&5 +printf "%s\n" "$as_me: WARNING: invalid locale \"$LOCALE_FR_UTF8\"; assuming \"none\"" >&2;} + LOCALE_FR_UTF8=none;; + esac + + + case "$host_os" in + *-musl* | midipix*) + LC_COLLATE_IMPLEMENTED=false + LC_NUMERIC_IMPLEMENTED=false + LC_TIME_IMPLEMENTED=false + LC_MONETARY_IMPLEMENTED=false + ;; + *) + LC_COLLATE_IMPLEMENTED=true + LC_NUMERIC_IMPLEMENTED=true + LC_TIME_IMPLEMENTED=true + LC_MONETARY_IMPLEMENTED=true + ;; + esac + + + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5 +printf %s "checking for a transitional chinese locale... " >&6; } +if test ${gt_cv_locale_zh_CN+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <locale.h> +#include <stdlib.h> +#include <time.h> +#if HAVE_LANGINFO_CODESET +# include <langinfo.h> +#endif +#include <stdlib.h> +#include <string.h> +struct tm t; +char buf[16]; +int main () +{ + /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl + imitates locale dependent behaviour by looking at the environment + variables, and all locales use the UTF-8 encoding. */ +#if defined __BEOS__ || defined __HAIKU__ + return 1; +#else + /* Check whether the given locale name is recognized by the system. */ +# if defined _WIN32 && !defined __CYGWIN__ + /* On native Windows, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; +# else + if (setlocale (LC_ALL, "") == NULL) return 1; +# endif + /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + is empty, and the behaviour of Tcl 8.4 in this locale is not useful. + On OpenBSD 4.0, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "646". In this situation, + some unit tests fail. + On MirBSD 10, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "UTF-8". */ +# if HAVE_LANGINFO_CODESET + { + const char *cs = nl_langinfo (CODESET); + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 + || strcmp (cs, "UTF-8") == 0) + return 1; + } +# endif +# ifdef __CYGWIN__ + /* On Cygwin, avoid locale names without encoding suffix, because the + locale_charset() function relies on the encoding suffix. Note that + LC_ALL is set on the command line. */ + if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; +# endif + /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. + This excludes the UTF-8 encoding (except on MirBSD). */ + { + const char *p; + t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; + if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; + for (p = buf; *p != '\0'; p++) + if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0) + return 1; + } + /* Check whether a typical GB18030 multibyte sequence is recognized as a + single wide character. This excludes the GB2312 and GBK encodings. */ + if (mblen ("\203\062\332\066", 5) != 4) + return 1; + return 0; +#endif +} + +_ACEOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest$ac_exeext; then + case "$host_os" in + # Handle native Windows specially, because there setlocale() interprets + # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", + # "fr" or "fra" as "French" or "French_France.1252", + # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", + # "ja" as "Japanese" or "Japanese_Japan.932", + # and similar. + mingw* | windows*) + # Test for the hypothetical native Windows locale name. + if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=Chinese_China.54936 + else + # None found. + gt_cv_locale_zh_CN=none + fi + ;; + solaris2.8) + # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are + # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK. + # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core. + gt_cv_locale_zh_CN=none + ;; + *) + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the locale name without encoding suffix. + if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=zh_CN + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=zh_CN.GB18030 + else + # None found. + gt_cv_locale_zh_CN=none + fi + fi + ;; + esac + else + # If there was a link error, due to mblen(), the system is so old that + # it certainly doesn't have a chinese locale. + gt_cv_locale_zh_CN=none + fi + rm -fr conftest* + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5 +printf "%s\n" "$gt_cv_locale_zh_CN" >&6; } + LOCALE_ZH_CN=$gt_cv_locale_zh_CN + case $LOCALE_ZH_CN in #( + '' | *[[:space:]\"\$\'*[]*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: invalid locale \"$LOCALE_ZH_CN\"; assuming \"none\"" >&5 +printf "%s\n" "$as_me: WARNING: invalid locale \"$LOCALE_ZH_CN\"; assuming \"none\"" >&2;} + LOCALE_ZH_CN=none;; + esac + + + + + + + + + + if case "$host_os" in + mingw* | windows*) true ;; + *) test $ac_cv_func_mbsinit = yes ;; + esac \ + && test $ac_cv_func_mbrtowc = yes; then + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5 +printf %s "checking whether mbrtowc handles incomplete characters... " >&6; } +if test ${gl_cv_func_mbrtowc_incomplete_state+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + case "$host_os" in + # Guess no on AIX and OSF/1. + aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;; + esac + if test $LOCALE_JA != none; then + if test "$cross_compiling" = yes +then : + : +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <locale.h> +#include <string.h> +#include <wchar.h> +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + { + const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) + if (mbsinit (&state)) + return 2; + } + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_mbrtowc_incomplete_state=yes +else case e in #( + e) gl_cv_func_mbrtowc_incomplete_state=no ;; +esac +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi + + else + if test $LOCALE_FR_UTF8 != none; then + if test "$cross_compiling" = yes +then : + : +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <locale.h> +#include <string.h> +#include <wchar.h> +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + const char input[] = "B\303\274\303\237er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) + if (mbsinit (&state)) + return 2; + } + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_mbrtowc_incomplete_state=yes +else case e in #( + e) gl_cv_func_mbrtowc_incomplete_state=no ;; +esac +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi + + fi + fi + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5 +printf "%s\n" "$gl_cv_func_mbrtowc_incomplete_state" >&6; } + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5 +printf %s "checking whether mbrtowc works as well as mbtowc... " >&6; } +if test ${gl_cv_func_mbrtowc_sanitycheck+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + case "$host_os" in + # Guess no on Solaris 8. + solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;; + esac + if test $LOCALE_ZH_CN != none; then + if test "$cross_compiling" = yes +then : + : +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <locale.h> +#include <stdlib.h> +#include <string.h> +#include <wchar.h> +int main () +{ + /* This fails on Solaris 8: + mbrtowc returns 2, and sets wc to 0x00F0. + mbtowc returns 4 (correct) and sets wc to 0x5EDC. */ + if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + { + char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 3, 6, &state) != 4 + && mbtowc (&wc, input + 3, 6) == 4) + return 2; + } + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_mbrtowc_sanitycheck=yes +else case e in #( + e) gl_cv_func_mbrtowc_sanitycheck=no ;; +esac +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi + + fi + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5 +printf "%s\n" "$gl_cv_func_mbrtowc_sanitycheck" >&6; } + + REPLACE_MBSTATE_T=0 + case "$gl_cv_func_mbrtowc_incomplete_state" in + *yes) ;; + *) REPLACE_MBSTATE_T=1 ;; + esac + case "$gl_cv_func_mbrtowc_sanitycheck" in + *yes) ;; + *) REPLACE_MBSTATE_T=1 ;; + esac + else + REPLACE_MBSTATE_T=1 + fi + + + ac_fn_check_decl "$LINENO" "mbrtoc32" "ac_cv_have_decl_mbrtoc32" "#ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_mbrtoc32" = xyes +then : + +fi + if test $ac_cv_have_decl_mbrtoc32 = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbrtoc32" >&5 +printf %s "checking for mbrtoc32... " >&6; } +if test ${gl_cv_func_mbrtoc32+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdlib.h> + #ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + +int +main (void) +{ +char32_t c; + return mbrtoc32 (&c, "", 1, NULL) == 0; + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + gl_cv_func_mbrtoc32=yes +else case e in #( + e) gl_cv_func_mbrtoc32=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtoc32" >&5 +printf "%s\n" "$gl_cv_func_mbrtoc32" >&6; } + else + gl_cv_func_mbrtoc32=no + fi + + + + + + + + if test $GNULIBHEADERS_OVERRIDE_CHAR32_T = 1 || test $gl_cv_func_mbrtoc32 = no; then + HAVE_WORKING_MBRTOC32=0 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtoc32 works as well as mbrtowc" >&5 +printf %s "checking whether mbrtoc32 works as well as mbrtowc... " >&6; } +if test ${gl_cv_func_mbrtoc32_sanitycheck+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + case "$host_os" in + # Guess no on FreeBSD, Solaris, native Windows. + freebsd* | midnightbsd* | solaris* | mingw* | windows*) + gl_cv_func_mbrtoc32_sanitycheck="guessing no" + ;; + # Guess yes otherwise. + *) + gl_cv_func_mbrtoc32_sanitycheck="guessing yes" + ;; + esac + if test $LOCALE_FR != none || test $LOCALE_ZH_CN != none; then + if test "$cross_compiling" = yes +then : + : +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <locale.h> +#include <stdlib.h> +#include <string.h> +#include <wchar.h> +#ifdef __HAIKU__ + #include <stdint.h> +#endif +#include <uchar.h> +int main () +{ + int result = 0; + /* This fails on native Windows: + mbrtoc32 returns (size_t)-1. + mbrtowc returns 1 (correct). */ + if (strcmp ("$LOCALE_FR", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR") != NULL) + { + mbstate_t state; + wchar_t wc = (wchar_t) 0xBADFACE; + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\374", 1, &state) == 1) + { + char32_t c32 = (wchar_t) 0xBADFACE; + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtoc32 (&c32, "\374", 1, &state) != 1) + result |= 1; + } + } + /* This fails on FreeBSD 13.0 and Solaris 11.4: + mbrtoc32 returns (size_t)-2 or (size_t)-1. + mbrtowc returns 4 (correct). */ + if (strcmp ("$LOCALE_ZH_CN", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + { + mbstate_t state; + wchar_t wc = (wchar_t) 0xBADFACE; + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\224\071\375\067", 4, &state) == 4) + { + char32_t c32 = (wchar_t) 0xBADFACE; + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtoc32 (&c32, "\224\071\375\067", 4, &state) != 4) + result |= 2; + } + } + return result; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_mbrtoc32_sanitycheck=yes +else case e in #( + e) gl_cv_func_mbrtoc32_sanitycheck=no ;; +esac +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi + + fi + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtoc32_sanitycheck" >&5 +printf "%s\n" "$gl_cv_func_mbrtoc32_sanitycheck" >&6; } + case "$gl_cv_func_mbrtoc32_sanitycheck" in + *yes) + HAVE_WORKING_MBRTOC32=1 + +printf "%s\n" "#define HAVE_WORKING_MBRTOC32 1" >>confdefs.h + + ;; + *) HAVE_WORKING_MBRTOC32=0 ;; + esac + fi + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5 printf %s "checking whether malloc is ptrdiff_t safe... " >&6; } if test ${gl_cv_malloc_ptrdiff+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdint.h> @@ -16995,11 +18603,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_malloc_ptrdiff=yes -else $as_nop - gl_cv_malloc_ptrdiff=no +else case e in #( + e) gl_cv_malloc_ptrdiff=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5 printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; } @@ -17016,10 +18626,10 @@ printf %s "checking whether malloc, realloc, calloc set errno on failure... " >& if test ${gl_cv_func_malloc_posix+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in - mingw*) + mingw* | windows*) gl_cv_func_malloc_posix=no ;; irix* | solaris*) @@ -17027,7 +18637,8 @@ else $as_nop *) gl_cv_func_malloc_posix=yes ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5 printf "%s\n" "$gl_cv_func_malloc_posix" >&6; } @@ -17057,8 +18668,8 @@ printf %s "checking whether lstat correctly handles trailing slash... " >&6; } if test ${gl_cv_func_lstat_dereferences_slashed_symlink+y} then : printf %s "(cached) " >&6 -else $as_nop - rm -f conftest.sym conftest.file +else case e in #( + e) rm -f conftest.sym conftest.file echo >conftest.file if test "$cross_compiling" = yes then : @@ -17072,7 +18683,7 @@ then : *-gnu* | gnu*) # Guess yes on glibc systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; - mingw*) + mingw* | windows*) # Guess no on native Windows. gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; *) @@ -17080,8 +18691,8 @@ then : gl_cv_func_lstat_dereferences_slashed_symlink="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -17102,15 +18713,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_lstat_dereferences_slashed_symlink=yes -else $as_nop - gl_cv_func_lstat_dereferences_slashed_symlink=no +else case e in #( + e) gl_cv_func_lstat_dereferences_slashed_symlink=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f conftest.sym conftest.file - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5 printf "%s\n" "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; } @@ -17130,8 +18744,8 @@ printf %s "checking whether // is distinct from /... " >&6; } if test ${gl_cv_double_slash_root+y} then : printf %s "(cached) " >&6 -else $as_nop - if test x"$cross_compiling" = xyes ; then +else case e in #( + e) if test x"$cross_compiling" = xyes ; then # When cross-compiling, there is no way to tell whether // is special # short of a list of hosts. However, the only known hosts to date # that have a distinct // are Apollo DomainOS (too old to port to), @@ -17153,7 +18767,8 @@ else $as_nop else gl_cv_double_slash_root=yes fi - fi + fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5 printf "%s\n" "$gl_cv_double_slash_root" >&6; } @@ -17166,14 +18781,13 @@ printf "%s\n" "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5 printf %s "checking whether realpath works... " >&6; } if test ${gl_cv_func_realpath_works+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) rm -rf conftest.a conftest.d touch conftest.a # Assume that if we have lstat, we can also check symlinks. @@ -17184,20 +18798,20 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;; - # Guess 'nearly' on musl systems. - *-musl*) gl_cv_func_realpath_works="guessing nearly" ;; - # Guess no on Cygwin. - cygwin*) gl_cv_func_realpath_works="guessing no" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_realpath_works="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_realpath_works="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;; + # Guess 'nearly' on musl systems. + *-musl*) gl_cv_func_realpath_works="guessing nearly" ;; + # Guess no on Cygwin. + cygwin*) gl_cv_func_realpath_works="guessing no" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_realpath_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_realpath_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17384,19 +18998,22 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_realpath_works=yes -else $as_nop - case $? in +else case e in #( + e) case $? in 32) gl_cv_func_realpath_works=nearly ;; *) gl_cv_func_realpath_works=no ;; esac - + ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -rf conftest.a conftest.l conftest.d - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_realpath_works" >&5 printf "%s\n" "$gl_cv_func_realpath_works" >&6; } @@ -17425,8 +19042,8 @@ printf %s "checking for faccessat... " >&6; } if test ${gl_cv_onwards_func_faccessat+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -17470,7 +19087,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_faccessat" >&5 printf "%s\n" "$gl_cv_onwards_func_faccessat" >&6; } @@ -17489,8 +19107,8 @@ printf "%s\n" "#define HAVE_FACCESSAT 1" >>confdefs.h case "$host_os" in - mingw*) ;; - *) ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd" + mingw* | windows*) ;; + *) ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd" if test "x$ac_cv_func_getcwd" = xyes then : printf "%s\n" "#define HAVE_GETCWD 1" >>confdefs.h @@ -17590,8 +19208,8 @@ fi case "$host_os" in - mingw*) DIR_HAS_FD_MEMBER=0 ;; - *) DIR_HAS_FD_MEMBER=1 ;; + mingw* | windows* | os2*) DIR_HAS_FD_MEMBER=0 ;; + *) DIR_HAS_FD_MEMBER=1 ;; esac @@ -17642,8 +19260,8 @@ printf %s "checking whether linux/if_alg.h has struct sockaddr_alg.... " >&6; } if test ${gl_cv_header_linux_if_alg_salg+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/socket.h> #include <linux/if_alg.h> @@ -17663,10 +19281,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_linux_if_alg_salg=yes -else $as_nop - gl_cv_header_linux_if_alg_salg=no +else case e in #( + e) gl_cv_header_linux_if_alg_salg=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_linux_if_alg_salg" >&5 printf "%s\n" "$gl_cv_header_linux_if_alg_salg" >&6; } @@ -17682,8 +19302,9 @@ printf "%s\n" "#define HAVE_LINUX_IF_ALG_H 1" >>confdefs.h if test ${with_linux_crypto+y} then : withval=$with_linux_crypto; use_af_alg=$withval -else $as_nop - use_af_alg=no +else case e in #( + e) use_af_alg=no ;; +esac fi if test "$gl_cv_header_linux_if_alg_salg" != yes; then @@ -17709,8 +19330,8 @@ printf %s "checking whether byte ordering is bigendian... " >&6; } if test ${ac_cv_c_bigendian+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_c_bigendian=unknown +else case e in #( + e) ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17756,8 +19377,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext int main (void) { -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \\ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \\ && LITTLE_ENDIAN) bogus endian macros #endif @@ -17788,8 +19409,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_c_bigendian=yes -else $as_nop - ac_cv_c_bigendian=no +else case e in #( + e) ac_cv_c_bigendian=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -17833,8 +19455,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_c_bigendian=yes -else $as_nop - ac_cv_c_bigendian=no +else case e in #( + e) ac_cv_c_bigendian=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -17861,22 +19484,23 @@ unsigned short int ascii_mm[] = int use_ebcdic (int i) { return ebcdic_mm[i] + ebcdic_ii[i]; } - extern int foo; - -int -main (void) -{ -return use_ascii (foo) == use_ebcdic (foo); - ; - return 0; -} + int + main (int argc, char **argv) + { + /* Intimidate the compiler so that it does not + optimize the arrays away. */ + char *p = argv[0]; + ascii_mm[1] = *p++; ebcdic_mm[1] = *p++; + ascii_ii[1] = *p++; ebcdic_ii[1] = *p++; + return use_ascii (argc) == use_ebcdic (*p); + } _ACEOF -if ac_fn_c_try_compile "$LINENO" +if ac_fn_c_try_link "$LINENO" then : - if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + if grep BIGenDianSyS conftest$ac_exeext >/dev/null; then ac_cv_c_bigendian=yes fi - if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if grep LiTTleEnDian conftest$ac_exeext >/dev/null ; then if test "$ac_cv_c_bigendian" = unknown; then ac_cv_c_bigendian=no else @@ -17885,9 +19509,10 @@ then : fi fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -17910,14 +19535,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_c_bigendian=no -else $as_nop - ac_cv_c_bigendian=yes +else case e in #( + e) ac_cv_c_bigendian=yes ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - fi + fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 printf "%s\n" "$ac_cv_c_bigendian" >&6; } @@ -17960,8 +19588,8 @@ printf %s "checking absolute name of <ctype.h>... " >&6; } if test ${gl_cv_next_ctype_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17974,7 +19602,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -17997,7 +19625,8 @@ _ACEOF gl_header=$gl_cv_absolute_ctype_h gl_cv_next_ctype_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_ctype_h" >&5 printf "%s\n" "$gl_cv_next_ctype_h" >&6; } @@ -18048,8 +19677,8 @@ printf %s "checking absolute name of <dirent.h>... " >&6; } if test ${gl_cv_next_dirent_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_dirent_h = yes; then @@ -18065,7 +19694,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -18091,7 +19720,8 @@ _ACEOF gl_cv_next_dirent_h='<'dirent.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_dirent_h" >&5 printf "%s\n" "$gl_cv_next_dirent_h" >&6; } @@ -18190,8 +19820,8 @@ printf %s "checking if environ is properly declared... " >&6; } if test ${gt_cv_var_environ_declaration+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if HAVE_UNISTD_H #include <unistd.h> @@ -18212,10 +19842,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gt_cv_var_environ_declaration=no -else $as_nop - gt_cv_var_environ_declaration=yes +else case e in #( + e) gt_cv_var_environ_declaration=yes ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5 printf "%s\n" "$gt_cv_var_environ_declaration" >&6; } @@ -18237,8 +19869,8 @@ printf %s "checking for complete errno.h... " >&6; } if test ${gl_cv_header_errno_h_complete+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18297,15 +19929,17 @@ booboo _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "booboo" >/dev/null 2>&1 + $EGREP_TRADITIONAL "booboo" >/dev/null 2>&1 then : gl_cv_header_errno_h_complete=no -else $as_nop - gl_cv_header_errno_h_complete=yes +else case e in #( + e) gl_cv_header_errno_h_complete=yes ;; +esac fi rm -rf conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5 printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; } @@ -18328,8 +19962,8 @@ printf %s "checking absolute name of <errno.h>... " >&6; } if test ${gl_cv_next_errno_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18342,7 +19976,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -18365,7 +19999,8 @@ _ACEOF gl_header=$gl_cv_absolute_errno_h gl_cv_next_errno_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5 printf "%s\n" "$gl_cv_next_errno_h" >&6; } @@ -18393,8 +20028,8 @@ printf %s "checking for EMULTIHOP value... " >&6; } if test ${gl_cv_header_errno_h_EMULTIHOP+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18405,11 +20040,12 @@ yes _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 + $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 then : gl_cv_header_errno_h_EMULTIHOP=yes -else $as_nop - gl_cv_header_errno_h_EMULTIHOP=no +else case e in #( + e) gl_cv_header_errno_h_EMULTIHOP=no ;; +esac fi rm -rf conftest* @@ -18425,7 +20061,7 @@ yes _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 + $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 then : gl_cv_header_errno_h_EMULTIHOP=hidden fi @@ -18445,7 +20081,8 @@ fi fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5 printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; } @@ -18468,8 +20105,8 @@ printf %s "checking for ENOLINK value... " >&6; } if test ${gl_cv_header_errno_h_ENOLINK+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18480,11 +20117,12 @@ yes _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 + $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 then : gl_cv_header_errno_h_ENOLINK=yes -else $as_nop - gl_cv_header_errno_h_ENOLINK=no +else case e in #( + e) gl_cv_header_errno_h_ENOLINK=no ;; +esac fi rm -rf conftest* @@ -18500,7 +20138,7 @@ yes _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 + $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 then : gl_cv_header_errno_h_ENOLINK=hidden fi @@ -18520,7 +20158,8 @@ fi fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5 printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; } @@ -18543,8 +20182,8 @@ printf %s "checking for EOVERFLOW value... " >&6; } if test ${gl_cv_header_errno_h_EOVERFLOW+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18555,11 +20194,12 @@ yes _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 + $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 then : gl_cv_header_errno_h_EOVERFLOW=yes -else $as_nop - gl_cv_header_errno_h_EOVERFLOW=no +else case e in #( + e) gl_cv_header_errno_h_EOVERFLOW=no ;; +esac fi rm -rf conftest* @@ -18575,7 +20215,7 @@ yes _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 + $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 then : gl_cv_header_errno_h_EOVERFLOW=hidden fi @@ -18595,7 +20235,8 @@ fi fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5 printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; } @@ -18632,8 +20273,8 @@ printf %s "checking absolute name of <error.h>... " >&6; } if test ${gl_cv_next_error_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_error_h = yes; then @@ -18649,7 +20290,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -18675,7 +20316,8 @@ _ACEOF gl_cv_next_error_h='<'error.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_error_h" >&5 printf "%s\n" "$gl_cv_next_error_h" >&6; } @@ -18710,8 +20352,8 @@ printf %s "checking for error... " >&6; } if test ${gl_cv_onwards_func_error+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -18755,7 +20397,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_error" >&5 printf "%s\n" "$gl_cv_onwards_func_error" >&6; } @@ -18792,8 +20435,8 @@ printf %s "checking for error_at_line... " >&6; } if test ${ac_cv_lib_error_at_line+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <error.h> int @@ -18807,11 +20450,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_error_at_line=yes -else $as_nop - ac_cv_lib_error_at_line=no +else case e in #( + e) ac_cv_lib_error_at_line=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 printf "%s\n" "$ac_cv_lib_error_at_line" >&6; } @@ -18831,8 +20476,8 @@ printf %s "checking for working error function... " >&6; } if test ${gl_cv_func_working_error+y} then : printf %s "(cached) " >&6 -else $as_nop - if test $cross_compiling != yes; then +else case e in #( + e) if test $cross_compiling != yes; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18866,8 +20511,9 @@ then : fi rm -f conftest.out -else $as_nop - gl_cv_func_working_error=no +else case e in #( + e) gl_cv_func_working_error=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -18899,12 +20545,14 @@ then : *) gl_cv_func_working_error="$gl_cross_guess_normal" ;; esac -else $as_nop - gl_cv_func_working_error=no +else case e in #( + e) gl_cv_func_working_error=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_error" >&5 printf "%s\n" "$gl_cv_func_working_error" >&6; } @@ -18918,9 +20566,9 @@ printf "%s\n" "$gl_cv_func_working_error" >&6; } if test $HAVE_ERROR = 0 || test $REPLACE_ERROR = 1 \ || test $HAVE_ERROR_AT_LINE = 0 || test $REPLACE_ERROR_AT_LINE = 1; then - GL_GENERATE_ERROR_H=true + COMPILE_ERROR_C=1 else - GL_GENERATE_ERROR_H=false + COMPILE_ERROR_C=0 fi @@ -18932,8 +20580,9 @@ ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includ if test "x$ac_cv_have_decl_strerror_r" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h @@ -18952,8 +20601,8 @@ printf %s "checking whether strerror_r returns char *... " >&6; } if test ${ac_cv_func_strerror_r_char_p+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) ac_cv_func_strerror_r_char_p=no if test $ac_cv_have_decl_strerror_r = yes; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18979,7 +20628,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5 printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; } @@ -18998,8 +20648,8 @@ printf %s "checking whether ctype.h defines __header_inline... " >&6; } if test ${gl_cv_have___header_inline+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ctype.h> #ifndef __header_inline @@ -19010,10 +20660,12 @@ _ACEOF if ac_fn_c_try_cpp "$LINENO" then : gl_cv_have___header_inline=yes -else $as_nop - gl_cv_have___header_inline=no +else case e in #( + e) gl_cv_have___header_inline=no ;; +esac fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have___header_inline" >&5 printf "%s\n" "$gl_cv_have___header_inline" >&6; } @@ -19034,10 +20686,11 @@ then : printf "%s\n" "#define HAVE_SIG_ATOMIC_T 1" >>confdefs.h -else $as_nop - +else case e in #( + e) printf "%s\n" "#define sig_atomic_t int" >>confdefs.h - + ;; +esac fi @@ -19045,8 +20698,9 @@ ac_fn_check_decl "$LINENO" "fchdir" "ac_cv_have_decl_fchdir" "$ac_includes_defau if test "x$ac_cv_have_decl_fchdir" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FCHDIR $ac_have_decl" >>confdefs.h @@ -19100,17 +20754,17 @@ printf %s "checking for working fcntl.h... " >&6; } if test ${gl_cv_header_working_fcntl_h+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess 'no' on native Windows. - mingw*) gl_cv_header_working_fcntl_h='no' ;; - *) gl_cv_header_working_fcntl_h=cross-compiling ;; + # Guess 'no' on native Windows. + mingw* | windows*) gl_cv_header_working_fcntl_h='no' ;; + *) gl_cv_header_working_fcntl_h=cross-compiling ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <sys/stat.h> @@ -19212,19 +20866,22 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_header_working_fcntl_h=yes -else $as_nop - case $? in #( +else case e in #( + e) case $? in #( 4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #( 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #( 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #( *) gl_cv_header_working_fcntl_h='no';; - esac + esac ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5 printf "%s\n" "$gl_cv_header_working_fcntl_h" >&6; } @@ -19249,10 +20906,11 @@ ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" if test "x$ac_cv_type_mode_t" = xyes then : -else $as_nop - +else case e in #( + e) printf "%s\n" "#define mode_t int" >>confdefs.h - + ;; +esac fi @@ -19274,8 +20932,8 @@ printf %s "checking absolute name of <fcntl.h>... " >&6; } if test ${gl_cv_next_fcntl_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19288,7 +20946,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -19311,7 +20969,8 @@ _ACEOF gl_header=$gl_cv_absolute_fcntl_h gl_cv_next_fcntl_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5 printf "%s\n" "$gl_cv_next_fcntl_h" >&6; } @@ -19641,10 +21300,11 @@ printf "%s\n" "$gl_cv_next_fcntl_h" >&6; } if test "x$ac_cv_func_eaccess" = xyes then : -else $as_nop - +else case e in #( + e) printf "%s\n" "#define eaccess access" >>confdefs.h - + ;; +esac fi @@ -19684,8 +21344,8 @@ printf %s "checking absolute name of <fnmatch.h>... " >&6; } if test ${gl_cv_next_fnmatch_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_fnmatch_h = yes; then @@ -19701,7 +21361,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -19727,7 +21387,8 @@ _ACEOF gl_cv_next_fnmatch_h='<'fnmatch.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fnmatch_h" >&5 printf "%s\n" "$gl_cv_next_fnmatch_h" >&6; } @@ -19779,50 +21440,10 @@ printf "%s\n" "$gl_cv_next_fnmatch_h" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 -printf %s "checking for mbstate_t... " >&6; } -if test ${ac_cv_type_mbstate_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default - #include <wchar.h> -int -main (void) -{ -mbstate_t x; return sizeof x; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_type_mbstate_t=yes -else $as_nop - ac_cv_type_mbstate_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5 -printf "%s\n" "$ac_cv_type_mbstate_t" >&6; } - if test $ac_cv_type_mbstate_t = yes; then - -printf "%s\n" "#define HAVE_MBSTATE_T 1" >>confdefs.h - - else - -printf "%s\n" "#define mbstate_t int" >>confdefs.h - - fi - - - case "$host_os" in - mingw* | pw*) + mingw* | windows* | pw*) REPLACE_FOPEN=1 gl_cv_func_fopen_slash="guessing no" ;; @@ -19832,8 +21453,8 @@ printf %s "checking whether fopen recognizes a trailing slash... " >&6; } if test ${gl_cv_func_fopen_slash+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : @@ -19844,8 +21465,8 @@ then : gl_cv_func_fopen_slash="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stddef.h> @@ -19862,15 +21483,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_fopen_slash=yes -else $as_nop - gl_cv_func_fopen_slash=no +else case e in #( + e) gl_cv_func_fopen_slash=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f conftest.sl - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_slash" >&5 printf "%s\n" "$gl_cv_func_fopen_slash" >&6; } @@ -19896,18 +21520,18 @@ printf %s "checking whether fflush works on input streams... " >&6; } if test ${gl_cv_func_fflush_stdin+y} then : printf %s "(cached) " >&6 -else $as_nop - echo hello world > conftest.txt +else case e in #( + e) echo hello world > conftest.txt if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_fflush_stdin="guessing no" ;; - *) gl_cv_func_fflush_stdin=cross ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_fflush_stdin="guessing no" ;; + *) gl_cv_func_fflush_stdin=cross ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -19967,15 +21591,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_fflush_stdin=yes -else $as_nop - gl_cv_func_fflush_stdin=no +else case e in #( + e) gl_cv_func_fflush_stdin=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm conftest.txt - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5 printf "%s\n" "$gl_cv_func_fflush_stdin" >&6; } @@ -20010,8 +21637,8 @@ printf %s "checking whether fclose works on input streams... " >&6; } if test ${gl_cv_func_fclose_stdin+y} then : printf %s "(cached) " >&6 -else $as_nop - echo hello world > conftest.txt +else case e in #( + e) echo hello world > conftest.txt if test "$cross_compiling" = yes then : case "$host_os" in @@ -20020,13 +21647,13 @@ then : # Guess yes on musl systems. *-musl* | midipix*) gl_cv_func_fclose_stdin="guessing yes" ;; # Guess no on native Windows. - mingw*) gl_cv_func_fclose_stdin="guessing no" ;; + mingw* | windows*) gl_cv_func_fclose_stdin="guessing no" ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_fclose_stdin="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <fcntl.h> #include <stdio.h> @@ -20076,15 +21703,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_fclose_stdin=yes -else $as_nop - gl_cv_func_fclose_stdin=no +else case e in #( + e) gl_cv_func_fclose_stdin=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm conftest.txt - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fclose_stdin" >&5 printf "%s\n" "$gl_cv_func_fclose_stdin" >&6; } @@ -20103,8 +21733,8 @@ printf %s "checking whether stdin defaults to large file offsets... " >&6; } if test ${gl_cv_var_stdin_large_offset+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> int @@ -20126,11 +21756,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_var_stdin_large_offset=yes -else $as_nop - gl_cv_var_stdin_large_offset=no +else case e in #( + e) gl_cv_var_stdin_large_offset=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var_stdin_large_offset" >&5 printf "%s\n" "$gl_cv_var_stdin_large_offset" >&6; } @@ -20140,14 +21772,14 @@ printf "%s\n" "$gl_cv_var_stdin_large_offset" >&6; } case "$host_os" in - mingw*) + mingw* | windows*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5 printf %s "checking for 64-bit off_t... " >&6; } if test ${gl_cv_type_off_t_64+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> int verify_off_t_size[sizeof (off_t) >= 8 ? 1 : -1]; @@ -20163,11 +21795,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_type_off_t_64=yes -else $as_nop - gl_cv_type_off_t_64=no +else case e in #( + e) gl_cv_type_off_t_64=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5 printf "%s\n" "$gl_cv_type_off_t_64" >&6; } @@ -20181,8 +21815,8 @@ printf %s "checking for 64-bit st_size... " >&6; } if test ${gl_cv_member_st_size_64+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> struct stat buf; @@ -20199,11 +21833,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_member_st_size_64=yes -else $as_nop - gl_cv_member_st_size_64=no +else case e in #( + e) gl_cv_member_st_size_64=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5 printf "%s\n" "$gl_cv_member_st_size_64" >&6; } @@ -20248,8 +21884,8 @@ printf %s "checking absolute name of <sys/types.h>... " >&6; } if test ${gl_cv_next_sys_types_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -20262,7 +21898,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -20285,7 +21921,8 @@ _ACEOF gl_header=$gl_cv_absolute_sys_types_h gl_cv_next_sys_types_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5 printf "%s\n" "$gl_cv_next_sys_types_h" >&6; } @@ -20320,8 +21957,9 @@ ac_fn_check_decl "$LINENO" "fseeko" "ac_cv_have_decl_fseeko" "$ac_includes_defau if test "x$ac_cv_have_decl_fseeko" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FSEEKO $ac_have_decl" >>confdefs.h @@ -20338,8 +21976,8 @@ printf %s "checking for fseeko... " >&6; } if test ${gl_cv_func_fseeko+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -20355,12 +21993,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_fseeko=yes -else $as_nop - gl_cv_func_fseeko=no +else case e in #( + e) gl_cv_func_fseeko=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fseeko" >&5 printf "%s\n" "$gl_cv_func_fseeko" >&6; } @@ -20387,18 +22027,18 @@ printf %s "checking whether fflush works on input streams... " >&6; } if test ${gl_cv_func_fflush_stdin+y} then : printf %s "(cached) " >&6 -else $as_nop - echo hello world > conftest.txt +else case e in #( + e) echo hello world > conftest.txt if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_fflush_stdin="guessing no" ;; - *) gl_cv_func_fflush_stdin=cross ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_fflush_stdin="guessing no" ;; + *) gl_cv_func_fflush_stdin=cross ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -20458,15 +22098,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_fflush_stdin=yes -else $as_nop - gl_cv_func_fflush_stdin=no +else case e in #( + e) gl_cv_func_fflush_stdin=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm conftest.txt - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5 printf "%s\n" "$gl_cv_func_fflush_stdin" >&6; } @@ -20518,8 +22161,8 @@ printf %s "checking whether stat file-mode macros are broken... " >&6; } if test ${ac_cv_header_stat_broken+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <sys/stat.h> @@ -20544,10 +22187,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_header_stat_broken=no -else $as_nop - ac_cv_header_stat_broken=yes +else case e in #( + e) ac_cv_header_stat_broken=yes ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5 printf "%s\n" "$ac_cv_header_stat_broken" >&6; } @@ -20579,8 +22224,8 @@ printf %s "checking absolute name of <sys/stat.h>... " >&6; } if test ${gl_cv_next_sys_stat_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_sys_stat_h = yes; then @@ -20596,7 +22241,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -20622,7 +22267,8 @@ _ACEOF gl_cv_next_sys_stat_h='<'sys/stat.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5 printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; } @@ -20660,10 +22306,11 @@ printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; } if test "x$ac_cv_type_nlink_t" = xyes then : -else $as_nop - +else case e in #( + e) printf "%s\n" "#define nlink_t int" >>confdefs.h - + ;; +esac fi @@ -20676,7 +22323,7 @@ fi case "$host_os" in - mingw*) + mingw* | windows*) ac_fn_c_check_header_compile "$LINENO" "sdkddkver.h" "ac_cv_header_sdkddkver_h" "$ac_includes_default" if test "x$ac_cv_header_sdkddkver_h" = xyes then : @@ -20778,8 +22425,9 @@ ac_fn_check_decl "$LINENO" "ftello" "ac_cv_have_decl_ftello" "$ac_includes_defau if test "x$ac_cv_have_decl_ftello" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FTELLO $ac_have_decl" >>confdefs.h @@ -20791,8 +22439,8 @@ printf %s "checking whether ungetc works on arbitrary bytes... " >&6; } if test ${gl_cv_func_ungetc_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess yes on glibc systems. @@ -20802,13 +22450,13 @@ then : # Guess yes on bionic systems. *-android*) gl_cv_func_ungetc_works="guessing yes" ;; # Guess yes on native Windows. - mingw*) gl_cv_func_ungetc_works="guessing yes" ;; + mingw* | windows*) gl_cv_func_ungetc_works="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_ungetc_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -20850,14 +22498,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_ungetc_works=yes -else $as_nop - gl_cv_func_ungetc_works=no +else case e in #( + e) gl_cv_func_ungetc_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ungetc_works" >&5 printf "%s\n" "$gl_cv_func_ungetc_works" >&6; } @@ -20894,8 +22545,8 @@ printf %s "checking for ftello... " >&6; } if test ${gl_cv_func_ftello+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -20910,12 +22561,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_ftello=yes -else $as_nop - gl_cv_func_ftello=no +else case e in #( + e) gl_cv_func_ftello=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello" >&5 printf "%s\n" "$gl_cv_func_ftello" >&6; } @@ -20931,7 +22584,7 @@ printf "%s\n" "$gl_cv_func_ftello" >&6; } if test $REPLACE_FTELLO = 0; then case "$host_os" in - mingw*) REPLACE_FTELLO=1 ;; + mingw* | windows*) REPLACE_FTELLO=1 ;; esac fi if test $REPLACE_FTELLO = 0; then @@ -20940,21 +22593,21 @@ printf %s "checking whether ftello works... " >&6; } if test ${gl_cv_func_ftello_works+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in - # Guess no on Solaris. - solaris*) gl_cv_func_ftello_works="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_ftello_works="guessing yes" ;; - # Guess yes otherwise. - *) gl_cv_func_ftello_works="guessing yes" ;; + # Guess no on Solaris. + solaris*) gl_cv_func_ftello_works="guessing no" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_ftello_works="guessing yes" ;; + # Guess yes otherwise. + *) gl_cv_func_ftello_works="guessing yes" ;; esac if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -21018,14 +22671,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_ftello_works=yes -else $as_nop - gl_cv_func_ftello_works=no +else case e in #( + e) gl_cv_func_ftello_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello_works" >&5 printf "%s\n" "$gl_cv_func_ftello_works" >&6; } @@ -21079,8 +22735,8 @@ printf %s "checking absolute name of <netdb.h>... " >&6; } if test ${gl_cv_next_netdb_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_netdb_h = yes; then @@ -21096,7 +22752,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -21122,7 +22778,8 @@ _ACEOF gl_cv_next_netdb_h='<'netdb.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_netdb_h" >&5 printf "%s\n" "$gl_cv_next_netdb_h" >&6; } @@ -21160,15 +22817,21 @@ printf %s "checking for library containing gethostbyname... " >&6; } if test ${ac_cv_search_gethostbyname+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char gethostbyname (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char gethostbyname (void); int main (void) { @@ -21199,11 +22862,13 @@ done if test ${ac_cv_search_gethostbyname+y} then : -else $as_nop - ac_cv_search_gethostbyname=no +else case e in #( + e) ac_cv_search_gethostbyname=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 printf "%s\n" "$ac_cv_search_gethostbyname" >&6; } @@ -21226,16 +22891,16 @@ if test "x$ac_cv_func_gethostbyname" = xyes then : printf "%s\n" "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in winsock2.h and -lws2_32" >&5 printf %s "checking for gethostbyname in winsock2.h and -lws2_32... " >&6; } if test ${gl_cv_w32_gethostbyname+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_cv_w32_gethostbyname=no - gl_save_LIBS="$LIBS" +else case e in #( + e) gl_cv_w32_gethostbyname=no + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21259,15 +22924,17 @@ then : fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gl_save_LIBS" - + LIBS="$gl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_gethostbyname" >&5 printf "%s\n" "$gl_cv_w32_gethostbyname" >&6; } if test "$gl_cv_w32_gethostbyname" = "yes"; then HOSTENT_LIB="-lws2_32" fi - + ;; +esac fi done @@ -21282,15 +22949,21 @@ printf %s "checking for library containing getservbyname... " >&6; } if test ${ac_cv_search_getservbyname+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char getservbyname (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char getservbyname (void); int main (void) { @@ -21321,11 +22994,13 @@ done if test ${ac_cv_search_getservbyname+y} then : -else $as_nop - ac_cv_search_getservbyname=no +else case e in #( + e) ac_cv_search_getservbyname=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getservbyname" >&5 printf "%s\n" "$ac_cv_search_getservbyname" >&6; } @@ -21348,16 +23023,16 @@ if test "x$ac_cv_func_getservbyname" = xyes then : printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getservbyname in winsock2.h and -lws2_32" >&5 printf %s "checking for getservbyname in winsock2.h and -lws2_32... " >&6; } if test ${gl_cv_w32_getservbyname+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_cv_w32_getservbyname=no - gl_save_LIBS="$LIBS" +else case e in #( + e) gl_cv_w32_getservbyname=no + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21381,15 +23056,17 @@ then : fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gl_save_LIBS" - + LIBS="$gl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_getservbyname" >&5 printf "%s\n" "$gl_cv_w32_getservbyname" >&6; } if test "$gl_cv_w32_getservbyname" = "yes"; then SERVENT_LIB="-lws2_32" fi - + ;; +esac fi done @@ -21434,8 +23111,9 @@ fi if test "x$ac_cv_have_decl_inet_ntop" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h @@ -21445,21 +23123,27 @@ printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h HAVE_DECL_INET_NTOP=0 fi else - gl_save_LIBS=$LIBS + gl_saved_LIBS=$LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5 printf %s "checking for library containing inet_ntop... " >&6; } if test ${ac_cv_search_inet_ntop+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char inet_ntop (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char inet_ntop (void); int main (void) { @@ -21490,11 +23174,13 @@ done if test ${ac_cv_search_inet_ntop+y} then : -else $as_nop - ac_cv_search_inet_ntop=no +else case e in #( + e) ac_cv_search_inet_ntop=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5 printf "%s\n" "$ac_cv_search_inet_ntop" >&6; } @@ -21503,8 +23189,8 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop - ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" +else case e in #( + e) ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" if test "x$ac_cv_func_inet_ntop" = xyes then : printf "%s\n" "#define HAVE_INET_NTOP 1" >>confdefs.h @@ -21514,10 +23200,11 @@ fi if test $ac_cv_func_inet_ntop = no; then HAVE_INET_NTOP=0 fi - + ;; +esac fi - LIBS=$gl_save_LIBS + LIBS=$gl_saved_LIBS if test "$ac_cv_search_inet_ntop" != "no" \ && test "$ac_cv_search_inet_ntop" != "none required"; then @@ -21534,8 +23221,9 @@ fi if test "x$ac_cv_have_decl_inet_ntop" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h @@ -21555,8 +23243,8 @@ printf %s "checking for IPv4 sockets... " >&6; } if test ${gl_cv_socket_ipv4+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H @@ -21580,10 +23268,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_socket_ipv4=yes -else $as_nop - gl_cv_socket_ipv4=no +else case e in #( + e) gl_cv_socket_ipv4=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socket_ipv4" >&5 printf "%s\n" "$gl_cv_socket_ipv4" >&6; } @@ -21598,8 +23288,8 @@ printf %s "checking for IPv6 sockets... " >&6; } if test ${gl_cv_socket_ipv6+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H @@ -21626,10 +23316,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_socket_ipv6=yes -else $as_nop - gl_cv_socket_ipv6=no +else case e in #( + e) gl_cv_socket_ipv6=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socket_ipv6" >&5 printf "%s\n" "$gl_cv_socket_ipv6" >&6; } @@ -21652,8 +23344,8 @@ printf %s "checking whether getcwd (NULL, 0) allocates memory for result... " >& if test ${gl_cv_func_getcwd_null+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess yes on glibc systems. @@ -21668,8 +23360,8 @@ then : *) gl_cv_func_getcwd_null="$gl_cross_guess_normal";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # include <stdlib.h> @@ -21682,10 +23374,6 @@ else $as_nop $gl_mda_defines -# ifndef getcwd - char *getcwd (); -# endif - int main (void) { @@ -21717,13 +23405,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_getcwd_null=yes -else $as_nop - gl_cv_func_getcwd_null=no +else case e in #( + e) gl_cv_func_getcwd_null=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_null" >&5 printf "%s\n" "$gl_cv_func_getcwd_null" >&6; } @@ -21734,8 +23425,8 @@ printf %s "checking for getcwd with POSIX signature... " >&6; } if test ${gl_cv_func_getcwd_posix_signature+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> @@ -21759,11 +23450,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_getcwd_posix_signature=yes -else $as_nop - gl_cv_func_getcwd_posix_signature=no +else case e in #( + e) gl_cv_func_getcwd_posix_signature=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_posix_signature" >&5 printf "%s\n" "$gl_cv_func_getcwd_posix_signature" >&6; } @@ -21772,8 +23465,9 @@ ac_fn_check_decl "$LINENO" "getcwd" "ac_cv_have_decl_getcwd" "$ac_includes_defau if test "x$ac_cv_have_decl_getcwd" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GETCWD $ac_have_decl" >>confdefs.h @@ -21781,8 +23475,9 @@ ac_fn_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim" "$ac_includes_d if test "x$ac_cv_have_decl_getdelim" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GETDELIM $ac_have_decl" >>confdefs.h @@ -21791,41 +23486,32 @@ ac_fn_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_ if test "x$ac_cv_have_decl_getdtablesize" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 -printf %s "checking for uid_t in sys/types.h... " >&6; } -if test ${ac_cv_type_uid_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1 +ac_fn_c_check_type "$LINENO" "uid_t" "ac_cv_type_uid_t" "$ac_includes_default" +if test "x$ac_cv_type_uid_t" = xyes then : - ac_cv_type_uid_t=yes -else $as_nop - ac_cv_type_uid_t=no -fi -rm -rf conftest* - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 -printf "%s\n" "$ac_cv_type_uid_t" >&6; } -if test $ac_cv_type_uid_t = no; then +else case e in #( + e) printf "%s\n" "#define uid_t int" >>confdefs.h + ;; +esac +fi +ac_fn_c_check_type "$LINENO" "gid_t" "ac_cv_type_gid_t" "$ac_includes_default" +if test "x$ac_cv_type_gid_t" = xyes +then : +else case e in #( + e) printf "%s\n" "#define gid_t int" >>confdefs.h - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking type of array argument to getgroups" >&5 @@ -21833,67 +23519,118 @@ printf %s "checking type of array argument to getgroups... " >&6; } if test ${ac_cv_type_getgroups+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) # If AC_TYPE_UID_T says there isn't any gid_t typedef, then we can skip +# everything below. +if test $ac_cv_type_gid_t = no then : - ac_cv_type_getgroups=cross -else $as_nop + ac_cv_type_getgroups=int +else case e in #( + e) # Test programs below rely on strict type checking of extern declarations: + # 'extern int getgroups(int, int *); extern int getgroups(int, pid_t *);' + # is valid in C89 if and only if pid_t is a typedef for int. Unlike + # anything involving either an assignment or a function call, compilers + # tend to make this kind of type mismatch a hard error, not just an + # "incompatible pointer types" warning. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Thanks to Mike Rendell for this test. */ $ac_includes_default -#define NGID 256 -#undef MAX -#define MAX(x, y) ((x) > (y) ? (x) : (y)) - +extern int getgroups(int, gid_t *); int main (void) { - gid_t gidset[NGID]; - int i, n; - union { gid_t gval; long int lval; } val; - - val.lval = -1; - for (i = 0; i < NGID; i++) - gidset[i] = val.gval; - n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1, - gidset); - /* Exit non-zero if getgroups seems to require an array of ints. This - happens when gid_t is short int but getgroups modifies an array - of ints. */ - return n > 0 && gidset[n] != val.gval; +return !(getgroups(0, 0) >= 0); + ; + return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" +if ac_fn_c_try_compile "$LINENO" then : - ac_cv_type_getgroups=gid_t -else $as_nop - ac_cv_type_getgroups=int + ac_getgroups_gidarray=yes +else case e in #( + e) ac_getgroups_gidarray=no ;; +esac fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +extern int getgroups(int, int *); +int +main (void) +{ +return !(getgroups(0, 0) >= 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_getgroups_intarray=yes +else case e in #( + e) ac_getgroups_intarray=no ;; +esac fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -if test $ac_cv_type_getgroups = cross; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + case int:$ac_getgroups_intarray,gid:$ac_getgroups_gidarray in #( + int:yes,gid:no) : + ac_cv_type_getgroups=int ;; #( + int:no,gid:yes) : + ac_cv_type_getgroups=gid_t ;; #( + int:yes,gid:yes) : + + # Both programs compiled - this means *either* that getgroups + # was declared with no prototype, in which case we should use int, + # or that it was declared prototyped but gid_t is a typedef for int, + # in which case we should use gid_t. Distinguish the two cases + # by testing if the compiler catches a blatantly incorrect function + # signature for getgroups. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <unistd.h> - +$ac_includes_default +extern int getgroups(int, float); +int +main (void) +{ +return !(getgroups(0, 0) >= 0); + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1 +if ac_fn_c_try_compile "$LINENO" then : - ac_cv_type_getgroups=gid_t -else $as_nop - ac_cv_type_getgroups=int + + # Compiler did not catch incorrect argument list; + # getgroups is unprototyped. + ac_cv_type_getgroups=int + +else case e in #( + e) + # Compiler caught incorrect argument list; + # gid_t is a typedef for int. + ac_cv_type_getgroups=gid_t + ;; +esac fi -rm -rf conftest* +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ;; #( + *) : + # Both programs failed to compile - this probably means getgroups + # wasn't declared at all. Use 'int', as this is probably a very + # old system where the type _would have been_ int. + ac_cv_type_getgroups=int + ;; +esac + ;; +esac fi + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_getgroups" >&5 printf "%s\n" "$ac_cv_type_getgroups" >&6; } - printf "%s\n" "#define GETGROUPS_T $ac_cv_type_getgroups" >>confdefs.h @@ -21901,8 +23638,9 @@ ac_fn_check_decl "$LINENO" "getline" "ac_cv_have_decl_getline" "$ac_includes_def if test "x$ac_cv_have_decl_getline" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GETLINE $ac_have_decl" >>confdefs.h @@ -21928,8 +23666,8 @@ printf %s "checking absolute name of <getopt.h>... " >&6; } if test ${gl_cv_next_getopt_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_getopt_h = yes; then @@ -21945,7 +23683,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -21971,7 +23709,8 @@ _ACEOF gl_cv_next_getopt_h='<'getopt.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_getopt_h" >&5 printf "%s\n" "$gl_cv_next_getopt_h" >&6; } @@ -22007,8 +23746,9 @@ if test "x$ac_cv_header_getopt_h" = xyes then : printf "%s\n" "#define HAVE_GETOPT_H 1" >>confdefs.h -else $as_nop - gl_replace_getopt=yes +else case e in #( + e) gl_replace_getopt=yes ;; +esac fi done @@ -22023,8 +23763,9 @@ if test "x$ac_cv_func_getopt_long_only" = xyes then : printf "%s\n" "#define HAVE_GETOPT_LONG_ONLY 1" >>confdefs.h -else $as_nop - gl_replace_getopt=yes +else case e in #( + e) gl_replace_getopt=yes ;; +esac fi done @@ -22036,17 +23777,17 @@ printf %s "checking whether getopt is POSIX compatible... " >&6; } if test ${gl_cv_func_getopt_posix+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $cross_compiling = no; then if test "$cross_compiling" = yes then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> @@ -22078,22 +23819,24 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_getopt_posix=maybe -else $as_nop - gl_cv_func_getopt_posix=no +else case e in #( + e) gl_cv_func_getopt_posix=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi if test $gl_cv_func_getopt_posix = maybe; then if test "$cross_compiling" = yes then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> @@ -22139,23 +23882,25 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_getopt_posix=maybe -else $as_nop - gl_cv_func_getopt_posix=no +else case e in #( + e) gl_cv_func_getopt_posix=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi if test $gl_cv_func_getopt_posix = maybe; then if test "$cross_compiling" = yes then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> @@ -22183,21 +23928,24 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_getopt_posix=yes -else $as_nop - gl_cv_func_getopt_posix=no +else case e in #( + e) gl_cv_func_getopt_posix=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi else case "$host_os" in - darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";; - *) gl_cv_func_getopt_posix="guessing yes";; + darwin* | aix* | mingw* | windows*) gl_cv_func_getopt_posix="guessing no";; + *) gl_cv_func_getopt_posix="guessing yes";; esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_posix" >&5 printf "%s\n" "$gl_cv_func_getopt_posix" >&6; } @@ -22212,8 +23960,8 @@ printf %s "checking for working GNU getopt function... " >&6; } if test ${gl_cv_func_getopt_gnu+y} then : printf %s "(cached) " >&6 -else $as_nop - # Even with POSIXLY_CORRECT, the GNU extension of leading '-' in the +else case e in #( + e) # Even with POSIXLY_CORRECT, the GNU extension of leading '-' in the # optstring is necessary for programs like m4 that have POSIX-mandated # semantics for supporting options interspersed with files. # Also, since getopt_long is a GNU extension, we require optind=0. @@ -22231,8 +23979,8 @@ else $as_nop then : gl_cv_func_getopt_gnu="$gl_cross_guess_normal" -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <getopt.h> #include <stddef.h> @@ -22434,11 +24182,13 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_getopt_gnu=yes -else $as_nop - gl_cv_func_getopt_gnu=no +else case e in #( + e) gl_cv_func_getopt_gnu=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi case $gl_had_POSIXLY_CORRECT in @@ -22446,7 +24196,8 @@ fi yes) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;}; POSIXLY_CORRECT=1 ;; *) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;} ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_gnu" >&5 printf "%s\n" "$gl_cv_func_getopt_gnu" >&6; } @@ -22458,16 +24209,16 @@ printf %s "checking for working GNU getopt_long function... " >&6; } if test ${gl_cv_func_getopt_long_gnu+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in openbsd*) gl_cv_func_getopt_long_gnu="guessing no";; *) gl_cv_func_getopt_long_gnu="guessing yes";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <getopt.h> #include <stddef.h> @@ -22503,14 +24254,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_getopt_long_gnu=yes -else $as_nop - gl_cv_func_getopt_long_gnu=no +else case e in #( + e) gl_cv_func_getopt_long_gnu=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_long_gnu" >&5 printf "%s\n" "$gl_cv_func_getopt_long_gnu" >&6; } @@ -22542,8 +24296,9 @@ ac_fn_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" " if test "x$ac_cv_have_decl_fflush_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl" >>confdefs.h @@ -22551,8 +24306,9 @@ ac_fn_check_decl "$LINENO" "flockfile" "ac_cv_have_decl_flockfile" "$ac_includes if test "x$ac_cv_have_decl_flockfile" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FLOCKFILE $ac_have_decl" >>confdefs.h @@ -22560,8 +24316,9 @@ ac_fn_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$a if test "x$ac_cv_have_decl_fputs_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl" >>confdefs.h @@ -22569,8 +24326,9 @@ ac_fn_check_decl "$LINENO" "funlockfile" "ac_cv_have_decl_funlockfile" "$ac_incl if test "x$ac_cv_have_decl_funlockfile" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FUNLOCKFILE $ac_have_decl" >>confdefs.h @@ -22578,8 +24336,9 @@ ac_fn_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_ if test "x$ac_cv_have_decl_putc_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl" >>confdefs.h @@ -22611,8 +24370,8 @@ printf %s "checking for timespec_get... " >&6; } if test ${gl_cv_onwards_func_timespec_get+y} then : printf %s "(cached) " >&6 -else $as_nop - if test $ac_cv_have_decl_timespec_get = yes; then +else case e in #( + e) if test $ac_cv_have_decl_timespec_get = yes; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <time.h> @@ -22630,8 +24389,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_onwards_func_timespec_get=yes -else $as_nop - gl_cv_onwards_func_timespec_get=no +else case e in #( + e) gl_cv_onwards_func_timespec_get=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -22645,7 +24405,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ fi ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_timespec_get" >&5 printf "%s\n" "$gl_cv_onwards_func_timespec_get" >&6; } @@ -22683,8 +24444,8 @@ printf %s "checking absolute name of <sys/time.h>... " >&6; } if test ${gl_cv_next_sys_time_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_sys_time_h = yes; then @@ -22700,7 +24461,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -22726,7 +24487,8 @@ _ACEOF gl_cv_next_sys_time_h='<'sys/time.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_time_h" >&5 printf "%s\n" "$gl_cv_next_sys_time_h" >&6; } @@ -22777,8 +24539,8 @@ printf %s "checking for struct timeval... " >&6; } if test ${gl_cv_sys_struct_timeval+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if HAVE_SYS_TIME_H #include <sys/time.h> @@ -22799,11 +24561,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_sys_struct_timeval=yes -else $as_nop - gl_cv_sys_struct_timeval=no +else case e in #( + e) gl_cv_sys_struct_timeval=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval" >&5 printf "%s\n" "$gl_cv_sys_struct_timeval" >&6; } @@ -22815,8 +24579,8 @@ printf %s "checking for wide-enough struct timeval.tv_sec member... " >&6; } if test ${gl_cv_sys_struct_timeval_tv_sec+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if HAVE_SYS_TIME_H #include <sys/time.h> @@ -22841,11 +24605,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_sys_struct_timeval_tv_sec=yes -else $as_nop - gl_cv_sys_struct_timeval_tv_sec=no +else case e in #( + e) gl_cv_sys_struct_timeval_tv_sec=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval_tv_sec" >&5 printf "%s\n" "$gl_cv_sys_struct_timeval_tv_sec" >&6; } @@ -22879,8 +24645,9 @@ printf "%s\n" "$gl_cv_sys_struct_timeval_tv_sec" >&6; } if test "x$ac_cv_header_pthread_h" = xyes then : gl_have_pthread_h=yes -else $as_nop - gl_have_pthread_h=no +else case e in #( + e) gl_have_pthread_h=no ;; +esac fi if test "$gl_have_pthread_h" = yes; then @@ -22894,7 +24661,7 @@ fi # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 # needs -pthread for some reason. See: # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html - save_LIBS=$LIBS + saved_LIBS="$LIBS" for gl_pthread in '' '-pthread'; do LIBS="$LIBS $gl_pthread" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -22920,11 +24687,11 @@ then : fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS=$save_LIBS + LIBS="$saved_LIBS" test $gl_pthread_api = yes && break done - echo "$as_me:22926: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:22927: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:24693: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:24694: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -22942,7 +24709,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky user" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Lucky user" >/dev/null 2>&1 then : gl_pthread_in_glibc=yes fi @@ -22950,7 +24717,7 @@ rm -rf conftest* ;; esac - echo "$as_me:22953: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:24720: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -22962,16 +24729,22 @@ printf %s "checking for pthread_kill in -lpthread... " >&6; } if test ${ac_cv_lib_pthread_pthread_kill+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pthread_kill (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (void); int main (void) { @@ -22983,12 +24756,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pthread_pthread_kill=yes -else $as_nop - ac_cv_lib_pthread_pthread_kill=no +else case e in #( + e) ac_cv_lib_pthread_pthread_kill=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; } @@ -23012,6 +24787,62 @@ printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h esac fi +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lthr" >&5 +printf %s "checking for pthread_kill in -lthr... " >&6; } +if test ${ac_cv_lib_thr_pthread_kill+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lthr $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (void); +int +main (void) +{ +return pthread_kill (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_thr_pthread_kill=yes +else case e in #( + e) ac_cv_lib_thr_pthread_kill=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_thr_pthread_kill" >&5 +printf "%s\n" "$ac_cv_lib_thr_pthread_kill" >&6; } +if test "x$ac_cv_lib_thr_pthread_kill" = xyes +then : + if test $gl_pthread_in_glibc = yes; then + LIBPMULTITHREAD= + else + LIBPMULTITHREAD=-lthr + fi + +fi + + ;; +esac fi elif test $gl_pthread_api != yes; then @@ -23021,16 +24852,22 @@ printf %s "checking for pthread_kill in -lpthread... " >&6; } if test ${ac_cv_lib_pthread_pthread_kill+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pthread_kill (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (void); int main (void) { @@ -23042,12 +24879,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pthread_pthread_kill=yes -else $as_nop - ac_cv_lib_pthread_pthread_kill=no +else case e in #( + e) ac_cv_lib_pthread_pthread_kill=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; } @@ -23065,16 +24904,22 @@ printf %s "checking for pthread_kill in -lc_r... " >&6; } if test ${ac_cv_lib_c_r_pthread_kill+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lc_r $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pthread_kill (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (void); int main (void) { @@ -23086,12 +24931,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_c_r_pthread_kill=yes -else $as_nop - ac_cv_lib_c_r_pthread_kill=no +else case e in #( + e) ac_cv_lib_c_r_pthread_kill=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5 printf "%s\n" "$ac_cv_lib_c_r_pthread_kill" >&6; } @@ -23104,7 +24951,7 @@ fi fi fi - echo "$as_me:23107: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:24954: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 printf %s "checking whether POSIX threads API is available... " >&6; } @@ -23133,22 +24980,28 @@ if ac_fn_c_try_link "$LINENO" then : SCHED_YIELD_LIB= -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 printf %s "checking for sched_yield in -lrt... " >&6; } if test ${ac_cv_lib_rt_sched_yield+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char sched_yield (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (void); int main (void) { @@ -23160,34 +25013,42 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_rt_sched_yield=yes -else $as_nop - ac_cv_lib_rt_sched_yield=no +else case e in #( + e) ac_cv_lib_rt_sched_yield=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; } if test "x$ac_cv_lib_rt_sched_yield" = xyes then : SCHED_YIELD_LIB=-lrt -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 printf %s "checking for sched_yield in -lposix4... " >&6; } if test ${ac_cv_lib_posix4_sched_yield+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lposix4 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char sched_yield (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (void); int main (void) { @@ -23199,12 +25060,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_posix4_sched_yield=yes -else $as_nop - ac_cv_lib_posix4_sched_yield=no +else case e in #( + e) ac_cv_lib_posix4_sched_yield=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; } @@ -23212,10 +25075,12 @@ if test "x$ac_cv_lib_posix4_sched_yield" = xyes then : SCHED_YIELD_LIB=-lposix4 fi - + ;; +esac fi - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -23238,8 +25103,8 @@ printf %s "checking whether setlocale (LC_ALL, NULL) is multithread-safe... " >& if test ${gl_cv_func_setlocale_null_all_mtsafe+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$host_os" in +else case e in #( + e) case "$host_os" in # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku. *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku*) gl_cv_func_setlocale_null_all_mtsafe=no ;; @@ -23257,28 +25122,30 @@ else $as_nop _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky user" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Lucky user" >/dev/null 2>&1 then : gl_cv_func_setlocale_null_all_mtsafe=yes -else $as_nop - gl_cv_func_setlocale_null_all_mtsafe=no +else case e in #( + e) gl_cv_func_setlocale_null_all_mtsafe=no ;; +esac fi rm -rf conftest* ;; # Guess yes on glibc, HP-UX, IRIX, Solaris, native Windows. - *-gnu* | gnu* | hpux* | irix* | solaris* | mingw*) + *-gnu* | gnu* | hpux* | irix* | solaris* | mingw* | windows*) gl_cv_func_setlocale_null_all_mtsafe=yes ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_setlocale_null_all_mtsafe="$gl_cross_guess_normal" ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_all_mtsafe" >&5 printf "%s\n" "$gl_cv_func_setlocale_null_all_mtsafe" >&6; } case "$host_os" in - mingw*) ;; + mingw* | windows*) ;; *) if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then gl_cv_func_setlocale_null_all_mtsafe="trivially yes" @@ -23298,24 +25165,25 @@ printf %s "checking whether setlocale (category, NULL) is multithread-safe... " if test ${gl_cv_func_setlocale_null_one_mtsafe+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$host_os" in +else case e in #( + e) case "$host_os" in # Guess no on OpenBSD, AIX. openbsd* | aix*) gl_cv_func_setlocale_null_one_mtsafe=no ;; # Guess yes on glibc, musl libc, macOS, FreeBSD, NetBSD, HP-UX, IRIX, Solaris, Haiku, Cygwin, native Windows. - *-gnu* | gnu* | *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*) + *-gnu* | gnu* | *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw* | windows*) gl_cv_func_setlocale_null_one_mtsafe=yes ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_setlocale_null_one_mtsafe="$gl_cross_guess_normal" ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_one_mtsafe" >&5 printf "%s\n" "$gl_cv_func_setlocale_null_one_mtsafe" >&6; } case "$host_os" in - mingw*) ;; + mingw* | windows*) ;; *) if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then gl_cv_func_setlocale_null_one_mtsafe="trivially yes" @@ -23332,7 +25200,9 @@ printf "%s\n" "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>c if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then case "$host_os" in - mingw*) SETLOCALE_NULL_LIB= ;; + mingw* | windows*) + SETLOCALE_NULL_LIB= + ;; *) @@ -23341,9 +25211,9 @@ printf %s "checking whether imported symbols can be declared weak... " >&6; } if test ${gl_cv_have_weak+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$host_os" in - cygwin* | mingw*) +else case e in #( + e) case "$host_os" in + cygwin* | mingw* | windows*) gl_cv_have_weak="guessing no" ;; *) @@ -23377,17 +25247,18 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Extensible Linking Format" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1 then : gl_cv_have_weak="guessing yes" -else $as_nop - gl_cv_have_weak="guessing no" +else case e in #( + e) gl_cv_have_weak="guessing no" ;; +esac fi rm -rf conftest* -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -23400,11 +25271,13 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_have_weak=yes -else $as_nop - gl_cv_have_weak=no +else case e in #( + e) gl_cv_have_weak=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi @@ -23434,7 +25307,8 @@ EOF esac ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 printf "%s\n" "$gl_cv_have_weak" >&6; } @@ -23486,8 +25360,8 @@ printf %s "checking absolute name of <iconv.h>... " >&6; } if test ${gl_cv_next_iconv_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_iconv_h = yes; then @@ -23503,7 +25377,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -23529,7 +25403,8 @@ _ACEOF gl_cv_next_iconv_h='<'iconv.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_iconv_h" >&5 printf "%s\n" "$gl_cv_next_iconv_h" >&6; } @@ -23574,8 +25449,8 @@ printf %s "checking absolute name of <limits.h>... " >&6; } if test ${gl_cv_next_limits_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_limits_h = yes; then @@ -23591,7 +25466,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -23617,7 +25492,8 @@ _ACEOF gl_cv_next_limits_h='<'limits.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5 printf "%s\n" "$gl_cv_next_limits_h" >&6; } @@ -23642,8 +25518,8 @@ printf %s "checking whether limits.h has WORD_BIT, BOOL_WIDTH etc.... " >&6; } if test ${gl_cv_header_limits_width+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 @@ -23667,18 +25543,48 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_limits_width=yes -else $as_nop - gl_cv_header_limits_width=no +else case e in #( + e) gl_cv_header_limits_width=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5 printf "%s\n" "$gl_cv_header_limits_width" >&6; } - if test "$gl_cv_header_limits_width" = yes; then - GL_GENERATE_LIMITS_H=false - else - GL_GENERATE_LIMITS_H=true - fi + GL_GENERATE_LIMITS_H=true + if test "$gl_cv_header_limits_width" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether limits.h has SSIZE_MAX" >&5 +printf %s "checking whether limits.h has SSIZE_MAX... " >&6; } +if test ${gl_cv_header_limits_ssize_max+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <limits.h> + #ifndef SSIZE_MAX + #error "SSIZE_MAX is not defined" + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_header_limits_ssize_max=yes +else case e in #( + e) gl_cv_header_limits_ssize_max=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_ssize_max" >&5 +printf "%s\n" "$gl_cv_header_limits_ssize_max" >&6; } + if test "$gl_cv_header_limits_ssize_max" = yes; then + GL_GENERATE_LIMITS_H=false + fi +fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5 @@ -23686,8 +25592,8 @@ printf %s "checking for wint_t... " >&6; } if test ${gt_cv_c_wint_t+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <wchar.h> wint_t foo = (wchar_t)'\0'; @@ -23702,10 +25608,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gt_cv_c_wint_t=yes -else $as_nop - gt_cv_c_wint_t=no +else case e in #( + e) gt_cv_c_wint_t=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5 printf "%s\n" "$gt_cv_c_wint_t" >&6; } @@ -23719,8 +25627,8 @@ printf %s "checking whether wint_t is large enough... " >&6; } if test ${gl_cv_type_wint_t_large_enough+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <wchar.h> int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; @@ -23736,10 +25644,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_type_wint_t_large_enough=yes -else $as_nop - gl_cv_type_wint_t_large_enough=no +else case e in #( + e) gl_cv_type_wint_t_large_enough=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5 printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; } @@ -23759,8 +25669,8 @@ printf %s "checking whether the compiler produces multi-arch binaries... " >&6; if test ${gl_cv_c_multiarch+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_cv_c_multiarch=no +else case e in #( + e) gl_cv_c_multiarch=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __APPLE_CC__ @@ -23795,7 +25705,8 @@ then : fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5 printf "%s\n" "$gl_cv_c_multiarch" >&6; } @@ -23859,8 +25770,8 @@ printf %s "checking absolute name of <stdint.h>... " >&6; } if test ${gl_cv_next_stdint_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_stdint_h = yes; then @@ -23876,7 +25787,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -23902,7 +25813,8 @@ _ACEOF gl_cv_next_stdint_h='<'stdint.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5 printf "%s\n" "$gl_cv_next_stdint_h" >&6; } @@ -23934,8 +25846,8 @@ printf %s "checking whether stdint.h conforms to C99... " >&6; } if test ${gl_cv_header_working_stdint_h+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_cv_header_working_stdint_h=no +else case e in #( + e) gl_cv_header_working_stdint_h=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24030,7 +25942,10 @@ intmax_t i = INTMAX_MAX; uintmax_t j = UINTMAX_MAX; /* Check that SIZE_MAX has the correct type, if possible. */ -#if 201112 <= __STDC_VERSION__ +/* ISO C 11 mandates _Generic, but GCC versions < 4.9 lack it. */ +#if 201112 <= __STDC_VERSION__ \ + && (!defined __GNUC__ || 4 < __GNUC__ + (9 <= __GNUC_MINOR__) \ + || defined __clang__) int k = _Generic (SIZE_MAX, size_t: 0); #elif (2 <= __GNUC__ || 4 <= __clang_major__ || defined __IBM__TYPEOF__ \ || (0x5110 <= __SUNPRO_C && !__STDC__)) @@ -24111,14 +26026,14 @@ then : if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on native Windows. - mingw*) gl_cv_header_working_stdint_h="guessing yes" ;; - # In general, assume it works. - *) gl_cv_header_working_stdint_h="guessing yes" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_header_working_stdint_h="guessing yes" ;; + # In general, assume it works. + *) gl_cv_header_working_stdint_h="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24196,13 +26111,15 @@ then : gl_cv_header_working_stdint_h=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5 printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; } @@ -24220,8 +26137,8 @@ printf %s "checking whether stdint.h works without ISO C predefines... " >&6; } if test ${gl_cv_header_stdint_without_STDC_macros+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_cv_header_stdint_without_STDC_macros=no +else case e in #( + e) gl_cv_header_stdint_without_STDC_macros=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24253,7 +26170,8 @@ then : gl_cv_header_stdint_without_STDC_macros=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5 printf "%s\n" "$gl_cv_header_stdint_without_STDC_macros" >&6; } @@ -24271,8 +26189,8 @@ printf %s "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; } if test ${gl_cv_header_stdint_width+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_cv_header_stdint_width=no +else case e in #( + e) gl_cv_header_stdint_width=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24303,7 +26221,8 @@ if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_stdint_width=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5 printf "%s\n" "$gl_cv_header_stdint_width" >&6; } @@ -24342,8 +26261,8 @@ printf %s "checking for bit size of $gltype... " >&6; } if eval test \${gl_cv_bitsizeof_${gltype}+y} then : printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" " +else case e in #( + e) if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" " #include <stddef.h> #include <signal.h> #if HAVE_WCHAR_H @@ -24353,12 +26272,14 @@ else $as_nop #include <limits.h>" then : -else $as_nop - result=unknown +else case e in #( + e) result=unknown ;; +esac fi eval gl_cv_bitsizeof_${gltype}=\$result - + ;; +esac fi eval ac_res=\$gl_cv_bitsizeof_${gltype} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -24383,8 +26304,8 @@ printf %s "checking for bit size of $gltype... " >&6; } if eval test \${gl_cv_bitsizeof_${gltype}+y} then : printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" " +else case e in #( + e) if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" " #include <stddef.h> #include <signal.h> #if HAVE_WCHAR_H @@ -24394,12 +26315,14 @@ else $as_nop #include <limits.h>" then : -else $as_nop - result=unknown +else case e in #( + e) result=unknown ;; +esac fi eval gl_cv_bitsizeof_${gltype}=\$result - + ;; +esac fi eval ac_res=\$gl_cv_bitsizeof_${gltype} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -24423,8 +26346,8 @@ printf %s "checking whether $gltype is signed... " >&6; } if eval test \${gl_cv_type_${gltype}_signed+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stddef.h> @@ -24445,12 +26368,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : result=yes -else $as_nop - result=no +else case e in #( + e) result=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext eval gl_cv_type_${gltype}_signed=\$result - + ;; +esac fi eval ac_res=\$gl_cv_type_${gltype}_signed { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -24478,8 +26403,8 @@ printf %s "checking for $gltype integer literal suffix... " >&6; } if eval test \${gl_cv_type_${gltype}_suffix+y} then : printf %s "(cached) " >&6 -else $as_nop - eval gl_cv_type_${gltype}_suffix=no +else case e in #( + e) eval gl_cv_type_${gltype}_suffix=no eval result=\$gl_cv_type_${gltype}_signed if test "$result" = yes; then glsufu= @@ -24523,7 +26448,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext eval result=\$gl_cv_type_${gltype}_suffix test "$result" != no && break - done + done ;; +esac fi eval ac_res=\$gl_cv_type_${gltype}_suffix { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -24546,8 +26472,8 @@ printf %s "checking for $gltype integer literal suffix... " >&6; } if eval test \${gl_cv_type_${gltype}_suffix+y} then : printf %s "(cached) " >&6 -else $as_nop - eval gl_cv_type_${gltype}_suffix=no +else case e in #( + e) eval gl_cv_type_${gltype}_suffix=no eval result=\$gl_cv_type_${gltype}_signed if test "$result" = yes; then glsufu= @@ -24591,7 +26517,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext eval result=\$gl_cv_type_${gltype}_suffix test "$result" != no && break - done + done ;; +esac fi eval ac_res=\$gl_cv_type_${gltype}_suffix { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -24662,8 +26589,8 @@ printf %s "checking absolute name of <inttypes.h>... " >&6; } if test ${gl_cv_next_inttypes_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_inttypes_h = yes; then @@ -24679,7 +26606,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -24705,7 +26632,8 @@ _ACEOF gl_cv_next_inttypes_h='<'inttypes.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5 printf "%s\n" "$gl_cv_next_inttypes_h" >&6; } @@ -24757,8 +26685,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : PRIPTR_PREFIX='"l"' -else $as_nop - PRIPTR_PREFIX='"ll"' +else case e in #( + e) PRIPTR_PREFIX='"ll"' ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext else @@ -24798,8 +26727,8 @@ printf %s "checking whether INT32_MAX < INTMAX_MAX... " >&6; } if test ${gl_cv_test_INT32_MAX_LT_INTMAX_MAX+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Work also in C++ mode. */ #define __STDC_LIMIT_MACROS 1 @@ -24829,10 +26758,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_test_INT32_MAX_LT_INTMAX_MAX=yes -else $as_nop - gl_cv_test_INT32_MAX_LT_INTMAX_MAX=no +else case e in #( + e) gl_cv_test_INT32_MAX_LT_INTMAX_MAX=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_INT32_MAX_LT_INTMAX_MAX" >&5 printf "%s\n" "$gl_cv_test_INT32_MAX_LT_INTMAX_MAX" >&6; } @@ -24850,8 +26781,8 @@ printf %s "checking whether INT64_MAX == LONG_MAX... " >&6; } if test ${gl_cv_test_INT64_MAX_EQ_LONG_MAX+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Work also in C++ mode. */ #define __STDC_LIMIT_MACROS 1 @@ -24881,10 +26812,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_test_INT64_MAX_EQ_LONG_MAX=yes -else $as_nop - gl_cv_test_INT64_MAX_EQ_LONG_MAX=no +else case e in #( + e) gl_cv_test_INT64_MAX_EQ_LONG_MAX=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_INT64_MAX_EQ_LONG_MAX" >&5 printf "%s\n" "$gl_cv_test_INT64_MAX_EQ_LONG_MAX" >&6; } @@ -24904,8 +26837,8 @@ printf %s "checking whether UINT32_MAX < UINTMAX_MAX... " >&6; } if test ${gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Work also in C++ mode. */ #define __STDC_LIMIT_MACROS 1 @@ -24935,10 +26868,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX=yes -else $as_nop - gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX=no +else case e in #( + e) gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX" >&5 printf "%s\n" "$gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX" >&6; } @@ -24956,8 +26891,8 @@ printf %s "checking whether UINT64_MAX == ULONG_MAX... " >&6; } if test ${gl_cv_test_UINT64_MAX_EQ_ULONG_MAX+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Work also in C++ mode. */ #define __STDC_LIMIT_MACROS 1 @@ -24987,10 +26922,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_test_UINT64_MAX_EQ_ULONG_MAX=yes -else $as_nop - gl_cv_test_UINT64_MAX_EQ_ULONG_MAX=no +else case e in #( + e) gl_cv_test_UINT64_MAX_EQ_ULONG_MAX=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&5 printf "%s\n" "$gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&6; } @@ -25037,7 +26974,10 @@ printf "%s\n" "$gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&6; } HAVE_WCTRANS_T=1; REPLACE_ISWBLANK=0; REPLACE_ISWDIGIT=0; + REPLACE_ISWPUNCT=0; REPLACE_ISWXDIGIT=0; + REPLACE_WCTRANS=0; + REPLACE_WCTYPE=0; @@ -25090,8 +27030,8 @@ printf %s "checking absolute name of <wctype.h>... " >&6; } if test ${gl_cv_next_wctype_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_wctype_h = yes; then @@ -25107,7 +27047,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -25133,7 +27073,8 @@ _ACEOF gl_cv_next_wctype_h='<'wctype.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5 printf "%s\n" "$gl_cv_next_wctype_h" >&6; } @@ -25159,8 +27100,8 @@ printf %s "checking whether iswcntrl works... " >&6; } if test ${gl_cv_func_iswcntrl_works+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -25180,13 +27121,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_iswcntrl_works="guessing yes" -else $as_nop - gl_cv_func_iswcntrl_works="guessing no" +else case e in #( + e) gl_cv_func_iswcntrl_works="guessing no" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <wchar.h> @@ -25197,14 +27139,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_iswcntrl_works=yes -else $as_nop - gl_cv_func_iswcntrl_works=no +else case e in #( + e) gl_cv_func_iswcntrl_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5 printf "%s\n" "$gl_cv_func_iswcntrl_works" >&6; } @@ -25251,8 +27196,9 @@ fi if test "x$ac_cv_have_decl_towlower" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_TOWLOWER $ac_have_decl" >>confdefs.h @@ -25274,8 +27220,8 @@ printf %s "checking for wctype_t... " >&6; } if test ${gl_cv_type_wctype_t+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <wchar.h> #if HAVE_WCTYPE_H @@ -25294,11 +27240,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_type_wctype_t=yes -else $as_nop - gl_cv_type_wctype_t=no +else case e in #( + e) gl_cv_type_wctype_t=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctype_t" >&5 printf "%s\n" "$gl_cv_type_wctype_t" >&6; } @@ -25311,8 +27259,8 @@ printf %s "checking for wctrans_t... " >&6; } if test ${gl_cv_type_wctrans_t+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <wchar.h> #include <wctype.h> @@ -25329,11 +27277,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_type_wctrans_t=yes -else $as_nop - gl_cv_type_wctrans_t=no +else case e in #( + e) gl_cv_type_wctrans_t=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctrans_t" >&5 printf "%s\n" "$gl_cv_type_wctrans_t" >&6; } @@ -25355,6 +27305,10 @@ printf "%s\n" "$gl_cv_type_wctrans_t" >&6; } + GL_GNULIB_ISWPUNCT=0 + + + GL_GNULIB_ISWXDIGIT=0 @@ -25378,423 +27332,69 @@ printf "%s\n" "$gl_cv_type_wctrans_t" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5 -printf %s "checking for a traditional japanese locale... " >&6; } -if test ${gt_cv_locale_ja+y} + HAVE_WCTYPE=$HAVE_WCTYPE_T + if test $HAVE_WCTYPE = 1; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wctype supports the \"blank\" and \"punct\" character classes" >&5 +printf %s "checking whether wctype supports the \"blank\" and \"punct\" character classes... " >&6; } +if test ${gl_cv_func_wctype_works+y} then : printf %s "(cached) " >&6 -else $as_nop - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <locale.h> -#include <time.h> -#if HAVE_LANGINFO_CODESET -# include <langinfo.h> -#endif -#include <stdlib.h> -#include <string.h> -struct tm t; -char buf[16]; -int main () -{ - /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl - imitates locale dependent behaviour by looking at the environment - variables, and all locales use the UTF-8 encoding. */ -#if defined __BEOS__ || defined __HAIKU__ - return 1; -#else - /* Check whether the given locale name is recognized by the system. */ -# if defined _WIN32 && !defined __CYGWIN__ - /* On native Windows, setlocale(category, "") looks at the system settings, - not at the environment variables. Also, when an encoding suffix such - as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE - category of the locale to "C". */ - if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL - || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) - return 1; -# else - if (setlocale (LC_ALL, "") == NULL) return 1; -# endif - /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) - is empty, and the behaviour of Tcl 8.4 in this locale is not useful. - On OpenBSD 4.0, when an unsupported locale is specified, setlocale() - succeeds but then nl_langinfo(CODESET) is "646". In this situation, - some unit tests fail. - On MirBSD 10, when an unsupported locale is specified, setlocale() - succeeds but then nl_langinfo(CODESET) is "UTF-8". */ -# if HAVE_LANGINFO_CODESET - { - const char *cs = nl_langinfo (CODESET); - if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 - || strcmp (cs, "UTF-8") == 0) - return 1; - } -# endif -# ifdef __CYGWIN__ - /* On Cygwin, avoid locale names without encoding suffix, because the - locale_charset() function relies on the encoding suffix. Note that - LC_ALL is set on the command line. */ - if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; -# endif - /* Check whether MB_CUR_MAX is > 1. This excludes the dysfunctional locales - on Cygwin 1.5.x. */ - if (MB_CUR_MAX == 1) - return 1; - /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. - This excludes the UTF-8 encoding (except on MirBSD). */ - { - const char *p; - t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; - if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; - for (p = buf; *p != '\0'; p++) - if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0) - return 1; - } - return 0; -#endif -} - -_ACEOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest$ac_exeext; then - case "$host_os" in - # Handle native Windows specially, because there setlocale() interprets - # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", - # "fr" or "fra" as "French" or "French_France.1252", - # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", - # "ja" as "Japanese" or "Japanese_Japan.932", - # and similar. - mingw*) - # Note that on native Windows, the Japanese locale is - # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we - # cannot use it here. - gt_cv_locale_ja=none - ;; - *) - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the AIX locale name. - if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja_JP - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja_JP.EUC-JP - else - # Test for the HP-UX, OSF/1, NetBSD locale name. - if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja_JP.eucJP - else - # Test for the IRIX, FreeBSD locale name. - if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja_JP.EUC - else - # Test for the Solaris 7 locale name. - if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja - else - # Special test for NetBSD 1.6. - if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then - gt_cv_locale_ja=ja_JP.eucJP - else - # None found. - gt_cv_locale_ja=none - fi - fi - fi - fi - fi - fi - ;; - esac - fi - rm -fr conftest* - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5 -printf "%s\n" "$gt_cv_locale_ja" >&6; } - LOCALE_JA=$gt_cv_locale_ja - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5 -printf %s "checking for a french Unicode locale... " >&6; } -if test ${gt_cv_locale_fr_utf8+y} +else case e in #( + e) if test "$cross_compiling" = yes then : - printf %s "(cached) " >&6 -else $as_nop + case "$host_os" in + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_wctype_works="guessing no" ;; + # Guess no on Android. + android*) gl_cv_func_wctype_works="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_wctype_works="guessing yes" ;; + esac - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <locale.h> -#include <time.h> -#if HAVE_LANGINFO_CODESET -# include <langinfo.h> -#endif -#include <stdlib.h> -#include <string.h> -struct tm t; -char buf[16]; -int main () { - /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl - imitates locale dependent behaviour by looking at the environment - variables, and all locales use the UTF-8 encoding. */ -#if !(defined __BEOS__ || defined __HAIKU__) - /* Check whether the given locale name is recognized by the system. */ -# if defined _WIN32 && !defined __CYGWIN__ - /* On native Windows, setlocale(category, "") looks at the system settings, - not at the environment variables. Also, when an encoding suffix such - as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE - category of the locale to "C". */ - if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL - || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) - return 1; -# else - if (setlocale (LC_ALL, "") == NULL) return 1; -# endif - /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) - is empty, and the behaviour of Tcl 8.4 in this locale is not useful. - On OpenBSD 4.0, when an unsupported locale is specified, setlocale() - succeeds but then nl_langinfo(CODESET) is "646". In this situation, - some unit tests fail. */ -# if HAVE_LANGINFO_CODESET - { - const char *cs = nl_langinfo (CODESET); - if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) - return 1; - } -# endif -# ifdef __CYGWIN__ - /* On Cygwin, avoid locale names without encoding suffix, because the - locale_charset() function relies on the encoding suffix. Note that - LC_ALL is set on the command line. */ - if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; -# endif - /* Check whether in the abbreviation of the second month, the second - character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is - two bytes long, with UTF-8 encoding. */ - t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; - if (strftime (buf, sizeof (buf), "%b", &t) < 4 - || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v') - return 1; -#endif -#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ - /* Check whether the decimal separator is a comma. - On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point - are nl_langinfo(RADIXCHAR) are both ".". */ - if (localeconv () ->decimal_point[0] != ',') return 1; -#endif - return 0; -} + #include <ctype.h> + #include <wchar.h> + #include <wctype.h> + int main () + { + /* This test fails on mingw. */ + if (wctype ("blank") == (wctype_t)0) + return 1; + /* This test fails on MSVC 14. */ + if ((! iswctype ('\t', wctype ("blank"))) != (! iswblank ('\t'))) + return 2; + /* This test fails on Android 11. */ + if ((! iswctype ('\`', wctype ("punct"))) != (! ispunct ('\`'))) + return 4; + return 0; + } _ACEOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest$ac_exeext; then - case "$host_os" in - # Handle native Windows specially, because there setlocale() interprets - # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", - # "fr" or "fra" as "French" or "French_France.1252", - # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", - # "ja" as "Japanese" or "Japanese_Japan.932", - # and similar. - mingw*) - # Test for the hypothetical native Windows locale name. - if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=French_France.65001 - else - # None found. - gt_cv_locale_fr_utf8=none - fi - ;; - *) - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the usual locale name. - if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR.UTF-8 - else - # Test for the Solaris 7 locale name. - if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr.UTF-8 - else - # None found. - gt_cv_locale_fr_utf8=none - fi - fi - fi - ;; - esac - fi - rm -fr conftest* - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5 -printf "%s\n" "$gt_cv_locale_fr_utf8" >&6; } - LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8 - - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5 -printf %s "checking for a transitional chinese locale... " >&6; } -if test ${gt_cv_locale_zh_CN+y} +if ac_fn_c_try_run "$LINENO" then : - printf %s "(cached) " >&6 -else $as_nop - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <locale.h> -#include <stdlib.h> -#include <time.h> -#if HAVE_LANGINFO_CODESET -# include <langinfo.h> -#endif -#include <stdlib.h> -#include <string.h> -struct tm t; -char buf[16]; -int main () -{ - /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl - imitates locale dependent behaviour by looking at the environment - variables, and all locales use the UTF-8 encoding. */ -#if defined __BEOS__ || defined __HAIKU__ - return 1; -#else - /* Check whether the given locale name is recognized by the system. */ -# if defined _WIN32 && !defined __CYGWIN__ - /* On native Windows, setlocale(category, "") looks at the system settings, - not at the environment variables. Also, when an encoding suffix such - as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE - category of the locale to "C". */ - if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL - || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) - return 1; -# else - if (setlocale (LC_ALL, "") == NULL) return 1; -# endif - /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) - is empty, and the behaviour of Tcl 8.4 in this locale is not useful. - On OpenBSD 4.0, when an unsupported locale is specified, setlocale() - succeeds but then nl_langinfo(CODESET) is "646". In this situation, - some unit tests fail. - On MirBSD 10, when an unsupported locale is specified, setlocale() - succeeds but then nl_langinfo(CODESET) is "UTF-8". */ -# if HAVE_LANGINFO_CODESET - { - const char *cs = nl_langinfo (CODESET); - if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 - || strcmp (cs, "UTF-8") == 0) - return 1; - } -# endif -# ifdef __CYGWIN__ - /* On Cygwin, avoid locale names without encoding suffix, because the - locale_charset() function relies on the encoding suffix. Note that - LC_ALL is set on the command line. */ - if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; -# endif - /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. - This excludes the UTF-8 encoding (except on MirBSD). */ - { - const char *p; - t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; - if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; - for (p = buf; *p != '\0'; p++) - if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0) - return 1; - } - /* Check whether a typical GB18030 multibyte sequence is recognized as a - single wide character. This excludes the GB2312 and GBK encodings. */ - if (mblen ("\203\062\332\066", 5) != 4) - return 1; - return 0; -#endif -} - -_ACEOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest$ac_exeext; then - case "$host_os" in - # Handle native Windows specially, because there setlocale() interprets - # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", - # "fr" or "fra" as "French" or "French_France.1252", - # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", - # "ja" as "Japanese" or "Japanese_Japan.932", - # and similar. - mingw*) - # Test for the hypothetical native Windows locale name. - if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_zh_CN=Chinese_China.54936 - else - # None found. - gt_cv_locale_zh_CN=none - fi - ;; - solaris2.8) - # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are - # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK. - # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core. - gt_cv_locale_zh_CN=none - ;; - *) - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the locale name without encoding suffix. - if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_zh_CN=zh_CN - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_zh_CN=zh_CN.GB18030 - else - # None found. - gt_cv_locale_zh_CN=none - fi - fi - ;; - esac - else - # If there was a link error, due to mblen(), the system is so old that - # it certainly doesn't have a chinese locale. - gt_cv_locale_zh_CN=none - fi - rm -fr conftest* - + gl_cv_func_wctype_works=yes +else case e in #( + e) gl_cv_func_wctype_works=no ;; +esac +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5 -printf "%s\n" "$gt_cv_locale_zh_CN" >&6; } - LOCALE_ZH_CN=$gt_cv_locale_zh_CN + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wctype_works" >&5 +printf "%s\n" "$gl_cv_func_wctype_works" >&6; } + case "$gl_cv_func_wctype_works" in + *yes) ;; + *) REPLACE_WCTYPE=1 ;; + esac + fi HAVE_NL_LANGINFO=1; @@ -25823,8 +27423,8 @@ printf %s "checking absolute name of <langinfo.h>... " >&6; } if test ${gl_cv_next_langinfo_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_langinfo_h = yes; then @@ -25840,7 +27440,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -25866,7 +27466,8 @@ _ACEOF gl_cv_next_langinfo_h='<'langinfo.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_langinfo_h" >&5 printf "%s\n" "$gl_cv_next_langinfo_h" >&6; } @@ -25899,8 +27500,8 @@ printf %s "checking whether langinfo.h defines CODESET... " >&6; } if test ${gl_cv_header_langinfo_codeset+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <langinfo.h> int a = CODESET; @@ -25916,11 +27517,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_langinfo_codeset=yes -else $as_nop - gl_cv_header_langinfo_codeset=no +else case e in #( + e) gl_cv_header_langinfo_codeset=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_codeset" >&5 printf "%s\n" "$gl_cv_header_langinfo_codeset" >&6; } @@ -25932,8 +27535,8 @@ printf %s "checking whether langinfo.h defines T_FMT_AMPM... " >&6; } if test ${gl_cv_header_langinfo_t_fmt_ampm+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <langinfo.h> int a = T_FMT_AMPM; @@ -25949,11 +27552,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_langinfo_t_fmt_ampm=yes -else $as_nop - gl_cv_header_langinfo_t_fmt_ampm=no +else case e in #( + e) gl_cv_header_langinfo_t_fmt_ampm=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_t_fmt_ampm" >&5 printf "%s\n" "$gl_cv_header_langinfo_t_fmt_ampm" >&6; } @@ -25965,8 +27570,8 @@ printf %s "checking whether langinfo.h defines ALTMON_1... " >&6; } if test ${gl_cv_header_langinfo_altmon+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <langinfo.h> int a = ALTMON_1; @@ -25982,11 +27587,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_langinfo_altmon=yes -else $as_nop - gl_cv_header_langinfo_altmon=no +else case e in #( + e) gl_cv_header_langinfo_altmon=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_altmon" >&5 printf "%s\n" "$gl_cv_header_langinfo_altmon" >&6; } @@ -25998,8 +27605,8 @@ printf %s "checking whether langinfo.h defines ERA... " >&6; } if test ${gl_cv_header_langinfo_era+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <langinfo.h> int a = ERA; @@ -26015,11 +27622,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_langinfo_era=yes -else $as_nop - gl_cv_header_langinfo_era=no +else case e in #( + e) gl_cv_header_langinfo_era=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_era" >&5 printf "%s\n" "$gl_cv_header_langinfo_era" >&6; } @@ -26031,8 +27640,8 @@ printf %s "checking whether langinfo.h defines YESEXPR... " >&6; } if test ${gl_cv_header_langinfo_yesexpr+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <langinfo.h> int a = YESEXPR; @@ -26048,11 +27657,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_langinfo_yesexpr=yes -else $as_nop - gl_cv_header_langinfo_yesexpr=no +else case e in #( + e) gl_cv_header_langinfo_yesexpr=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_yesexpr" >&5 printf "%s\n" "$gl_cv_header_langinfo_yesexpr" >&6; } @@ -26092,8 +27703,9 @@ printf %s "checking whether included libunistring is requested... " >&6; } if test ${with_included_libunistring+y} then : withval=$with_included_libunistring; gl_libunistring_force_included=$withval -else $as_nop - gl_libunistring_force_included=no +else case e in #( + e) gl_libunistring_force_included=no ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_libunistring_force_included" >&5 @@ -26123,9 +27735,9 @@ printf "%s\n" "$gl_libunistring_force_included" >&6; } use_additional=yes - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -26133,8 +27745,8 @@ printf "%s\n" "$gl_libunistring_force_included" >&6; } eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" # Check whether --with-libunistring-prefix was given. @@ -26146,9 +27758,9 @@ then : else if test "X$withval" = "X"; then - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -26156,8 +27768,8 @@ then : eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" else additional_includedir="$withval/include" @@ -26269,13 +27881,13 @@ fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIBUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" case "$x" in -L*) @@ -26363,13 +27975,13 @@ fi haveit= for x in $LDFLAGS $LIBUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$found_dir"; then haveit=yes @@ -26431,13 +28043,13 @@ fi if test -z "$haveit"; then for x in $CPPFLAGS $INCUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-I$additional_includedir"; then haveit=yes @@ -26453,12 +28065,12 @@ fi fi fi if test -n "$found_la"; then - save_libdir="$libdir" + saved_libdir="$libdir" case "$found_la" in */* | *\\*) . "$found_la" ;; *) . "./$found_la" ;; esac - libdir="$save_libdir" + libdir="$saved_libdir" for dep in $dependency_libs; do case "$dep" in -L*) @@ -26480,13 +28092,13 @@ fi haveit= for x in $LDFLAGS $LIBUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -26501,13 +28113,13 @@ fi haveit= for x in $LDFLAGS $LTLIBUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -26581,17 +28193,17 @@ fi for found_dir in $rpathdirs; do alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBUNISTRING="${LIBUNISTRING}${LIBUNISTRING:+ }$flag" else for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$found_dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBUNISTRING="${LIBUNISTRING}${LIBUNISTRING:+ }$flag" done fi @@ -26607,19 +28219,19 @@ fi - ac_save_CPPFLAGS="$CPPFLAGS" + acl_saved_CPPFLAGS="$CPPFLAGS" for element in $INCUNISTRING; do haveit= for x in $CPPFLAGS; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X$element"; then haveit=yes @@ -26637,9 +28249,9 @@ printf %s "checking for libunistring... " >&6; } if test ${ac_cv_libunistring+y} then : printf %s "(cached) " >&6 -else $as_nop - - ac_save_LIBS="$LIBS" +else case e in #( + e) + acl_saved_LIBS="$LIBS" case " $LIBUNISTRING" in *" -l"*) LIBS="$LIBS $LIBUNISTRING" ;; *) LIBS="$LIBUNISTRING $LIBS" ;; @@ -26658,13 +28270,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_libunistring=yes -else $as_nop - ac_cv_libunistring='no, trying again together with libiconv' +else case e in #( + e) ac_cv_libunistring='no, trying again together with libiconv' ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_save_LIBS" - + LIBS="$acl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libunistring" >&5 printf "%s\n" "$ac_cv_libunistring" >&6; } @@ -26679,7 +28293,7 @@ printf %s "checking how to link with libunistring... " >&6; } printf "%s\n" "$LIBUNISTRING" >&6; } else HAVE_LIBUNISTRING=no - CPPFLAGS="$ac_save_CPPFLAGS" + CPPFLAGS="$acl_saved_CPPFLAGS" LIBUNISTRING= LTLIBUNISTRING= LIBUNISTRING_PREFIX= @@ -26693,7 +28307,7 @@ printf "%s\n" "$LIBUNISTRING" >&6; } if test "$ac_cv_libunistring" != yes; then unset ac_cv_libunistring - glus_save_LIBS="$LIBS" + glus_saved_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" @@ -26709,9 +28323,9 @@ printf "%s\n" "$LIBUNISTRING" >&6; } use_additional=yes - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -26719,8 +28333,8 @@ printf "%s\n" "$LIBUNISTRING" >&6; } eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" # Check whether --with-libunistring-prefix was given. @@ -26732,9 +28346,9 @@ then : else if test "X$withval" = "X"; then - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -26742,8 +28356,8 @@ then : eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" else additional_includedir="$withval/include" @@ -26855,13 +28469,13 @@ fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIBUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" case "$x" in -L*) @@ -26949,13 +28563,13 @@ fi haveit= for x in $LDFLAGS $LIBUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$found_dir"; then haveit=yes @@ -27017,13 +28631,13 @@ fi if test -z "$haveit"; then for x in $CPPFLAGS $INCUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-I$additional_includedir"; then haveit=yes @@ -27039,12 +28653,12 @@ fi fi fi if test -n "$found_la"; then - save_libdir="$libdir" + saved_libdir="$libdir" case "$found_la" in */* | *\\*) . "$found_la" ;; *) . "./$found_la" ;; esac - libdir="$save_libdir" + libdir="$saved_libdir" for dep in $dependency_libs; do case "$dep" in -L*) @@ -27066,13 +28680,13 @@ fi haveit= for x in $LDFLAGS $LIBUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -27087,13 +28701,13 @@ fi haveit= for x in $LDFLAGS $LTLIBUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -27167,17 +28781,17 @@ fi for found_dir in $rpathdirs; do alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBUNISTRING="${LIBUNISTRING}${LIBUNISTRING:+ }$flag" else for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$found_dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBUNISTRING="${LIBUNISTRING}${LIBUNISTRING:+ }$flag" done fi @@ -27193,19 +28807,19 @@ fi - ac_save_CPPFLAGS="$CPPFLAGS" + acl_saved_CPPFLAGS="$CPPFLAGS" for element in $INCUNISTRING; do haveit= for x in $CPPFLAGS; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X$element"; then haveit=yes @@ -27223,9 +28837,9 @@ printf %s "checking for libunistring... " >&6; } if test ${ac_cv_libunistring+y} then : printf %s "(cached) " >&6 -else $as_nop - - ac_save_LIBS="$LIBS" +else case e in #( + e) + acl_saved_LIBS="$LIBS" case " $LIBUNISTRING" in *" -l"*) LIBS="$LIBS $LIBUNISTRING" ;; *) LIBS="$LIBUNISTRING $LIBS" ;; @@ -27244,13 +28858,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_libunistring=yes -else $as_nop - ac_cv_libunistring='no, consider installing GNU libunistring' +else case e in #( + e) ac_cv_libunistring='no, consider installing GNU libunistring' ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_save_LIBS" - + LIBS="$acl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libunistring" >&5 printf "%s\n" "$ac_cv_libunistring" >&6; } @@ -27265,7 +28881,7 @@ printf %s "checking how to link with libunistring... " >&6; } printf "%s\n" "$LIBUNISTRING" >&6; } else HAVE_LIBUNISTRING=no - CPPFLAGS="$ac_save_CPPFLAGS" + CPPFLAGS="$acl_saved_CPPFLAGS" LIBUNISTRING= LTLIBUNISTRING= LIBUNISTRING_PREFIX= @@ -27281,7 +28897,7 @@ printf "%s\n" "$LIBUNISTRING" >&6; } LIBUNISTRING="$LIBUNISTRING $LIBICONV" LTLIBUNISTRING="$LTLIBUNISTRING $LTLIBICONV" fi - LIBS="$glus_save_LIBS" + LIBS="$glus_saved_LIBS" fi else @@ -27298,9 +28914,9 @@ printf "%s\n" "$LIBUNISTRING" >&6; } use_additional=yes - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -27308,8 +28924,8 @@ printf "%s\n" "$LIBUNISTRING" >&6; } eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" # Check whether --with-libunistring-prefix was given. @@ -27321,9 +28937,9 @@ then : else if test "X$withval" = "X"; then - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -27331,8 +28947,8 @@ then : eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" else additional_includedir="$withval/include" @@ -27444,13 +29060,13 @@ fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIBUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" case "$x" in -L*) @@ -27538,13 +29154,13 @@ fi haveit= for x in $LDFLAGS $LIBUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$found_dir"; then haveit=yes @@ -27606,13 +29222,13 @@ fi if test -z "$haveit"; then for x in $CPPFLAGS $INCUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-I$additional_includedir"; then haveit=yes @@ -27628,12 +29244,12 @@ fi fi fi if test -n "$found_la"; then - save_libdir="$libdir" + saved_libdir="$libdir" case "$found_la" in */* | *\\*) . "$found_la" ;; *) . "./$found_la" ;; esac - libdir="$save_libdir" + libdir="$saved_libdir" for dep in $dependency_libs; do case "$dep" in -L*) @@ -27655,13 +29271,13 @@ fi haveit= for x in $LDFLAGS $LIBUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -27676,13 +29292,13 @@ fi haveit= for x in $LDFLAGS $LTLIBUNISTRING; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -27756,17 +29372,17 @@ fi for found_dir in $rpathdirs; do alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBUNISTRING="${LIBUNISTRING}${LIBUNISTRING:+ }$flag" else for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$found_dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBUNISTRING="${LIBUNISTRING}${LIBUNISTRING:+ }$flag" done fi @@ -27782,19 +29398,19 @@ fi - ac_save_CPPFLAGS="$CPPFLAGS" + acl_saved_CPPFLAGS="$CPPFLAGS" for element in $INCUNISTRING; do haveit= for x in $CPPFLAGS; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X$element"; then haveit=yes @@ -27812,9 +29428,9 @@ printf %s "checking for libunistring... " >&6; } if test ${ac_cv_libunistring+y} then : printf %s "(cached) " >&6 -else $as_nop - - ac_save_LIBS="$LIBS" +else case e in #( + e) + acl_saved_LIBS="$LIBS" case " $LIBUNISTRING" in *" -l"*) LIBS="$LIBS $LIBUNISTRING" ;; *) LIBS="$LIBUNISTRING $LIBS" ;; @@ -27833,13 +29449,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_libunistring=yes -else $as_nop - ac_cv_libunistring='no, consider installing GNU libunistring' +else case e in #( + e) ac_cv_libunistring='no, consider installing GNU libunistring' ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_save_LIBS" - + LIBS="$acl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libunistring" >&5 printf "%s\n" "$ac_cv_libunistring" >&6; } @@ -27854,7 +29472,7 @@ printf %s "checking how to link with libunistring... " >&6; } printf "%s\n" "$LIBUNISTRING" >&6; } else HAVE_LIBUNISTRING=no - CPPFLAGS="$ac_save_CPPFLAGS" + CPPFLAGS="$acl_saved_CPPFLAGS" LIBUNISTRING= LTLIBUNISTRING= LIBUNISTRING_PREFIX= @@ -27873,8 +29491,8 @@ printf %s "checking for libunistring version... " >&6; } if test ${gl_cv_libunistring_version+y} then : printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "_LIBUNISTRING_VERSION" "gl_libunistring_hexversion" "#include <unistring/version.h>" +else case e in #( + e) if ac_fn_c_compute_int "$LINENO" "_LIBUNISTRING_VERSION" "gl_libunistring_hexversion" "#include <unistring/version.h>" then : fi @@ -27894,8 +29512,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_libunistring_version092=true -else $as_nop - gl_cv_libunistring_version092=false +else case e in #( + e) gl_cv_libunistring_version092=false ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if $gl_cv_libunistring_version092; then @@ -27911,7 +29530,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -27953,8 +29572,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_libunistring_version091=true -else $as_nop - gl_cv_libunistring_version091=false +else case e in #( + e) gl_cv_libunistring_version091=false ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if $gl_cv_libunistring_version091; then @@ -27968,7 +29588,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext gl_libunistring_minor=`expr $gl_libunistring_hexversion / 256 % 256` gl_libunistring_subminor=`expr $gl_libunistring_hexversion % 256` gl_cv_libunistring_version="$gl_libunistring_major.$gl_libunistring_minor.$gl_libunistring_subminor" - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_libunistring_version" >&5 printf "%s\n" "$gl_cv_libunistring_version" >&6; } @@ -28007,8 +29628,8 @@ printf %s "checking for wchar_t... " >&6; } if test ${gt_cv_c_wchar_t+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stddef.h> wchar_t foo = (wchar_t)'\0'; @@ -28023,10 +29644,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gt_cv_c_wchar_t=yes -else $as_nop - gt_cv_c_wchar_t=no +else case e in #( + e) gt_cv_c_wchar_t=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5 printf "%s\n" "$gt_cv_c_wchar_t" >&6; } @@ -28049,8 +29672,8 @@ printf %s "checking for good max_align_t... " >&6; } if test ${gl_cv_type_max_align_t+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* On FreeBSD 12.0/x86, max_align_t defined by <stddef.h> has the correct alignment with the default (wrong) definition of @@ -28084,11 +29707,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_type_max_align_t=yes -else $as_nop - gl_cv_type_max_align_t=no +else case e in #( + e) gl_cv_type_max_align_t=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5 printf "%s\n" "$gl_cv_type_max_align_t" >&6; } @@ -28107,8 +29732,8 @@ printf %s "checking whether NULL can be used in arbitrary expressions... " >&6; if test ${gl_cv_decl_null_works+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stddef.h> int test[2 * (sizeof NULL == sizeof (void *)) -1]; @@ -28124,10 +29749,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_decl_null_works=yes -else $as_nop - gl_cv_decl_null_works=no +else case e in #( + e) gl_cv_decl_null_works=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5 printf "%s\n" "$gl_cv_decl_null_works" >&6; } @@ -28141,8 +29768,8 @@ printf %s "checking for unreachable... " >&6; } if test ${gl_cv_func_unreachable+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stddef.h> @@ -28158,12 +29785,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_unreachable=yes -else $as_nop - gl_cv_func_unreachable=no +else case e in #( + e) gl_cv_func_unreachable=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unreachable" >&5 printf "%s\n" "$gl_cv_func_unreachable" >&6; } @@ -28188,8 +29817,8 @@ printf %s "checking absolute name of <stddef.h>... " >&6; } if test ${gl_cv_next_stddef_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -28202,7 +29831,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -28225,7 +29854,8 @@ _ACEOF gl_header=$gl_cv_absolute_stddef_h gl_cv_next_stddef_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5 printf "%s\n" "$gl_cv_next_stddef_h" >&6; } @@ -28255,8 +29885,8 @@ printf %s "checking whether locale.h defines locale_t... " >&6; } if test ${gl_cv_header_locale_has_locale_t+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> locale_t x; @@ -28271,11 +29901,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_locale_has_locale_t=yes -else $as_nop - gl_cv_header_locale_has_locale_t=no +else case e in #( + e) gl_cv_header_locale_has_locale_t=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_has_locale_t" >&5 printf "%s\n" "$gl_cv_header_locale_has_locale_t" >&6; } @@ -28323,8 +29955,8 @@ printf %s "checking whether locale.h conforms to POSIX:2001... " >&6; } if test ${gl_cv_header_locale_h_posix2001+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> int x = LC_MESSAGES; @@ -28340,10 +29972,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_locale_h_posix2001=yes -else $as_nop - gl_cv_header_locale_h_posix2001=no +else case e in #( + e) gl_cv_header_locale_h_posix2001=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_h_posix2001" >&5 printf "%s\n" "$gl_cv_header_locale_h_posix2001" >&6; } @@ -28353,8 +29987,8 @@ printf %s "checking whether struct lconv is properly defined... " >&6; } if test ${gl_cv_sys_struct_lconv_ok+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> struct lconv l; @@ -28371,17 +30005,21 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_sys_struct_lconv_ok=yes -else $as_nop - gl_cv_sys_struct_lconv_ok=no +else case e in #( + e) gl_cv_sys_struct_lconv_ok=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_lconv_ok" >&5 printf "%s\n" "$gl_cv_sys_struct_lconv_ok" >&6; } if test $gl_cv_sys_struct_lconv_ok = no; then case "$host_os" in - mingw*) + windows*-msvc*) + ;; + mingw* | windows*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -28391,11 +30029,12 @@ printf "%s\n" "$gl_cv_sys_struct_lconv_ok" >&6; } _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Special" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Special" >/dev/null 2>&1 then : -else $as_nop - REPLACE_STRUCT_LCONV=1 +else case e in #( + e) REPLACE_STRUCT_LCONV=1 ;; +esac fi rm -rf conftest* @@ -28420,8 +30059,8 @@ printf %s "checking absolute name of <locale.h>... " >&6; } if test ${gl_cv_next_locale_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -28434,7 +30073,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -28457,7 +30096,8 @@ _ACEOF gl_header=$gl_cv_absolute_locale_h gl_cv_next_locale_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_locale_h" >&5 printf "%s\n" "$gl_cv_next_locale_h" >&6; } @@ -28499,7 +30139,7 @@ printf "%s\n" "$gl_cv_next_locale_h" >&6; } - GL_GNULIB_LOCALENAME=0 + GL_GNULIB_LOCALENAME_UNSAFE=0 @@ -28518,9 +30158,9 @@ printf %s "checking whether imported symbols can be declared weak... " >&6; } if test ${gl_cv_have_weak+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$host_os" in - cygwin* | mingw*) +else case e in #( + e) case "$host_os" in + cygwin* | mingw* | windows*) gl_cv_have_weak="guessing no" ;; *) @@ -28554,17 +30194,18 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Extensible Linking Format" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1 then : gl_cv_have_weak="guessing yes" -else $as_nop - gl_cv_have_weak="guessing no" +else case e in #( + e) gl_cv_have_weak="guessing no" ;; +esac fi rm -rf conftest* -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -28577,11 +30218,13 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_have_weak=yes -else $as_nop - gl_cv_have_weak=no +else case e in #( + e) gl_cv_have_weak=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi @@ -28611,7 +30254,8 @@ EOF esac ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 printf "%s\n" "$gl_cv_have_weak" >&6; } @@ -28646,8 +30290,9 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h if test "x$ac_cv_header_pthread_h" = xyes then : gl_have_pthread_h=yes -else $as_nop - gl_have_pthread_h=no +else case e in #( + e) gl_have_pthread_h=no ;; +esac fi if test "$gl_have_pthread_h" = yes; then @@ -28661,7 +30306,7 @@ fi # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 # needs -pthread for some reason. See: # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html - save_LIBS=$LIBS + saved_LIBS="$LIBS" for gl_pthread in '' '-pthread'; do LIBS="$LIBS $gl_pthread" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -28687,11 +30332,11 @@ then : fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS=$save_LIBS + LIBS="$saved_LIBS" test $gl_pthread_api = yes && break done - echo "$as_me:28693: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:28694: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:30338: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:30339: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -28709,7 +30354,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky user" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Lucky user" >/dev/null 2>&1 then : gl_pthread_in_glibc=yes fi @@ -28717,7 +30362,7 @@ rm -rf conftest* ;; esac - echo "$as_me:28720: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:30365: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -28729,16 +30374,22 @@ printf %s "checking for pthread_kill in -lpthread... " >&6; } if test ${ac_cv_lib_pthread_pthread_kill+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pthread_kill (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (void); int main (void) { @@ -28750,12 +30401,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pthread_pthread_kill=yes -else $as_nop - ac_cv_lib_pthread_pthread_kill=no +else case e in #( + e) ac_cv_lib_pthread_pthread_kill=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; } @@ -28779,6 +30432,62 @@ printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h esac fi +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lthr" >&5 +printf %s "checking for pthread_kill in -lthr... " >&6; } +if test ${ac_cv_lib_thr_pthread_kill+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lthr $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (void); +int +main (void) +{ +return pthread_kill (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_thr_pthread_kill=yes +else case e in #( + e) ac_cv_lib_thr_pthread_kill=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_thr_pthread_kill" >&5 +printf "%s\n" "$ac_cv_lib_thr_pthread_kill" >&6; } +if test "x$ac_cv_lib_thr_pthread_kill" = xyes +then : + if test $gl_pthread_in_glibc = yes; then + LIBPMULTITHREAD= + else + LIBPMULTITHREAD=-lthr + fi + +fi + + ;; +esac fi elif test $gl_pthread_api != yes; then @@ -28788,16 +30497,22 @@ printf %s "checking for pthread_kill in -lpthread... " >&6; } if test ${ac_cv_lib_pthread_pthread_kill+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pthread_kill (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (void); int main (void) { @@ -28809,12 +30524,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pthread_pthread_kill=yes -else $as_nop - ac_cv_lib_pthread_pthread_kill=no +else case e in #( + e) ac_cv_lib_pthread_pthread_kill=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; } @@ -28832,16 +30549,22 @@ printf %s "checking for pthread_kill in -lc_r... " >&6; } if test ${ac_cv_lib_c_r_pthread_kill+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lc_r $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pthread_kill (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (void); int main (void) { @@ -28853,12 +30576,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_c_r_pthread_kill=yes -else $as_nop - ac_cv_lib_c_r_pthread_kill=no +else case e in #( + e) ac_cv_lib_c_r_pthread_kill=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5 printf "%s\n" "$ac_cv_lib_c_r_pthread_kill" >&6; } @@ -28871,7 +30596,7 @@ fi fi fi - echo "$as_me:28874: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:30599: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 printf %s "checking whether POSIX threads API is available... " >&6; } @@ -28900,22 +30625,28 @@ if ac_fn_c_try_link "$LINENO" then : SCHED_YIELD_LIB= -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 printf %s "checking for sched_yield in -lrt... " >&6; } if test ${ac_cv_lib_rt_sched_yield+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char sched_yield (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (void); int main (void) { @@ -28927,34 +30658,42 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_rt_sched_yield=yes -else $as_nop - ac_cv_lib_rt_sched_yield=no +else case e in #( + e) ac_cv_lib_rt_sched_yield=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; } if test "x$ac_cv_lib_rt_sched_yield" = xyes then : SCHED_YIELD_LIB=-lrt -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 printf %s "checking for sched_yield in -lposix4... " >&6; } if test ${ac_cv_lib_posix4_sched_yield+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lposix4 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char sched_yield (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (void); int main (void) { @@ -28966,12 +30705,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_posix4_sched_yield=yes -else $as_nop - ac_cv_lib_posix4_sched_yield=no +else case e in #( + e) ac_cv_lib_posix4_sched_yield=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; } @@ -28979,10 +30720,12 @@ if test "x$ac_cv_lib_posix4_sched_yield" = xyes then : SCHED_YIELD_LIB=-lposix4 fi - + ;; +esac fi - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -29041,7 +30784,7 @@ printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h case "$host_os" in - mingw*) + mingw* | windows*) LIBSTDTHREAD= ;; *) @@ -29057,8 +30800,9 @@ printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h if test "x$ac_cv_header_pthread_h" = xyes then : gl_have_pthread_h=yes -else $as_nop - gl_have_pthread_h=no +else case e in #( + e) gl_have_pthread_h=no ;; +esac fi if test "$gl_have_pthread_h" = yes; then @@ -29072,7 +30816,7 @@ fi # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 # needs -pthread for some reason. See: # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html - save_LIBS=$LIBS + saved_LIBS="$LIBS" for gl_pthread in '' '-pthread'; do LIBS="$LIBS $gl_pthread" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -29098,11 +30842,11 @@ then : fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS=$save_LIBS + LIBS="$saved_LIBS" test $gl_pthread_api = yes && break done - echo "$as_me:29104: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:29105: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:30848: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:30849: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -29120,7 +30864,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky user" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Lucky user" >/dev/null 2>&1 then : gl_pthread_in_glibc=yes fi @@ -29128,7 +30872,7 @@ rm -rf conftest* ;; esac - echo "$as_me:29131: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:30875: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -29140,16 +30884,22 @@ printf %s "checking for pthread_kill in -lpthread... " >&6; } if test ${ac_cv_lib_pthread_pthread_kill+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pthread_kill (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (void); int main (void) { @@ -29161,12 +30911,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pthread_pthread_kill=yes -else $as_nop - ac_cv_lib_pthread_pthread_kill=no +else case e in #( + e) ac_cv_lib_pthread_pthread_kill=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; } @@ -29190,6 +30942,62 @@ printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h esac fi +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lthr" >&5 +printf %s "checking for pthread_kill in -lthr... " >&6; } +if test ${ac_cv_lib_thr_pthread_kill+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lthr $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (void); +int +main (void) +{ +return pthread_kill (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_thr_pthread_kill=yes +else case e in #( + e) ac_cv_lib_thr_pthread_kill=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_thr_pthread_kill" >&5 +printf "%s\n" "$ac_cv_lib_thr_pthread_kill" >&6; } +if test "x$ac_cv_lib_thr_pthread_kill" = xyes +then : + if test $gl_pthread_in_glibc = yes; then + LIBPMULTITHREAD= + else + LIBPMULTITHREAD=-lthr + fi + +fi + + ;; +esac fi elif test $gl_pthread_api != yes; then @@ -29199,16 +31007,22 @@ printf %s "checking for pthread_kill in -lpthread... " >&6; } if test ${ac_cv_lib_pthread_pthread_kill+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pthread_kill (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (void); int main (void) { @@ -29220,12 +31034,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pthread_pthread_kill=yes -else $as_nop - ac_cv_lib_pthread_pthread_kill=no +else case e in #( + e) ac_cv_lib_pthread_pthread_kill=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; } @@ -29243,16 +31059,22 @@ printf %s "checking for pthread_kill in -lc_r... " >&6; } if test ${ac_cv_lib_c_r_pthread_kill+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lc_r $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pthread_kill (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (void); int main (void) { @@ -29264,12 +31086,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_c_r_pthread_kill=yes -else $as_nop - ac_cv_lib_c_r_pthread_kill=no +else case e in #( + e) ac_cv_lib_c_r_pthread_kill=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5 printf "%s\n" "$ac_cv_lib_c_r_pthread_kill" >&6; } @@ -29282,7 +31106,7 @@ fi fi fi - echo "$as_me:29285: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:31109: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 printf %s "checking whether POSIX threads API is available... " >&6; } @@ -29311,22 +31135,28 @@ if ac_fn_c_try_link "$LINENO" then : SCHED_YIELD_LIB= -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 printf %s "checking for sched_yield in -lrt... " >&6; } if test ${ac_cv_lib_rt_sched_yield+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char sched_yield (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (void); int main (void) { @@ -29338,34 +31168,42 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_rt_sched_yield=yes -else $as_nop - ac_cv_lib_rt_sched_yield=no +else case e in #( + e) ac_cv_lib_rt_sched_yield=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; } if test "x$ac_cv_lib_rt_sched_yield" = xyes then : SCHED_YIELD_LIB=-lrt -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 printf %s "checking for sched_yield in -lposix4... " >&6; } if test ${ac_cv_lib_posix4_sched_yield+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lposix4 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char sched_yield (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (void); int main (void) { @@ -29377,12 +31215,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_posix4_sched_yield=yes -else $as_nop - ac_cv_lib_posix4_sched_yield=no +else case e in #( + e) ac_cv_lib_posix4_sched_yield=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; } @@ -29390,10 +31230,12 @@ if test "x$ac_cv_lib_posix4_sched_yield" = xyes then : SCHED_YIELD_LIB=-lposix4 fi - + ;; +esac fi - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -29412,8 +31254,8 @@ printf %s "checking for thrd_create... " >&6; } if test ${gl_cv_onwards_func_thrd_create+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -29457,7 +31299,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_thrd_create" >&5 printf "%s\n" "$gl_cv_onwards_func_thrd_create" >&6; } @@ -29481,16 +31324,22 @@ printf %s "checking for thrd_create in -lstdthreads... " >&6; } if test ${ac_cv_lib_stdthreads_thrd_create+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lstdthreads $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char thrd_create (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char thrd_create (void); int main (void) { @@ -29502,12 +31351,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_stdthreads_thrd_create=yes -else $as_nop - ac_cv_lib_stdthreads_thrd_create=no +else case e in #( + e) ac_cv_lib_stdthreads_thrd_create=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdthreads_thrd_create" >&5 printf "%s\n" "$ac_cv_lib_stdthreads_thrd_create" >&6; } @@ -29516,10 +31367,11 @@ then : LIBSTDTHREAD='-lstdthreads -lpthread' -else $as_nop - +else case e in #( + e) LIBSTDTHREAD="$LIBPMULTITHREAD" - + ;; +esac fi fi @@ -29549,7 +31401,7 @@ printf "%s\n" "#define USE_ISOC_THREADS 1" >>confdefs.h case "$gl_use_threads" in yes | windows | win32) # The 'win32' is for backward compatibility. if { case "$host_os" in - mingw*) true;; + mingw* | windows*) true;; *) false;; esac }; then @@ -29561,6 +31413,10 @@ printf "%s\n" "#define USE_WINDOWS_THREADS 1" >>confdefs.h ;; esac fi + else + +printf "%s\n" "#define AVOID_ANY_THREADS 1" >>confdefs.h + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for multithread API to use" >&5 printf %s "checking for multithread API to use... " >&6; } @@ -29575,6 +31431,77 @@ printf "%s\n" "$gl_threads_api" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in grep ggrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in #( +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +#( +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5 @@ -29582,21 +31509,21 @@ printf %s "checking whether malloc (0) returns nonnull... " >&6; } if test ${ac_cv_func_malloc_0_nonnull+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess yes on platforms where we know the result. *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ | gnu* | *-musl* | midipix* | midnightbsd* \ - | hpux* | solaris* | cygwin* | mingw* | msys* ) + | hpux* | solaris* | cygwin* | mingw* | windows* | msys* ) ac_cv_func_malloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -29604,7 +31531,8 @@ int main (void) { void *p = malloc (0); - int result = !p; + void * volatile vp = p; + int result = !vp; free (p); return result; ; @@ -29615,14 +31543,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_malloc_0_nonnull=yes -else $as_nop - ac_cv_func_malloc_0_nonnull=no +else case e in #( + e) ac_cv_func_malloc_0_nonnull=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; } @@ -29639,191 +31570,13 @@ printf "%s\n" "#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confd + case "$host_os" in + *-musl* | midipix*) +printf "%s\n" "#define MUSL_LIBC 1" >>confdefs.h - - - - - if case "$host_os" in - mingw*) true ;; - *) test $ac_cv_func_mbsinit = yes ;; - esac \ - && test $ac_cv_func_mbrtowc = yes; then - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5 -printf %s "checking whether mbrtowc handles incomplete characters... " >&6; } -if test ${gl_cv_func_mbrtowc_incomplete_state+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - case "$host_os" in - # Guess no on AIX and OSF/1. - aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;; - esac - if test $LOCALE_JA != none; then - if test "$cross_compiling" = yes -then : - : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <locale.h> -#include <string.h> -#include <wchar.h> -int main () -{ - if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) - { - const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */ - mbstate_t state; - wchar_t wc; - - memset (&state, '\0', sizeof (mbstate_t)); - if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) - if (mbsinit (&state)) - return 2; - } - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - gl_cv_func_mbrtowc_incomplete_state=yes -else $as_nop - gl_cv_func_mbrtowc_incomplete_state=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - else - if test $LOCALE_FR_UTF8 != none; then - if test "$cross_compiling" = yes -then : - : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <locale.h> -#include <string.h> -#include <wchar.h> -int main () -{ - if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) - { - const char input[] = "B\303\274\303\237er"; /* "Büßer" */ - mbstate_t state; - wchar_t wc; - - memset (&state, '\0', sizeof (mbstate_t)); - if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) - if (mbsinit (&state)) - return 2; - } - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - gl_cv_func_mbrtowc_incomplete_state=yes -else $as_nop - gl_cv_func_mbrtowc_incomplete_state=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - fi - fi - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_incomplete_state" >&6; } - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5 -printf %s "checking whether mbrtowc works as well as mbtowc... " >&6; } -if test ${gl_cv_func_mbrtowc_sanitycheck+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - case "$host_os" in - # Guess no on Solaris 8. - solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;; - esac - if test $LOCALE_ZH_CN != none; then - if test "$cross_compiling" = yes -then : - : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <locale.h> -#include <stdlib.h> -#include <string.h> -#include <wchar.h> -int main () -{ - /* This fails on Solaris 8: - mbrtowc returns 2, and sets wc to 0x00F0. - mbtowc returns 4 (correct) and sets wc to 0x5EDC. */ - if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) - { - char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */ - mbstate_t state; - wchar_t wc; - - memset (&state, '\0', sizeof (mbstate_t)); - if (mbrtowc (&wc, input + 3, 6, &state) != 4 - && mbtowc (&wc, input + 3, 6) == 4) - return 2; - } - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - gl_cv_func_mbrtowc_sanitycheck=yes -else $as_nop - gl_cv_func_mbrtowc_sanitycheck=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - fi - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_sanitycheck" >&6; } - - REPLACE_MBSTATE_T=0 - case "$gl_cv_func_mbrtowc_incomplete_state" in - *yes) ;; - *) REPLACE_MBSTATE_T=1 ;; - esac - case "$gl_cv_func_mbrtowc_sanitycheck" in - *yes) ;; - *) REPLACE_MBSTATE_T=1 ;; - esac - else - REPLACE_MBSTATE_T=1 - fi + ;; + esac @@ -29835,8 +31588,9 @@ printf "%s\n" "$gl_cv_func_mbrtowc_sanitycheck" >&6; } if test "x$ac_cv_func_mmap" = xyes then : gl_have_mmap=yes -else $as_nop - gl_have_mmap=no +else case e in #( + e) gl_have_mmap=no ;; +esac fi @@ -29855,7 +31609,7 @@ printf %s "checking for MAP_ANONYMOUS... " >&6; } _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cannot identify this map" >/dev/null 2>&1 + $EGREP_TRADITIONAL "I cannot identify this map" >/dev/null 2>&1 then : gl_have_mmap_anonymous=yes fi @@ -29872,7 +31626,7 @@ rm -rf conftest* _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cannot identify this map" >/dev/null 2>&1 + $EGREP_TRADITIONAL "I cannot identify this map" >/dev/null 2>&1 then : printf "%s\n" "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h @@ -29923,6 +31677,7 @@ printf "%s\n" "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h REPLACE_MEMCHR=0; REPLACE_MEMMEM=0; REPLACE_MEMPCPY=0; + REPLACE_MEMSET_EXPLICIT=0; REPLACE_STPCPY=0; REPLACE_STPNCPY=0; REPLACE_STRCHRNUL=0; @@ -29937,6 +31692,7 @@ printf "%s\n" "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h REPLACE_STRERROR_R=0; REPLACE_STRERRORNAME_NP=0; REPLACE_STRSIGNAL=0; + REPLACE_STRVERSCMP=0; UNDEFINE_STRTOK_R=0; @@ -29960,20 +31716,20 @@ printf %s "checking whether memchr works... " >&6; } if test ${gl_cv_func_memchr_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on Android. - linux*-android*) gl_cv_func_memchr_works="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_memchr_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_memchr_works="$gl_cross_guess_normal" ;; + # Guess no on Android. + linux*-android*) gl_cv_func_memchr_works="guessing no" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_memchr_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_memchr_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> @@ -30044,14 +31800,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_memchr_works=yes -else $as_nop - gl_cv_func_memchr_works=no +else case e in #( + e) gl_cv_func_memchr_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memchr_works" >&5 printf "%s\n" "$gl_cv_func_memchr_works" >&6; } @@ -30242,8 +32001,9 @@ ac_fn_check_decl "$LINENO" "memrchr" "ac_cv_have_decl_memrchr" "$ac_includes_def if test "x$ac_cv_have_decl_memrchr" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_MEMRCHR $ac_have_decl" >>confdefs.h @@ -30256,8 +32016,8 @@ printf %s "checking whether <limits.h> defines MIN and MAX... " >&6; } if test ${gl_cv_minmax_in_limits_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <limits.h> int x = MIN (42, 17); @@ -30272,10 +32032,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_minmax_in_limits_h=yes -else $as_nop - gl_cv_minmax_in_limits_h=no +else case e in #( + e) gl_cv_minmax_in_limits_h=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5 printf "%s\n" "$gl_cv_minmax_in_limits_h" >&6; } @@ -30295,8 +32057,8 @@ printf %s "checking whether <sys/param.h> defines MIN and MAX... " >&6; } if test ${gl_cv_minmax_in_sys_param_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/param.h> int x = MIN (42, 17); @@ -30311,10 +32073,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_minmax_in_sys_param_h=yes -else $as_nop - gl_cv_minmax_in_sys_param_h=no +else case e in #( + e) gl_cv_minmax_in_sys_param_h=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5 printf "%s\n" "$gl_cv_minmax_in_sys_param_h" >&6; } @@ -30336,19 +32100,18 @@ printf "%s\n" "#define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h HAVE_TIMESPEC_GET=1; HAVE_TIMESPEC_GETRES=1; HAVE_TIMEZONE_T=0; - REPLACE_CTIME=GNULIB_PORTCHECK; - REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; - REPLACE_MKTIME=GNULIB_PORTCHECK; - REPLACE_NANOSLEEP=GNULIB_PORTCHECK; - REPLACE_STRFTIME=GNULIB_PORTCHECK; - REPLACE_TIME=0; - REPLACE_TIMEGM=GNULIB_PORTCHECK; - REPLACE_TIMESPEC_GET=GNULIB_PORTCHECK; - REPLACE_TZSET=GNULIB_PORTCHECK; - - : ${GNULIB_GETTIMEOFDAY=0}; - REPLACE_GMTIME=0; + REPLACE_CTIME=0; + REPLACE_GMTIME=0; REPLACE_LOCALTIME=0; + REPLACE_LOCALTIME_R=0; + REPLACE_MKTIME=0; + REPLACE_NANOSLEEP=0; + REPLACE_STRFTIME=0; + REPLACE_TIME=0; + REPLACE_TIMEGM=0; + REPLACE_TIMESPEC_GET=0; + REPLACE_TIMESPEC_GETRES=0; + REPLACE_TZSET=0; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether time_t is signed" >&5 @@ -30356,8 +32119,8 @@ printf %s "checking whether time_t is signed... " >&6; } if test ${gl_cv_time_t_is_signed+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <time.h> char time_t_signed[(time_t) -1 < 0 ? 1 : -1]; @@ -30372,10 +32135,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_time_t_is_signed=yes -else $as_nop - gl_cv_time_t_is_signed=no +else case e in #( + e) gl_cv_time_t_is_signed=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_t_is_signed" >&5 printf "%s\n" "$gl_cv_time_t_is_signed" >&6; } @@ -30389,8 +32154,9 @@ ac_fn_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default if test "x$ac_cv_have_decl_alarm" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_ALARM $ac_have_decl" >>confdefs.h @@ -30405,8 +32171,8 @@ printf %s "checking for working mktime... " >&6; } if test ${gl_cv_func_working_mktime+y} then : printf %s "(cached) " >&6 -else $as_nop - if test $APPLE_UNIVERSAL_BUILD = 1; then +else case e in #( + e) if test $APPLE_UNIVERSAL_BUILD = 1; then # A universal build on Apple Mac OS X platforms. # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. # But we need a configuration result that is valid in both modes. @@ -30415,13 +32181,13 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_working_mktime="guessing no" ;; - *) gl_cv_func_working_mktime="$gl_cross_guess_normal" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_working_mktime="guessing no" ;; + *) gl_cv_func_working_mktime="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Test program from Paul Eggert and Tony Leneis. */ #include <limits.h> @@ -30650,15 +32416,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_working_mktime=yes -else $as_nop - gl_cv_func_working_mktime=no +else case e in #( + e) gl_cv_func_working_mktime=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_mktime" >&5 printf "%s\n" "$gl_cv_func_working_mktime" >&6; } @@ -30730,8 +32499,8 @@ printf %s "checking for O_CLOEXEC... " >&6; } if test ${gl_cv_macro_O_CLOEXEC+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <fcntl.h> #ifndef O_CLOEXEC @@ -30749,10 +32518,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_macro_O_CLOEXEC=yes -else $as_nop - gl_cv_macro_O_CLOEXEC=no +else case e in #( + e) gl_cv_macro_O_CLOEXEC=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5 printf "%s\n" "$gl_cv_macro_O_CLOEXEC" >&6; } @@ -30764,8 +32535,8 @@ printf %s "checking for promoted mode_t type... " >&6; } if test ${gl_cv_promoted_mode_t+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -30780,11 +32551,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_promoted_mode_t='int' -else $as_nop - gl_cv_promoted_mode_t='mode_t' +else case e in #( + e) gl_cv_promoted_mode_t='mode_t' ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5 printf "%s\n" "$gl_cv_promoted_mode_t" >&6; } @@ -30826,15 +32599,21 @@ printf %s "checking for library containing posix_spawn... " >&6; } if test ${ac_cv_search_posix_spawn+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char posix_spawn (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char posix_spawn (void); int main (void) { @@ -30865,11 +32644,13 @@ done if test ${ac_cv_search_posix_spawn+y} then : -else $as_nop - ac_cv_search_posix_spawn=no +else case e in #( + e) ac_cv_search_posix_spawn=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_posix_spawn" >&5 printf "%s\n" "$ac_cv_search_posix_spawn" >&6; } @@ -30888,8 +32669,8 @@ printf %s "checking for posix_spawn... " >&6; } if test ${gl_cv_onwards_func_posix_spawn+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -30933,7 +32714,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_posix_spawn" >&5 printf "%s\n" "$gl_cv_onwards_func_posix_spawn" >&6; } @@ -30963,19 +32745,87 @@ printf "%s\n" "#define HAVE_POSIX_SPAWN 1" >>confdefs.h - ac_fn_check_decl "$LINENO" "posix_spawn" "ac_cv_have_decl_posix_spawn" "#include <spawn.h> " "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_posix_spawn" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_POSIX_SPAWN $ac_have_decl" >>confdefs.h if test $ac_cv_func_posix_spawn = yes; then + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for posix_spawn_file_actions_addchdir_np" >&5 +printf %s "checking for posix_spawn_file_actions_addchdir_np... " >&6; } +if test ${gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "posix_spawn_file_actions_addchdir_np" "ac_cv_have_decl_posix_spawn_file_actions_addchdir_np" "#include <spawn.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_posix_spawn_file_actions_addchdir_np" = xyes +then : + +fi + if test $ac_cv_have_decl_posix_spawn_file_actions_addchdir_np = yes; then + ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addchdir_np" "ac_cv_func_posix_spawn_file_actions_addchdir_np" +if test "x$ac_cv_func_posix_spawn_file_actions_addchdir_np" = xyes +then : + +fi + + if test $ac_cv_func_posix_spawn_file_actions_addchdir_np = yes; then + gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np=yes + else + gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np='future OS version' + fi + else + gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addchdir_np" "ac_cv_func_posix_spawn_file_actions_addchdir_np" +if test "x$ac_cv_func_posix_spawn_file_actions_addchdir_np" = xyes +then : + +fi + + gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np=$ac_cv_func_posix_spawn_file_actions_addchdir_np + ;; + + esac + + exec 6>&9 9>&- + + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np" >&5 +printf "%s\n" "$gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np" >&6; } + + case "$gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np" in + future*) ac_cv_func_posix_spawn_file_actions_addchdir_np=no ;; + *) ac_cv_func_posix_spawn_file_actions_addchdir_np=$gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np ;; + esac + if test $ac_cv_func_posix_spawn_file_actions_addchdir_np = yes; then + +printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP 1" >>confdefs.h + + fi + + if test $ac_cv_func_posix_spawn_file_actions_addchdir_np = no; then REPLACE_POSIX_SPAWN=1 fi @@ -30989,8 +32839,8 @@ printf %s "checking whether posix_spawn works... " >&6; } if test ${gl_cv_func_posix_spawn_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test $cross_compiling = no; then +else case e in #( + e) if test $cross_compiling = no; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31139,20 +32989,21 @@ then : else gl_cv_func_posix_spawn_works=no fi -else $as_nop - gl_cv_func_posix_spawn_works=no +else case e in #( + e) gl_cv_func_posix_spawn_works=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test $gl_cv_func_posix_spawn_works = yes; then if test "$cross_compiling" = yes then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Test whether posix_spawn_file_actions_addopen supports filename arguments @@ -31313,11 +33164,13 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : -else $as_nop - gl_cv_func_posix_spawn_works=no +else case e in #( + e) gl_cv_func_posix_spawn_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi @@ -31327,7 +33180,8 @@ fi *) gl_cv_func_posix_spawn_works="guessing yes";; esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_works" >&5 printf "%s\n" "$gl_cv_func_posix_spawn_works" >&6; } @@ -31345,8 +33199,8 @@ printf %s "checking whether posix_spawn rejects scripts without shebang... " >&6 if test ${gl_cv_func_posix_spawn_secure_exec+y} then : printf %s "(cached) " >&6 -else $as_nop - echo ':' > conftest.scr +else case e in #( + e) echo ':' > conftest.scr chmod a+x conftest.scr if test "$cross_compiling" = yes then : @@ -31359,8 +33213,8 @@ then : gl_cv_func_posix_spawn_secure_exec="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <errno.h> @@ -31396,15 +33250,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_posix_spawn_secure_exec=yes -else $as_nop - gl_cv_func_posix_spawn_secure_exec=no +else case e in #( + e) gl_cv_func_posix_spawn_secure_exec=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f conftest.scr - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_secure_exec" >&5 printf "%s\n" "$gl_cv_func_posix_spawn_secure_exec" >&6; } @@ -31413,8 +33270,8 @@ printf %s "checking whether posix_spawnp rejects scripts without shebang... " >& if test ${gl_cv_func_posix_spawnp_secure_exec+y} then : printf %s "(cached) " >&6 -else $as_nop - echo ':' > conftest.scr +else case e in #( + e) echo ':' > conftest.scr chmod a+x conftest.scr if test "$cross_compiling" = yes then : @@ -31432,8 +33289,8 @@ then : gl_cv_func_posix_spawnp_secure_exec="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <errno.h> @@ -31469,15 +33326,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_posix_spawnp_secure_exec=yes -else $as_nop - gl_cv_func_posix_spawnp_secure_exec=no +else case e in #( + e) gl_cv_func_posix_spawnp_secure_exec=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f conftest.scr - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawnp_secure_exec" >&5 printf "%s\n" "$gl_cv_func_posix_spawnp_secure_exec" >&6; } @@ -31497,8 +33357,8 @@ printf %s "checking whether posix_spawnattr_setschedpolicy is supported... " >&6 if test ${gl_cv_func_spawnattr_setschedpolicy+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <spawn.h> @@ -31508,15 +33368,17 @@ else $as_nop _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "POSIX scheduling supported" >/dev/null 2>&1 + $EGREP_TRADITIONAL "POSIX scheduling supported" >/dev/null 2>&1 then : gl_cv_func_spawnattr_setschedpolicy=yes -else $as_nop - gl_cv_func_spawnattr_setschedpolicy=no +else case e in #( + e) gl_cv_func_spawnattr_setschedpolicy=no ;; +esac fi rm -rf conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_spawnattr_setschedpolicy" >&5 printf "%s\n" "$gl_cv_func_spawnattr_setschedpolicy" >&6; } @@ -31525,8 +33387,8 @@ printf %s "checking whether posix_spawnattr_setschedparam is supported... " >&6; if test ${gl_cv_func_spawnattr_setschedparam+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <spawn.h> @@ -31536,15 +33398,17 @@ else $as_nop _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "POSIX scheduling supported" >/dev/null 2>&1 + $EGREP_TRADITIONAL "POSIX scheduling supported" >/dev/null 2>&1 then : gl_cv_func_spawnattr_setschedparam=yes -else $as_nop - gl_cv_func_spawnattr_setschedparam=no +else case e in #( + e) gl_cv_func_spawnattr_setschedparam=no ;; +esac fi rm -rf conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_spawnattr_setschedparam" >&5 printf "%s\n" "$gl_cv_func_spawnattr_setschedparam" >&6; } @@ -31669,8 +33533,8 @@ printf %s "checking whether <sys/select.h> is self-contained... " >&6; } if test ${gl_cv_header_sys_select_h_selfcontained+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/select.h> @@ -31685,8 +33549,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_sys_select_h_selfcontained=yes -else $as_nop - gl_cv_header_sys_select_h_selfcontained=no +else case e in #( + e) gl_cv_header_sys_select_h_selfcontained=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test $gl_cv_header_sys_select_h_selfcontained = yes; then @@ -31736,8 +33601,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : -else $as_nop - gl_cv_header_sys_select_h_selfcontained=no +else case e in #( + e) gl_cv_header_sys_select_h_selfcontained=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -31745,7 +33611,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_select_h_selfcontained" >&5 printf "%s\n" "$gl_cv_header_sys_select_h_selfcontained" >&6; } @@ -31766,8 +33633,8 @@ printf %s "checking absolute name of <sys/select.h>... " >&6; } if test ${gl_cv_next_sys_select_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_sys_select_h = yes; then @@ -31783,7 +33650,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -31809,7 +33676,8 @@ _ACEOF gl_cv_next_sys_select_h='<'sys/select.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_select_h" >&5 printf "%s\n" "$gl_cv_next_sys_select_h" >&6; } @@ -31923,8 +33791,9 @@ then : printf "%s\n" "#define HAVE_SIGSET_T 1" >>confdefs.h gl_cv_type_sigset_t=yes -else $as_nop - gl_cv_type_sigset_t=no +else case e in #( + e) gl_cv_type_sigset_t=no ;; +esac fi if test $gl_cv_type_sigset_t != yes; then @@ -31938,8 +33807,8 @@ printf %s "checking for SIGPIPE... " >&6; } if test ${gl_cv_header_signal_h_SIGPIPE+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31950,15 +33819,17 @@ booboo _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "booboo" >/dev/null 2>&1 + $EGREP_TRADITIONAL "booboo" >/dev/null 2>&1 then : gl_cv_header_signal_h_SIGPIPE=no -else $as_nop - gl_cv_header_signal_h_SIGPIPE=yes +else case e in #( + e) gl_cv_header_signal_h_SIGPIPE=yes ;; +esac fi rm -rf conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5 printf "%s\n" "$gl_cv_header_signal_h_SIGPIPE" >&6; } @@ -32010,8 +33881,8 @@ printf %s "checking absolute name of <sched.h>... " >&6; } if test ${gl_cv_next_sched_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32024,7 +33895,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -32047,7 +33918,8 @@ _ACEOF gl_header=$gl_cv_absolute_sched_h gl_cv_next_sched_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sched_h" >&5 printf "%s\n" "$gl_cv_next_sched_h" >&6; } @@ -32084,8 +33956,9 @@ printf "%s\n" "$gl_cv_next_sched_h" >&6; } if test "x$ac_cv_type_struct_sched_param" = xyes then : HAVE_STRUCT_SCHED_PARAM=1 -else $as_nop - HAVE_STRUCT_SCHED_PARAM=0 +else case e in #( + e) HAVE_STRUCT_SCHED_PARAM=0 ;; +esac fi else @@ -32166,9 +34039,9 @@ printf %s "checking for WSAStartup... " >&6; } if test ${gl_cv_func_wsastartup+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_LIBS="$LIBS" +else case e in #( + e) + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -32193,13 +34066,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_wsastartup=yes -else $as_nop - gl_cv_func_wsastartup=no +else case e in #( + e) gl_cv_func_wsastartup=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gl_save_LIBS" - + LIBS="$gl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wsastartup" >&5 printf "%s\n" "$gl_cv_func_wsastartup" >&6; } @@ -32215,8 +34090,8 @@ printf %s "checking for library containing setsockopt... " >&6; } if test ${gl_cv_lib_socket+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) gl_cv_lib_socket= cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -32236,9 +34111,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : -else $as_nop - gl_save_LIBS="$LIBS" - LIBS="$gl_save_LIBS -lsocket" +else case e in #( + e) gl_saved_LIBS="$LIBS" + LIBS="$gl_saved_LIBS -lsocket" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ extern @@ -32261,7 +34136,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$gl_cv_lib_socket"; then - LIBS="$gl_save_LIBS -lnetwork" + LIBS="$gl_saved_LIBS -lnetwork" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ extern @@ -32284,7 +34159,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$gl_cv_lib_socket"; then - LIBS="$gl_save_LIBS -lnet" + LIBS="$gl_saved_LIBS -lnet" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ extern @@ -32308,15 +34183,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi fi - LIBS="$gl_save_LIBS" - + LIBS="$gl_saved_LIBS" + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$gl_cv_lib_socket"; then gl_cv_lib_socket="none needed" fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_lib_socket" >&5 printf "%s\n" "$gl_cv_lib_socket" >&6; } @@ -32355,8 +34232,8 @@ printf %s "checking absolute name of <signal.h>... " >&6; } if test ${gl_cv_next_signal_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32369,7 +34246,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -32392,7 +34269,8 @@ _ACEOF gl_header=$gl_cv_absolute_signal_h gl_cv_next_signal_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5 printf "%s\n" "$gl_cv_next_signal_h" >&6; } @@ -32421,8 +34299,9 @@ printf "%s\n" "$gl_cv_next_signal_h" >&6; } if test "x$ac_cv_type_volatile_sig_atomic_t" = xyes then : -else $as_nop - HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0 +else case e in #( + e) HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0 ;; +esac fi @@ -32438,8 +34317,9 @@ fi if test "x$ac_cv_type_sighandler_t" = xyes then : -else $as_nop - HAVE_SIGHANDLER_T=0 +else case e in #( + e) HAVE_SIGHANDLER_T=0 ;; +esac fi @@ -32449,6 +34329,83 @@ fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in #( +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +#( +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + EGREP_TRADITIONAL=$EGREP + ac_cv_path_EGREP_TRADITIONAL=$EGREP + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -32459,7 +34416,7 @@ MicrosoftCompiler _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "MicrosoftCompiler" >/dev/null 2>&1 + $EGREP_TRADITIONAL "MicrosoftCompiler" >/dev/null 2>&1 then : rm -f conftest* echo 'int dummy;' > conftest.c @@ -32478,10 +34435,11 @@ then : fi rm -f conftest* -else $as_nop - gl_asmext='s' +else case e in #( + e) gl_asmext='s' gl_c_asm_opt='-S' - + ;; +esac fi rm -rf conftest* @@ -32494,8 +34452,8 @@ printf %s "checking whether C symbols are prefixed with underscore at the linker if test ${gl_cv_prog_as_underscore+y} then : printf %s "(cached) " >&6 -else $as_nop - cat > conftest.c <<EOF +else case e in #( + e) cat > conftest.c <<EOF #ifdef __cplusplus extern "C" int foo (void); #endif @@ -32514,7 +34472,8 @@ EOF gl_cv_prog_as_underscore=no fi rm -f conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5 printf "%s\n" "$gl_cv_prog_as_underscore" >&6; } @@ -32541,8 +34500,8 @@ printf %s "checking whether snprintf returns a byte count as in C99... " >&6; } if test ${gl_cv_func_snprintf_retval_c99+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in @@ -32576,7 +34535,8 @@ then : # Guess yes on Android. linux*-android*) gl_cv_func_snprintf_retval_c99="guessing yes";; # Guess yes on MSVC, no on mingw. - mingw*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + windows*-msvc*) gl_cv_func_snprintf_retval_c99="guessing yes" ;; + mingw* | windows*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef _MSC_VER @@ -32585,11 +34545,12 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Known" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Known" >/dev/null 2>&1 then : gl_cv_func_snprintf_retval_c99="guessing yes" -else $as_nop - gl_cv_func_snprintf_retval_c99="guessing no" +else case e in #( + e) gl_cv_func_snprintf_retval_c99="guessing no" ;; +esac fi rm -rf conftest* @@ -32598,8 +34559,8 @@ rm -rf conftest* *) gl_cv_func_snprintf_retval_c99="$gl_cross_guess_normal";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -32634,14 +34595,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_snprintf_retval_c99=yes -else $as_nop - gl_cv_func_snprintf_retval_c99=no +else case e in #( + e) gl_cv_func_snprintf_retval_c99=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_retval_c99" >&5 printf "%s\n" "$gl_cv_func_snprintf_retval_c99" >&6; } @@ -32653,24 +34617,28 @@ printf %s "checking whether printf supports POSIX/XSI format strings with positi if test ${gl_cv_func_printf_positions+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*) - gl_cv_func_printf_positions="guessing no";; - beos*) gl_cv_func_printf_positions="guessing no";; - # Guess yes on Android. - linux*-android*) gl_cv_func_printf_positions="guessing yes";; - # Guess no on native Windows. - mingw* | pw*) gl_cv_func_printf_positions="guessing no";; - *) gl_cv_func_printf_positions="guessing yes";; + gl_cv_func_printf_positions="guessing no";; + beos*) + gl_cv_func_printf_positions="guessing no";; + # Guess yes on Android. + linux*-android*) + gl_cv_func_printf_positions="guessing yes";; + # Guess no on native Windows. + mingw* | windows* | pw*) + gl_cv_func_printf_positions="guessing no";; + *) + gl_cv_func_printf_positions="guessing yes";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -32688,14 +34656,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_printf_positions=yes -else $as_nop - gl_cv_func_printf_positions=no +else case e in #( + e) gl_cv_func_printf_positions=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_positions" >&5 printf "%s\n" "$gl_cv_func_printf_positions" >&6; } @@ -32704,8 +34675,9 @@ ac_fn_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_d if test "x$ac_cv_have_decl_snprintf" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_SNPRINTF $ac_have_decl" >>confdefs.h @@ -32730,8 +34702,8 @@ printf %s "checking absolute name of <spawn.h>... " >&6; } if test ${gl_cv_next_spawn_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_spawn_h = yes; then @@ -32747,7 +34719,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -32773,7 +34745,8 @@ _ACEOF gl_cv_next_spawn_h='<'spawn.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_spawn_h" >&5 printf "%s\n" "$gl_cv_next_spawn_h" >&6; } @@ -32805,8 +34778,9 @@ then : printf "%s\n" "#define HAVE_POSIX_SPAWNATTR_T 1" >>confdefs.h -else $as_nop - HAVE_POSIX_SPAWNATTR_T=0 +else case e in #( + e) HAVE_POSIX_SPAWNATTR_T=0 ;; +esac fi ac_fn_c_check_type "$LINENO" "posix_spawn_file_actions_t" "ac_cv_type_posix_spawn_file_actions_t" " @@ -32819,8 +34793,9 @@ then : printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_T 1" >>confdefs.h -else $as_nop - HAVE_POSIX_SPAWN_FILE_ACTIONS_T=0 +else case e in #( + e) HAVE_POSIX_SPAWN_FILE_ACTIONS_T=0 ;; +esac fi else @@ -32846,22 +34821,13 @@ fi - - - case "$host_os" in - *-musl* | midipix*) - -printf "%s\n" "#define MUSL_LIBC 1" >>confdefs.h - - ;; - esac - ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_fcloseall" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h @@ -32869,8 +34835,9 @@ ac_fn_check_decl "$LINENO" "getw" "ac_cv_have_decl_getw" "$ac_includes_default" if test "x$ac_cv_have_decl_getw" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GETW $ac_have_decl" >>confdefs.h @@ -32878,8 +34845,9 @@ ac_fn_check_decl "$LINENO" "putw" "ac_cv_have_decl_putw" "$ac_includes_default" if test "x$ac_cv_have_decl_putw" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_PUTW $ac_have_decl" >>confdefs.h @@ -32901,8 +34869,8 @@ printf %s "checking absolute name of <stdio.h>... " >&6; } if test ${gl_cv_next_stdio_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32915,7 +34883,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -32938,7 +34906,8 @@ _ACEOF gl_header=$gl_cv_absolute_stdio_h gl_cv_next_stdio_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5 printf "%s\n" "$gl_cv_next_stdio_h" >&6; } @@ -32963,8 +34932,8 @@ printf %s "checking which flavor of printf attribute matches inttypes macros... if test ${gl_cv_func_printf_attribute_flavor+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define __STDC_FORMAT_MACROS 1 @@ -32989,10 +34958,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_printf_attribute_flavor=system -else $as_nop - gl_cv_func_printf_attribute_flavor=gnu +else case e in #( + e) gl_cv_func_printf_attribute_flavor=gnu ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5 printf "%s\n" "$gl_cv_func_printf_attribute_flavor" >&6; } @@ -33041,8 +35012,9 @@ ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" if test "x$ac_cv_have_decl_ecvt" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_ECVT $ac_have_decl" >>confdefs.h @@ -33050,8 +35022,9 @@ ac_fn_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" if test "x$ac_cv_have_decl_fcvt" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FCVT $ac_have_decl" >>confdefs.h @@ -33059,8 +35032,9 @@ ac_fn_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" if test "x$ac_cv_have_decl_gcvt" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h @@ -33082,8 +35056,8 @@ printf %s "checking absolute name of <stdlib.h>... " >&6; } if test ${gl_cv_next_stdlib_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33096,7 +35070,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -33119,7 +35093,8 @@ _ACEOF gl_header=$gl_cv_absolute_stdlib_h gl_cv_next_stdlib_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5 printf "%s\n" "$gl_cv_next_stdlib_h" >&6; } @@ -33152,8 +35127,8 @@ printf %s "checking whether MB_CUR_MAX is correct... " >&6; } if test ${gl_cv_macro_MB_CUR_MAX_good+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in # Guess no on Solaris. solaris*) gl_cv_macro_MB_CUR_MAX_good="guessing no" ;; @@ -33164,8 +35139,8 @@ else $as_nop if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -33184,15 +35159,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_macro_MB_CUR_MAX_good=yes -else $as_nop - gl_cv_macro_MB_CUR_MAX_good=no +else case e in #( + e) gl_cv_macro_MB_CUR_MAX_good=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_MB_CUR_MAX_good" >&5 printf "%s\n" "$gl_cv_macro_MB_CUR_MAX_good" >&6; } @@ -33223,8 +35201,9 @@ ac_fn_check_decl "$LINENO" "strdup" "ac_cv_have_decl_strdup" "$ac_includes_defau if test "x$ac_cv_have_decl_strdup" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_STRDUP $ac_have_decl" >>confdefs.h @@ -33235,8 +35214,8 @@ printf %s "checking whether strerror(0) succeeds... " >&6; } if test ${gl_cv_func_strerror_0_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess yes on glibc systems. @@ -33244,13 +35223,13 @@ then : # Guess yes on musl systems. *-musl* | midipix*) gl_cv_func_strerror_0_works="guessing yes" ;; # Guess yes on native Windows. - mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; + mingw* | windows*) gl_cv_func_strerror_0_works="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> #include <errno.h> @@ -33274,14 +35253,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_strerror_0_works=yes -else $as_nop - gl_cv_func_strerror_0_works=no +else case e in #( + e) gl_cv_func_strerror_0_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5 printf "%s\n" "$gl_cv_func_strerror_0_works" >&6; } @@ -33310,8 +35292,8 @@ printf %s "checking for strerror_r... " >&6; } if test ${gl_cv_onwards_func_strerror_r+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -33355,7 +35337,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_strerror_r" >&5 printf "%s\n" "$gl_cv_onwards_func_strerror_r" >&6; } @@ -33378,8 +35361,8 @@ printf %s "checking for strerror_r with POSIX signature... " >&6; } if test ${gl_cv_func_strerror_r_posix_signature+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> int strerror_r (int, char *, size_t); @@ -33395,11 +35378,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_strerror_r_posix_signature=yes -else $as_nop - gl_cv_func_strerror_r_posix_signature=no +else case e in #( + e) gl_cv_func_strerror_r_posix_signature=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_r_posix_signature" >&5 printf "%s\n" "$gl_cv_func_strerror_r_posix_signature" >&6; } @@ -33409,8 +35394,8 @@ printf %s "checking whether strerror_r works... " >&6; } if test ${gl_cv_func_strerror_r_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in @@ -33424,8 +35409,8 @@ then : *) gl_cv_func_strerror_r_works="guessing yes";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <errno.h> #include <string.h> @@ -33464,14 +35449,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_strerror_r_works=yes -else $as_nop - gl_cv_func_strerror_r_works=no +else case e in #( + e) gl_cv_func_strerror_r_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_r_works" >&5 printf "%s\n" "$gl_cv_func_strerror_r_works" >&6; } @@ -33483,13 +35471,13 @@ printf %s "checking whether __xpg_strerror_r works... " >&6; } if test ${gl_cv_func_strerror_r_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : gl_cv_func_strerror_r_works="$gl_cross_guess_normal" -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <errno.h> #include <string.h> @@ -33523,14 +35511,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_strerror_r_works=yes -else $as_nop - gl_cv_func_strerror_r_works=no +else case e in #( + e) gl_cv_func_strerror_r_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_r_works" >&5 printf "%s\n" "$gl_cv_func_strerror_r_works" >&6; } @@ -33561,8 +35552,8 @@ printf %s "checking absolute name of <string.h>... " >&6; } if test ${gl_cv_next_string_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33575,7 +35566,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -33598,7 +35589,8 @@ _ACEOF gl_header=$gl_cv_absolute_string_h gl_cv_next_string_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5 printf "%s\n" "$gl_cv_next_string_h" >&6; } @@ -33644,8 +35636,8 @@ printf %s "checking absolute name of <strings.h>... " >&6; } if test ${gl_cv_next_strings_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_strings_h = yes; then @@ -33661,7 +35653,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -33687,7 +35679,8 @@ _ACEOF gl_cv_next_strings_h='<'strings.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_strings_h" >&5 printf "%s\n" "$gl_cv_next_strings_h" >&6; } @@ -33727,8 +35720,9 @@ ac_fn_check_decl "$LINENO" "strndup" "ac_cv_have_decl_strndup" "$ac_includes_def if test "x$ac_cv_have_decl_strndup" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_STRNDUP $ac_have_decl" >>confdefs.h @@ -33737,8 +35731,9 @@ ac_fn_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_def if test "x$ac_cv_have_decl_strnlen" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_STRNLEN $ac_have_decl" >>confdefs.h @@ -33758,8 +35753,9 @@ ac_fn_check_decl "$LINENO" "strtok_r" "ac_cv_have_decl_strtok_r" "$ac_includes_d if test "x$ac_cv_have_decl_strtok_r" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_STRTOK_R $ac_have_decl" >>confdefs.h @@ -33784,8 +35780,8 @@ printf %s "checking absolute name of <sys/file.h>... " >&6; } if test ${gl_cv_next_sys_file_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_sys_file_h = yes; then @@ -33801,7 +35797,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -33827,7 +35823,8 @@ _ACEOF gl_cv_next_sys_file_h='<'sys/file.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_file_h" >&5 printf "%s\n" "$gl_cv_next_sys_file_h" >&6; } @@ -33870,8 +35867,8 @@ printf %s "checking whether <sys/ioctl.h> declares ioctl... " >&6; } if test ${gl_cv_decl_ioctl_in_sys_ioctl_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/ioctl.h> int @@ -33885,11 +35882,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_decl_ioctl_in_sys_ioctl_h=yes -else $as_nop - gl_cv_decl_ioctl_in_sys_ioctl_h=no +else case e in #( + e) gl_cv_decl_ioctl_in_sys_ioctl_h=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_ioctl_in_sys_ioctl_h" >&5 printf "%s\n" "$gl_cv_decl_ioctl_in_sys_ioctl_h" >&6; } @@ -33914,8 +35913,8 @@ printf %s "checking absolute name of <sys/ioctl.h>... " >&6; } if test ${gl_cv_next_sys_ioctl_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_sys_ioctl_h = yes; then @@ -33931,7 +35930,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -33957,7 +35956,8 @@ _ACEOF gl_cv_next_sys_ioctl_h='<'sys/ioctl.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_ioctl_h" >&5 printf "%s\n" "$gl_cv_next_sys_ioctl_h" >&6; } @@ -34001,8 +36001,8 @@ printf %s "checking absolute name of <sys/random.h>... " >&6; } if test ${gl_cv_next_sys_random_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_sys_random_h = yes; then @@ -34018,7 +36018,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -34044,7 +36044,8 @@ _ACEOF gl_cv_next_sys_random_h='<'sys/random.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_random_h" >&5 printf "%s\n" "$gl_cv_next_sys_random_h" >&6; } @@ -34103,8 +36104,8 @@ printf %s "checking absolute name of <sys/uio.h>... " >&6; } if test ${gl_cv_next_sys_uio_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_sys_uio_h = yes; then @@ -34120,7 +36121,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -34146,7 +36147,8 @@ _ACEOF gl_cv_next_sys_uio_h='<'sys/uio.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_uio_h" >&5 printf "%s\n" "$gl_cv_next_sys_uio_h" >&6; } @@ -34197,8 +36199,8 @@ printf %s "checking absolute name of <sys/wait.h>... " >&6; } if test ${gl_cv_next_sys_wait_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_sys_wait_h = yes; then @@ -34214,7 +36216,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -34240,7 +36242,8 @@ _ACEOF gl_cv_next_sys_wait_h='<'sys/wait.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_wait_h" >&5 printf "%s\n" "$gl_cv_next_sys_wait_h" >&6; } @@ -34279,8 +36282,8 @@ printf %s "checking for struct timespec in <time.h>... " >&6; } if test ${gl_cv_sys_struct_timespec_in_time_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <time.h> @@ -34295,10 +36298,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_sys_struct_timespec_in_time_h=yes -else $as_nop - gl_cv_sys_struct_timespec_in_time_h=no +else case e in #( + e) gl_cv_sys_struct_timespec_in_time_h=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5 printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; } @@ -34315,8 +36320,8 @@ printf %s "checking for struct timespec in <sys/time.h>... " >&6; } if test ${gl_cv_sys_struct_timespec_in_sys_time_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/time.h> @@ -34331,10 +36336,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_sys_struct_timespec_in_sys_time_h=yes -else $as_nop - gl_cv_sys_struct_timespec_in_sys_time_h=no +else case e in #( + e) gl_cv_sys_struct_timespec_in_sys_time_h=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5 printf "%s\n" "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; } @@ -34346,8 +36353,8 @@ printf %s "checking for struct timespec in <pthread.h>... " >&6; } if test ${gl_cv_sys_struct_timespec_in_pthread_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> @@ -34362,10 +36369,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_sys_struct_timespec_in_pthread_h=yes -else $as_nop - gl_cv_sys_struct_timespec_in_pthread_h=no +else case e in #( + e) gl_cv_sys_struct_timespec_in_pthread_h=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5 printf "%s\n" "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; } @@ -34377,8 +36386,8 @@ printf %s "checking for struct timespec in <unistd.h>... " >&6; } if test ${gl_cv_sys_struct_timespec_in_unistd_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> @@ -34393,10 +36402,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_sys_struct_timespec_in_unistd_h=yes -else $as_nop - gl_cv_sys_struct_timespec_in_unistd_h=no +else case e in #( + e) gl_cv_sys_struct_timespec_in_unistd_h=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5 printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; } @@ -34430,8 +36441,8 @@ printf %s "checking absolute name of <time.h>... " >&6; } if test ${gl_cv_next_time_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -34444,7 +36455,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -34467,7 +36478,8 @@ _ACEOF gl_header=$gl_cv_absolute_time_h gl_cv_next_time_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5 printf "%s\n" "$gl_cv_next_time_h" >&6; } @@ -34499,8 +36511,8 @@ printf %s "checking for TIME_UTC in <time.h>... " >&6; } if test ${gl_cv_time_h_has_TIME_UTC+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <time.h> @@ -34515,10 +36527,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_time_h_has_TIME_UTC=yes -else $as_nop - gl_cv_time_h_has_TIME_UTC=no +else case e in #( + e) gl_cv_time_h_has_TIME_UTC=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5 printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; } @@ -34567,8 +36581,9 @@ if test "x$ac_cv_header_unistring_woe32dll_h" = xyes then : printf "%s\n" "#define HAVE_UNISTRING_WOE32DLL_H 1" >>confdefs.h HAVE_UNISTRING_WOE32DLL_H=1 -else $as_nop - HAVE_UNISTRING_WOE32DLL_H=0 +else case e in #( + e) HAVE_UNISTRING_WOE32DLL_H=0 ;; +esac fi done @@ -34872,6 +36887,14 @@ done + GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE' + + + + GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE' + + + GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE' @@ -34988,6 +37011,10 @@ done + GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE' + + + GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE' @@ -35040,6 +37067,10 @@ done + GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE' + + + GL_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE' @@ -35151,8 +37182,9 @@ ac_fn_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_def if test "x$ac_cv_have_decl_execvpe" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h @@ -35176,8 +37208,8 @@ printf %s "checking absolute name of <unistd.h>... " >&6; } if test ${gl_cv_next_unistd_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_unistd_h = yes; then @@ -35193,7 +37225,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -35219,7 +37251,8 @@ _ACEOF gl_cv_next_unistd_h='<'unistd.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5 printf "%s\n" "$gl_cv_next_unistd_h" >&6; } @@ -35264,8 +37297,9 @@ ac_fn_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocke if test "x$ac_cv_have_decl_clearerr_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl" >>confdefs.h @@ -35273,8 +37307,9 @@ ac_fn_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_ if test "x$ac_cv_have_decl_feof_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl" >>confdefs.h @@ -35282,8 +37317,9 @@ ac_fn_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" " if test "x$ac_cv_have_decl_ferror_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl" >>confdefs.h @@ -35291,8 +37327,9 @@ ac_fn_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$a if test "x$ac_cv_have_decl_fgets_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl" >>confdefs.h @@ -35300,8 +37337,9 @@ ac_fn_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$a if test "x$ac_cv_have_decl_fputc_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl" >>confdefs.h @@ -35309,8 +37347,9 @@ ac_fn_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$a if test "x$ac_cv_have_decl_fread_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl" >>confdefs.h @@ -35318,8 +37357,9 @@ ac_fn_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" " if test "x$ac_cv_have_decl_fwrite_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl" >>confdefs.h @@ -35327,8 +37367,9 @@ ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_ if test "x$ac_cv_have_decl_getc_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h @@ -35336,8 +37377,9 @@ ac_fn_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" if test "x$ac_cv_have_decl_getchar_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl" >>confdefs.h @@ -35345,8 +37387,9 @@ ac_fn_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" if test "x$ac_cv_have_decl_putchar_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h @@ -35387,8 +37430,8 @@ printf %s "checking absolute name of <utime.h>... " >&6; } if test ${gl_cv_next_utime_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_utime_h = yes; then @@ -35404,7 +37447,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -35430,7 +37473,8 @@ _ACEOF gl_cv_next_utime_h='<'utime.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_utime_h" >&5 printf "%s\n" "$gl_cv_next_utime_h" >&6; } @@ -35467,19 +37511,19 @@ printf %s "checking whether the utimes function works... " >&6; } if test ${gl_cv_func_working_utimes+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on musl systems. - *-musl*) gl_cv_func_working_utimes="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_working_utimes="guessing no" ;; - *) gl_cv_func_working_utimes="$gl_cross_guess_normal" ;; + # Guess yes on musl systems. + *-musl*) gl_cv_func_working_utimes="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_working_utimes="guessing no" ;; + *) gl_cv_func_working_utimes="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -35606,14 +37650,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_working_utimes=yes -else $as_nop - gl_cv_func_working_utimes=no +else case e in #( + e) gl_cv_func_working_utimes=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_utimes" >&5 printf "%s\n" "$gl_cv_func_working_utimes" >&6; } @@ -35633,8 +37680,8 @@ printf %s "checking for inttypes.h... " >&6; } if test ${gl_cv_header_inttypes_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -35651,10 +37698,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_inttypes_h=yes -else $as_nop - gl_cv_header_inttypes_h=no +else case e in #( + e) gl_cv_header_inttypes_h=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_inttypes_h" >&5 printf "%s\n" "$gl_cv_header_inttypes_h" >&6; } @@ -35670,8 +37719,8 @@ printf %s "checking for stdint.h... " >&6; } if test ${gl_cv_header_stdint_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <stdint.h> @@ -35686,10 +37735,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_stdint_h=yes -else $as_nop - gl_cv_header_stdint_h=no +else case e in #( + e) gl_cv_header_stdint_h=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_h" >&5 printf "%s\n" "$gl_cv_header_stdint_h" >&6; } @@ -35707,8 +37758,8 @@ printf %s "checking for intmax_t... " >&6; } if test ${gt_cv_c_intmax_t+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stddef.h> @@ -35731,10 +37782,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gt_cv_c_intmax_t=yes -else $as_nop - gt_cv_c_intmax_t=no +else case e in #( + e) gt_cv_c_intmax_t=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_intmax_t" >&5 printf "%s\n" "$gt_cv_c_intmax_t" >&6; } @@ -35756,8 +37809,8 @@ printf %s "checking whether snprintf truncates the result as in C99... " >&6; } if test ${gl_cv_func_snprintf_truncation_c99+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : @@ -35801,13 +37854,13 @@ then : # Guess yes on Android. linux*-android*) gl_cv_func_snprintf_truncation_c99="guessing yes";; # Guess no on native Windows. - mingw*) gl_cv_func_snprintf_truncation_c99="guessing no";; + mingw* | windows*) gl_cv_func_snprintf_truncation_c99="guessing no";; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_snprintf_truncation_c99="$gl_cross_guess_normal";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -35839,14 +37892,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_snprintf_truncation_c99=yes -else $as_nop - gl_cv_func_snprintf_truncation_c99=no +else case e in #( + e) gl_cv_func_snprintf_truncation_c99=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_truncation_c99" >&5 printf "%s\n" "$gl_cv_func_snprintf_truncation_c99" >&6; } @@ -35857,8 +37913,8 @@ printf %s "checking where to find the exponent in a 'double'... " >&6; } if test ${gl_cv_cc_double_expbit0+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : @@ -35871,17 +37927,17 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "mixed_endianness" >/dev/null 2>&1 + $EGREP_TRADITIONAL "mixed_endianness" >/dev/null 2>&1 then : gl_cv_cc_double_expbit0="unknown" -else $as_nop - +else case e in #( + e) : if test ${ac_cv_c_bigendian+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_c_bigendian=unknown +else case e in #( + e) ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -35927,8 +37983,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext int main (void) { -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \\ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \\ && LITTLE_ENDIAN) bogus endian macros #endif @@ -35959,8 +38015,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_c_bigendian=yes -else $as_nop - ac_cv_c_bigendian=no +else case e in #( + e) ac_cv_c_bigendian=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -36004,8 +38061,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_c_bigendian=yes -else $as_nop - ac_cv_c_bigendian=no +else case e in #( + e) ac_cv_c_bigendian=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -36032,22 +38090,23 @@ unsigned short int ascii_mm[] = int use_ebcdic (int i) { return ebcdic_mm[i] + ebcdic_ii[i]; } - extern int foo; - -int -main (void) -{ -return use_ascii (foo) == use_ebcdic (foo); - ; - return 0; -} + int + main (int argc, char **argv) + { + /* Intimidate the compiler so that it does not + optimize the arrays away. */ + char *p = argv[0]; + ascii_mm[1] = *p++; ebcdic_mm[1] = *p++; + ascii_ii[1] = *p++; ebcdic_ii[1] = *p++; + return use_ascii (argc) == use_ebcdic (*p); + } _ACEOF -if ac_fn_c_try_compile "$LINENO" +if ac_fn_c_try_link "$LINENO" then : - if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + if grep BIGenDianSyS conftest$ac_exeext >/dev/null; then ac_cv_c_bigendian=yes fi - if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if grep LiTTleEnDian conftest$ac_exeext >/dev/null ; then if test "$ac_cv_c_bigendian" = unknown; then ac_cv_c_bigendian=no else @@ -36056,9 +38115,10 @@ then : fi fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -36081,14 +38141,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_c_bigendian=no -else $as_nop - ac_cv_c_bigendian=yes +else case e in #( + e) ac_cv_c_bigendian=yes ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - fi + fi ;; +esac fi : case $ac_cv_c_bigendian in #( @@ -36105,13 +38168,14 @@ printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h gl_cv_cc_double_expbit0="unknown" ;; esac - + ;; +esac fi rm -rf conftest* -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <float.h> @@ -36181,15 +38245,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_cc_double_expbit0=`cat conftest.out` -else $as_nop - gl_cv_cc_double_expbit0="unknown" +else case e in #( + e) gl_cv_cc_double_expbit0="unknown" ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f conftest.out - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_double_expbit0" >&5 printf "%s\n" "$gl_cv_cc_double_expbit0" >&6; } @@ -36244,8 +38311,9 @@ fi if test "x$ac_cv_have_decl__snprintf" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL__SNPRINTF $ac_have_decl" >>confdefs.h @@ -36271,8 +38339,9 @@ ac_fn_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes if test "x$ac_cv_have_decl_vsnprintf" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_VSNPRINTF $ac_have_decl" >>confdefs.h @@ -36296,8 +38365,8 @@ printf %s "checking absolute name of <wchar.h>... " >&6; } if test ${gl_cv_next_wchar_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_wchar_h = yes; then @@ -36313,7 +38382,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -36339,7 +38408,8 @@ _ACEOF gl_cv_next_wchar_h='<'wchar.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5 printf "%s\n" "$gl_cv_next_wchar_h" >&6; } @@ -36390,8 +38460,9 @@ printf "%s\n" "$gl_cv_next_wchar_h" >&6; } if test "x$ac_cv_have_decl_wcsdup" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h @@ -36408,8 +38479,8 @@ printf %s "checking for C compiler option to allow warnings... " >&6; } if test ${gl_cv_cc_wallow+y} then : printf %s "(cached) " >&6 -else $as_nop - rm -f conftest* +else case e in #( + e) rm -f conftest* echo 'int dummy;' > conftest.c { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 @@ -36429,7 +38500,8 @@ else $as_nop gl_cv_cc_wallow=none fi rm -f conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_wallow" >&5 printf "%s\n" "$gl_cv_cc_wallow" >&6; } @@ -36443,7 +38515,7 @@ printf "%s\n" "$gl_cv_cc_wallow" >&6; } GL_CFLAG_GNULIB_WARNINGS='' if test -n "$GL_CFLAG_ALLOW_WARNINGS"; then - cat > conftest.c <<\EOF + cat > conftest.c <<\EOF #if __GNUC__ >= 3 || (__clang_major__ + (__clang_minor__ >= 9) > 3) -Wno-cast-qual -Wno-conversion @@ -36462,6 +38534,9 @@ printf "%s\n" "$gl_cv_cc_wallow" >&6; } #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) -Wno-pedantic #endif + #if 3 < __clang_major__ + (9 <= __clang_minor__) + -Wno-tautological-constant-out-of-range-compare + #endif #if __GNUC__ + (__GNUC_MINOR__ >= 3) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) -Wno-sign-conversion -Wno-type-limits @@ -36551,7 +38626,84 @@ printf "%s\n" "#define GNULIB_TEST_ACCEPT 1" >>confdefs.h case "$host_os" in - mingw*) REPLACE_ACCESS=1 ;; + mingw* | windows*) + REPLACE_ACCESS=1 + ;; + *) + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether access honors trailing slash" >&5 +printf %s "checking whether access honors trailing slash... " >&6; } +if test ${gl_cv_func_access_slash_works+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) # Assume that if we have lstat, we can also check symlinks. + if test $ac_cv_func_lstat = yes; then + rm -rf conftest.f conftest.lnk + touch conftest.f || as_fn_error $? "cannot create temporary files" "$LINENO" 5 + ln -s conftest.f conftest.lnk + if test "$cross_compiling" = yes +then : + case "$host_os" in + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_access_slash_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_access_slash_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_access_slash_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_access_slash_works="$gl_cross_guess_normal" ;; + esac + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include <unistd.h> + +int +main (void) +{ +int result = 0; + if (access ("conftest.lnk/", R_OK) == 0) + result |= 1; + return result; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_access_slash_works=yes +else case e in #( + e) gl_cv_func_access_slash_works=no ;; +esac +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi + + rm -rf conftest.f conftest.lnk + else + gl_cv_func_access_slash_works="guessing yes" + fi + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_access_slash_works" >&5 +printf "%s\n" "$gl_cv_func_access_slash_works" >&6; } + case "$gl_cv_func_access_slash_works" in + *yes) ;; + *) + REPLACE_ACCESS=1 + +printf "%s\n" "#define ACCESS_TRAILING_SLASH_BUG 1" >>confdefs.h + + ;; + esac + ;; esac @@ -36593,12 +38745,12 @@ printf %s "checking for alignas and alignof... " >&6; } if test ${gl_cv_header_working_stdalign_h+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_save_CFLAGS=$CFLAGS +else case e in #( + e) gl_saved_CFLAGS=$CFLAGS for gl_working in "yes, keywords" "yes, <stdalign.h> macros"; do case $gl_working in #( *stdalign.h*) : - CFLAGS="$gl_save_CFLAGS -DINCLUDE_STDALIGN_H" ;; #( + CFLAGS="$gl_saved_CFLAGS -DINCLUDE_STDALIGN_H" ;; #( *) : ;; esac @@ -36649,14 +38801,16 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_working_stdalign_h=$gl_working -else $as_nop - gl_cv_header_working_stdalign_h=no +else case e in #( + e) gl_cv_header_working_stdalign_h=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS=$gl_save_CFLAGS + CFLAGS=$gl_saved_CFLAGS test "$gl_cv_header_working_stdalign_h" != no && break - done + done ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5 printf "%s\n" "$gl_cv_header_working_stdalign_h" >&6; } @@ -36685,8 +38839,8 @@ printf %s "checking for alloca as a compiler built-in... " >&6; } if test ${gl_cv_rpl_alloca+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -36696,15 +38850,17 @@ else $as_nop _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Need own alloca" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Need own alloca" >/dev/null 2>&1 then : gl_cv_rpl_alloca=yes -else $as_nop - gl_cv_rpl_alloca=no +else case e in #( + e) gl_cv_rpl_alloca=no ;; +esac fi rm -rf conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_rpl_alloca" >&5 printf "%s\n" "$gl_cv_rpl_alloca" >&6; } @@ -36773,12 +38929,12 @@ printf %s "checking for static_assert... " >&6; } if test ${gl_cv_static_assert+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_save_CFLAGS=$CFLAGS +else case e in #( + e) gl_saved_CFLAGS=$CFLAGS for gl_working in "yes, a keyword" "yes, an <assert.h> macro"; do case $gl_working in #( *assert.h*) : - CFLAGS="$gl_save_CFLAGS -DINCLUDE_ASSERT_H" ;; #( + CFLAGS="$gl_saved_CFLAGS -DINCLUDE_ASSERT_H" ;; #( *) : ;; esac @@ -36809,13 +38965,15 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_static_assert=$gl_working -else $as_nop - gl_cv_static_assert=no +else case e in #( + e) gl_cv_static_assert=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS=$gl_save_CFLAGS + CFLAGS=$gl_saved_CFLAGS test "$gl_cv_static_assert" != no && break - done + done ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_static_assert" >&5 printf "%s\n" "$gl_cv_static_assert" >&6; } @@ -36844,8 +39002,8 @@ printf %s "checking absolute name of <assert.h>... " >&6; } if test ${gl_cv_next_assert_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -36858,7 +39016,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -36881,7 +39039,8 @@ _ACEOF gl_header=$gl_cv_absolute_assert_h gl_cv_next_assert_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_assert_h" >&5 printf "%s\n" "$gl_cv_next_assert_h" >&6; } @@ -36985,6 +39144,25 @@ printf "%s\n" "#define GNULIB_TEST_BIND 1" >>confdefs.h + + + + GL_GNULIB_BTOC32=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_BTOC32 1" >>confdefs.h + + + + + + + + + if test $ac_cv_func_btowc = no; then HAVE_BTOWC=0 else @@ -36997,22 +39175,22 @@ printf %s "checking whether btowc(0) is correct... " >&6; } if test ${gl_cv_func_btowc_nul+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on Cygwin. - cygwin*) gl_cv_func_btowc_nul="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_btowc_nul="guessing yes" ;; - # Guess yes otherwise. - *) gl_cv_func_btowc_nul="guessing yes" ;; + # Guess no on Cygwin. + cygwin*) gl_cv_func_btowc_nul="guessing no" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_btowc_nul="guessing yes" ;; + # Guess yes otherwise. + *) gl_cv_func_btowc_nul="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <wchar.h> @@ -37026,14 +39204,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_btowc_nul=yes -else $as_nop - gl_cv_func_btowc_nul=no +else case e in #( + e) gl_cv_func_btowc_nul=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_btowc_nul" >&5 printf "%s\n" "$gl_cv_func_btowc_nul" >&6; } @@ -37043,22 +39224,22 @@ printf %s "checking whether btowc(EOF) is correct... " >&6; } if test ${gl_cv_func_btowc_eof+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in - # Guess no on IRIX. - irix*) gl_cv_func_btowc_eof="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_btowc_eof="guessing yes" ;; - # Guess yes otherwise. - *) gl_cv_func_btowc_eof="guessing yes" ;; + # Guess no on IRIX. + irix*) gl_cv_func_btowc_eof="guessing no" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_btowc_eof="guessing yes" ;; + # Guess yes otherwise. + *) gl_cv_func_btowc_eof="guessing yes" ;; esac if test $LOCALE_FR != none; then if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -37077,15 +39258,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_btowc_eof=yes -else $as_nop - gl_cv_func_btowc_eof=no +else case e in #( + e) gl_cv_func_btowc_eof=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_btowc_eof" >&5 printf "%s\n" "$gl_cv_func_btowc_eof" >&6; } @@ -37096,13 +39280,14 @@ printf %s "checking whether btowc is consistent with mbrtowc in the C locale... if test ${gl_cv_func_btowc_consistent+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on mingw. - mingw*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # Guess no on mingw. + mingw* | windows*) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __MINGW32__ @@ -37111,21 +39296,22 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Problem" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Problem" >/dev/null 2>&1 then : gl_cv_func_btowc_consistent="guessing no" -else $as_nop - gl_cv_func_btowc_consistent="guessing yes" +else case e in #( + e) gl_cv_func_btowc_consistent="guessing yes" ;; +esac fi rm -rf conftest* - ;; - # Guess yes otherwise. - *) gl_cv_func_btowc_consistent="guessing yes" ;; + ;; + # Guess yes otherwise. + *) gl_cv_func_btowc_consistent="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -37148,14 +39334,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_btowc_consistent=yes -else $as_nop - gl_cv_func_btowc_consistent=no +else case e in #( + e) gl_cv_func_btowc_consistent=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_btowc_consistent" >&5 printf "%s\n" "$gl_cv_func_btowc_consistent" >&6; } @@ -37179,19 +39368,17 @@ printf %s "checking whether the C locale is free of encoding errors... " >&6; } if test ${gl_cv_func_mbrtowc_C_locale_sans_EILSEQ+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" - - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on native Windows. - mingw*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;; - esac + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;; + *) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;; + esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <limits.h> #include <locale.h> @@ -37223,14 +39410,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=yes -else $as_nop - gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no +else case e in #( + e) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&5 printf "%s\n" "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&6; } @@ -37294,8 +39484,8 @@ printf %s "checking for __builtin_expect... " >&6; } if test ${gl_cv___builtin_expect+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -37308,8 +39498,8 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv___builtin_expect=yes -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <builtins.h> @@ -37323,14 +39513,17 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv___builtin_expect="in <builtins.h>" -else $as_nop - gl_cv___builtin_expect=no +else case e in #( + e) gl_cv___builtin_expect=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5 printf "%s\n" "$gl_cv___builtin_expect" >&6; } @@ -37353,10 +39546,11 @@ then : GL_GENERATE_BYTESWAP_H=false -else $as_nop - +else case e in #( + e) GL_GENERATE_BYTESWAP_H=true - + ;; +esac fi done @@ -37397,6 +39591,352 @@ fi + + + + + + + GL_GNULIB_C32_APPLY_TYPE_TEST=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32_APPLY_TYPE_TEST 1" >>confdefs.h + + + + + + + + + + + + + GL_GNULIB_C32_GET_TYPE_TEST=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32_GET_TYPE_TEST 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32ISALNUM=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32ISALNUM 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32ISALPHA=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32ISALPHA 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32ISBLANK=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32ISBLANK 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32ISCNTRL=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32ISCNTRL 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32ISDIGIT=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32ISDIGIT 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32ISGRAPH=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32ISGRAPH 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32ISLOWER=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32ISLOWER 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32ISPRINT=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32ISPRINT 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32ISPUNCT=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32ISPUNCT 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32ISSPACE=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32ISSPACE 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32ISUPPER=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32ISUPPER 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32ISXDIGIT=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32ISXDIGIT 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32TOLOWER=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32TOLOWER 1" >>confdefs.h + + + + + + + + + + + + + + + + GL_GNULIB_C32WIDTH=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_C32WIDTH 1" >>confdefs.h + + + + + + REPLACE_CALLOC_FOR_CALLOC_GNU="$REPLACE_CALLOC_FOR_CALLOC_POSIX" if test $REPLACE_CALLOC_FOR_CALLOC_GNU = 0; then @@ -37405,17 +39945,17 @@ printf %s "checking whether calloc (0, n) and calloc (n, 0) return nonnull... " if test ${ac_cv_func_calloc_0_nonnull+y} then : printf %s "(cached) " >&6 -else $as_nop - if test $cross_compiling != yes; then +else case e in #( + e) if test $cross_compiling != yes; then ac_cv_func_calloc_0_nonnull=yes if test "$cross_compiling" = yes then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -37435,11 +39975,13 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : -else $as_nop - ac_cv_func_calloc_0_nonnull=no +else case e in #( + e) ac_cv_func_calloc_0_nonnull=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi else @@ -37449,12 +39991,13 @@ fi # Guess yes on musl systems. *-musl* | midipix*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; # Guess yes on native Windows. - mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; + mingw* | windows*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) ac_cv_func_calloc_0_nonnull="$gl_cross_guess_normal" ;; esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_calloc_0_nonnull" >&5 printf "%s\n" "$ac_cv_func_calloc_0_nonnull" >&6; } @@ -37547,8 +40090,8 @@ printf %s "checking for faccessat... " >&6; } if test ${gl_cv_onwards_func_faccessat+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -37592,7 +40135,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_faccessat" >&5 printf "%s\n" "$gl_cv_onwards_func_faccessat" >&6; } @@ -37755,8 +40299,8 @@ printf %s "checking whether this system supports file names of any length... " > if test ${gl_cv_have_unlimited_file_name_length+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Arrange to define PATH_MAX, like "pathmax.h" does. */ @@ -37784,14 +40328,16 @@ have_arbitrary_file_name_length_limit #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "have_arbitrary_file_name_length_limit" >/dev/null 2>&1 + $EGREP_TRADITIONAL "have_arbitrary_file_name_length_limit" >/dev/null 2>&1 then : gl_cv_have_unlimited_file_name_length=no -else $as_nop - gl_cv_have_unlimited_file_name_length=yes +else case e in #( + e) gl_cv_have_unlimited_file_name_length=yes ;; +esac fi rm -rf conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_unlimited_file_name_length" >&5 printf "%s\n" "$gl_cv_have_unlimited_file_name_length" >&6; } @@ -37818,6 +40364,14 @@ fi + + + # On mingw, these functions are defined in the libwinpthread library, + # which is better avoided. In fact, the clock_gettime function is buggy + # in 32-bit mingw, when -D__MINGW_USE_VC2005_COMPAT is used (which Gnulib's + # year2038 module does): It leaves the upper 32 bits of the tv_sec field + # of the result uninitialized. + # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function. # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. @@ -37826,21 +40380,34 @@ fi # library, inducing unnecessary run-time overhead. CLOCK_TIME_LIB= - gl_saved_libs=$LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 + case "$host_os" in + mingw* | windows*) + ac_cv_func_clock_getres=no + ac_cv_func_clock_gettime=no + ac_cv_func_clock_settime=no + ;; + *) + gl_saved_libs=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 printf %s "checking for library containing clock_gettime... " >&6; } if test ${ac_cv_search_clock_gettime+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char clock_gettime (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char clock_gettime (void); int main (void) { @@ -37871,11 +40438,13 @@ done if test ${ac_cv_search_clock_gettime+y} then : -else $as_nop - ac_cv_search_clock_gettime=no +else case e in #( + e) ac_cv_search_clock_gettime=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 printf "%s\n" "$ac_cv_search_clock_gettime" >&6; } @@ -37884,10 +40453,10 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" test "$ac_cv_search_clock_gettime" = "none required" || - CLOCK_TIME_LIB=$ac_cv_search_clock_gettime + CLOCK_TIME_LIB=$ac_cv_search_clock_gettime fi - ac_fn_c_check_func "$LINENO" "clock_getres" "ac_cv_func_clock_getres" + ac_fn_c_check_func "$LINENO" "clock_getres" "ac_cv_func_clock_getres" if test "x$ac_cv_func_clock_getres" = xyes then : printf "%s\n" "#define HAVE_CLOCK_GETRES 1" >>confdefs.h @@ -37906,7 +40475,10 @@ then : fi - LIBS=$gl_saved_libs + LIBS=$gl_saved_libs + ;; + esac + # For backward compatibility. LIB_CLOCK_GETTIME="$CLOCK_TIME_LIB" @@ -37967,9 +40539,6 @@ fi if test $DIR_HAS_FD_MEMBER = 0; then REPLACE_CLOSEDIR=1 fi - case $host_os in - os2*) REPLACE_CLOSEDIR=1 ;; - esac @@ -38072,21 +40641,22 @@ printf "%s\n" "#define GNULIB_TEST_CONNECT 1" >>confdefs.h if test ${with_openssl+y} then : withval=$with_openssl; -else $as_nop - with_openssl=$with_openssl_default +else case e in #( + e) with_openssl=$with_openssl_default ;; +esac fi if test "x$with_openssl" != xno; then if test "x$with_openssl" = xauto-gpl-compat; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether openssl is GPL compatible" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether openssl is GPL compatible" >&5 printf %s "checking whether openssl is GPL compatible... " >&6; } if test ${gl_cv_openssl_gpl_compat+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <openssl/opensslv.h> @@ -38105,10 +40675,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_openssl_gpl_compat=yes -else $as_nop - gl_cv_openssl_gpl_compat=no +else case e in #( + e) gl_cv_openssl_gpl_compat=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_openssl_gpl_compat" >&5 printf "%s\n" "$gl_cv_openssl_gpl_compat" >&6; } @@ -38120,16 +40692,22 @@ printf %s "checking for MD5 in -lcrypto... " >&6; } if test ${ac_cv_lib_crypto_MD5+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char MD5 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char MD5 (void); int main (void) { @@ -38141,12 +40719,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_crypto_MD5=yes -else $as_nop - ac_cv_lib_crypto_MD5=no +else case e in #( + e) ac_cv_lib_crypto_MD5=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_MD5" >&5 printf "%s\n" "$ac_cv_lib_crypto_MD5" >&6; } @@ -38198,21 +40778,22 @@ printf "%s\n" "$as_me: WARNING: $message" >&2;} if test ${with_openssl+y} then : withval=$with_openssl; -else $as_nop - with_openssl=$with_openssl_default +else case e in #( + e) with_openssl=$with_openssl_default ;; +esac fi if test "x$with_openssl" != xno; then if test "x$with_openssl" = xauto-gpl-compat; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether openssl is GPL compatible" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether openssl is GPL compatible" >&5 printf %s "checking whether openssl is GPL compatible... " >&6; } if test ${gl_cv_openssl_gpl_compat+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <openssl/opensslv.h> @@ -38231,10 +40812,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_openssl_gpl_compat=yes -else $as_nop - gl_cv_openssl_gpl_compat=no +else case e in #( + e) gl_cv_openssl_gpl_compat=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_openssl_gpl_compat" >&5 printf "%s\n" "$gl_cv_openssl_gpl_compat" >&6; } @@ -38246,16 +40829,22 @@ printf %s "checking for SHA1 in -lcrypto... " >&6; } if test ${ac_cv_lib_crypto_SHA1+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char SHA1 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char SHA1 (void); int main (void) { @@ -38267,12 +40856,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_crypto_SHA1=yes -else $as_nop - ac_cv_lib_crypto_SHA1=no +else case e in #( + e) ac_cv_lib_crypto_SHA1=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA1" >&5 printf "%s\n" "$ac_cv_lib_crypto_SHA1" >&6; } @@ -38324,21 +40915,22 @@ printf "%s\n" "$as_me: WARNING: $message" >&2;} if test ${with_openssl+y} then : withval=$with_openssl; -else $as_nop - with_openssl=$with_openssl_default +else case e in #( + e) with_openssl=$with_openssl_default ;; +esac fi if test "x$with_openssl" != xno; then if test "x$with_openssl" = xauto-gpl-compat; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether openssl is GPL compatible" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether openssl is GPL compatible" >&5 printf %s "checking whether openssl is GPL compatible... " >&6; } if test ${gl_cv_openssl_gpl_compat+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <openssl/opensslv.h> @@ -38357,10 +40949,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_openssl_gpl_compat=yes -else $as_nop - gl_cv_openssl_gpl_compat=no +else case e in #( + e) gl_cv_openssl_gpl_compat=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_openssl_gpl_compat" >&5 printf "%s\n" "$gl_cv_openssl_gpl_compat" >&6; } @@ -38372,16 +40966,22 @@ printf %s "checking for SHA256 in -lcrypto... " >&6; } if test ${ac_cv_lib_crypto_SHA256+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char SHA256 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char SHA256 (void); int main (void) { @@ -38393,12 +40993,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_crypto_SHA256=yes -else $as_nop - ac_cv_lib_crypto_SHA256=no +else case e in #( + e) ac_cv_lib_crypto_SHA256=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA256" >&5 printf "%s\n" "$ac_cv_lib_crypto_SHA256" >&6; } @@ -38450,21 +41052,22 @@ printf "%s\n" "$as_me: WARNING: $message" >&2;} if test ${with_openssl+y} then : withval=$with_openssl; -else $as_nop - with_openssl=$with_openssl_default +else case e in #( + e) with_openssl=$with_openssl_default ;; +esac fi if test "x$with_openssl" != xno; then if test "x$with_openssl" = xauto-gpl-compat; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether openssl is GPL compatible" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether openssl is GPL compatible" >&5 printf %s "checking whether openssl is GPL compatible... " >&6; } if test ${gl_cv_openssl_gpl_compat+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <openssl/opensslv.h> @@ -38483,10 +41086,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_openssl_gpl_compat=yes -else $as_nop - gl_cv_openssl_gpl_compat=no +else case e in #( + e) gl_cv_openssl_gpl_compat=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_openssl_gpl_compat" >&5 printf "%s\n" "$gl_cv_openssl_gpl_compat" >&6; } @@ -38498,16 +41103,22 @@ printf %s "checking for SHA512 in -lcrypto... " >&6; } if test ${ac_cv_lib_crypto_SHA512+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char SHA512 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char SHA512 (void); int main (void) { @@ -38519,12 +41130,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_crypto_SHA512=yes -else $as_nop - ac_cv_lib_crypto_SHA512=no +else case e in #( + e) ac_cv_lib_crypto_SHA512=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA512" >&5 printf "%s\n" "$ac_cv_lib_crypto_SHA512" >&6; } @@ -38574,24 +41187,24 @@ printf %s "checking for d_ino member in directory struct... " >&6; } if test ${gl_cv_struct_dirent_d_ino+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on glibc systems with Linux kernel. - linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; - # Guess yes on musl systems with Linux kernel. - linux*-musl*) gl_cv_struct_dirent_d_ino="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_struct_dirent_d_ino="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_struct_dirent_d_ino="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems with Linux kernel. + linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; + # Guess yes on musl systems with Linux kernel. + linux*-musl*) gl_cv_struct_dirent_d_ino="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_struct_dirent_d_ino="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_struct_dirent_d_ino="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_struct_dirent_d_ino="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <sys/stat.h> @@ -38622,13 +41235,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_struct_dirent_d_ino=yes -else $as_nop - gl_cv_struct_dirent_d_ino=no +else case e in #( + e) gl_cv_struct_dirent_d_ino=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_struct_dirent_d_ino" >&5 printf "%s\n" "$gl_cv_struct_dirent_d_ino" >&6; } @@ -38667,8 +41283,9 @@ fi if test "x$ac_cv_have_decl_dirfd" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_DIRFD $ac_have_decl" >>confdefs.h @@ -38681,8 +41298,8 @@ printf %s "checking whether dirfd is a macro... " >&6; } if test ${gl_cv_func_dirfd_macro+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -38692,14 +41309,16 @@ else $as_nop #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "dirent_header_defines_dirfd" >/dev/null 2>&1 + $EGREP_TRADITIONAL "dirent_header_defines_dirfd" >/dev/null 2>&1 then : gl_cv_func_dirfd_macro=yes -else $as_nop - gl_cv_func_dirfd_macro=no +else case e in #( + e) gl_cv_func_dirfd_macro=no ;; +esac fi rm -rf conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dirfd_macro" >&5 printf "%s\n" "$gl_cv_func_dirfd_macro" >&6; } @@ -38712,9 +41331,6 @@ printf "%s\n" "$gl_cv_func_dirfd_macro" >&6; } if test $DIR_HAS_FD_MEMBER = 0; then REPLACE_DIRFD=1 fi - case "$host_os" in - os2*) REPLACE_DIRFD=1 ;; - esac fi @@ -38739,9 +41355,9 @@ printf %s "checking how to get the file descriptor associated with an open DIR*. if test ${gl_cv_sys_dir_fd_member_name+y} then : printf %s "(cached) " >&6 -else $as_nop - - dirfd_save_CFLAGS=$CFLAGS +else case e in #( + e) + gl_saved_CFLAGS=$CFLAGS for ac_expr in d_fd dd_fd; do CFLAGS="$CFLAGS -DDIR_FD_MEMBER_NAME=$ac_expr" @@ -38764,14 +41380,15 @@ then : fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS=$dirfd_save_CFLAGS + CFLAGS=$gl_saved_CFLAGS test "$dir_fd_found" = yes && break done test "$dir_fd_found" = yes || ac_expr=no_such_member gl_cv_sys_dir_fd_member_name=$ac_expr - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_dir_fd_member_name" >&5 printf "%s\n" "$gl_cv_sys_dir_fd_member_name" >&6; } @@ -38815,8 +41432,8 @@ printf %s "checking whether // is distinct from /... " >&6; } if test ${gl_cv_double_slash_root+y} then : printf %s "(cached) " >&6 -else $as_nop - if test x"$cross_compiling" = xyes ; then +else case e in #( + e) if test x"$cross_compiling" = xyes ; then # When cross-compiling, there is no way to tell whether // is special # short of a list of hosts. However, the only known hosts to date # that have a distinct // are Apollo DomainOS (too old to port to), @@ -38838,7 +41455,8 @@ else $as_nop else gl_cv_double_slash_root=yes fi - fi + fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5 printf "%s\n" "$gl_cv_double_slash_root" >&6; } @@ -38873,17 +41491,17 @@ printf %s "checking whether dup works... " >&6; } if test ${gl_cv_func_dup_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_dup_works="guessing no" ;; - *) gl_cv_func_dup_works="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_dup_works="guessing no" ;; + *) gl_cv_func_dup_works="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> #include <fcntl.h> @@ -38907,14 +41525,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_dup_works=yes -else $as_nop - gl_cv_func_dup_works=no +else case e in #( + e) gl_cv_func_dup_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup_works" >&5 printf "%s\n" "$gl_cv_func_dup_works" >&6; } @@ -38971,11 +41592,11 @@ printf %s "checking whether dup2 works... " >&6; } if test ${gl_cv_func_dup2_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - mingw*) # on this platform, dup2 always returns 0 for success + mingw* | windows*) # on this platform, dup2 always returns 0 for success gl_cv_func_dup2_works="guessing no" ;; cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 gl_cv_func_dup2_works="guessing no" ;; @@ -38991,8 +41612,8 @@ then : gl_cv_func_dup2_works="guessing no" ;; *) gl_cv_func_dup2_works="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <errno.h> @@ -39062,14 +41683,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_dup2_works=yes -else $as_nop - gl_cv_func_dup2_works=no +else case e in #( + e) gl_cv_func_dup2_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5 printf "%s\n" "$gl_cv_func_dup2_works" >&6; } @@ -39195,7 +41819,7 @@ fi - if test $GL_GENERATE_ERROR_H = true; then + if test $COMPILE_ERROR_C = 1; then GL_COND_OBJ_ERROR_TRUE= GL_COND_OBJ_ERROR_FALSE='#' else @@ -39231,38 +41855,6 @@ fi - case "$GL_GENERATE_ERROR_H" in - false) ERROR_H='' ;; - true) - if test -z "$ERROR_H"; then - ERROR_H="${gl_source_base_prefix}error.h" - fi - ;; - *) echo "*** GL_GENERATE_ERROR_H is not set correctly" 1>&2; exit 1 ;; - esac - - - if $GL_GENERATE_ERROR_H; then - GL_GENERATE_ERROR_H_TRUE= - GL_GENERATE_ERROR_H_FALSE='#' -else - GL_GENERATE_ERROR_H_TRUE='#' - GL_GENERATE_ERROR_H_FALSE= -fi -: - if test -z "${GL_GENERATE_ERROR_H_TRUE}" && test -z "${GL_GENERATE_ERROR_H_FALSE}"; then - GL_GENERATE_ERROR_H_TRUE='#' - GL_GENERATE_ERROR_H_FALSE='#' - fi - - - - - - - - - : @@ -39276,7 +41868,14 @@ fi fi - if test $HAVE_FCHDIR = 0; then + if test $HAVE_FCHDIR = 1; then + + if test $DIR_HAS_FD_MEMBER = 0; then + REPLACE_FCHDIR=1 + fi + fi + + if test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1; then printf "%s\n" "#define REPLACE_FCHDIR 1" >>confdefs.h @@ -39285,24 +41884,24 @@ printf %s "checking whether open can visit directories... " >&6; } if test ${gl_cv_func_open_directory_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_open_directory_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_open_directory_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_open_directory_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_open_directory_works="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_open_directory_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_open_directory_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_open_directory_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_open_directory_works="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_open_directory_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_open_directory_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <fcntl.h> @@ -39320,13 +41919,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_open_directory_works=yes -else $as_nop - gl_cv_func_open_directory_works=no +else case e in #( + e) gl_cv_func_open_directory_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_directory_works" >&5 printf "%s\n" "$gl_cv_func_open_directory_works" >&6; } @@ -39341,7 +41943,7 @@ printf "%s\n" "#define REPLACE_OPEN_DIRECTORY 1" >>confdefs.h fi - if test $HAVE_FCHDIR = 0; then + if test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1; then GL_COND_OBJ_FCHDIR_TRUE= GL_COND_OBJ_FCHDIR_FALSE='#' else @@ -39399,16 +42001,16 @@ printf %s "checking whether fcntl handles F_DUPFD correctly... " >&6; } if test ${gl_cv_func_fcntl_f_dupfd_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case $host_os in aix* | cygwin* | haiku*) gl_cv_func_fcntl_f_dupfd_works="guessing no" ;; *) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <errno.h> #include <fcntl.h> @@ -39461,13 +42063,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_fcntl_f_dupfd_works=yes -else $as_nop - gl_cv_func_fcntl_f_dupfd_works=no +else case e in #( + e) gl_cv_func_fcntl_f_dupfd_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5 printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; } @@ -39492,8 +42097,8 @@ printf %s "checking whether fcntl understands F_DUPFD_CLOEXEC... " >&6; } if test ${gl_cv_func_fcntl_f_dupfd_cloexec+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess no on NetBSD. @@ -39501,8 +42106,8 @@ then : *) gl_cv_func_fcntl_f_dupfd_cloexec="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <fcntl.h> #include <unistd.h> @@ -39544,19 +42149,23 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_fcntl_f_dupfd_cloexec=yes -else $as_nop - gl_cv_func_fcntl_f_dupfd_cloexec="needs runtime check" +else case e in #( + e) gl_cv_func_fcntl_f_dupfd_cloexec="needs runtime check" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else $as_nop - gl_cv_func_fcntl_f_dupfd_cloexec=no +else case e in #( + e) gl_cv_func_fcntl_f_dupfd_cloexec=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5 printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; } @@ -39652,15 +42261,17 @@ printf "%s\n" "#define GNULIB_FD_SAFER_FLAG 1" >>confdefs.h if test "x$ac_cv_have_decl_fdopendir" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FDOPENDIR $ac_have_decl" >>confdefs.h if test $ac_have_decl = 1 then : -else $as_nop - HAVE_DECL_FDOPENDIR=0 +else case e in #( + e) HAVE_DECL_FDOPENDIR=0 ;; +esac fi @@ -39672,8 +42283,8 @@ printf %s "checking whether fdopendir works... " >&6; } if test ${gl_cv_func_fdopendir_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess yes on glibc systems. @@ -39684,8 +42295,8 @@ then : *) gl_cv_func_fdopendir_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <dirent.h> @@ -39720,13 +42331,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_fdopendir_works=yes -else $as_nop - gl_cv_func_fdopendir_works=no +else case e in #( + e) gl_cv_func_fdopendir_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fdopendir_works" >&5 printf "%s\n" "$gl_cv_func_fdopendir_works" >&6; } @@ -39785,18 +42399,18 @@ printf %s "checking whether fflush works on input streams... " >&6; } if test ${gl_cv_func_fflush_stdin+y} then : printf %s "(cached) " >&6 -else $as_nop - echo hello world > conftest.txt +else case e in #( + e) echo hello world > conftest.txt if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_fflush_stdin="guessing no" ;; - *) gl_cv_func_fflush_stdin=cross ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_fflush_stdin="guessing no" ;; + *) gl_cv_func_fflush_stdin=cross ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -39856,15 +42470,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_fflush_stdin=yes -else $as_nop - gl_cv_func_fflush_stdin=no +else case e in #( + e) gl_cv_func_fflush_stdin=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm conftest.txt - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5 printf "%s\n" "$gl_cv_func_fflush_stdin" >&6; } @@ -39933,8 +42550,8 @@ printf %s "checking for mempcpy... " >&6; } if test ${gl_cv_onwards_func_mempcpy+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -39978,7 +42595,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_mempcpy" >&5 printf "%s\n" "$gl_cv_onwards_func_mempcpy" >&6; } @@ -40004,8 +42622,8 @@ printf %s "checking for flexible array member... " >&6; } if test ${ac_cv_c_flexmember+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> #include <stdio.h> @@ -40031,10 +42649,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_c_flexmember=yes -else $as_nop - ac_cv_c_flexmember=no +else case e in #( + e) ac_cv_c_flexmember=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_flexmember" >&5 printf "%s\n" "$ac_cv_c_flexmember" >&6; } @@ -40076,8 +42696,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - GL_GENERATE_FLOAT_H=true +else case e in #( + e) GL_GENERATE_FLOAT_H=true ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; @@ -40105,8 +42726,8 @@ printf %s "checking whether conversion from 'int' to 'long double' works... " >& if test ${gl_cv_func_itold_works+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host" in @@ -40123,18 +42744,21 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_itold_works="guessing no" -else $as_nop - gl_cv_func_itold_works="guessing yes" +else case e in #( + e) gl_cv_func_itold_works="guessing yes" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_itold_works="guessing yes" ;; - *) gl_cv_func_itold_works="guessing yes" ;; + # Guess yes on native Windows. + mingw* | windows*) + gl_cv_func_itold_works="guessing yes" ;; + *) + gl_cv_func_itold_works="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i = -1; @@ -40150,14 +42774,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_itold_works=yes -else $as_nop - gl_cv_func_itold_works=no +else case e in #( + e) gl_cv_func_itold_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_itold_works" >&5 printf "%s\n" "$gl_cv_func_itold_works" >&6; } @@ -40185,8 +42812,8 @@ printf %s "checking absolute name of <float.h>... " >&6; } if test ${gl_cv_next_float_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -40199,7 +42826,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -40222,7 +42849,8 @@ _ACEOF gl_header=$gl_cv_absolute_float_h gl_cv_next_float_h='"'$gl_header'"' - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_float_h" >&5 printf "%s\n" "$gl_cv_next_float_h" >&6; } @@ -40363,7 +42991,8 @@ fi - gl_fnmatch_required_lowercase=` + + gl_fnmatch_required_lowercase=` echo $gl_fnmatch_required | LC_ALL=C tr '[A-Z]' '[a-z]' ` @@ -40376,8 +43005,8 @@ printf %s "checking for working $gl_fnmatch_required fnmatch... " >&6; } if eval test \${$gl_fnmatch_cache_var+y} then : printf %s "(cached) " >&6 -else $as_nop - if test $gl_fnmatch_required = GNU; then +else case e in #( + e) if test $gl_fnmatch_required = GNU; then gl_fnmatch_gnu_start= gl_fnmatch_gnu_end= else @@ -40393,10 +43022,12 @@ then : *) eval "$gl_fnmatch_cache_var=\"guessing no\"" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <fnmatch.h> + #include <locale.h> + #include <stddef.h> static int y (char const *pattern, char const *string, int flags) { @@ -40420,60 +43051,96 @@ char const *Apat = 'A' < '\\\\' ? "[A-\\\\\\\\]" : "[\\\\\\\\-A]"; static char const bs_1[] = { '\\\\' - 1, 0 }; static char const bs01[] = { '\\\\' + 1, 0 }; int result = 0; + /* ==== Start of tests in the "C" locale ==== */ + /* These are sanity checks. They all succeed on current platforms. */ if (!n ("a*", "", 0)) return 1; if (!y ("a*", "abc", 0)) return 1; - if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */ - return 1; if (!n ("d*/*1", "d/s/1", FNM_PATHNAME)) - return 2; + return 1; if (!y ("a\\\\bc", "abc", 0)) - return 3; + return 1; if (!n ("a\\\\bc", "abc", FNM_NOESCAPE)) - return 3; + return 1; if (!y ("*x", ".x", 0)) - return 4; + return 1; if (!n ("*x", ".x", FNM_PERIOD)) - return 4; + return 1; + /* glibc bug <https://sourceware.org/bugzilla/show_bug.cgi?id=361> + exists in glibc 2.3.3, fixed in glibc 2.5. */ if (!y (Apat, "\\\\", 0)) - return 5; + result |= 2; if (!y (Apat, "A", 0)) - return 5; + result |= 2; if (!y (apat, "\\\\", 0)) - return 5; + result |= 2; if (!y (apat, "a", 0)) - return 5; + result |= 2; if (!(n (Apat, A_1, 0) == ('A' < '\\\\'))) - return 5; + result |= 2; if (!(n (apat, a_1, 0) == ('a' < '\\\\'))) - return 5; + result |= 2; if (!(y (Apat, A01, 0) == ('A' < '\\\\'))) - return 5; + result |= 2; if (!(y (apat, a01, 0) == ('a' < '\\\\'))) - return 5; + result |= 2; if (!(y (Apat, bs_1, 0) == ('A' < '\\\\'))) - return 5; + result |= 2; if (!(y (apat, bs_1, 0) == ('a' < '\\\\'))) - return 5; + result |= 2; if (!(n (Apat, bs01, 0) == ('A' < '\\\\'))) - return 5; + result |= 2; if (!(n (apat, bs01, 0) == ('a' < '\\\\'))) - return 5; - $gl_fnmatch_gnu_start - if (!y ("xxXX", "xXxX", FNM_CASEFOLD)) + result |= 2; + /* glibc bug <https://sourceware.org/bugzilla/show_bug.cgi?id=12378> + exists in glibc 2.12, fixed in glibc 2.13. */ + if (!y ("[/b", "[/b", 0)) /*"]]"*/ + result |= 4; + /* glibc bug <https://sourceware.org/bugzilla/show_bug.cgi?id=17062> + is fixed in glibc 2.20. + glibc bugs <https://sourceware.org/bugzilla/show_bug.cgi?id=18032> + <https://sourceware.org/bugzilla/show_bug.cgi?id=18036> + are fixed in glibc 2.22. + These bugs are not easy to test for reliably (without mmap), + therefore test the glibc version. */ + #if defined __GLIBC__ + if (__GLIBC__ == 2 && __GLIBC_MINOR__ < 22) + result |= 4; + #endif + /* This test fails on FreeBSD 13.2, NetBSD 9.3, Cygwin 3.4.6. */ + if (!y ("[[:alnum:]]", "a", 0)) result |= 8; + $gl_fnmatch_gnu_start /* ==== Start of GNU extensions tests ==== */ + /* Sanity checks, mainly to check the presence of the FNM_* macros. */ + if (!y ("xxXX", "xXxX", FNM_CASEFOLD)) + result |= 64; if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH)) - result |= 16; + result |= 64; if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME)) - result |= 32; + result |= 64; if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR)) result |= 64; if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR)) result |= 64; if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR)) result |= 64; - $gl_fnmatch_gnu_end + $gl_fnmatch_gnu_end /* ==== End of GNU extensions tests ==== */ + /* ==== End of tests in the "C" locale ==== */ + /* ==== Start of tests that require a specific locale ==== */ + /* This test fails on Solaris 11.4. */ + if (setlocale (LC_ALL, "en_US.UTF-8") != NULL) + { + if (!n ("[!a-z]", "", 0)) + result |= 16; + } + /* This test fails on NetBSD 9.3, Android 13. */ + if (setlocale (LC_ALL, "C.UTF-8") != NULL) + { + if (!y ("x?y", "x\\303\\274y", 0)) + result |= 32; + } + /* ==== End of tests that require a specific locale ==== */ return result; ; @@ -40483,14 +43150,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : eval "$gl_fnmatch_cache_var=yes" -else $as_nop - eval "$gl_fnmatch_cache_var=no" +else case e in #( + e) eval "$gl_fnmatch_cache_var=no" ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi eval ac_res=\$$gl_fnmatch_cache_var { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -40500,6 +43170,16 @@ printf "%s\n" "$ac_res" >&6; } *yes) ;; *) REPLACE_FNMATCH=1 ;; esac + + if test $SMALL_WCHAR_T = 1; then + case "$host_os" in + cygwin*) + ;; + *) + REPLACE_FNMATCH=1 + ;; + esac + fi fi if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then @@ -40690,8 +43370,8 @@ printf %s "checking whether fopen supports the mode character 'x'... " >&6; } if test ${gl_cv_func_fopen_mode_x+y} then : printf %s "(cached) " >&6 -else $as_nop - rm -f conftest.x +else case e in #( + e) rm -f conftest.x if test "$cross_compiling" = yes then : case "$host_os" in @@ -40703,8 +43383,8 @@ then : gl_cv_func_fopen_mode_x="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -40728,15 +43408,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_fopen_mode_x=yes -else $as_nop - gl_cv_func_fopen_mode_x=no +else case e in #( + e) gl_cv_func_fopen_mode_x=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f conftest.x - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_mode_x" >&5 printf "%s\n" "$gl_cv_func_fopen_mode_x" >&6; } @@ -40745,8 +43428,8 @@ printf %s "checking whether fopen supports the mode character 'e'... " >&6; } if test ${gl_cv_func_fopen_mode_e+y} then : printf %s "(cached) " >&6 -else $as_nop - echo foo > conftest.x +else case e in #( + e) echo foo > conftest.x if test "$cross_compiling" = yes then : case "$host_os" in @@ -40754,15 +43437,15 @@ then : linux*-gnu* | gnu* | kfreebsd*-gnu | *-musl* | midipix*) gl_cv_func_fopen_mode_e="guessing yes" ;; # Guess no on native Windows. - mingw*) + mingw* | windows*) gl_cv_func_fopen_mode_e="guessing no" ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_fopen_mode_e="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -40791,15 +43474,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_fopen_mode_e=yes -else $as_nop - gl_cv_func_fopen_mode_e=no +else case e in #( + e) gl_cv_func_fopen_mode_e=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f conftest.x - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_mode_e" >&5 printf "%s\n" "$gl_cv_func_fopen_mode_e" >&6; } @@ -40859,8 +43545,8 @@ printf %s "checking for __fpurge... " >&6; } if test ${gl_cv_onwards_func___fpurge+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -40904,7 +43590,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func___fpurge" >&5 printf "%s\n" "$gl_cv_onwards_func___fpurge" >&6; } @@ -40925,8 +43612,9 @@ printf "%s\n" "#define HAVE___FPURGE 1" >>confdefs.h if test "x$ac_cv_have_decl_fpurge" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FPURGE $ac_have_decl" >>confdefs.h @@ -40938,8 +43626,8 @@ printf %s "checking whether fpurge works... " >&6; } if test ${gl_cv_func_fpurge_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess yes on musl systems. @@ -40948,8 +43636,8 @@ then : *) gl_cv_func_fpurge_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -40993,14 +43681,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_fpurge_works=yes -else $as_nop - gl_cv_func_fpurge_works=no +else case e in #( + e) gl_cv_func_fpurge_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fpurge_works" >&5 printf "%s\n" "$gl_cv_func_fpurge_works" >&6; } @@ -41057,8 +43748,8 @@ printf %s "checking for __freading... " >&6; } if test ${gl_cv_onwards_func___freading+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -41104,7 +43795,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func___freading" >&5 printf "%s\n" "$gl_cv_onwards_func___freading" >&6; } @@ -41129,8 +43821,8 @@ printf %s "checking whether free is known to preserve errno... " >&6; } if test ${gl_cv_func_free_preserves_errno+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -41151,11 +43843,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_free_preserves_errno=yes -else $as_nop - gl_cv_func_free_preserves_errno=no +else case e in #( + e) gl_cv_func_free_preserves_errno=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5 printf "%s\n" "$gl_cv_func_free_preserves_errno" >&6; } @@ -41260,8 +43954,8 @@ printf %s "checking for fseeko... " >&6; } if test ${gl_cv_func_fseeko+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -41277,12 +43971,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_fseeko=yes -else $as_nop - gl_cv_func_fseeko=no +else case e in #( + e) gl_cv_func_fseeko=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fseeko" >&5 printf "%s\n" "$gl_cv_func_fseeko" >&6; } @@ -41309,18 +44005,18 @@ printf %s "checking whether fflush works on input streams... " >&6; } if test ${gl_cv_func_fflush_stdin+y} then : printf %s "(cached) " >&6 -else $as_nop - echo hello world > conftest.txt +else case e in #( + e) echo hello world > conftest.txt if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_fflush_stdin="guessing no" ;; - *) gl_cv_func_fflush_stdin=cross ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_fflush_stdin="guessing no" ;; + *) gl_cv_func_fflush_stdin=cross ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -41380,15 +44076,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_fflush_stdin=yes -else $as_nop - gl_cv_func_fflush_stdin=no +else case e in #( + e) gl_cv_func_fflush_stdin=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm conftest.txt - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5 printf "%s\n" "$gl_cv_func_fflush_stdin" >&6; } @@ -41437,8 +44136,9 @@ fi if test "x$ac_cv_have_decl__fseeki64" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL__FSEEKI64 $ac_have_decl" >>confdefs.h @@ -41470,7 +44170,7 @@ printf "%s\n" "#define GNULIB_TEST_FSEEKO 1" >>confdefs.h case "$host_os" in - mingw* | solaris*) + darwin* | mingw* | windows* | solaris*) REPLACE_FSTAT=1 ;; esac @@ -41510,7 +44210,7 @@ fi if test -z "$GL_COND_OBJ_FSTAT_TRUE"; then : case "$host_os" in - mingw*) + mingw* | windows*) @@ -41564,16 +44264,16 @@ printf %s "checking whether fstatat (..., 0) works... " >&6; } if test ${gl_cv_func_fstatat_zero_flag+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in aix*) gl_cv_func_fstatat_zero_flag="guessing no";; *) gl_cv_func_fstatat_zero_flag="guessing yes";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <fcntl.h> @@ -41589,14 +44289,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_fstatat_zero_flag=yes -else $as_nop - gl_cv_func_fstatat_zero_flag=no +else case e in #( + e) gl_cv_func_fstatat_zero_flag=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fstatat_zero_flag" >&5 printf "%s\n" "$gl_cv_func_fstatat_zero_flag" >&6; } @@ -41607,7 +44310,7 @@ printf "%s\n" "$gl_cv_func_fstatat_zero_flag" >&6; } esac case $host_os in - solaris*) + darwin* | solaris*) REPLACE_FSTATAT=1 ;; esac @@ -41711,8 +44414,8 @@ printf %s "checking for ftello... " >&6; } if test ${gl_cv_func_ftello+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -41727,12 +44430,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_ftello=yes -else $as_nop - gl_cv_func_ftello=no +else case e in #( + e) gl_cv_func_ftello=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello" >&5 printf "%s\n" "$gl_cv_func_ftello" >&6; } @@ -41748,7 +44453,7 @@ printf "%s\n" "$gl_cv_func_ftello" >&6; } if test $REPLACE_FTELLO = 0; then case "$host_os" in - mingw*) REPLACE_FTELLO=1 ;; + mingw* | windows*) REPLACE_FTELLO=1 ;; esac fi if test $REPLACE_FTELLO = 0; then @@ -41757,21 +44462,21 @@ printf %s "checking whether ftello works... " >&6; } if test ${gl_cv_func_ftello_works+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in - # Guess no on Solaris. - solaris*) gl_cv_func_ftello_works="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_ftello_works="guessing yes" ;; - # Guess yes otherwise. - *) gl_cv_func_ftello_works="guessing yes" ;; + # Guess no on Solaris. + solaris*) gl_cv_func_ftello_works="guessing no" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_ftello_works="guessing yes" ;; + # Guess yes otherwise. + *) gl_cv_func_ftello_works="guessing yes" ;; esac if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -41835,14 +44540,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_ftello_works=yes -else $as_nop - gl_cv_func_ftello_works=no +else case e in #( + e) gl_cv_func_ftello_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello_works" >&5 printf "%s\n" "$gl_cv_func_ftello_works" >&6; } @@ -41923,8 +44631,8 @@ printf %s "checking for futimens... " >&6; } if test ${gl_cv_onwards_func_futimens+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -41968,7 +44676,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_futimens" >&5 printf "%s\n" "$gl_cv_onwards_func_futimens" >&6; } @@ -41995,8 +44704,8 @@ printf %s "checking whether futimens works... " >&6; } if test ${gl_cv_func_futimens_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess no on glibc systems. @@ -42007,8 +44716,8 @@ then : *) gl_cv_func_futimens_works="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <fcntl.h> @@ -42048,14 +44757,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_futimens_works=yes -else $as_nop - gl_cv_func_futimens_works=no +else case e in #( + e) gl_cv_func_futimens_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - rm -f conftest.file + rm -f conftest.file ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_futimens_works" >&5 printf "%s\n" "$gl_cv_func_futimens_works" >&6; } @@ -42109,15 +44821,21 @@ printf %s "checking for library containing getaddrinfo... " >&6; } if test ${ac_cv_search_getaddrinfo+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char getaddrinfo (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char getaddrinfo (void); int main (void) { @@ -42148,11 +44866,13 @@ done if test ${ac_cv_search_getaddrinfo+y} then : -else $as_nop - ac_cv_search_getaddrinfo=no +else case e in #( + e) ac_cv_search_getaddrinfo=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5 printf "%s\n" "$ac_cv_search_getaddrinfo" >&6; } @@ -42173,8 +44893,8 @@ printf %s "checking for getaddrinfo... " >&6; } if test ${gl_cv_func_getaddrinfo+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42198,11 +44918,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_getaddrinfo=yes -else $as_nop - gl_cv_func_getaddrinfo=no +else case e in #( + e) gl_cv_func_getaddrinfo=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getaddrinfo" >&5 printf "%s\n" "$gl_cv_func_getaddrinfo" >&6; } @@ -42212,10 +44934,10 @@ printf %s "checking for getaddrinfo in ws2tcpip.h and -lws2_32... " >&6; } if test ${gl_cv_w32_getaddrinfo+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) gl_cv_w32_getaddrinfo=no - am_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42239,8 +44961,9 @@ then : fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$am_save_LIBS" - + LIBS="$gl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_getaddrinfo" >&5 printf "%s\n" "$gl_cv_w32_getaddrinfo" >&6; } @@ -42252,8 +44975,8 @@ printf %s "checking for getaddrinfo with POSIX signature... " >&6; } if test ${gl_cv_func_getaddrinfo_posix_signature+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -42277,11 +45000,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_getaddrinfo_posix_signature=yes -else $as_nop - gl_cv_func_getaddrinfo_posix_signature=no +else case e in #( + e) gl_cv_func_getaddrinfo_posix_signature=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getaddrinfo_posix_signature" >&5 printf "%s\n" "$gl_cv_func_getaddrinfo_posix_signature" >&6; } @@ -42316,8 +45041,9 @@ printf "%s\n" "#define HAVE_GETADDRINFO $HAVE_GETADDRINFO" >>confdefs.h if test "x$ac_cv_have_decl_gai_strerror" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GAI_STRERROR $ac_have_decl" >>confdefs.h @@ -42339,8 +45065,9 @@ printf "%s\n" "#define HAVE_DECL_GAI_STRERROR $ac_have_decl" >>confdefs.h if test "x$ac_cv_have_decl_gai_strerrorA" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GAI_STRERRORA $ac_have_decl" >>confdefs.h @@ -42349,8 +45076,8 @@ printf %s "checking for gai_strerror with POSIX signature... " >&6; } if test ${gl_cv_func_gai_strerror_posix_signature+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42374,10 +45101,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_gai_strerror_posix_signature=yes -else $as_nop - gl_cv_func_gai_strerror_posix_signature=no +else case e in #( + e) gl_cv_func_gai_strerror_posix_signature=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_gai_strerror_posix_signature" >&5 printf "%s\n" "$gl_cv_func_gai_strerror_posix_signature" >&6; } @@ -42430,8 +45159,9 @@ fi if test "x$ac_cv_have_decl_getaddrinfo" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GETADDRINFO $ac_have_decl" >>confdefs.h ac_fn_check_decl "$LINENO" "freeaddrinfo" "ac_cv_have_decl_freeaddrinfo" " @@ -42453,8 +45183,9 @@ ac_fn_check_decl "$LINENO" "freeaddrinfo" "ac_cv_have_decl_freeaddrinfo" " if test "x$ac_cv_have_decl_freeaddrinfo" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_FREEADDRINFO $ac_have_decl" >>confdefs.h ac_fn_check_decl "$LINENO" "getnameinfo" "ac_cv_have_decl_getnameinfo" " @@ -42476,8 +45207,9 @@ ac_fn_check_decl "$LINENO" "getnameinfo" "ac_cv_have_decl_getnameinfo" " if test "x$ac_cv_have_decl_getnameinfo" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GETNAMEINFO $ac_have_decl" >>confdefs.h @@ -42591,7 +45323,7 @@ printf "%s\n" "#define GNULIB_TEST_GETADDRINFO 1" >>confdefs.h gl_abort_bug=no case "$host_os" in - mingw*) + mingw* | windows*) gl_cv_func_getcwd_path_max=yes ;; *) @@ -42605,8 +45337,8 @@ printf %s "checking whether getcwd handles long file names properly... " >&6; } if test ${gl_cv_func_getcwd_path_max+y} then : printf %s "(cached) " >&6 -else $as_nop - # Arrange for deletion of the temporary directory this test creates. +else case e in #( + e) # Arrange for deletion of the temporary directory this test creates. ac_clean_files="$ac_clean_files confdir3" if test "$cross_compiling" = yes then : @@ -42626,8 +45358,8 @@ then : gl_cv_func_getcwd_path_max="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <errno.h> @@ -42838,19 +45570,22 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_getcwd_path_max=yes -else $as_nop - case $? in +else case e in #( + e) case $? in 10|11|12) gl_cv_func_getcwd_path_max='no, but it is partly working';; 31) gl_cv_func_getcwd_path_max='no, it has the AIX bug';; 32) gl_cv_func_getcwd_path_max='yes, but with shorter paths';; *) gl_cv_func_getcwd_path_max=no;; - esac + esac ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_path_max" >&5 printf "%s\n" "$gl_cv_func_getcwd_path_max" >&6; } @@ -42868,8 +45603,8 @@ printf %s "checking for getpagesize... " >&6; } if test ${gl_cv_func_getpagesize+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> int @@ -42884,12 +45619,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_getpagesize=yes -else $as_nop - gl_cv_func_getpagesize=no +else case e in #( + e) gl_cv_func_getpagesize=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getpagesize" >&5 printf "%s\n" "$gl_cv_func_getpagesize" >&6; } @@ -42905,8 +45642,8 @@ printf %s "checking whether getcwd succeeds when 4k < cwd_length < 16k... " >&6; if test ${gl_cv_func_getcwd_succeeds_beyond_4k+y} then : printf %s "(cached) " >&6 -else $as_nop - # Remove any remnants of a previous test. +else case e in #( + e) # Remove any remnants of a previous test. rm -rf confdir-14B--- # Arrange for deletion of the temporary directory this test creates. ac_clean_files="$ac_clean_files confdir-14B---" @@ -42917,8 +45654,8 @@ then : *) gl_cv_func_getcwd_succeeds_beyond_4k="guessing no" esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <errno.h> @@ -43040,20 +45777,23 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_getcwd_succeeds_beyond_4k=yes -else $as_nop - ret=$? +else case e in #( + e) ret=$? if test $ret -ge 128 || test $ret = 4; then gl_cv_func_getcwd_succeeds_beyond_4k=no else gl_cv_func_getcwd_succeeds_beyond_4k=yes fi - + ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_succeeds_beyond_4k" >&5 printf "%s\n" "$gl_cv_func_getcwd_succeeds_beyond_4k" >&6; } @@ -43205,8 +45945,8 @@ printf %s "checking for getdelim... " >&6; } if test ${gl_cv_onwards_func_getdelim+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -43250,7 +45990,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_getdelim" >&5 printf "%s\n" "$gl_cv_onwards_func_getdelim" >&6; } @@ -43273,8 +46014,8 @@ printf %s "checking for working getdelim function... " >&6; } if test ${gl_cv_func_working_getdelim+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$host_os" in +else case e in #( + e) case "$host_os" in darwin*) gl_cv_func_working_getdelim=no ;; *) @@ -43293,21 +46034,22 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky GNU user" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Lucky GNU user" >/dev/null 2>&1 then : gl_cv_func_working_getdelim="guessing yes" -else $as_nop - case "$host_os" in +else case e in #( + e) case "$host_os" in *-musl* | midipix*) gl_cv_func_working_getdelim="guessing yes" ;; *) gl_cv_func_working_getdelim="$gl_cross_guess_normal" ;; esac - + ;; +esac fi rm -rf conftest* -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # include <stdio.h> @@ -43345,16 +46087,19 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_working_getdelim=yes -else $as_nop - gl_cv_func_working_getdelim=no +else case e in #( + e) gl_cv_func_working_getdelim=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_getdelim" >&5 printf "%s\n" "$gl_cv_func_working_getdelim" >&6; } @@ -43407,8 +46152,9 @@ fi if test "x$ac_cv_have_decl_getc_unlocked" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h @@ -43446,8 +46192,8 @@ printf %s "checking whether getdtablesize works... " >&6; } if test ${gl_cv_func_getdtablesize_works+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$host_os" in +else case e in #( + e) case "$host_os" in vms*) gl_cv_func_getdtablesize_works="no (limitation)" ;; *) if test "$cross_compiling" = yes @@ -43458,8 +46204,8 @@ then : *) gl_cv_func_getdtablesize_works="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> @@ -43484,16 +46230,19 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_getdtablesize_works=yes -else $as_nop - gl_cv_func_getdtablesize_works=no +else case e in #( + e) gl_cv_func_getdtablesize_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5 printf "%s\n" "$gl_cv_func_getdtablesize_works" >&6; } @@ -43557,23 +46306,29 @@ fi # If we don't yet have getgroups, see if it's in -lbsd. # This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1. - ac_save_LIBS=$LIBS + gl_saved_LIBS=$LIBS if test $ac_cv_func_getgroups = no; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getgroups in -lbsd" >&5 printf %s "checking for getgroups in -lbsd... " >&6; } if test ${ac_cv_lib_bsd_getgroups+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char getgroups (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char getgroups (void); int main (void) { @@ -43585,12 +46340,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_bsd_getgroups=yes -else $as_nop - ac_cv_lib_bsd_getgroups=no +else case e in #( + e) ac_cv_lib_bsd_getgroups=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_getgroups" >&5 printf "%s\n" "$ac_cv_lib_bsd_getgroups" >&6; } @@ -43609,8 +46366,8 @@ printf %s "checking for working getgroups... " >&6; } if test ${ac_cv_func_getgroups_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # (( # Guess yes on glibc systems. @@ -43621,8 +46378,8 @@ then : *) ac_cv_func_getgroups_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -43638,14 +46395,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_getgroups_works=yes -else $as_nop - ac_cv_func_getgroups_works=no +else case e in #( + e) ac_cv_func_getgroups_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getgroups_works" >&5 printf "%s\n" "$ac_cv_func_getgroups_works" >&6; } @@ -43659,7 +46419,7 @@ printf "%s\n" "#define HAVE_GETGROUPS 1" >>confdefs.h ;; esac - LIBS=$ac_save_LIBS + LIBS=$gl_saved_LIBS if test $ac_cv_func_getgroups != yes; then HAVE_GETGROUPS=0 @@ -43680,8 +46440,8 @@ printf %s "checking whether getgroups handles negative values... " >&6; } if test ${gl_cv_func_getgroups_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess yes on glibc systems. @@ -43692,8 +46452,8 @@ then : *) gl_cv_func_getgroups_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -43711,13 +46471,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_getgroups_works=yes -else $as_nop - gl_cv_func_getgroups_works=no +else case e in #( + e) gl_cv_func_getgroups_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getgroups_works" >&5 printf "%s\n" "$gl_cv_func_getgroups_works" >&6; } @@ -43776,8 +46539,8 @@ printf %s "checking for getline... " >&6; } if test ${gl_cv_onwards_func_getline+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -43821,7 +46584,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_getline" >&5 printf "%s\n" "$gl_cv_onwards_func_getline" >&6; } @@ -43843,8 +46607,8 @@ printf %s "checking for working getline function... " >&6; } if test ${am_cv_func_working_getline+y} then : printf %s "(cached) " >&6 -else $as_nop - echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data +else case e in #( + e) echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data if test "$cross_compiling" = yes then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -43859,21 +46623,22 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky GNU user" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Lucky GNU user" >/dev/null 2>&1 then : am_cv_func_working_getline="guessing yes" -else $as_nop - case "$host_os" in +else case e in #( + e) case "$host_os" in *-musl* | midipix*) am_cv_func_working_getline="guessing yes" ;; *) am_cv_func_working_getline="$gl_cross_guess_normal" ;; esac - + ;; +esac fi rm -rf conftest* -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # include <stdio.h> @@ -43911,14 +46676,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : am_cv_func_working_getline=yes -else $as_nop - am_cv_func_working_getline=no +else case e in #( + e) am_cv_func_working_getline=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_working_getline" >&5 printf "%s\n" "$am_cv_func_working_getline" >&6; } @@ -44146,8 +46914,8 @@ printf %s "checking for __fsetlocking... " >&6; } if test ${gl_cv_onwards_func___fsetlocking+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -44191,7 +46959,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func___fsetlocking" >&5 printf "%s\n" "$gl_cv_onwards_func___fsetlocking" >&6; } @@ -44215,8 +46984,9 @@ printf "%s\n" "#define HAVE___FSETLOCKING 1" >>confdefs.h if test "x$ac_cv_have_decl___fsetlocking" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL___FSETLOCKING $ac_have_decl" >>confdefs.h @@ -44231,8 +47001,8 @@ printf %s "checking for tcgetattr... " >&6; } if test ${gl_cv_func_tcgetattr+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <termios.h> struct termios x; @@ -44249,12 +47019,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_tcgetattr=yes -else $as_nop - gl_cv_func_tcgetattr=no +else case e in #( + e) gl_cv_func_tcgetattr=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_tcgetattr" >&5 printf "%s\n" "$gl_cv_func_tcgetattr" >&6; } @@ -44273,8 +47045,8 @@ printf %s "checking for tcsetattr... " >&6; } if test ${gl_cv_func_tcsetattr+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <termios.h> struct termios x; @@ -44291,12 +47063,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_tcsetattr=yes -else $as_nop - gl_cv_func_tcsetattr=no +else case e in #( + e) gl_cv_func_tcsetattr=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_tcsetattr" >&5 printf "%s\n" "$gl_cv_func_tcsetattr" >&6; } @@ -44339,8 +47113,8 @@ printf %s "checking for getpass without length limitations... " >&6; } if test ${gl_cv_func_getpass_good+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <features.h> @@ -44352,15 +47126,17 @@ else $as_nop _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky GNU user" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Lucky GNU user" >/dev/null 2>&1 then : gl_cv_func_getpass_good=yes -else $as_nop - gl_cv_func_getpass_good=no +else case e in #( + e) gl_cv_func_getpass_good=no ;; +esac fi rm -rf conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getpass_good" >&5 printf "%s\n" "$gl_cv_func_getpass_good" >&6; } @@ -44389,8 +47165,8 @@ printf %s "checking for __fsetlocking... " >&6; } if test ${gl_cv_onwards_func___fsetlocking+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -44434,7 +47210,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func___fsetlocking" >&5 printf "%s\n" "$gl_cv_onwards_func___fsetlocking" >&6; } @@ -44458,8 +47235,9 @@ printf "%s\n" "#define HAVE___FSETLOCKING 1" >>confdefs.h if test "x$ac_cv_have_decl___fsetlocking" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL___FSETLOCKING $ac_have_decl" >>confdefs.h @@ -44474,8 +47252,8 @@ printf %s "checking for tcgetattr... " >&6; } if test ${gl_cv_func_tcgetattr+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <termios.h> struct termios x; @@ -44492,12 +47270,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_tcgetattr=yes -else $as_nop - gl_cv_func_tcgetattr=no +else case e in #( + e) gl_cv_func_tcgetattr=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_tcgetattr" >&5 printf "%s\n" "$gl_cv_func_tcgetattr" >&6; } @@ -44516,8 +47296,8 @@ printf %s "checking for tcsetattr... " >&6; } if test ${gl_cv_func_tcsetattr+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <termios.h> struct termios x; @@ -44534,12 +47314,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_tcsetattr=yes -else $as_nop - gl_cv_func_tcsetattr=no +else case e in #( + e) gl_cv_func_tcsetattr=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_tcsetattr" >&5 printf "%s\n" "$gl_cv_func_tcsetattr" >&6; } @@ -44616,8 +47398,8 @@ printf %s "checking for getprogname... " >&6; } if test ${gl_cv_onwards_func_getprogname+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -44661,7 +47443,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_getprogname" >&5 printf "%s\n" "$gl_cv_onwards_func_getprogname" >&6; } @@ -44688,15 +47471,17 @@ printf "%s\n" "#define HAVE_GETPROGNAME 1" >>confdefs.h if test "x$ac_cv_have_decl_program_invocation_name" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h if test $ac_have_decl = 1 then : -else $as_nop - HAVE_DECL_PROGRAM_INVOCATION_NAME=0 +else case e in #( + e) HAVE_DECL_PROGRAM_INVOCATION_NAME=0 ;; +esac fi @@ -44725,8 +47510,9 @@ fi if test "x$ac_cv_have_decl_program_invocation_name" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h if test $ac_have_decl = 1 @@ -44739,8 +47525,9 @@ fi if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h if test $ac_have_decl = 1 @@ -44753,8 +47540,9 @@ fi if test "x$ac_cv_have_decl___argv" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h if test $ac_have_decl = 1 @@ -44772,8 +47560,8 @@ printf %s "checking whether __progname is defined in default libraries... " >&6; if test ${gl_cv_var___progname+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) gl_cv_var___progname= cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -44795,7 +47583,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5 printf "%s\n" "$gl_cv_var___progname" >&6; } @@ -44832,13 +47621,15 @@ printf "%s\n" "#define GNULIB_TEST_GETPROGNAME 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getrandom" >&5 printf %s "checking for getrandom... " >&6; } if test ${gl_cv_onwards_func_getrandom+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -44887,7 +47678,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_getrandom" >&5 printf "%s\n" "$gl_cv_onwards_func_getrandom" >&6; } @@ -44914,8 +47706,8 @@ printf %s "checking whether getrandom is compatible with its GNU+BSD signature.. if test ${gl_cv_func_getrandom_ok+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Additional includes are needed before <sys/random.h> on uClibc and Mac OS X. */ @@ -44936,11 +47728,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_getrandom_ok=yes -else $as_nop - gl_cv_func_getrandom_ok=no +else case e in #( + e) gl_cv_func_getrandom_ok=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getrandom_ok" >&5 printf "%s\n" "$gl_cv_func_getrandom_ok" >&6; } @@ -44950,7 +47744,7 @@ printf "%s\n" "$gl_cv_func_getrandom_ok" >&6; } fi case "$host_os" in - mingw*) + mingw* | windows*) ac_fn_c_check_header_compile "$LINENO" "bcrypt.h" "ac_cv_header_bcrypt_h" "#include <windows.h> " @@ -44965,8 +47759,8 @@ printf %s "checking whether the bcrypt library is guaranteed to be present... " if test ${gl_cv_lib_assume_bcrypt+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <windows.h> int @@ -44984,11 +47778,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_lib_assume_bcrypt=yes -else $as_nop - gl_cv_lib_assume_bcrypt=no +else case e in #( + e) gl_cv_lib_assume_bcrypt=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_lib_assume_bcrypt" >&5 printf "%s\n" "$gl_cv_lib_assume_bcrypt" >&6; } @@ -45104,8 +47900,8 @@ printf %s "checking for gettimeofday with POSIX signature... " >&6; } if test ${gl_cv_func_gettimeofday_posix_signature+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/time.h> struct timeval c; @@ -45131,8 +47927,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_gettimeofday_posix_signature=yes -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/time.h> int gettimeofday (struct timeval *restrict, struct timezone *restrict); @@ -45148,12 +47944,15 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_gettimeofday_posix_signature=almost -else $as_nop - gl_cv_func_gettimeofday_posix_signature=no +else case e in #( + e) gl_cv_func_gettimeofday_posix_signature=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_gettimeofday_posix_signature" >&5 printf "%s\n" "$gl_cv_func_gettimeofday_posix_signature" >&6; } @@ -45166,7 +47965,7 @@ printf "%s\n" "$gl_cv_func_gettimeofday_posix_signature" >&6; } REPLACE_GETTIMEOFDAY=1 fi case "$host_os" in - mingw*) REPLACE_GETTIMEOFDAY=1 ;; + mingw* | windows*) REPLACE_GETTIMEOFDAY=1 ;; esac fi @@ -45230,10 +48029,11 @@ printf "%s\n" "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h if test "x$ac_cv_func_group_member" = xyes then : -else $as_nop - +else case e in #( + e) HAVE_GROUP_MEMBER=0 - + ;; +esac fi @@ -45291,15 +48091,21 @@ printf %s "checking for library containing gethostbyname... " >&6; } if test ${ac_cv_search_gethostbyname+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char gethostbyname (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char gethostbyname (void); int main (void) { @@ -45330,11 +48136,13 @@ done if test ${ac_cv_search_gethostbyname+y} then : -else $as_nop - ac_cv_search_gethostbyname=no +else case e in #( + e) ac_cv_search_gethostbyname=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 printf "%s\n" "$ac_cv_search_gethostbyname" >&6; } @@ -45357,16 +48165,16 @@ if test "x$ac_cv_func_gethostbyname" = xyes then : printf "%s\n" "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in winsock2.h and -lws2_32" >&5 printf %s "checking for gethostbyname in winsock2.h and -lws2_32... " >&6; } if test ${gl_cv_w32_gethostbyname+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_cv_w32_gethostbyname=no - gl_save_LIBS="$LIBS" +else case e in #( + e) gl_cv_w32_gethostbyname=no + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -45390,15 +48198,17 @@ then : fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gl_save_LIBS" - + LIBS="$gl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_gethostbyname" >&5 printf "%s\n" "$gl_cv_w32_gethostbyname" >&6; } if test "$gl_cv_w32_gethostbyname" = "yes"; then HOSTENT_LIB="-lws2_32" fi - + ;; +esac fi done @@ -45497,8 +48307,9 @@ fi if test "x$ac_cv_have_decl_inet_ntop" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h @@ -45508,21 +48319,27 @@ printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h HAVE_DECL_INET_NTOP=0 fi else - gl_save_LIBS=$LIBS + gl_saved_LIBS=$LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5 printf %s "checking for library containing inet_ntop... " >&6; } if test ${ac_cv_search_inet_ntop+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char inet_ntop (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char inet_ntop (void); int main (void) { @@ -45553,11 +48370,13 @@ done if test ${ac_cv_search_inet_ntop+y} then : -else $as_nop - ac_cv_search_inet_ntop=no +else case e in #( + e) ac_cv_search_inet_ntop=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5 printf "%s\n" "$ac_cv_search_inet_ntop" >&6; } @@ -45566,8 +48385,8 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop - ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" +else case e in #( + e) ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" if test "x$ac_cv_func_inet_ntop" = xyes then : printf "%s\n" "#define HAVE_INET_NTOP 1" >>confdefs.h @@ -45577,10 +48396,11 @@ fi if test $ac_cv_func_inet_ntop = no; then HAVE_INET_NTOP=0 fi - + ;; +esac fi - LIBS=$gl_save_LIBS + LIBS=$gl_saved_LIBS if test "$ac_cv_search_inet_ntop" != "no" \ && test "$ac_cv_search_inet_ntop" != "none required"; then @@ -45597,8 +48417,9 @@ fi if test "x$ac_cv_have_decl_inet_ntop" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h @@ -45650,8 +48471,8 @@ printf %s "checking whether the compiler generally respects inline... " >&6; } if test ${gl_cv_c_inline_effective+y} then : printf %s "(cached) " >&6 -else $as_nop - if test $ac_cv_c_inline = no; then +else case e in #( + e) if test $ac_cv_c_inline = no; then gl_cv_c_inline_effective=no else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -45670,12 +48491,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_c_inline_effective=yes -else $as_nop - gl_cv_c_inline_effective=no +else case e in #( + e) gl_cv_c_inline_effective=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_inline_effective" >&5 printf "%s\n" "$gl_cv_c_inline_effective" >&6; } @@ -45712,8 +48535,8 @@ printf %s "checking for ioctl with POSIX signature... " >&6; } if test ${gl_cv_func_ioctl_posix_signature+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/ioctl.h> /* On some platforms, ioctl() is declared in <unistd.h>. */ @@ -45736,11 +48559,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_ioctl_posix_signature=yes -else $as_nop - gl_cv_func_ioctl_posix_signature=no +else case e in #( + e) gl_cv_func_ioctl_posix_signature=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ioctl_posix_signature" >&5 printf "%s\n" "$gl_cv_func_ioctl_posix_signature" >&6; } @@ -45835,8 +48660,8 @@ printf %s "checking for iswblank... " >&6; } if test ${gl_cv_onwards_func_iswblank+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -45880,7 +48705,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_iswblank" >&5 printf "%s\n" "$gl_cv_onwards_func_iswblank" >&6; } @@ -45904,8 +48730,9 @@ printf "%s\n" "#define HAVE_ISWBLANK 1" >>confdefs.h if test "x$ac_cv_have_decl_iswblank" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_ISWBLANK $ac_have_decl" >>confdefs.h @@ -45967,6 +48794,45 @@ printf "%s\n" "#define GNULIB_TEST_ISWBLANK 1" >>confdefs.h + if test $HAVE_WCTYPE_T = 0 || test $GNULIBHEADERS_OVERRIDE_WINT_T = 1 || test $REPLACE_WCTYPE = 1; then + GL_COND_OBJ_ISWCTYPE_TRUE= + GL_COND_OBJ_ISWCTYPE_FALSE='#' +else + GL_COND_OBJ_ISWCTYPE_TRUE='#' + GL_COND_OBJ_ISWCTYPE_FALSE= +fi +: + if test -z "${GL_COND_OBJ_ISWCTYPE_TRUE}" && test -z "${GL_COND_OBJ_ISWCTYPE_FALSE}"; then + GL_COND_OBJ_ISWCTYPE_TRUE='#' + GL_COND_OBJ_ISWCTYPE_FALSE='#' + fi + + + + + + + + + + + GL_GNULIB_ISWCTYPE=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_ISWCTYPE 1" >>confdefs.h + + + + + + + + + + if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then @@ -45977,11 +48843,11 @@ printf %s "checking whether iswdigit is ISO C compliant... " >&6; } if test ${gl_cv_func_iswdigit_works+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in # Guess no on FreeBSD, NetBSD, Solaris, native Windows. - freebsd* | dragonfly* | netbsd* | solaris* | mingw*) + freebsd* | dragonfly* | netbsd* | solaris* | mingw* | windows*) gl_cv_func_iswdigit_works="guessing no" ;; # Guess yes otherwise. *) gl_cv_func_iswdigit_works="guessing yes" ;; @@ -45990,8 +48856,8 @@ else $as_nop if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -46023,7 +48889,8 @@ main (int argc, char *argv[]) int is; int result = 0; - if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) + if (strcmp ("$LOCALE_FR", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR") != NULL) { /* This fails on mingw, MSVC 14. */ /* U+00B2 SUPERSCRIPT TWO */ @@ -46031,7 +48898,8 @@ main (int argc, char *argv[]) if (!(is == 0)) result |= 1; } - if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + if (strcmp ("$LOCALE_JA", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_JA") != NULL) { /* This fails on NetBSD 8.0. */ /* U+FF11 FULLWIDTH DIGIT ONE */ @@ -46039,7 +48907,8 @@ main (int argc, char *argv[]) if (!(is == 0)) result |= 2; } - if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + if (strcmp ("$LOCALE_FR_UTF8", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { /* This fails on FreeBSD 13.0, NetBSD 8.0, MSVC 14. */ /* U+0663 ARABIC-INDIC DIGIT THREE */ @@ -46052,7 +48921,8 @@ main (int argc, char *argv[]) if (!(is == 0)) result |= 8; } - if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + if (strcmp ("$LOCALE_ZH_CN", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) { /* This fails on NetBSD 8.0, Solaris 10, Solaris 11.4. */ /* U+FF11 FULLWIDTH DIGIT ONE */ @@ -46066,15 +48936,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_iswdigit_works=yes -else $as_nop - gl_cv_func_iswdigit_works=no +else case e in #( + e) gl_cv_func_iswdigit_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswdigit_works" >&5 printf "%s\n" "$gl_cv_func_iswdigit_works" >&6; } @@ -46121,6 +48994,102 @@ printf "%s\n" "#define GNULIB_TEST_ISWDIGIT 1" >>confdefs.h + if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then + REPLACE_ISWPUNCT="$REPLACE_ISWCNTRL" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether iswpunct is consistent with ispunct" >&5 +printf %s "checking whether iswpunct is consistent with ispunct... " >&6; } +if test ${gl_cv_func_iswpunct_works+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test "$cross_compiling" = yes +then : + case "$host_os" in + # Guess no on Android. + android*) gl_cv_func_iswpunct_works="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_iswpunct_works="guessing yes" ;; + esac + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <ctype.h> +#include <wchar.h> +#include <wctype.h> +int +main (int argc, char *argv[]) +{ + int result = 0; + /* This fails on Android 11. */ + if ((! iswpunct ('\`')) != (! ispunct ('\`'))) + result |= 1; + return result; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_iswpunct_works=yes +else case e in #( + e) gl_cv_func_iswpunct_works=no ;; +esac +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi + + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswpunct_works" >&5 +printf "%s\n" "$gl_cv_func_iswpunct_works" >&6; } + case "$gl_cv_func_iswpunct_works" in + *yes) ;; + *) REPLACE_ISWPUNCT=1 ;; + esac + fi + + + if ! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && test $REPLACE_ISWPUNCT = 1; then + GL_COND_OBJ_ISWPUNCT_TRUE= + GL_COND_OBJ_ISWPUNCT_FALSE='#' +else + GL_COND_OBJ_ISWPUNCT_TRUE='#' + GL_COND_OBJ_ISWPUNCT_FALSE= +fi +: + if test -z "${GL_COND_OBJ_ISWPUNCT_TRUE}" && test -z "${GL_COND_OBJ_ISWPUNCT_FALSE}"; then + GL_COND_OBJ_ISWPUNCT_TRUE='#' + GL_COND_OBJ_ISWPUNCT_FALSE='#' + fi + + + + + + + + + + + GL_GNULIB_ISWPUNCT=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_ISWPUNCT 1" >>confdefs.h + + + + + + + + @@ -46132,11 +49101,11 @@ printf %s "checking whether iswxdigit is ISO C compliant... " >&6; } if test ${gl_cv_func_iswxdigit_works+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in # Guess no on FreeBSD, NetBSD, Solaris, native Windows. - freebsd* | dragonfly* | netbsd* | solaris* | mingw*) + freebsd* | dragonfly* | netbsd* | solaris* | mingw* | windows*) gl_cv_func_iswxdigit_works="guessing no" ;; # Guess yes otherwise. *) gl_cv_func_iswxdigit_works="guessing yes" ;; @@ -46145,8 +49114,8 @@ else $as_nop if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -46178,7 +49147,8 @@ main (int argc, char *argv[]) int is; int result = 0; - if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + if (strcmp ("$LOCALE_JA", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_JA") != NULL) { /* This fails on NetBSD 8.0. */ /* U+FF21 FULLWIDTH LATIN CAPITAL LETTER A */ @@ -46186,7 +49156,8 @@ main (int argc, char *argv[]) if (!(is == 0)) result |= 1; } - if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + if (strcmp ("$LOCALE_FR_UTF8", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { /* This fails on FreeBSD 13.0. */ /* U+0663 ARABIC-INDIC DIGIT THREE */ @@ -46199,7 +49170,8 @@ main (int argc, char *argv[]) if (!(is == 0)) result |= 4; } - if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + if (strcmp ("$LOCALE_ZH_CN", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) { /* This fails on Solaris 10, Solaris 11.4. */ /* U+FF11 FULLWIDTH DIGIT ONE */ @@ -46213,15 +49185,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_iswxdigit_works=yes -else $as_nop - gl_cv_func_iswxdigit_works=no +else case e in #( + e) gl_cv_func_iswxdigit_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswxdigit_works" >&5 printf "%s\n" "$gl_cv_func_iswxdigit_works" >&6; } @@ -46278,8 +49253,8 @@ printf %s "checking whether the compiler supports the __inline keyword... " >&6; if test ${gl_cv_c___inline+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ typedef int foo_t; static __inline foo_t foo (void) { return 0; } @@ -46294,10 +49269,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_c___inline=yes -else $as_nop - gl_cv_c___inline=no +else case e in #( + e) gl_cv_c___inline=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5 printf "%s\n" "$gl_cv_c___inline" >&6; } @@ -46360,8 +49337,8 @@ printf %s "checking whether link obeys POSIX... " >&6; } if test ${gl_cv_func_link_works+y} then : printf %s "(cached) " >&6 -else $as_nop - touch conftest.a +else case e in #( + e) touch conftest.a # Assume that if we have lstat, we can also check symlinks. if test $ac_cv_func_lstat = yes; then ln -s conftest.a conftest.lnk @@ -46379,8 +49356,8 @@ then : *) gl_cv_func_link_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> #include <stdio.h> @@ -46408,14 +49385,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_link_works=yes -else $as_nop - gl_cv_func_link_works=no +else case e in #( + e) gl_cv_func_link_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - rm -f conftest.a conftest.b conftest.lnk + rm -f conftest.a conftest.b conftest.lnk ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_link_works" >&5 printf "%s\n" "$gl_cv_func_link_works" >&6; } @@ -46519,8 +49499,8 @@ printf %s "checking whether localeconv works... " >&6; } if test ${gl_cv_func_localeconv_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess yes on glibc systems. @@ -46528,13 +49508,13 @@ then : # Guess yes on musl systems. *-musl* | midipix*) gl_cv_func_localeconv_works="guessing yes" ;; # Guess no on native Windows. - mingw*) gl_cv_func_localeconv_works="guessing no" ;; + mingw* | windows*) gl_cv_func_localeconv_works="guessing no" ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_localeconv_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -46549,14 +49529,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_localeconv_works=yes -else $as_nop - gl_cv_func_localeconv_works=no +else case e in #( + e) gl_cv_func_localeconv_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_localeconv_works" >&5 printf "%s\n" "$gl_cv_func_localeconv_works" >&6; } @@ -46649,8 +49632,8 @@ printf %s "checking whether pthread_rwlock_rdlock prefers a writer to a reader.. if test ${gl_cv_pthread_rwlock_rdlock_prefer_writer+y} then : printf %s "(cached) " >&6 -else $as_nop - save_LIBS="$LIBS" +else case e in #( + e) saved_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" if test "$cross_compiling" = yes then : @@ -46663,7 +49646,7 @@ then : *-android*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; # Guess yes on native Windows with the mingw-w64 winpthreads library. # Guess no on native Windows with the gnulib windows-rwlock module. - mingw*) if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then + mingw* | windows*) if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes" else gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" @@ -46673,8 +49656,8 @@ then : *) gl_cv_pthread_rwlock_rdlock_prefer_writer="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <errno.h> @@ -46792,15 +49775,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_pthread_rwlock_rdlock_prefer_writer=yes -else $as_nop - gl_cv_pthread_rwlock_rdlock_prefer_writer=no +else case e in #( + e) gl_cv_pthread_rwlock_rdlock_prefer_writer=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - LIBS="$save_LIBS" - + LIBS="$saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pthread_rwlock_rdlock_prefer_writer" >&5 printf "%s\n" "$gl_cv_pthread_rwlock_rdlock_prefer_writer" >&6; } @@ -46862,9 +49848,9 @@ printf %s "checking whether lseek detects pipes... " >&6; } if test ${gl_cv_func_lseek_pipe+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$host_os" in - mingw*) +else case e in #( + e) case "$host_os" in + mingw* | windows*) gl_cv_func_lseek_pipe=no ;; *) @@ -46905,8 +49891,9 @@ then : gl_cv_func_lseek_pipe=no fi -else $as_nop - gl_cv_func_lseek_pipe=no +else case e in #( + e) gl_cv_func_lseek_pipe=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -46922,14 +49909,16 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_func_lseek_pipe=yes -else $as_nop - gl_cv_func_lseek_pipe=no +else case e in #( + e) gl_cv_func_lseek_pipe=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lseek_pipe" >&5 printf "%s\n" "$gl_cv_func_lseek_pipe" >&6; } @@ -46952,8 +49941,8 @@ printf %s "checking whether SEEK_DATA works but is incompatible with GNU... " >& if test ${gl_cv_func_lseek_works_but_incompatible+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> #if defined __APPLE__ && defined __MACH__ && defined SEEK_DATA @@ -46972,10 +49961,12 @@ _ACEOF if ac_fn_c_try_cpp "$LINENO" then : gl_cv_func_lseek_works_but_incompatible=yes -else $as_nop - gl_cv_func_lseek_works_but_incompatible=no +else case e in #( + e) gl_cv_func_lseek_works_but_incompatible=no ;; +esac fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lseek_works_but_incompatible" >&5 printf "%s\n" "$gl_cv_func_lseek_works_but_incompatible" >&6; } @@ -47024,7 +50015,7 @@ printf "%s\n" "#define GNULIB_TEST_LSEEK 1" >>confdefs.h if test $ac_cv_func_lstat = yes; then case $host_os,$gl_cv_func_lstat_dereferences_slashed_symlink in - solaris* | *no) + darwin* | solaris* | *no) REPLACE_LSTAT=1 ;; esac @@ -47084,21 +50075,21 @@ printf %s "checking whether malloc (0) returns nonnull... " >&6; } if test ${ac_cv_func_malloc_0_nonnull+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess yes on platforms where we know the result. *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ | gnu* | *-musl* | midipix* | midnightbsd* \ - | hpux* | solaris* | cygwin* | mingw* | msys* ) + | hpux* | solaris* | cygwin* | mingw* | windows* | msys* ) ac_cv_func_malloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -47106,7 +50097,8 @@ int main (void) { void *p = malloc (0); - int result = !p; + void * volatile vp = p; + int result = !vp; free (p); return result; ; @@ -47117,14 +50109,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_malloc_0_nonnull=yes -else $as_nop - ac_cv_func_malloc_0_nonnull=no +else case e in #( + e) ac_cv_func_malloc_0_nonnull=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; } @@ -47219,6 +50214,324 @@ printf "%s\n" "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h + + if test $gl_cv_func_mbrtoc32 = no; then + HAVE_MBRTOC32=0 + else + if test $GNULIBHEADERS_OVERRIDE_CHAR32_T = 1 || test $REPLACE_MBSTATE_T = 1; then + REPLACE_MBRTOC32=1 + else + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtoc32 works on empty input" >&5 +printf %s "checking whether mbrtoc32 works on empty input... " >&6; } +if test ${gl_cv_func_mbrtoc32_empty_input+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + if test "$cross_compiling" = yes +then : + case "$host_os" in + # Guess no on glibc systems. + *-gnu* | gnu*) gl_cv_func_mbrtoc32_empty_input="guessing no" ;; + # Guess no on Android. + linux*-android*) gl_cv_func_mbrtoc32_empty_input="guessing no" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_mbrtoc32_empty_input="guessing no" ;; + *) gl_cv_func_mbrtoc32_empty_input="guessing yes" ;; + esac + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + static char32_t wc; + static mbstate_t mbs; + int + main (void) + { + return mbrtoc32 (&wc, "", 0, &mbs) != (size_t) -2; + } +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_mbrtoc32_empty_input=yes +else case e in #( + e) gl_cv_func_mbrtoc32_empty_input=no ;; +esac +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi + + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtoc32_empty_input" >&5 +printf "%s\n" "$gl_cv_func_mbrtoc32_empty_input" >&6; } + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5 +printf %s "checking whether the C locale is free of encoding errors... " >&6; } +if test ${gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test "$cross_compiling" = yes +then : + case "$host_os" in + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ="guessing yes" ;; + *) gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;; + esac + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <limits.h> + #include <locale.h> + #ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + +int +main (void) +{ + + int i; + char *locale = setlocale (LC_ALL, "C"); + if (! locale) + return 2; + for (i = CHAR_MIN; i <= CHAR_MAX; i++) + { + char c = i; + char32_t wc; + mbstate_t mbs = { 0, }; + size_t ss = mbrtoc32 (&wc, &c, 1, &mbs); + if (1 < ss) + return 3; + } + return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ=yes +else case e in #( + e) gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ=no ;; +esac +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi + + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ" >&5 +printf "%s\n" "$gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ" >&6; } + + case "$gl_cv_func_mbrtoc32_empty_input" in + *yes) ;; + *) +printf "%s\n" "#define MBRTOC32_EMPTY_INPUT_BUG 1" >>confdefs.h + + REPLACE_MBRTOC32=1 + ;; + esac + case "$gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ" in + *yes) ;; + *) +printf "%s\n" "#define MBRTOC32_IN_C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h + + REPLACE_MBRTOC32=1 + ;; + esac + fi + if test $HAVE_WORKING_MBRTOC32 = 0; then + REPLACE_MBRTOC32=1 + fi + fi + + + if test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; then + GL_COND_OBJ_MBRTOC32_TRUE= + GL_COND_OBJ_MBRTOC32_FALSE='#' +else + GL_COND_OBJ_MBRTOC32_TRUE='#' + GL_COND_OBJ_MBRTOC32_FALSE= +fi +: + if test -z "${GL_COND_OBJ_MBRTOC32_TRUE}" && test -z "${GL_COND_OBJ_MBRTOC32_FALSE}"; then + GL_COND_OBJ_MBRTOC32_TRUE='#' + GL_COND_OBJ_MBRTOC32_FALSE='#' + fi + + if test -z "$GL_COND_OBJ_MBRTOC32_TRUE"; then : + + if test $REPLACE_MBSTATE_T = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS lc-charset-dispatch.$ac_objext" + + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS mbtowc-lock.$ac_objext" + + + + + CFLAG_VISIBILITY= + HAVE_VISIBILITY=0 + if test -n "$GCC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5 +printf %s "checking whether the -Werror option is usable... " >&6; } +if test ${gl_cv_cc_vis_werror+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) gl_saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_cc_vis_werror=yes +else case e in #( + e) gl_cv_cc_vis_werror=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CFLAGS="$gl_saved_CFLAGS" + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 +printf "%s\n" "$gl_cv_cc_vis_werror" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 +printf %s "checking for simple visibility declarations... " >&6; } +if test ${gl_cv_cc_visibility+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) gl_saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=hidden" + if test $gl_cv_cc_vis_werror = yes; then + CFLAGS="$CFLAGS -Werror" + fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +extern __attribute__((__visibility__("hidden"))) int hiddenvar; + extern __attribute__((__visibility__("default"))) int exportedvar; + extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); + extern __attribute__((__visibility__("default"))) int exportedfunc (void); + void dummyfunc (void); + int hiddenvar; + int exportedvar; + int hiddenfunc (void) { return 51; } + int exportedfunc (void) { return 1225736919; } + void dummyfunc (void) {} + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_cc_visibility=yes +else case e in #( + e) gl_cv_cc_visibility=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CFLAGS="$gl_saved_CFLAGS" + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 +printf "%s\n" "$gl_cv_cc_visibility" >&6; } + if test $gl_cv_cc_visibility = yes; then + CFLAG_VISIBILITY="-fvisibility=hidden" + HAVE_VISIBILITY=1 + fi + fi + + + +printf "%s\n" "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h + + + + fi + + : + + +fi + + + + + + + + + + GL_GNULIB_MBRTOC32=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_MBRTOC32 1" >>confdefs.h + + + + + + + + + + + + if test $ac_cv_func_mbrtowc = no; then HAVE_MBRTOWC=0 ac_fn_check_decl "$LINENO" "mbrtowc" "ac_cv_have_decl_mbrtowc" " @@ -47228,8 +50541,9 @@ printf "%s\n" "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h if test "x$ac_cv_have_decl_mbrtowc" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_MBRTOWC $ac_have_decl" >>confdefs.h @@ -47248,8 +50562,8 @@ printf %s "checking whether mbrtowc handles a NULL pwc argument... " >&6; } if test ${gl_cv_func_mbrtowc_null_arg1+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in # Guess no on Solaris. solaris*) gl_cv_func_mbrtowc_null_arg1="guessing no" ;; @@ -47260,8 +50574,8 @@ else $as_nop if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -47300,15 +50614,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_mbrtowc_null_arg1=yes -else $as_nop - gl_cv_func_mbrtowc_null_arg1=no +else case e in #( + e) gl_cv_func_mbrtowc_null_arg1=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg1" >&5 printf "%s\n" "$gl_cv_func_mbrtowc_null_arg1" >&6; } @@ -47321,8 +50638,8 @@ printf %s "checking whether mbrtowc handles a NULL string argument... " >&6; } if test ${gl_cv_func_mbrtowc_null_arg2+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in # Guess no on OSF/1. osf*) gl_cv_func_mbrtowc_null_arg2="guessing no" ;; @@ -47333,8 +50650,8 @@ else $as_nop if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -47361,15 +50678,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_mbrtowc_null_arg2=yes -else $as_nop - gl_cv_func_mbrtowc_null_arg2=no +else case e in #( + e) gl_cv_func_mbrtowc_null_arg2=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg2" >&5 printf "%s\n" "$gl_cv_func_mbrtowc_null_arg2" >&6; } @@ -47384,21 +50704,23 @@ printf %s "checking whether mbrtowc has a correct return value... " >&6; } if test ${gl_cv_func_mbrtowc_retval+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in - # Guess no on HP-UX, Solaris, native Windows. - hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_mbrtowc_retval="guessing yes" ;; + # Guess no on HP-UX, Solaris, native Windows. + hpux* | solaris* | mingw* | windows*) + gl_cv_func_mbrtowc_retval="guessing no" ;; + # Guess yes otherwise. + *) + gl_cv_func_mbrtowc_retval="guessing yes" ;; esac if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \ - || { case "$host_os" in mingw*) true;; *) false;; esac; }; then + || { case "$host_os" in mingw* | windows*) true;; *) false;; esac; }; then if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -47409,7 +50731,8 @@ int main () int result = 0; int found_some_locale = 0; /* This fails on Solaris. */ - if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + if (strcmp ("$LOCALE_FR_UTF8", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { char input[] = "B\303\274\303\237er"; /* "Büßer" */ mbstate_t state; @@ -47425,7 +50748,8 @@ int main () found_some_locale = 1; } /* This fails on HP-UX 11.11. */ - if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + if (strcmp ("$LOCALE_JA", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_JA") != NULL) { char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */ mbstate_t state; @@ -47492,18 +50816,21 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_mbrtowc_retval=yes -else $as_nop - if test $? != 77; then +else case e in #( + e) if test $? != 77; then gl_cv_func_mbrtowc_retval=no fi - + ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_retval" >&5 printf "%s\n" "$gl_cv_func_mbrtowc_retval" >&6; } @@ -47516,8 +50843,8 @@ printf %s "checking whether mbrtowc returns 0 when parsing a NUL character... " if test ${gl_cv_func_mbrtowc_nul_retval+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in # Guess no on Solaris 8 and 9. solaris2.[89]) gl_cv_func_mbrtowc_nul_retval="guessing no" ;; @@ -47528,8 +50855,8 @@ else $as_nop if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -47553,15 +50880,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_mbrtowc_nul_retval=yes -else $as_nop - gl_cv_func_mbrtowc_nul_retval=no +else case e in #( + e) gl_cv_func_mbrtowc_nul_retval=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5 printf "%s\n" "$gl_cv_func_mbrtowc_nul_retval" >&6; } @@ -47573,20 +50903,20 @@ printf %s "checking whether mbrtowc stores incomplete characters... " >&6; } if test ${gl_cv_func_mbrtowc_stores_incomplete+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in - # Guess yes on native Windows. - mingw*) gl_cv_func_mbrtowc_stores_incomplete="guessing yes" ;; - *) gl_cv_func_mbrtowc_stores_incomplete="guessing no" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_mbrtowc_stores_incomplete="guessing yes" ;; + *) gl_cv_func_mbrtowc_stores_incomplete="guessing no" ;; esac case "$host_os" in - mingw*) + mingw* | windows*) if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -47641,11 +50971,13 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_mbrtowc_stores_incomplete=no -else $as_nop - gl_cv_func_mbrtowc_stores_incomplete=yes +else case e in #( + e) gl_cv_func_mbrtowc_stores_incomplete=yes ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi ;; @@ -47655,8 +50987,8 @@ fi if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -47680,17 +51012,20 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_mbrtowc_stores_incomplete=no -else $as_nop - gl_cv_func_mbrtowc_stores_incomplete=yes +else case e in #( + e) gl_cv_func_mbrtowc_stores_incomplete=yes ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_stores_incomplete" >&5 printf "%s\n" "$gl_cv_func_mbrtowc_stores_incomplete" >&6; } @@ -47702,42 +51037,46 @@ printf %s "checking whether mbrtowc works on empty input... " >&6; } if test ${gl_cv_func_mbrtowc_empty_input+y} then : printf %s "(cached) " >&6 -else $as_nop - - case "$host_os" in - # Guess no on AIX and glibc systems. - aix* | *-gnu* | gnu*) gl_cv_func_mbrtowc_empty_input="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; - *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; - esac - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : - : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + case "$host_os" in + # Guess no on AIX and glibc systems. + aix* | *-gnu* | gnu*) gl_cv_func_mbrtowc_empty_input="guessing no" ;; + # Guess no on Android. + linux*-android*) gl_cv_func_mbrtowc_empty_input="guessing no" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_mbrtowc_empty_input="guessing no" ;; + *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; + esac + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include <wchar.h> - static wchar_t wc; - static mbstate_t mbs; - int - main (void) - { - return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2; - } + #include <wchar.h> + static wchar_t wc; + static mbstate_t mbs; + int + main (void) + { + return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2; + } _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_mbrtowc_empty_input=yes -else $as_nop - gl_cv_func_mbrtowc_empty_input=no +else case e in #( + e) gl_cv_func_mbrtowc_empty_input=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5 printf "%s\n" "$gl_cv_func_mbrtowc_empty_input" >&6; } @@ -47748,19 +51087,17 @@ printf %s "checking whether the C locale is free of encoding errors... " >&6; } if test ${gl_cv_func_mbrtowc_C_locale_sans_EILSEQ+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" - - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on native Windows. - mingw*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;; - esac + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;; + *) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;; + esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <limits.h> #include <locale.h> @@ -47792,14 +51129,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=yes -else $as_nop - gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no +else case e in #( + e) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&5 printf "%s\n" "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&6; } @@ -47864,7 +51204,9 @@ printf "%s\n" "#define MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h fi if test $REPLACE_MBSTATE_T = 1; then case "$host_os" in - mingw*) MBRTOWC_LIB= ;; + mingw* | windows*) + MBRTOWC_LIB= + ;; *) @@ -47873,9 +51215,9 @@ printf %s "checking whether imported symbols can be declared weak... " >&6; } if test ${gl_cv_have_weak+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$host_os" in - cygwin* | mingw*) +else case e in #( + e) case "$host_os" in + cygwin* | mingw* | windows*) gl_cv_have_weak="guessing no" ;; *) @@ -47909,17 +51251,18 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Extensible Linking Format" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1 then : gl_cv_have_weak="guessing yes" -else $as_nop - gl_cv_have_weak="guessing no" +else case e in #( + e) gl_cv_have_weak="guessing no" ;; +esac fi rm -rf conftest* -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -47932,11 +51275,13 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_have_weak=yes -else $as_nop - gl_cv_have_weak=no +else case e in #( + e) gl_cv_have_weak=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi @@ -47966,7 +51311,8 @@ EOF esac ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 printf "%s\n" "$gl_cv_have_weak" >&6; } @@ -48039,8 +51385,8 @@ printf %s "checking whether the -Werror option is usable... " >&6; } if test ${gl_cv_cc_vis_werror+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_save_CFLAGS="$CFLAGS" +else case e in #( + e) gl_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -48056,12 +51402,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_cc_vis_werror=yes -else $as_nop - gl_cv_cc_vis_werror=no +else case e in #( + e) gl_cv_cc_vis_werror=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS="$gl_save_CFLAGS" - + CFLAGS="$gl_saved_CFLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 printf "%s\n" "$gl_cv_cc_vis_werror" >&6; } @@ -48070,8 +51418,8 @@ printf %s "checking for simple visibility declarations... " >&6; } if test ${gl_cv_cc_visibility+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_save_CFLAGS="$CFLAGS" +else case e in #( + e) gl_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" if test $gl_cv_cc_vis_werror = yes; then CFLAGS="$CFLAGS -Werror" @@ -48100,12 +51448,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_cc_visibility=yes -else $as_nop - gl_cv_cc_visibility=no +else case e in #( + e) gl_cv_cc_visibility=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS="$gl_save_CFLAGS" - + CFLAGS="$gl_saved_CFLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 printf "%s\n" "$gl_cv_cc_visibility" >&6; } @@ -48169,8 +51519,9 @@ printf "%s\n" "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h if test "x$ac_cv_have_decl_mbsinit" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_MBSINIT $ac_have_decl" >>confdefs.h @@ -48182,7 +51533,7 @@ printf "%s\n" "#define HAVE_DECL_MBSINIT $ac_have_decl" >>confdefs.h REPLACE_MBSINIT=1 else case "$host_os" in - mingw*) REPLACE_MBSINIT=1 ;; + mingw* | windows*) REPLACE_MBSINIT=1 ;; esac fi fi @@ -48239,6 +51590,36 @@ printf "%s\n" "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h + + + gl_LIBOBJS="$gl_LIBOBJS mbsrtoc32s-state.$ac_objext" + + + + + + + + + + + GL_GNULIB_MBSRTOC32S=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_MBSRTOC32S 1" >>confdefs.h + + + + + + + + + + if test $ac_cv_func_mbsrtowcs = no; then HAVE_MBSRTOWCS=0 ac_fn_check_decl "$LINENO" "mbsrtowcs" "ac_cv_have_decl_mbsrtowcs" " @@ -48248,8 +51629,9 @@ printf "%s\n" "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h if test "x$ac_cv_have_decl_mbsrtowcs" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_MBSRTOWCS $ac_have_decl" >>confdefs.h @@ -48271,20 +51653,22 @@ printf %s "checking whether mbsrtowcs works... " >&6; } if test ${gl_cv_func_mbsrtowcs_works+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in - # Guess no on HP-UX, Solaris, mingw. - hpux* | solaris* | mingw*) gl_cv_func_mbsrtowcs_works="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_mbsrtowcs_works="guessing yes" ;; + # Guess no on HP-UX, Solaris, mingw. + hpux* | solaris* | mingw* | windows*) + gl_cv_func_mbsrtowcs_works="guessing no" ;; + # Guess yes otherwise. + *) + gl_cv_func_mbsrtowcs_works="guessing yes" ;; esac if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -48295,7 +51679,8 @@ int main () int result = 0; /* Test whether the function supports a NULL destination argument. This fails on native Windows. */ - if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) + if (strcmp ("$LOCALE_FR", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR") != NULL) { const char input[] = "\337er"; const char *src = input; @@ -48308,7 +51693,8 @@ int main () } /* Test whether the function works when started with a conversion state in non-initial state. This fails on HP-UX 11.11 and Solaris 10. */ - if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + if (strcmp ("$LOCALE_FR_UTF8", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { const char input[] = "B\303\274\303\237er"; mbstate_t state; @@ -48322,7 +51708,8 @@ int main () result |= 2; } } - if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + if (strcmp ("$LOCALE_JA", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_JA") != NULL) { const char input[] = "<\306\374\313\334\270\354>"; mbstate_t state; @@ -48336,7 +51723,8 @@ int main () result |= 4; } } - if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + if (strcmp ("$LOCALE_ZH_CN", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) { const char input[] = "B\250\271\201\060\211\070er"; mbstate_t state; @@ -48356,15 +51744,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_mbsrtowcs_works=yes -else $as_nop - gl_cv_func_mbsrtowcs_works=no +else case e in #( + e) gl_cv_func_mbsrtowcs_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbsrtowcs_works" >&5 printf "%s\n" "$gl_cv_func_mbsrtowcs_works" >&6; } @@ -48380,19 +51771,17 @@ printf %s "checking whether the C locale is free of encoding errors... " >&6; } if test ${gl_cv_func_mbrtowc_C_locale_sans_EILSEQ+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" - - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on native Windows. - mingw*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;; - esac + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;; + *) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;; + esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <limits.h> #include <locale.h> @@ -48424,14 +51813,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=yes -else $as_nop - gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no +else case e in #( + e) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&5 printf "%s\n" "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&6; } @@ -48504,13 +51896,40 @@ printf "%s\n" "#define GNULIB_TEST_MBSRTOWCS 1" >>confdefs.h + + + + + + + + + + + + + GL_GNULIB_MBSZERO=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_MBSZERO 1" >>confdefs.h + + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbtowc" >&5 printf %s "checking for mbtowc... " >&6; } if test ${gl_cv_onwards_func_mbtowc+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -48554,7 +51973,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_mbtowc" >&5 printf "%s\n" "$gl_cv_onwards_func_mbtowc" >&6; } @@ -48686,8 +52106,8 @@ printf %s "checking for mempcpy... " >&6; } if test ${gl_cv_onwards_func_mempcpy+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -48731,7 +52151,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_mempcpy" >&5 printf "%s\n" "$gl_cv_onwards_func_mempcpy" >&6; } @@ -48869,19 +52290,20 @@ printf %s "checking whether mkdir handles trailing slash... " >&6; } if test ${gl_cv_func_mkdir_trailing_slash_works+y} then : printf %s "(cached) " >&6 -else $as_nop - rm -rf conftest.dir +else case e in #( + e) rm -rf conftest.dir if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; - # Guess yes on MSVC, no on mingw. - mingw*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on MSVC, no on mingw. + windows*-msvc*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + mingw* | windows*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef _MSC_VER @@ -48890,21 +52312,22 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Known" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Known" >/dev/null 2>&1 then : gl_cv_func_mkdir_trailing_slash_works="guessing yes" -else $as_nop - gl_cv_func_mkdir_trailing_slash_works="guessing no" +else case e in #( + e) gl_cv_func_mkdir_trailing_slash_works="guessing no" ;; +esac fi rm -rf conftest* - ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_mkdir_trailing_slash_works="$gl_cross_guess_normal" ;; + ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_mkdir_trailing_slash_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -48924,15 +52347,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_mkdir_trailing_slash_works=yes -else $as_nop - gl_cv_func_mkdir_trailing_slash_works=no +else case e in #( + e) gl_cv_func_mkdir_trailing_slash_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -rf conftest.dir - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mkdir_trailing_slash_works" >&5 printf "%s\n" "$gl_cv_func_mkdir_trailing_slash_works" >&6; } @@ -48948,25 +52374,25 @@ printf %s "checking whether mkdir handles trailing dot... " >&6; } if test ${gl_cv_func_mkdir_trailing_dot_works+y} then : printf %s "(cached) " >&6 -else $as_nop - rm -rf conftest.dir +else case e in #( + e) rm -rf conftest.dir if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_mkdir_trailing_dot_works="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; + # Guess yes on musl systems. + *-musl*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_mkdir_trailing_dot_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -48986,16 +52412,19 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_mkdir_trailing_dot_works=yes -else $as_nop - gl_cv_func_mkdir_trailing_dot_works=no +else case e in #( + e) gl_cv_func_mkdir_trailing_dot_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -rf conftest.dir - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mkdir_trailing_dot_works" >&5 printf "%s\n" "$gl_cv_func_mkdir_trailing_dot_works" >&6; } @@ -49054,8 +52483,8 @@ printf %s "checking for mkostemp... " >&6; } if test ${gl_cv_onwards_func_mkostemp+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -49099,7 +52528,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_mkostemp" >&5 printf "%s\n" "$gl_cv_onwards_func_mkostemp" >&6; } @@ -49176,8 +52606,8 @@ printf %s "checking for working mkstemp... " >&6; } if test ${gl_cv_func_working_mkstemp+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) mkdir conftest.mkstemp if test "$cross_compiling" = yes then : @@ -49187,13 +52617,13 @@ then : # Guess yes on musl systems. *-musl* | midipix*) gl_cv_func_working_mkstemp="guessing yes" ;; # Guess no on native Windows. - mingw*) gl_cv_func_working_mkstemp="guessing no" ;; + mingw* | windows*) gl_cv_func_working_mkstemp="guessing no" ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_working_mkstemp="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default @@ -49237,15 +52667,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_working_mkstemp=yes -else $as_nop - gl_cv_func_working_mkstemp=no +else case e in #( + e) gl_cv_func_working_mkstemp=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -rf conftest.mkstemp - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_mkstemp" >&5 printf "%s\n" "$gl_cv_func_working_mkstemp" >&6; } @@ -49303,7 +52736,6 @@ printf "%s\n" "#define GNULIB_TEST_MKSTEMP 1" >>confdefs.h - REPLACE_MKTIME=0 if test "$gl_cv_func_working_mktime" != yes; then REPLACE_MKTIME=1 @@ -49311,7 +52743,7 @@ printf "%s\n" "#define NEED_MKTIME_WORKING 1" >>confdefs.h fi case "$host_os" in - mingw*) + mingw* | windows*) REPLACE_MKTIME=1 printf "%s\n" "#define NEED_MKTIME_WINDOWS 1" >>confdefs.h @@ -49362,12 +52794,13 @@ then : printf "%s\n" "#define mktime_internal __mktime_internal" >>confdefs.h -else $as_nop - WANT_MKTIME_INTERNAL=1 +else case e in #( + e) WANT_MKTIME_INTERNAL=1 printf "%s\n" "#define NEED_MKTIME_INTERNAL 1" >>confdefs.h - + ;; +esac fi @@ -49427,7 +52860,7 @@ printf "%s\n" "#define GNULIB_MSVC_NOTHROW 1" >>confdefs.h - nanosleep_save_libs=$LIBS + gl_saved_LIBS=$LIBS # Solaris 2.5.1 needs -lposix4 to get the nanosleep function. # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. @@ -49438,15 +52871,21 @@ printf %s "checking for library containing nanosleep... " >&6; } if test ${ac_cv_search_nanosleep+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char nanosleep (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char nanosleep (void); int main (void) { @@ -49477,11 +52916,13 @@ done if test ${ac_cv_search_nanosleep+y} then : -else $as_nop - ac_cv_search_nanosleep=no +else case e in #( + e) ac_cv_search_nanosleep=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nanosleep" >&5 printf "%s\n" "$ac_cv_search_nanosleep" >&6; } @@ -49509,21 +52950,28 @@ printf %s "checking for working nanosleep... " >&6; } if test ${gl_cv_func_nanosleep+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - linux*) # Guess it halfway works when the kernel is Linux. + # Guess it halfway works when the kernel is Linux. + linux*) gl_cv_func_nanosleep='guessing no (mishandles large arguments)' ;; - mingw*) # Guess no on native Windows. + # Midipix generally emulates the Linux system calls, + # but here it handles large arguments correctly. + midipix*) + gl_cv_func_nanosleep='guessing yes' ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_nanosleep='guessing no' ;; - *) # If we don't know, obey --enable-cross-guesses. + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_nanosleep="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <errno.h> @@ -49592,25 +53040,26 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_nanosleep=yes -else $as_nop - case $? in +else case e in #( + e) case $? in 4|5|6) gl_cv_func_nanosleep='no (mishandles large arguments)' ;; 7) gl_cv_func_nanosleep='no (mishandles negative tv_nsec)' ;; *) gl_cv_func_nanosleep=no ;; - esac + esac ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_nanosleep" >&5 printf "%s\n" "$gl_cv_func_nanosleep" >&6; } case "$gl_cv_func_nanosleep" in - *yes) - REPLACE_NANOSLEEP=0 - ;; + *yes) ;; *) REPLACE_NANOSLEEP=1 case "$gl_cv_func_nanosleep" in @@ -49625,7 +53074,7 @@ printf "%s\n" "#define HAVE_BUG_BIG_NANOSLEEP 1" >>confdefs.h else HAVE_NANOSLEEP=0 fi - LIBS=$nanosleep_save_libs + LIBS=$gl_saved_LIBS # For backward compatibility. LIB_NANOSLEEP="$NANOSLEEP_LIB" @@ -49677,8 +53126,8 @@ printf %s "checking whether <netinet/in.h> is self-contained... " >&6; } if test ${gl_cv_header_netinet_in_h_selfcontained+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <netinet/in.h> @@ -49693,11 +53142,13 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_header_netinet_in_h_selfcontained=yes -else $as_nop - gl_cv_header_netinet_in_h_selfcontained=no +else case e in #( + e) gl_cv_header_netinet_in_h_selfcontained=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_netinet_in_h_selfcontained" >&5 printf "%s\n" "$gl_cv_header_netinet_in_h_selfcontained" >&6; } @@ -49729,8 +53180,8 @@ printf %s "checking absolute name of <netinet/in.h>... " >&6; } if test ${gl_cv_next_netinet_in_h+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $ac_cv_header_netinet_in_h = yes; then @@ -49746,7 +53197,7 @@ _ACEOF esac case "$host_os" in - mingw*) + mingw* | windows*) gl_dirsep_regex='[/\\]' ;; *) @@ -49772,7 +53223,8 @@ _ACEOF gl_cv_next_netinet_in_h='<'netinet/in.h'>' fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_netinet_in_h" >&5 printf "%s\n" "$gl_cv_next_netinet_in_h" >&6; } @@ -49842,8 +53294,8 @@ printf %s "checking for nl_langinfo... " >&6; } if test ${gl_cv_onwards_func_nl_langinfo+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -49887,7 +53339,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_nl_langinfo" >&5 printf "%s\n" "$gl_cv_onwards_func_nl_langinfo" >&6; } @@ -49914,8 +53367,8 @@ printf %s "checking whether YESEXPR works... " >&6; } if test ${gl_cv_func_nl_langinfo_yesexpr_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in @@ -49925,8 +53378,8 @@ then : *) gl_cv_func_nl_langinfo_yesexpr_works="guessing yes";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <langinfo.h> @@ -49942,14 +53395,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_nl_langinfo_yesexpr_works=yes -else $as_nop - gl_cv_func_nl_langinfo_yesexpr_works=no +else case e in #( + e) gl_cv_func_nl_langinfo_yesexpr_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_nl_langinfo_yesexpr_works" >&5 printf "%s\n" "$gl_cv_func_nl_langinfo_yesexpr_works" >&6; } @@ -50034,8 +53490,8 @@ printf %s "checking whether the -Werror option is usable... " >&6; } if test ${gl_cv_cc_vis_werror+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_save_CFLAGS="$CFLAGS" +else case e in #( + e) gl_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -50051,12 +53507,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_cc_vis_werror=yes -else $as_nop - gl_cv_cc_vis_werror=no +else case e in #( + e) gl_cv_cc_vis_werror=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS="$gl_save_CFLAGS" - + CFLAGS="$gl_saved_CFLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 printf "%s\n" "$gl_cv_cc_vis_werror" >&6; } @@ -50065,8 +53523,8 @@ printf %s "checking for simple visibility declarations... " >&6; } if test ${gl_cv_cc_visibility+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_save_CFLAGS="$CFLAGS" +else case e in #( + e) gl_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" if test $gl_cv_cc_vis_werror = yes; then CFLAGS="$CFLAGS -Werror" @@ -50095,12 +53553,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_cc_visibility=yes -else $as_nop - gl_cv_cc_visibility=no +else case e in #( + e) gl_cv_cc_visibility=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS="$gl_save_CFLAGS" - + CFLAGS="$gl_saved_CFLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 printf "%s\n" "$gl_cv_cc_visibility" >&6; } @@ -50140,7 +53600,7 @@ printf "%s\n" "#define GNULIB_TEST_NL_LANGINFO 1" >>confdefs.h case "$host_os" in - mingw* | pw*) + mingw* | windows* | pw*) REPLACE_OPEN=1 ;; *) @@ -50155,8 +53615,8 @@ printf %s "checking whether open recognizes a trailing slash... " >&6; } if test ${gl_cv_func_open_slash+y} then : printf %s "(cached) " >&6 -else $as_nop - # Assume that if we have lstat, we can also check symlinks. +else case e in #( + e) # Assume that if we have lstat, we can also check symlinks. if test $ac_cv_func_lstat = yes; then touch conftest.tmp ln -s conftest.tmp conftest.lnk @@ -50171,8 +53631,8 @@ then : gl_cv_func_open_slash="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <fcntl.h> @@ -50198,15 +53658,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_open_slash=yes -else $as_nop - gl_cv_func_open_slash=no +else case e in #( + e) gl_cv_func_open_slash=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f conftest.sl conftest.tmp conftest.lnk - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5 printf "%s\n" "$gl_cv_func_open_slash" >&6; } @@ -50364,9 +53827,6 @@ fi if test $DIR_HAS_FD_MEMBER = 0; then REPLACE_OPENDIR=1 fi - case $host_os in - os2*) REPLACE_OPENDIR=1 ;; - esac @@ -50470,8 +53930,8 @@ printf %s "checking for pipe2... " >&6; } if test ${gl_cv_onwards_func_pipe2+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -50515,7 +53975,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_pipe2" >&5 printf "%s\n" "$gl_cv_onwards_func_pipe2" >&6; } @@ -50674,6 +54135,75 @@ fi + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for posix_spawn_file_actions_addchdir_np" >&5 +printf %s "checking for posix_spawn_file_actions_addchdir_np... " >&6; } +if test ${gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "posix_spawn_file_actions_addchdir_np" "ac_cv_have_decl_posix_spawn_file_actions_addchdir_np" "#include <spawn.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_posix_spawn_file_actions_addchdir_np" = xyes +then : + +fi + if test $ac_cv_have_decl_posix_spawn_file_actions_addchdir_np = yes; then + ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addchdir_np" "ac_cv_func_posix_spawn_file_actions_addchdir_np" +if test "x$ac_cv_func_posix_spawn_file_actions_addchdir_np" = xyes +then : + +fi + + if test $ac_cv_func_posix_spawn_file_actions_addchdir_np = yes; then + gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np=yes + else + gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np='future OS version' + fi + else + gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addchdir_np" "ac_cv_func_posix_spawn_file_actions_addchdir_np" +if test "x$ac_cv_func_posix_spawn_file_actions_addchdir_np" = xyes +then : + +fi + + gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np=$ac_cv_func_posix_spawn_file_actions_addchdir_np + ;; + + esac + + exec 6>&9 9>&- + + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np" >&5 +printf "%s\n" "$gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np" >&6; } + + case "$gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np" in + future*) ac_cv_func_posix_spawn_file_actions_addchdir_np=no ;; + *) ac_cv_func_posix_spawn_file_actions_addchdir_np=$gl_cv_onwards_func_posix_spawn_file_actions_addchdir_np ;; + esac + if test $ac_cv_func_posix_spawn_file_actions_addchdir_np = yes; then + +printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP 1" >>confdefs.h + + fi + + if test $ac_cv_func_posix_spawn_file_actions_addchdir = yes; then REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR=1 else @@ -50727,20 +54257,20 @@ printf %s "checking whether posix_spawn_file_actions_addclose works... " >&6; } if test ${gl_cv_func_posix_spawn_file_actions_addclose_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : # Guess no on musl libc and Solaris, yes otherwise. case "$host_os" in *-musl* | midipix*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;; solaris*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;; # Guess no on native Windows. - mingw*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;; + mingw* | windows*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;; *) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <spawn.h> @@ -50757,14 +54287,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_posix_spawn_file_actions_addclose_works=yes -else $as_nop - gl_cv_func_posix_spawn_file_actions_addclose_works=no +else case e in #( + e) gl_cv_func_posix_spawn_file_actions_addclose_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_file_actions_addclose_works" >&5 printf "%s\n" "$gl_cv_func_posix_spawn_file_actions_addclose_works" >&6; } @@ -50821,20 +54354,20 @@ printf %s "checking whether posix_spawn_file_actions_adddup2 works... " >&6; } if test ${gl_cv_func_posix_spawn_file_actions_adddup2_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : # Guess no on musl libc and Solaris, yes otherwise. case "$host_os" in *-musl* | midipix*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no";; solaris*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no";; # Guess no on native Windows. - mingw*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no" ;; + mingw* | windows*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no" ;; *) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing yes";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <spawn.h> @@ -50851,14 +54384,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_posix_spawn_file_actions_adddup2_works=yes -else $as_nop - gl_cv_func_posix_spawn_file_actions_adddup2_works=no +else case e in #( + e) gl_cv_func_posix_spawn_file_actions_adddup2_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_file_actions_adddup2_works" >&5 printf "%s\n" "$gl_cv_func_posix_spawn_file_actions_adddup2_works" >&6; } @@ -50915,20 +54451,20 @@ printf %s "checking whether posix_spawn_file_actions_addopen works... " >&6; } if test ${gl_cv_func_posix_spawn_file_actions_addopen_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : # Guess no on musl libc and Solaris, yes otherwise. case "$host_os" in *-musl* | midipix*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no";; solaris*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no";; # Guess no on native Windows. - mingw*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no" ;; + mingw* | windows*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no" ;; *) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing yes";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <spawn.h> @@ -50947,14 +54483,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_posix_spawn_file_actions_addopen_works=yes -else $as_nop - gl_cv_func_posix_spawn_file_actions_addopen_works=no +else case e in #( + e) gl_cv_func_posix_spawn_file_actions_addopen_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_file_actions_addopen_works" >&5 printf "%s\n" "$gl_cv_func_posix_spawn_file_actions_addopen_works" >&6; } @@ -51296,8 +54835,8 @@ printf %s "checking whether signature of pselect conforms to POSIX... " >&6; } if test ${gl_cv_sig_pselect+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/select.h> @@ -51315,11 +54854,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_sig_pselect=yes -else $as_nop - gl_cv_sig_pselect=no +else case e in #( + e) gl_cv_sig_pselect=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sig_pselect" >&5 printf "%s\n" "$gl_cv_sig_pselect" >&6; } @@ -51329,8 +54870,8 @@ printf %s "checking whether pselect detects invalid fds... " >&6; } if test ${gl_cv_func_pselect_detects_ebadf+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : @@ -51345,8 +54886,8 @@ then : *) gl_cv_func_pselect_detects_ebadf="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -51381,14 +54922,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_pselect_detects_ebadf=yes -else $as_nop - gl_cv_func_pselect_detects_ebadf=no +else case e in #( + e) gl_cv_func_pselect_detects_ebadf=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pselect_detects_ebadf" >&5 printf "%s\n" "$gl_cv_func_pselect_detects_ebadf" >&6; } @@ -51445,8 +54989,8 @@ printf %s "checking whether pthread_sigmask is a macro... " >&6; } if test ${gl_cv_func_pthread_sigmask_macro+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> @@ -51456,15 +55000,17 @@ else $as_nop #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "headers_define_pthread_sigmask" >/dev/null 2>&1 + $EGREP_TRADITIONAL "headers_define_pthread_sigmask" >/dev/null 2>&1 then : gl_cv_func_pthread_sigmask_macro=yes -else $as_nop - gl_cv_func_pthread_sigmask_macro=no +else case e in #( + e) gl_cv_func_pthread_sigmask_macro=no ;; +esac fi rm -rf conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_macro" >&5 printf "%s\n" "$gl_cv_func_pthread_sigmask_macro" >&6; } @@ -51488,8 +55034,8 @@ printf %s "checking for pthread_sigmask in $LIBMULTITHREAD... " >&6; } if test ${gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_save_LIBS="$LIBS" +else case e in #( + e) gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -51508,13 +55054,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=yes -else $as_nop - gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no +else case e in #( + e) gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gl_save_LIBS" - + LIBS="$gl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD" >&5 printf "%s\n" "$gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD" >&6; } @@ -51554,8 +55102,8 @@ printf %s "checking whether pthread_sigmask works without -lpthread... " >&6; } if test ${gl_cv_func_pthread_sigmask_in_libc_works+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : @@ -51566,8 +55114,8 @@ then : gl_cv_func_pthread_sigmask_in_libc_works="guessing yes";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> @@ -51583,14 +55131,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_pthread_sigmask_in_libc_works=no -else $as_nop - gl_cv_func_pthread_sigmask_in_libc_works=yes +else case e in #( + e) gl_cv_func_pthread_sigmask_in_libc_works=yes ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_in_libc_works" >&5 printf "%s\n" "$gl_cv_func_pthread_sigmask_in_libc_works" >&6; } @@ -51610,9 +55161,9 @@ printf %s "checking whether pthread_sigmask returns error numbers... " >&6; } if test ${gl_cv_func_pthread_sigmask_return_works+y} then : printf %s "(cached) " >&6 -else $as_nop - - gl_save_LIBS="$LIBS" +else case e in #( + e) + gl_saved_LIBS="$LIBS" LIBS="$LIBS $PTHREAD_SIGMASK_LIB" if test "$cross_compiling" = yes then : @@ -51623,8 +55174,8 @@ then : gl_cv_func_pthread_sigmask_return_works="guessing yes";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> @@ -51642,15 +55193,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_pthread_sigmask_return_works=yes -else $as_nop - gl_cv_func_pthread_sigmask_return_works=no +else case e in #( + e) gl_cv_func_pthread_sigmask_return_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - LIBS="$gl_save_LIBS" - + LIBS="$gl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_return_works" >&5 printf "%s\n" "$gl_cv_func_pthread_sigmask_return_works" >&6; } @@ -51668,21 +55222,21 @@ printf %s "checking whether pthread_sigmask unblocks signals correctly... " >&6; if test ${gl_cv_func_pthread_sigmask_unblock_works+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in irix*) gl_cv_func_pthread_sigmask_unblock_works="guessing no";; *) gl_cv_func_pthread_sigmask_unblock_works="guessing yes";; esac - gl_save_LIBS=$LIBS + gl_saved_LIBS=$LIBS LIBS="$LIBS $LIBMULTITHREAD" if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <limits.h> @@ -51729,15 +55283,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : : -else $as_nop - gl_cv_func_pthread_sigmask_unblock_works=no +else case e in #( + e) gl_cv_func_pthread_sigmask_unblock_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - LIBS=$gl_save_LIBS - + LIBS=$gl_saved_LIBS + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_unblock_works" >&5 printf "%s\n" "$gl_cv_func_pthread_sigmask_unblock_works" >&6; } @@ -52007,8 +55564,8 @@ printf %s "checking whether readlink signature is correct... " >&6; } if test ${gl_cv_decl_readlink_works+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> /* Cause compilation failure if original declaration has wrong type. */ @@ -52024,10 +55581,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_decl_readlink_works=yes -else $as_nop - gl_cv_decl_readlink_works=no +else case e in #( + e) gl_cv_decl_readlink_works=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5 printf "%s\n" "$gl_cv_decl_readlink_works" >&6; } @@ -52036,8 +55595,8 @@ printf %s "checking whether readlink handles trailing slash correctly... " >&6; if test ${gl_cv_func_readlink_trailing_slash+y} then : printf %s "(cached) " >&6 -else $as_nop - # We have readlink, so assume ln -s works. +else case e in #( + e) # We have readlink, so assume ln -s works. ln -s conftest.no-such conftest.link ln -s conftest.link conftest.lnk2 if test "$cross_compiling" = yes @@ -52057,8 +55616,8 @@ then : gl_cv_func_readlink_trailing_slash="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> @@ -52074,14 +55633,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_readlink_trailing_slash=yes -else $as_nop - gl_cv_func_readlink_trailing_slash=no +else case e in #( + e) gl_cv_func_readlink_trailing_slash=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - rm -f conftest.link conftest.lnk2 + rm -f conftest.link conftest.lnk2 ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_trailing_slash" >&5 printf "%s\n" "$gl_cv_func_readlink_trailing_slash" >&6; } @@ -52104,8 +55666,8 @@ printf %s "checking whether readlink truncates results correctly... " >&6; } if test ${gl_cv_func_readlink_truncate+y} then : printf %s "(cached) " >&6 -else $as_nop - # We have readlink, so assume ln -s works. +else case e in #( + e) # We have readlink, so assume ln -s works. ln -s ab conftest.link if test "$cross_compiling" = yes then : @@ -52124,8 +55686,8 @@ then : gl_cv_func_readlink_truncate="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> @@ -52141,14 +55703,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_readlink_truncate=yes -else $as_nop - gl_cv_func_readlink_truncate=no +else case e in #( + e) gl_cv_func_readlink_truncate=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - rm -f conftest.link conftest.lnk2 + rm -f conftest.link conftest.lnk2 ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_truncate" >&5 printf "%s\n" "$gl_cv_func_readlink_truncate" >&6; } @@ -52217,21 +55782,21 @@ printf %s "checking whether realloc (0, 0) returns nonnull... " >&6; } if test ${ac_cv_func_realloc_0_nonnull+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess yes on platforms where we know the result. *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ | gnu* | *-musl* | midipix* | midnightbsd* \ - | hpux* | solaris* | cygwin* | mingw* | msys* ) + | hpux* | solaris* | cygwin* | mingw* | windows* | msys* ) ac_cv_func_realloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -52239,7 +55804,8 @@ int main (void) { void *p = realloc (0, 0); - int result = !p; + void * volatile vp = p; + int result = !vp; free (p); return result; ; @@ -52250,14 +55816,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_realloc_0_nonnull=yes -else $as_nop - ac_cv_func_realloc_0_nonnull=no +else case e in #( + e) ac_cv_func_realloc_0_nonnull=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 printf "%s\n" "$ac_cv_func_realloc_0_nonnull" >&6; } @@ -52351,8 +55920,8 @@ printf %s "checking for reallocarray... " >&6; } if test ${gl_cv_onwards_func_reallocarray+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -52396,7 +55965,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_reallocarray" >&5 printf "%s\n" "$gl_cv_onwards_func_reallocarray" >&6; } @@ -52522,18 +56092,18 @@ printf %s "checking for working re_compile_pattern... " >&6; } if test ${gl_cv_func_re_compile_pattern_working+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_re_compile_pattern_working="guessing no" ;; - # Otherwise obey --enable-cross-guesses. - *) gl_cv_func_re_compile_pattern_working="$gl_cross_guess_normal" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_re_compile_pattern_working="guessing no" ;; + # Otherwise obey --enable-cross-guesses. + *) gl_cv_func_re_compile_pattern_working="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <regex.h> @@ -52835,14 +56405,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_re_compile_pattern_working=yes -else $as_nop - gl_cv_func_re_compile_pattern_working=no +else case e in #( + e) gl_cv_func_re_compile_pattern_working=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_re_compile_pattern_working" >&5 printf "%s\n" "$gl_cv_func_re_compile_pattern_working" >&6; } @@ -52944,8 +56517,9 @@ fi if test "x$ac_cv_have_decl_isblank" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_ISBLANK $ac_have_decl" >>confdefs.h @@ -52962,8 +56536,8 @@ printf %s "checking whether rename honors trailing slash on destination... " >&6 if test ${gl_cv_func_rename_slash_dst_works+y} then : printf %s "(cached) " >&6 -else $as_nop - rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 conftest.lnk +else case e in #( + e) rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 conftest.lnk touch conftest.f && touch conftest.f1 && mkdir conftest.d1 || as_fn_error $? "cannot create temporary files" "$LINENO" 5 # Assume that if we have lstat, we can also check symlinks. @@ -52973,20 +56547,19 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_rename_slash_dst_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rename_slash_dst_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_rename_slash_dst_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_rename_slash_dst_works="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_rename_slash_dst_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems + # and on systems that emulate the Linux system calls. + linux* | midipix*) gl_cv_func_rename_slash_dst_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_rename_slash_dst_works="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_rename_slash_dst_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_rename_slash_dst_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # include <stdio.h> @@ -53013,15 +56586,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_rename_slash_dst_works=yes -else $as_nop - gl_cv_func_rename_slash_dst_works=no +else case e in #( + e) gl_cv_func_rename_slash_dst_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 conftest.lnk - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rename_slash_dst_works" >&5 printf "%s\n" "$gl_cv_func_rename_slash_dst_works" >&6; } @@ -53040,8 +56616,8 @@ printf %s "checking whether rename honors trailing slash on source... " >&6; } if test ${gl_cv_func_rename_slash_src_works+y} then : printf %s "(cached) " >&6 -else $as_nop - rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 conftest.lnk +else case e in #( + e) rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 conftest.lnk touch conftest.f && touch conftest.f1 && mkdir conftest.d1 || as_fn_error $? "cannot create temporary files" "$LINENO" 5 # Assume that if we have lstat, we can also check symlinks. @@ -53051,20 +56627,19 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_rename_slash_src_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rename_slash_src_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_rename_slash_src_works="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_rename_slash_src_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_rename_slash_src_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems + # and on systems that emulate the Linux system calls. + linux* | midipix*) gl_cv_func_rename_slash_src_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_rename_slash_src_works="guessing yes" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_rename_slash_src_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_rename_slash_src_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # include <stdio.h> @@ -53091,15 +56666,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_rename_slash_src_works=yes -else $as_nop - gl_cv_func_rename_slash_src_works=no +else case e in #( + e) gl_cv_func_rename_slash_src_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 conftest.lnk - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rename_slash_src_works" >&5 printf "%s\n" "$gl_cv_func_rename_slash_src_works" >&6; } @@ -53119,8 +56697,8 @@ printf %s "checking whether rename manages hard links correctly... " >&6; } if test ${gl_cv_func_rename_link_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test $ac_cv_func_link = yes; then +else case e in #( + e) if test $ac_cv_func_link = yes; then if test $cross_compiling != yes; then rm -rf conftest.f conftest.f1 conftest.f2 if touch conftest.f conftest.f2 && ln conftest.f conftest.f1 && @@ -53129,8 +56707,8 @@ else $as_nop then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # include <errno.h> @@ -53170,11 +56748,13 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_rename_link_works=yes -else $as_nop - gl_cv_func_rename_link_works=no +else case e in #( + e) gl_cv_func_rename_link_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi else @@ -53183,22 +56763,22 @@ fi rm -rf conftest.f conftest.f1 conftest.f2 else case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_rename_link_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rename_link_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_rename_link_works="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_rename_link_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_rename_link_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems + # and on systems that emulate the Linux system calls. + linux* | midipix*) gl_cv_func_rename_link_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_rename_link_works="guessing yes" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_rename_link_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_rename_link_works="$gl_cross_guess_normal" ;; esac fi else gl_cv_func_rename_link_works=yes fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rename_link_works" >&5 printf "%s\n" "$gl_cv_func_rename_link_works" >&6; } @@ -53217,25 +56797,26 @@ printf %s "checking whether rename manages existing destinations correctly... " if test ${gl_cv_func_rename_dest_works+y} then : printf %s "(cached) " >&6 -else $as_nop - rm -rf conftest.f conftest.d1 conftest.d2 +else case e in #( + e) rm -rf conftest.f conftest.d1 conftest.d2 touch conftest.f && mkdir conftest.d1 conftest.d2 || as_fn_error $? "cannot create temporary files" "$LINENO" 5 if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_rename_dest_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_rename_dest_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_rename_dest_works="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_rename_dest_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems + # and on systems that emulate the Linux system calls. + linux* | midipix*) gl_cv_func_rename_dest_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_rename_dest_works="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_rename_dest_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_rename_dest_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # include <stdio.h> @@ -53258,15 +56839,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_rename_dest_works=yes -else $as_nop - gl_cv_func_rename_dest_works=no +else case e in #( + e) gl_cv_func_rename_dest_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -rf conftest.f conftest.d1 conftest.d2 - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rename_dest_works" >&5 printf "%s\n" "$gl_cv_func_rename_dest_works" >&6; } @@ -53373,26 +56957,26 @@ printf %s "checking whether rmdir works... " >&6; } if test ${gl_cv_func_rmdir_works+y} then : printf %s "(cached) " >&6 -else $as_nop - mkdir conftest.dir +else case e in #( + e) mkdir conftest.dir touch conftest.file if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_rmdir_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rmdir_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_rmdir_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_rmdir_works="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_rmdir_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_rmdir_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_rmdir_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_rmdir_works="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_rmdir_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_rmdir_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> #include <errno.h> @@ -53424,14 +57008,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_rmdir_works=yes -else $as_nop - gl_cv_func_rmdir_works=no +else case e in #( + e) gl_cv_func_rmdir_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - rm -rf conftest.dir conftest.file + rm -rf conftest.dir conftest.file ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rmdir_works" >&5 printf "%s\n" "$gl_cv_func_rmdir_works" >&6; } @@ -53526,8 +57113,8 @@ printf %s "checking for issetugid... " >&6; } if test ${gl_cv_onwards_func_issetugid+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -53571,7 +57158,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_issetugid" >&5 printf "%s\n" "$gl_cv_onwards_func_issetugid" >&6; } @@ -53624,8 +57212,8 @@ printf %s "checking whether select supports a 0 argument... " >&6; } if test ${gl_cv_func_select_supports0+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : @@ -53636,8 +57224,8 @@ then : *) gl_cv_func_select_supports0="guessing yes";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -53656,14 +57244,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_select_supports0=yes -else $as_nop - gl_cv_func_select_supports0=no +else case e in #( + e) gl_cv_func_select_supports0=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_select_supports0" >&5 printf "%s\n" "$gl_cv_func_select_supports0" >&6; } @@ -53677,8 +57268,8 @@ printf %s "checking whether select detects invalid fds... " >&6; } if test ${gl_cv_func_select_detects_ebadf+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : @@ -53693,8 +57284,8 @@ then : *) gl_cv_func_select_detects_ebadf="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -53729,14 +57320,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_select_detects_ebadf=yes -else $as_nop - gl_cv_func_select_detects_ebadf=no +else case e in #( + e) gl_cv_func_select_detects_ebadf=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_select_detects_ebadf" >&5 printf "%s\n" "$gl_cv_func_select_detects_ebadf" >&6; } @@ -53749,7 +57343,7 @@ printf "%s\n" "$gl_cv_func_select_detects_ebadf" >&6; } SELECT_LIB="$LIBSOCKET" if test $REPLACE_SELECT = 1; then case "$host_os" in - mingw*) + mingw* | windows*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -53765,8 +57359,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : -else $as_nop - SELECT_LIB="$SELECT_LIB -luser32" +else case e in #( + e) SELECT_LIB="$SELECT_LIB -luser32" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -53852,15 +57447,21 @@ printf %s "checking for library containing getservbyname... " >&6; } if test ${ac_cv_search_getservbyname+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char getservbyname (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char getservbyname (void); int main (void) { @@ -53891,11 +57492,13 @@ done if test ${ac_cv_search_getservbyname+y} then : -else $as_nop - ac_cv_search_getservbyname=no +else case e in #( + e) ac_cv_search_getservbyname=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getservbyname" >&5 printf "%s\n" "$ac_cv_search_getservbyname" >&6; } @@ -53918,16 +57521,16 @@ if test "x$ac_cv_func_getservbyname" = xyes then : printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getservbyname in winsock2.h and -lws2_32" >&5 printf %s "checking for getservbyname in winsock2.h and -lws2_32... " >&6; } if test ${gl_cv_w32_getservbyname+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_cv_w32_getservbyname=no - gl_save_LIBS="$LIBS" +else case e in #( + e) gl_cv_w32_getservbyname=no + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -53951,15 +57554,17 @@ then : fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gl_save_LIBS" - + LIBS="$gl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_getservbyname" >&5 printf "%s\n" "$gl_cv_w32_getservbyname" >&6; } if test "$gl_cv_w32_getservbyname" = "yes"; then SERVENT_LIB="-lws2_32" fi - + ;; +esac fi done @@ -53976,8 +57581,8 @@ printf %s "checking whether setlocale (LC_ALL, NULL) is multithread-safe... " >& if test ${gl_cv_func_setlocale_null_all_mtsafe+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$host_os" in +else case e in #( + e) case "$host_os" in # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku. *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku*) gl_cv_func_setlocale_null_all_mtsafe=no ;; @@ -53995,28 +57600,30 @@ else $as_nop _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky user" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Lucky user" >/dev/null 2>&1 then : gl_cv_func_setlocale_null_all_mtsafe=yes -else $as_nop - gl_cv_func_setlocale_null_all_mtsafe=no +else case e in #( + e) gl_cv_func_setlocale_null_all_mtsafe=no ;; +esac fi rm -rf conftest* ;; # Guess yes on glibc, HP-UX, IRIX, Solaris, native Windows. - *-gnu* | gnu* | hpux* | irix* | solaris* | mingw*) + *-gnu* | gnu* | hpux* | irix* | solaris* | mingw* | windows*) gl_cv_func_setlocale_null_all_mtsafe=yes ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_setlocale_null_all_mtsafe="$gl_cross_guess_normal" ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_all_mtsafe" >&5 printf "%s\n" "$gl_cv_func_setlocale_null_all_mtsafe" >&6; } case "$host_os" in - mingw*) ;; + mingw* | windows*) ;; *) if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then gl_cv_func_setlocale_null_all_mtsafe="trivially yes" @@ -54036,24 +57643,25 @@ printf %s "checking whether setlocale (category, NULL) is multithread-safe... " if test ${gl_cv_func_setlocale_null_one_mtsafe+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$host_os" in +else case e in #( + e) case "$host_os" in # Guess no on OpenBSD, AIX. openbsd* | aix*) gl_cv_func_setlocale_null_one_mtsafe=no ;; # Guess yes on glibc, musl libc, macOS, FreeBSD, NetBSD, HP-UX, IRIX, Solaris, Haiku, Cygwin, native Windows. - *-gnu* | gnu* | *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*) + *-gnu* | gnu* | *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw* | windows*) gl_cv_func_setlocale_null_one_mtsafe=yes ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_setlocale_null_one_mtsafe="$gl_cross_guess_normal" ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_one_mtsafe" >&5 printf "%s\n" "$gl_cv_func_setlocale_null_one_mtsafe" >&6; } case "$host_os" in - mingw*) ;; + mingw* | windows*) ;; *) if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then gl_cv_func_setlocale_null_one_mtsafe="trivially yes" @@ -54070,7 +57678,9 @@ printf "%s\n" "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>c if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then case "$host_os" in - mingw*) SETLOCALE_NULL_LIB= ;; + mingw* | windows*) + SETLOCALE_NULL_LIB= + ;; *) @@ -54079,9 +57689,9 @@ printf %s "checking whether imported symbols can be declared weak... " >&6; } if test ${gl_cv_have_weak+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$host_os" in - cygwin* | mingw*) +else case e in #( + e) case "$host_os" in + cygwin* | mingw* | windows*) gl_cv_have_weak="guessing no" ;; *) @@ -54115,17 +57725,18 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Extensible Linking Format" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1 then : gl_cv_have_weak="guessing yes" -else $as_nop - gl_cv_have_weak="guessing no" +else case e in #( + e) gl_cv_have_weak="guessing no" ;; +esac fi rm -rf conftest* -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -54138,11 +57749,13 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_have_weak=yes -else $as_nop - gl_cv_have_weak=no +else case e in #( + e) gl_cv_have_weak=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi @@ -54172,7 +57785,8 @@ EOF esac ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 printf "%s\n" "$gl_cv_have_weak" >&6; } @@ -54224,8 +57838,8 @@ printf %s "checking whether the -Werror option is usable... " >&6; } if test ${gl_cv_cc_vis_werror+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_save_CFLAGS="$CFLAGS" +else case e in #( + e) gl_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -54241,12 +57855,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_cc_vis_werror=yes -else $as_nop - gl_cv_cc_vis_werror=no +else case e in #( + e) gl_cv_cc_vis_werror=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS="$gl_save_CFLAGS" - + CFLAGS="$gl_saved_CFLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 printf "%s\n" "$gl_cv_cc_vis_werror" >&6; } @@ -54255,8 +57871,8 @@ printf %s "checking for simple visibility declarations... " >&6; } if test ${gl_cv_cc_visibility+y} then : printf %s "(cached) " >&6 -else $as_nop - gl_save_CFLAGS="$CFLAGS" +else case e in #( + e) gl_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" if test $gl_cv_cc_vis_werror = yes; then CFLAGS="$CFLAGS -Werror" @@ -54285,12 +57901,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_cc_visibility=yes -else $as_nop - gl_cv_cc_visibility=no +else case e in #( + e) gl_cv_cc_visibility=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS="$gl_save_CFLAGS" - + CFLAGS="$gl_saved_CFLAGS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 printf "%s\n" "$gl_cv_cc_visibility" >&6; } @@ -54551,8 +58169,8 @@ printf %s "checking for SIZE_MAX... " >&6; } if test ${gl_cv_size_max+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) gl_cv_size_max=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -54567,7 +58185,7 @@ Found it _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Found it" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Found it" >/dev/null 2>&1 then : gl_cv_size_max=yes fi @@ -54578,15 +58196,17 @@ rm -rf conftest* #include <limits.h>" then : -else $as_nop - size_t_bits_minus_1= +else case e in #( + e) size_t_bits_minus_1= ;; +esac fi if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) <= sizeof (unsigned int)" "fits_in_uint" "#include <stddef.h>" then : -else $as_nop - fits_in_uint= +else case e in #( + e) fits_in_uint= ;; +esac fi if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then @@ -54620,7 +58240,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext gl_cv_size_max='((size_t)~(size_t)0)' fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_max" >&5 printf "%s\n" "$gl_cv_size_max" >&6; } @@ -54650,20 +58271,20 @@ printf %s "checking whether snprintf respects a size of 1... " >&6; } if test ${gl_cv_func_snprintf_size1+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on Android. - linux*-android*) gl_cv_func_snprintf_size1="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_snprintf_size1="guessing yes" ;; - *) gl_cv_func_snprintf_size1="guessing yes" ;; + # Guess yes on Android. + linux*-android*) gl_cv_func_snprintf_size1="guessing yes" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_snprintf_size1="guessing yes" ;; + *) gl_cv_func_snprintf_size1="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -54691,14 +58312,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_snprintf_size1=yes -else $as_nop - gl_cv_func_snprintf_size1=no +else case e in #( + e) gl_cv_func_snprintf_size1=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5 printf "%s\n" "$gl_cv_func_snprintf_size1" >&6; } @@ -54840,14 +58464,14 @@ printf "%s\n" "#define GNULIB_TEST_SOCKET 1" >>confdefs.h if test "x$ac_cv_type_socklen_t" = xyes then : -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5 printf %s "checking for socklen_t equivalent... " >&6; } if test ${gl_cv_socklen_t_equiv+y} then : printf %s "(cached) " >&6 -else $as_nop - # Systems have either "struct sockaddr *" or +else case e in #( + e) # Systems have either "struct sockaddr *" or # "void *" as the second argument to getpeername gl_cv_socklen_t_equiv= for arg2 in "struct sockaddr" void; do @@ -54879,13 +58503,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test "$gl_cv_socklen_t_equiv" = ""; then as_fn_error $? "Cannot find a type to use in place of socklen_t" "$LINENO" 5 fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socklen_t_equiv" >&5 printf "%s\n" "$gl_cv_socklen_t_equiv" >&6; } printf "%s\n" "#define socklen_t $gl_cv_socklen_t_equiv" >>confdefs.h - + ;; +esac fi @@ -54916,11 +58542,11 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5 printf %s "checking for ssize_t... " >&6; } -if test ${gt_cv_ssize_t+y} +if test ${gl_cv_ssize_t+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> int @@ -54934,17 +58560,55 @@ int x = sizeof (ssize_t *) + sizeof (ssize_t); _ACEOF if ac_fn_c_try_compile "$LINENO" then : - gt_cv_ssize_t=yes -else $as_nop - gt_cv_ssize_t=no + gl_cv_ssize_t=yes +else case e in #( + e) gl_cv_ssize_t=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5 -printf "%s\n" "$gt_cv_ssize_t" >&6; } - if test $gt_cv_ssize_t = no; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_ssize_t" >&5 +printf "%s\n" "$gl_cv_ssize_t" >&6; } + if test $gl_cv_ssize_t = no; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether size_t is wider than 'long'" >&5 +printf %s "checking whether size_t is wider than 'long'... " >&6; } +if test ${gl_cv_size_t_large+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> + typedef int array [2 * (sizeof (size_t) > sizeof (long)) - 1]; -printf "%s\n" "#define ssize_t int" >>confdefs.h +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_size_t_large=yes +else case e in #( + e) gl_cv_size_t_large=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_t_large" >&5 +printf "%s\n" "$gl_cv_size_t_large" >&6; } + if test $gl_cv_size_t_large = yes; then + gl_def_ssize_t='long long' + else + gl_def_ssize_t='long' + fi + +printf "%s\n" "#define ssize_t $gl_def_ssize_t" >>confdefs.h fi @@ -54953,7 +58617,7 @@ printf "%s\n" "#define ssize_t int" >>confdefs.h case "$host_os" in - mingw*) + mingw* | windows*) REPLACE_STAT=1 ;; *) @@ -54962,8 +58626,8 @@ printf %s "checking whether stat handles trailing slashes on files... " >&6; } if test ${gl_cv_func_stat_file_slash+y} then : printf %s "(cached) " >&6 -else $as_nop - touch conftest.tmp +else case e in #( + e) touch conftest.tmp # Assume that if we have lstat, we can also check symlinks. if test $ac_cv_func_lstat = yes; then ln -s conftest.tmp conftest.lnk @@ -54981,8 +58645,8 @@ then : *) gl_cv_func_stat_file_slash="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/stat.h> @@ -55006,14 +58670,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_stat_file_slash=yes -else $as_nop - gl_cv_func_stat_file_slash=no +else case e in #( + e) gl_cv_func_stat_file_slash=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - rm -f conftest.tmp conftest.lnk + rm -f conftest.tmp conftest.lnk ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5 printf "%s\n" "$gl_cv_func_stat_file_slash" >&6; } @@ -55025,7 +58692,7 @@ printf "%s\n" "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h ;; esac case $host_os in - solaris*) + darwin* | solaris*) REPLACE_FSTAT=1 ;; esac ;; @@ -55048,7 +58715,7 @@ fi if test -z "$GL_COND_OBJ_STAT_TRUE"; then : case "$host_os" in - mingw*) + mingw* | windows*) @@ -55104,8 +58771,8 @@ printf %s "checking whether struct stat.st_atim is of type struct timespec... " if test ${ac_cv_typeof_struct_stat_st_atim_is_struct_timespec+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -55130,10 +58797,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=yes -else $as_nop - ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no +else case e in #( + e) ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5 printf "%s\n" "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; } @@ -55142,8 +58811,8 @@ printf "%s\n" "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; } printf "%s\n" "#define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h fi -else $as_nop - ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec.tv_nsec" "ac_cv_member_struct_stat_st_atimespec_tv_nsec" "#include <sys/types.h> +else case e in #( + e) ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec.tv_nsec" "ac_cv_member_struct_stat_st_atimespec_tv_nsec" "#include <sys/types.h> #include <sys/stat.h> " if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = xyes @@ -55152,8 +58821,8 @@ then : printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h -else $as_nop - ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct_stat_st_atimensec" "#include <sys/types.h> +else case e in #( + e) ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct_stat_st_atimensec" "#include <sys/types.h> #include <sys/stat.h> " if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes @@ -55162,8 +58831,8 @@ then : printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h -else $as_nop - ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.st__tim.tv_nsec" "ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" "#include <sys/types.h> +else case e in #( + e) ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.st__tim.tv_nsec" "ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" "#include <sys/types.h> #include <sys/stat.h> " if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = xyes @@ -55173,11 +58842,14 @@ printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h fi - + ;; +esac fi - + ;; +esac fi - + ;; +esac fi @@ -55193,8 +58865,8 @@ then : printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h -else $as_nop - ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "#include <sys/types.h> +else case e in #( + e) ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "#include <sys/types.h> #include <sys/stat.h> " if test "x$ac_cv_member_struct_stat_st_birthtimensec" = xyes @@ -55203,8 +58875,8 @@ then : printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h -else $as_nop - ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtim.tv_nsec" "ac_cv_member_struct_stat_st_birthtim_tv_nsec" "#include <sys/types.h> +else case e in #( + e) ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtim.tv_nsec" "ac_cv_member_struct_stat_st_birthtim_tv_nsec" "#include <sys/types.h> #include <sys/stat.h> " if test "x$ac_cv_member_struct_stat_st_birthtim_tv_nsec" = xyes @@ -55214,9 +58886,11 @@ printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1" >>confdefs.h fi - + ;; +esac fi - + ;; +esac fi @@ -55226,8 +58900,8 @@ printf %s "checking for bool, true, false... " >&6; } if test ${gl_cv_c_bool+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if true == false @@ -55239,10 +58913,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_c_bool=yes -else $as_nop - gl_cv_c_bool=no +else case e in #( + e) gl_cv_c_bool=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_bool" >&5 printf "%s\n" "$gl_cv_c_bool" >&6; } @@ -55788,8 +59464,8 @@ printf %s "checking for stpcpy... " >&6; } if test ${gl_cv_onwards_func_stpcpy+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -55833,7 +59509,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_stpcpy" >&5 printf "%s\n" "$gl_cv_onwards_func_stpcpy" >&6; } @@ -55933,8 +59610,9 @@ fi if test "x$ac_cv_have_decl_strncasecmp" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_STRNCASECMP $ac_have_decl" >>confdefs.h @@ -55996,8 +59674,8 @@ printf %s "checking for strchrnul... " >&6; } if test ${gl_cv_onwards_func_strchrnul+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -56041,7 +59719,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_strchrnul" >&5 printf "%s\n" "$gl_cv_onwards_func_strchrnul" >&6; } @@ -56068,8 +59747,8 @@ printf %s "checking whether strchrnul works... " >&6; } if test ${gl_cv_func_strchrnul_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56085,17 +59764,18 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky user" >/dev/null 2>&1 + $EGREP_TRADITIONAL "Lucky user" >/dev/null 2>&1 then : gl_cv_func_strchrnul_works="guessing yes" -else $as_nop - gl_cv_func_strchrnul_works="guessing no" +else case e in #( + e) gl_cv_func_strchrnul_works="guessing no" ;; +esac fi rm -rf conftest* -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> /* for strchrnul */ @@ -56113,14 +59793,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_strchrnul_works=yes -else $as_nop - gl_cv_func_strchrnul_works=no +else case e in #( + e) gl_cv_func_strchrnul_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strchrnul_works" >&5 printf "%s\n" "$gl_cv_func_strchrnul_works" >&6; } @@ -56240,8 +59923,8 @@ printf %s "checking for working strerror function... " >&6; } if test ${gl_cv_func_working_strerror+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess yes on glibc systems. @@ -56252,8 +59935,8 @@ then : *) gl_cv_func_working_strerror="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> @@ -56268,14 +59951,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_working_strerror=yes -else $as_nop - gl_cv_func_working_strerror=no +else case e in #( + e) gl_cv_func_working_strerror=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5 printf "%s\n" "$gl_cv_func_working_strerror" >&6; } @@ -56425,8 +60111,8 @@ printf %s "checking for catgets... " >&6; } if test ${gl_cv_onwards_func_catgets+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -56470,7 +60156,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_catgets" >&5 printf "%s\n" "$gl_cv_onwards_func_catgets" >&6; } @@ -56556,8 +60243,8 @@ printf %s "checking for working strndup... " >&6; } if test ${gl_cv_func_strndup_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case $host_os in @@ -56565,8 +60252,8 @@ then : *) gl_cv_func_strndup_works="guessing yes";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> @@ -56597,13 +60284,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_strndup_works=yes -else $as_nop - gl_cv_func_strndup_works=no +else case e in #( + e) gl_cv_func_strndup_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strndup_works" >&5 printf "%s\n" "$gl_cv_func_strndup_works" >&6; } @@ -56667,16 +60357,16 @@ printf %s "checking for working strnlen... " >&6; } if test ${ac_cv_func_strnlen_working+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : # Guess no on AIX systems, yes otherwise. case "$host_os" in aix*) ac_cv_func_strnlen_working=no;; *) ac_cv_func_strnlen_working=yes;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -56705,13 +60395,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_strnlen_working=yes -else $as_nop - ac_cv_func_strnlen_working=no +else case e in #( + e) ac_cv_func_strnlen_working=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strnlen_working" >&5 printf "%s\n" "$ac_cv_func_strnlen_working" >&6; } @@ -56889,19 +60582,19 @@ printf %s "checking whether strtok_r works... " >&6; } if test ${gl_cv_func_strtok_r_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on glibc systems. - *-gnu* | gnu*) gl_cv_func_strtok_r_works="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_strtok_r_works="guessing yes" ;; - *) gl_cv_func_strtok_r_works="guessing yes" ;; + # Guess no on glibc systems. + *-gnu* | gnu*) gl_cv_func_strtok_r_works="guessing no" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_strtok_r_works="guessing yes" ;; + *) gl_cv_func_strtok_r_works="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __OPTIMIZE__ @@ -56930,14 +60623,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_strtok_r_works=yes -else $as_nop - gl_cv_func_strtok_r_works=no +else case e in #( + e) gl_cv_func_strtok_r_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strtok_r_works" >&5 printf "%s\n" "$gl_cv_func_strtok_r_works" >&6; } @@ -57015,12 +60711,12 @@ printf %s "checking whether strtol works... " >&6; } if test ${gl_cv_func_strtol_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess no on native Windows. - mingw*) gl_cv_func_strtol_works="guessing no" ;; + mingw* | windows*) gl_cv_func_strtol_works="guessing no" ;; # Guess no on glibc systems. *-gnu* | gnu*) gl_cv_func_strtol_works="guessing no" ;; # Guess no on musl systems. @@ -57028,8 +60724,8 @@ then : *) gl_cv_func_strtol_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> int @@ -57039,10 +60735,16 @@ int result = 0; char *term; /* This test fails on Minix and native Windows. */ { - const char input[] = "0x"; - (void) strtol (input, &term, 16); - if (term != input + 1) - result |= 1; + static char const input[2][3] = {"0x", "0b"}; + static int const base[] = {0, 2, 10}; + int i, j; + for (i = 0; i < 2; i++) + for (j = 0; j < 3; j++) + { + (void) strtol (input[i], &term, base[j]); + if (term != input[i] + 1) + result |= 1; + } } /* This test fails on pre-C23 platforms. */ { @@ -57061,14 +60763,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_strtol_works=yes -else $as_nop - gl_cv_func_strtol_works=no +else case e in #( + e) gl_cv_func_strtol_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strtol_works" >&5 printf "%s\n" "$gl_cv_func_strtol_works" >&6; } @@ -57129,12 +60834,12 @@ printf %s "checking whether strtoll works... " >&6; } if test ${gl_cv_func_strtoll_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess no on native Windows. - mingw*) gl_cv_func_strtoll_works="guessing no" ;; + mingw* | windows*) gl_cv_func_strtoll_works="guessing no" ;; # Guess no on glibc systems. *-gnu* | gnu*) gl_cv_func_strtoll_works="guessing no" ;; # Guess no on musl systems. @@ -57142,8 +60847,8 @@ then : *) gl_cv_func_strtoll_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> int @@ -57153,10 +60858,16 @@ int result = 0; char *term; /* This test fails on Minix and native Windows. */ { - const char input[] = "0x"; - (void) strtoll (input, &term, 16); - if (term != input + 1) - result |= 1; + static char const input[2][3] = {"0x", "0b"}; + static int const base[] = {0, 2, 10}; + int i, j; + for (i = 0; i < 2; i++) + for (j = 0; j < 3; j++) + { + (void) strtoll (input[i], &term, base[j]); + if (term != input[i] + 1) + result |= 1; + } } /* This test fails on pre-C23 platforms. */ { @@ -57175,14 +60886,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_strtoll_works=yes -else $as_nop - gl_cv_func_strtoll_works=no +else case e in #( + e) gl_cv_func_strtoll_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strtoll_works" >&5 printf "%s\n" "$gl_cv_func_strtoll_works" >&6; } @@ -57245,8 +60959,8 @@ printf %s "checking whether symlink handles trailing slash correctly... " >&6; } if test ${gl_cv_func_symlink_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess yes on Linux systems. @@ -57259,8 +60973,8 @@ then : *) gl_cv_func_symlink_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> @@ -57283,14 +60997,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_symlink_works=yes -else $as_nop - gl_cv_func_symlink_works=no +else case e in #( + e) gl_cv_func_symlink_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - rm -f conftest.f conftest.link conftest.lnk2 + rm -f conftest.f conftest.link conftest.lnk2 ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_symlink_works" >&5 printf "%s\n" "$gl_cv_func_symlink_works" >&6; } @@ -57448,8 +61165,9 @@ fi if test "x$ac_cv_have_decl_localtime_r" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_LOCALTIME_R $ac_have_decl" >>confdefs.h @@ -57465,8 +61183,8 @@ printf %s "checking whether localtime_r is compatible with its POSIX signature.. if test ${gl_cv_time_r_posix+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* mingw's <time.h> provides the functions asctime_r, ctime_r, gmtime_r, localtime_r only if <unistd.h> or <pthread.h> has @@ -57495,17 +61213,17 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : gl_cv_time_r_posix=yes -else $as_nop - gl_cv_time_r_posix=no +else case e in #( + e) gl_cv_time_r_posix=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_r_posix" >&5 printf "%s\n" "$gl_cv_time_r_posix" >&6; } - if test $gl_cv_time_r_posix = yes; then - REPLACE_LOCALTIME_R=0 - else + if test $gl_cv_time_r_posix != yes; then REPLACE_LOCALTIME_R=1 fi else @@ -57515,8 +61233,8 @@ printf %s "checking whether localtime_r exists as an inline function... " >&6; } if test ${gl_cv_func_localtime_r_inline+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* mingw's <time.h> provides the functions asctime_r, ctime_r, gmtime_r, localtime_r only if <unistd.h> or <pthread.h> has @@ -57541,12 +61259,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_localtime_r_inline=yes -else $as_nop - gl_cv_func_localtime_r_inline=no +else case e in #( + e) gl_cv_func_localtime_r_inline=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_localtime_r_inline" >&5 printf "%s\n" "$gl_cv_func_localtime_r_inline" >&6; } @@ -57598,7 +61318,6 @@ printf "%s\n" "#define GNULIB_TEST_TIME_R 1" >>confdefs.h - REPLACE_TIMEGM=0 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timegm" >&5 @@ -57606,8 +61325,8 @@ printf %s "checking for timegm... " >&6; } if test ${gl_cv_onwards_func_timegm+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -57651,7 +61370,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_timegm" >&5 printf "%s\n" "$gl_cv_onwards_func_timegm" >&6; } @@ -57723,6 +61443,13 @@ printf "%s\n" "#define GNULIB_TEST_TIMEGM 1" >>confdefs.h : + + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ || { @@ -57997,6 +61724,438 @@ fi + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 1 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 1 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 2 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 2 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM_TRUE= + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM_FALSE='#' +else + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM_FALSE}"; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM_FALSE='#' + fi + + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 1 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 1 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 2 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 2 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_TRUE= + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_FALSE='#' +else + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_FALSE}"; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_FALSE='#' + fi + + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 8 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK_TRUE= + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK_FALSE='#' +else + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK_FALSE}"; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK_FALSE='#' + fi + + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 8 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL_TRUE= + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL_FALSE='#' +else + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL_FALSE}"; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL_FALSE='#' + fi + + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 8 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT_TRUE= + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT_FALSE='#' +else + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT_FALSE}"; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT_FALSE='#' + fi + + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 1 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 1 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 2 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 2 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH_TRUE= + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH_FALSE='#' +else + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH_FALSE}"; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH_FALSE='#' + fi + + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 11 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER_TRUE= + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER_FALSE='#' +else + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER_FALSE}"; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER_FALSE='#' + fi + + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 1 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 1 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 2 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 2 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT_TRUE= + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT_FALSE='#' +else + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT_FALSE}"; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT_FALSE='#' + fi + + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 1 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 1 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 2 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 2 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT_TRUE= + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT_FALSE='#' +else + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT_FALSE}"; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT_FALSE='#' + fi + + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 8 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_TRUE= + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_FALSE='#' +else + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_FALSE}"; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_FALSE='#' + fi + + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 11 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER_TRUE= + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER_FALSE='#' +else + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER_FALSE}"; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER_FALSE='#' + fi + + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 8 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT_TRUE= + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT_FALSE='#' +else + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT_FALSE}"; then + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT_TRUE='#' + LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT_FALSE='#' + fi + + + + + + @@ -58133,11 +62292,11 @@ fi - test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ - || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ - && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ - || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 11 + test $LIBUNISTRING_VERSION_MAJOR -lt 1 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 1 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 2 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 2 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 } } } @@ -58178,6 +62337,181 @@ fi } }; then + LIBUNISTRING_COMPILE_UNISTR_U32_CHR_TRUE= + LIBUNISTRING_COMPILE_UNISTR_U32_CHR_FALSE='#' +else + LIBUNISTRING_COMPILE_UNISTR_U32_CHR_TRUE='#' + LIBUNISTRING_COMPILE_UNISTR_U32_CHR_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNISTR_U32_CHR_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U32_CHR_FALSE}"; then + LIBUNISTRING_COMPILE_UNISTR_U32_CHR_TRUE='#' + LIBUNISTRING_COMPILE_UNISTR_U32_CHR_FALSE='#' + fi + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNISTR_U32_CPY_TRUE= + LIBUNISTRING_COMPILE_UNISTR_U32_CPY_FALSE='#' +else + LIBUNISTRING_COMPILE_UNISTR_U32_CPY_TRUE='#' + LIBUNISTRING_COMPILE_UNISTR_U32_CPY_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNISTR_U32_CPY_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U32_CPY_FALSE}"; then + LIBUNISTRING_COMPILE_UNISTR_U32_CPY_TRUE='#' + LIBUNISTRING_COMPILE_UNISTR_U32_CPY_FALSE='#' + fi + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 1 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 1 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 2 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 2 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNISTR_U32_PCPY_TRUE= + LIBUNISTRING_COMPILE_UNISTR_U32_PCPY_FALSE='#' +else + LIBUNISTRING_COMPILE_UNISTR_U32_PCPY_TRUE='#' + LIBUNISTRING_COMPILE_UNISTR_U32_PCPY_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNISTR_U32_PCPY_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U32_PCPY_FALSE}"; then + LIBUNISTRING_COMPILE_UNISTR_U32_PCPY_TRUE='#' + LIBUNISTRING_COMPILE_UNISTR_U32_PCPY_FALSE='#' + fi + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT_TRUE= + LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT_FALSE='#' +else + LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT_TRUE='#' + LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT_FALSE}"; then + LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT_TRUE='#' + LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT_FALSE='#' + fi + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + } + } + } + + + + + } + }; then + LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_TRUE= + LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_FALSE='#' +else + LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_TRUE='#' + LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_FALSE= +fi +: + if test -z "${LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_FALSE}"; then + LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_TRUE='#' + LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_FALSE='#' + fi + + + + + + if { test "$HAVE_LIBUNISTRING" != yes \ + || { + + + + test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ + || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + } + } + } + + + + + } + }; then LIBUNISTRING_COMPILE_UNISTR_U8_CPY_TRUE= LIBUNISTRING_COMPILE_UNISTR_U8_CPY_FALSE='#' else @@ -58377,8 +62711,8 @@ fi test $LIBUNISTRING_VERSION_MAJOR -lt 1 \ || { test $LIBUNISTRING_VERSION_MAJOR -eq 1 \ - && { test $LIBUNISTRING_VERSION_MINOR -lt 1 \ - || { test $LIBUNISTRING_VERSION_MINOR -eq 1 \ + && { test $LIBUNISTRING_VERSION_MINOR -lt 2 \ + || { test $LIBUNISTRING_VERSION_MINOR -eq 2 \ && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 } } @@ -58412,8 +62746,8 @@ printf %s "checking whether unlink honors trailing slashes... " >&6; } if test ${gl_cv_func_unlink_honors_slashes+y} then : printf %s "(cached) " >&6 -else $as_nop - touch conftest.file +else case e in #( + e) touch conftest.file # Assume that if we have lstat, we can also check symlinks. if test $ac_cv_func_lstat = yes; then ln -s conftest.file conftest.lnk @@ -58421,20 +62755,20 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_unlink_honors_slashes="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_unlink_honors_slashes="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_unlink_honors_slashes="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_unlink_honors_slashes="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_unlink_honors_slashes="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_unlink_honors_slashes="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if HAVE_UNISTD_H # include <unistd.h> @@ -58469,14 +62803,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_unlink_honors_slashes=yes -else $as_nop - gl_cv_func_unlink_honors_slashes=no +else case e in #( + e) gl_cv_func_unlink_honors_slashes=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - rm -f conftest.file conftest.lnk + rm -f conftest.file conftest.lnk ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unlink_honors_slashes" >&5 printf "%s\n" "$gl_cv_func_unlink_honors_slashes" >&6; } @@ -58491,8 +62828,8 @@ printf %s "checking whether unlink of a parent directory fails as it should... " if test ${gl_cv_func_unlink_parent_fails+y} then : printf %s "(cached) " >&6 -else $as_nop - case "$host_os" in +else case e in #( + e) case "$host_os" in darwin*) if { # Use the mktemp program if available. If not available, hide the error @@ -58517,8 +62854,8 @@ then : # If we don't know, obey --enable-cross-guesses. gl_cv_func_unlink_parent_fails="$gl_cross_guess_normal" -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -58546,11 +62883,13 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_unlink_parent_fails=yes -else $as_nop - gl_cv_func_unlink_parent_fails=no +else case e in #( + e) gl_cv_func_unlink_parent_fails=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi unset GL_SUBDIR_FOR_UNLINK @@ -58563,7 +62902,8 @@ fi gl_cv_func_unlink_parent_fails="guessing yes" ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unlink_parent_fails" >&5 printf "%s\n" "$gl_cv_func_unlink_parent_fails" >&6; } @@ -58637,7 +62977,7 @@ printf "%s\n" "#define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs.h case "$host_os" in - mingw*) + mingw* | windows*) REPLACE_UTIME=1 ;; *) @@ -58656,8 +62996,8 @@ printf %s "checking whether utime handles trailing slashes on files... " >&6; } if test ${gl_cv_func_utime_file_slash+y} then : printf %s "(cached) " >&6 -else $as_nop - touch conftest.tmp +else case e in #( + e) touch conftest.tmp # Assume that if we have lstat, we can also check symlinks. if test $ac_cv_func_lstat = yes; then ln -s conftest.tmp conftest.lnk @@ -58665,18 +63005,19 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_utime_file_slash="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_utime_file_slash="guessing yes" ;; - # Guess no on macOS. - darwin*) gl_cv_func_utime_file_slash="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_utime_file_slash="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems + # and on systems that emulate the Linux system calls. + linux* | midipix*) gl_cv_func_utime_file_slash="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_utime_file_slash="guessing yes" ;; + # Guess no on macOS. + darwin*) gl_cv_func_utime_file_slash="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_utime_file_slash="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stddef.h> #include <utime.h> @@ -58700,15 +63041,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_utime_file_slash=yes -else $as_nop - gl_cv_func_utime_file_slash=no +else case e in #( + e) gl_cv_func_utime_file_slash=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f conftest.tmp conftest.lnk - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_utime_file_slash" >&5 printf "%s\n" "$gl_cv_func_utime_file_slash" >&6; } @@ -58779,8 +63123,8 @@ printf %s "checking for futimes... " >&6; } if test ${gl_cv_onwards_func_futimes+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -58824,7 +63168,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_futimes" >&5 printf "%s\n" "$gl_cv_onwards_func_futimes" >&6; } @@ -58847,8 +63192,8 @@ printf %s "checking for futimesat... " >&6; } if test ${gl_cv_onwards_func_futimesat+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -58892,7 +63237,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_futimesat" >&5 printf "%s\n" "$gl_cv_onwards_func_futimesat" >&6; } @@ -58915,8 +63261,8 @@ printf %s "checking for lutimes... " >&6; } if test ${gl_cv_onwards_func_lutimes+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -58960,7 +63306,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_lutimes" >&5 printf "%s\n" "$gl_cv_onwards_func_lutimes" >&6; } @@ -58983,8 +63330,8 @@ printf %s "checking for futimens... " >&6; } if test ${gl_cv_onwards_func_futimens+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -59028,7 +63375,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_futimens" >&5 printf "%s\n" "$gl_cv_onwards_func_futimens" >&6; } @@ -59051,8 +63399,8 @@ printf %s "checking for utimensat... " >&6; } if test ${gl_cv_onwards_func_utimensat+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -59096,7 +63444,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_utimensat" >&5 printf "%s\n" "$gl_cv_onwards_func_utimensat" >&6; } @@ -59119,21 +63468,22 @@ printf %s "checking whether futimesat handles NULL file... " >&6; } if test ${gl_cv_func_futimesat_works+y} then : printf %s "(cached) " >&6 -else $as_nop - touch conftest.file +else case e in #( + e) touch conftest.file if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_futimesat_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_futimesat_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems + # and on systems that emulate the Linux system calls. + linux* | midipix*) gl_cv_func_futimesat_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_futimesat_works="$gl_cross_guess_normal" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stddef.h> @@ -59157,14 +63507,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_futimesat_works=yes -else $as_nop - gl_cv_func_futimesat_works=no +else case e in #( + e) gl_cv_func_futimesat_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - rm -f conftest.file + rm -f conftest.file ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_futimesat_works" >&5 printf "%s\n" "$gl_cv_func_futimesat_works" >&6; } @@ -59184,20 +63537,19 @@ printf %s "checking for variable-length arrays... " >&6; } if test ${ac_cv_c_vararrays+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC_NO_VLA__ - defined + #ifndef __STDC_NO_VLA__ + #error __STDC_NO_VLA__ not defined #endif _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "defined" >/dev/null 2>&1 +if ac_fn_c_try_compile "$LINENO" then : ac_cv_c_vararrays='no: __STDC_NO_VLA__ is defined' -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Test for VLA support. This test is partly inspired from examples in the C standard. Use at least two VLA @@ -59240,13 +63592,15 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_c_vararrays=yes -else $as_nop - ac_cv_c_vararrays=no +else case e in #( + e) ac_cv_c_vararrays=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -rf conftest* - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_vararrays" >&5 printf "%s\n" "$ac_cv_c_vararrays" >&6; } @@ -59324,11 +63678,12 @@ printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h if test "x$ac_cv_type_ptrdiff_t" = xyes then : -else $as_nop - +else case e in #( + e) printf "%s\n" "#define ptrdiff_t long" >>confdefs.h - + ;; +esac fi @@ -59431,20 +63786,20 @@ printf %s "checking whether snprintf respects a size of 1... " >&6; } if test ${gl_cv_func_snprintf_size1+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on Android. - linux*-android*) gl_cv_func_snprintf_size1="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_snprintf_size1="guessing yes" ;; - *) gl_cv_func_snprintf_size1="guessing yes" ;; + # Guess yes on Android. + linux*-android*) gl_cv_func_snprintf_size1="guessing yes" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_snprintf_size1="guessing yes" ;; + *) gl_cv_func_snprintf_size1="guessing yes" ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -59472,14 +63827,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_snprintf_size1=yes -else $as_nop - gl_cv_func_snprintf_size1=no +else case e in #( + e) gl_cv_func_snprintf_size1=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5 printf "%s\n" "$gl_cv_func_snprintf_size1" >&6; } @@ -59562,7 +63920,7 @@ fi HAVE_WAITPID=1 case $host_os in - mingw*) HAVE_WAITPID=0 ;; + mingw* | windows*) HAVE_WAITPID=0 ;; esac @@ -59626,8 +63984,9 @@ printf "%s\n" "#define GNULIB_TEST_WAITPID 1" >>confdefs.h if test "x$ac_cv_have_decl_wcrtomb" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_WCRTOMB $ac_have_decl" >>confdefs.h @@ -59646,8 +64005,8 @@ printf %s "checking whether wcrtomb works in the C locale... " >&6; } if test ${gl_cv_func_wcrtomb_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # Guess no on Android. @@ -59656,8 +64015,8 @@ then : *) gl_cv_func_wcrtomb_works="guessing yes";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> @@ -59677,14 +64036,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_wcrtomb_works=yes -else $as_nop - gl_cv_func_wcrtomb_works=no +else case e in #( + e) gl_cv_func_wcrtomb_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcrtomb_works" >&5 printf "%s\n" "$gl_cv_func_wcrtomb_works" >&6; } @@ -59702,20 +64064,22 @@ printf %s "checking whether wcrtomb return value is correct... " >&6; } if test ${gl_cv_func_wcrtomb_retval+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) case "$host_os" in # Guess no on AIX 4, OSF/1, Solaris, native Windows. - aix4* | osf* | solaris* | mingw*) gl_cv_func_wcrtomb_retval="guessing no" ;; + aix4* | osf* | solaris* | mingw* | windows*) + gl_cv_func_wcrtomb_retval="guessing no" ;; # Guess yes otherwise. - *) gl_cv_func_wcrtomb_retval="guessing yes" ;; + *) + gl_cv_func_wcrtomb_retval="guessing yes" ;; esac if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then if test "$cross_compiling" = yes then : : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -59725,12 +64089,14 @@ else $as_nop int main () { int result = 0; - if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) + if (strcmp ("$LOCALE_FR", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) result |= 1; } - if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + if (strcmp ("$LOCALE_FR_UTF8", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) result |= 2; @@ -59741,12 +64107,14 @@ int main () result |= 2; } } - if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + if (strcmp ("$LOCALE_JA", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_JA") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) result |= 4; } - if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + if (strcmp ("$LOCALE_ZH_CN", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) result |= 8; @@ -59757,15 +64125,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_wcrtomb_retval=yes -else $as_nop - gl_cv_func_wcrtomb_retval=no +else case e in #( + e) gl_cv_func_wcrtomb_retval=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcrtomb_retval" >&5 printf "%s\n" "$gl_cv_func_wcrtomb_retval" >&6; } @@ -59826,6 +64197,40 @@ printf "%s\n" "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h + if test $HAVE_WCTYPE = 0 || test $REPLACE_WCTYPE = 1; then + GL_COND_OBJ_WCTYPE_TRUE= + GL_COND_OBJ_WCTYPE_FALSE='#' +else + GL_COND_OBJ_WCTYPE_TRUE='#' + GL_COND_OBJ_WCTYPE_FALSE= +fi +: + if test -z "${GL_COND_OBJ_WCTYPE_TRUE}" && test -z "${GL_COND_OBJ_WCTYPE_FALSE}"; then + GL_COND_OBJ_WCTYPE_TRUE='#' + GL_COND_OBJ_WCTYPE_FALSE='#' + fi + + + + + + + + + + + GL_GNULIB_WCTYPE=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_WCTYPE 1" >>confdefs.h + + + + + @@ -59849,8 +64254,9 @@ printf "%s\n" "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h if test "x$ac_cv_have_decl_wcwidth" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_WCWIDTH $ac_have_decl" >>confdefs.h @@ -59864,8 +64270,8 @@ printf %s "checking whether wcwidth is a macro... " >&6; } if test ${gl_cv_func_wcwidth_macro+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <wchar.h> @@ -59874,15 +64280,17 @@ else $as_nop #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "wchar_header_defines_wcwidth" >/dev/null 2>&1 + $EGREP_TRADITIONAL "wchar_header_defines_wcwidth" >/dev/null 2>&1 then : gl_cv_func_wcwidth_macro=yes -else $as_nop - gl_cv_func_wcwidth_macro=no +else case e in #( + e) gl_cv_func_wcwidth_macro=no ;; +esac fi rm -rf conftest* - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcwidth_macro" >&5 printf "%s\n" "$gl_cv_func_wcwidth_macro" >&6; } @@ -59895,8 +64303,8 @@ printf %s "checking whether wcwidth works reasonably in UTF-8 locales... " >&6; if test ${gl_cv_func_wcwidth_works+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "$cross_compiling" = yes then : @@ -59910,8 +64318,8 @@ then : *) gl_cv_func_wcwidth_works="$gl_cross_guess_normal";; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> @@ -59945,14 +64353,17 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : gl_cv_func_wcwidth_works=yes -else $as_nop - gl_cv_func_wcwidth_works=no +else case e in #( + e) gl_cv_func_wcwidth_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcwidth_works" >&5 printf "%s\n" "$gl_cv_func_wcwidth_works" >&6; } @@ -60012,7 +64423,7 @@ printf "%s\n" "#define GNULIB_TEST_WCWIDTH 1" >>confdefs.h - if case "$host_os" in mingw*) true;; *) false;; esac; then + if case "$host_os" in mingw* | windows*) true;; *) false;; esac; then GL_COND_OBJ_WINDOWS_MUTEX_TRUE= GL_COND_OBJ_WINDOWS_MUTEX_FALSE='#' else @@ -60027,7 +64438,7 @@ fi - if case "$host_os" in mingw*) true;; *) false;; esac; then + if case "$host_os" in mingw* | windows*) true;; *) false;; esac; then GL_COND_OBJ_WINDOWS_ONCE_TRUE= GL_COND_OBJ_WINDOWS_ONCE_FALSE='#' else @@ -60042,7 +64453,7 @@ fi - if case "$host_os" in mingw*) true;; *) false;; esac; then + if case "$host_os" in mingw* | windows*) true;; *) false;; esac; then GL_COND_OBJ_WINDOWS_RECMUTEX_TRUE= GL_COND_OBJ_WINDOWS_RECMUTEX_FALSE='#' else @@ -60057,7 +64468,7 @@ fi - if case "$host_os" in mingw*) true;; *) false;; esac; then + if case "$host_os" in mingw* | windows*) true;; *) false;; esac; then GL_COND_OBJ_WINDOWS_RWLOCK_TRUE= GL_COND_OBJ_WINDOWS_RWLOCK_FALSE='#' else @@ -60072,7 +64483,7 @@ fi - if case "$host_os" in mingw*) true;; *) false;; esac; then + if case "$host_os" in mingw* | windows*) true;; *) false;; esac; then GL_COND_OBJ_WINDOWS_SPAWN_TRUE= GL_COND_OBJ_WINDOWS_SPAWN_FALSE='#' else @@ -60092,8 +64503,8 @@ printf %s "checking for wmemchr... " >&6; } if test ${gl_cv_func_wmemchr+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <wchar.h> @@ -60109,12 +64520,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : gl_cv_func_wmemchr=yes -else $as_nop - gl_cv_func_wmemchr=no +else case e in #( + e) gl_cv_func_wmemchr=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wmemchr" >&5 printf "%s\n" "$gl_cv_func_wmemchr" >&6; } @@ -60174,8 +64587,8 @@ printf %s "checking for wmempcpy... " >&6; } if test ${gl_cv_onwards_func_wmempcpy+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) exec 9>&6 6>/dev/null case "$host_os" in @@ -60219,7 +64632,8 @@ fi exec 6>&9 9>&- - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_wmempcpy" >&5 printf "%s\n" "$gl_cv_onwards_func_wmempcpy" >&6; } @@ -60431,8 +64845,9 @@ fi if test ${with_gcov+y} then : withval=$with_gcov; _AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov -else $as_nop - _AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov +else case e in #( + e) _AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov ;; +esac fi @@ -60442,8 +64857,9 @@ printf %s "checking whether to build with code coverage support... " >&6; } if test ${enable_code_coverage+y} then : enableval=$enable_code_coverage; -else $as_nop - enable_code_coverage=no +else case e in #( + e) enable_code_coverage=no ;; +esac fi @@ -60473,8 +64889,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_AWK+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$AWK"; then +else case e in #( + e) if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -60496,7 +64912,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then @@ -60516,8 +64933,8 @@ printf %s "checking for GNU make... " >&6; } if test ${_cv_gnu_make_command+y} then : printf %s "(cached) " >&6 -else $as_nop - _cv_gnu_make_command="" ; +else case e in #( + e) _cv_gnu_make_command="" ; for a in "$MAKE" make gmake gnumake ; do if test -z "$a" ; then continue ; fi ; if "$a" --version 2> /dev/null | grep GNU 2>&1 > /dev/null ; then @@ -60526,27 +64943,31 @@ else $as_nop ax_check_gnu_make_version=$(echo ${AX_CHECK_GNU_MAKE_HEADLINE} | ${AWK} -F " " '{ print $(NF); }') break ; fi - done ; + done ; ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $_cv_gnu_make_command" >&5 printf "%s\n" "$_cv_gnu_make_command" >&6; } if test "x$_cv_gnu_make_command" = x"" then : ifGNUmake="#" -else $as_nop - ifGNUmake="" +else case e in #( + e) ifGNUmake="" ;; +esac fi if test "x$_cv_gnu_make_command" = x"" then : ifnGNUmake="" -else $as_nop - ifnGNUmake="#" +else case e in #( + e) ifnGNUmake="#" ;; +esac fi if test "x$_cv_gnu_make_command" = x"" then : { ax_cv_gnu_make_command=; unset ax_cv_gnu_make_command;} -else $as_nop - ax_cv_gnu_make_command=${_cv_gnu_make_command} +else case e in #( + e) ax_cv_gnu_make_command=${_cv_gnu_make_command} ;; +esac fi if test "x$_cv_gnu_make_command" = x"" then : @@ -60565,8 +64986,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_GCOV+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$GCOV"; then +else case e in #( + e) if test -n "$GCOV"; then ac_cv_prog_GCOV="$GCOV" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -60588,7 +65009,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi GCOV=$ac_cv_prog_GCOV if test -n "$GCOV"; then @@ -60610,8 +65032,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_GCOV+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_GCOV"; then +else case e in #( + e) if test -n "$ac_ct_GCOV"; then ac_cv_prog_ac_ct_GCOV="$ac_ct_GCOV" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -60633,7 +65055,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_GCOV=$ac_cv_prog_ac_ct_GCOV if test -n "$ac_ct_GCOV"; then @@ -60679,8 +65102,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_LCOV+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$LCOV"; then +else case e in #( + e) if test -n "$LCOV"; then ac_cv_prog_LCOV="$LCOV" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -60702,7 +65125,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi LCOV=$ac_cv_prog_LCOV if test -n "$LCOV"; then @@ -60721,8 +65145,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_GENHTML+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$GENHTML"; then +else case e in #( + e) if test -n "$GENHTML"; then ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -60744,7 +65168,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi GENHTML=$ac_cv_prog_GENHTML if test -n "$GENHTML"; then @@ -60803,8 +65228,8 @@ printf %s "checking for working mmap... " >&6; } if test ${ac_cv_func_mmap_fixed_mapped+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # (( # Guess yes on platforms where we know the result. @@ -60812,8 +65237,8 @@ then : # If we don't know, assume the worst. *) ac_cv_func_mmap_fixed_mapped=no ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default /* malloc might have been renamed as rpl_malloc. */ @@ -60834,21 +65259,21 @@ $ac_includes_default VM page cache was not coherent with the file system buffer cache like early versions of FreeBSD and possibly contemporary NetBSD.) For shared mappings, we should conversely verify that changes get - propagated back to all the places they're supposed to be. - - Grep wants private fixed already mapped. - The main things grep needs to know about mmap are: - * does it exist and is it safe to write into the mmap'd area - * how to use it (BSD variants) */ + propagated back to all the places they're supposed to be. */ #include <fcntl.h> #include <sys/mman.h> -/* This mess was copied from the GNU getpagesize.h. */ -#ifndef HAVE_GETPAGESIZE +#ifndef getpagesize +/* Prefer sysconf to the legacy getpagesize function, as getpagesize has + been removed from POSIX and is limited to page sizes that fit in 'int'. */ # ifdef _SC_PAGESIZE -# define getpagesize() sysconf(_SC_PAGESIZE) -# else /* no _SC_PAGESIZE */ +# define getpagesize() sysconf (_SC_PAGESIZE) +# elif defined _SC_PAGE_SIZE +# define getpagesize() sysconf (_SC_PAGE_SIZE) +# elif HAVE_GETPAGESIZE +int getpagesize (); +# else # ifdef HAVE_SYS_PARAM_H # include <sys/param.h> # ifdef EXEC_PAGESIZE @@ -60872,16 +65297,15 @@ $ac_includes_default # else /* no HAVE_SYS_PARAM_H */ # define getpagesize() 8192 /* punt totally */ # endif /* no HAVE_SYS_PARAM_H */ -# endif /* no _SC_PAGESIZE */ - -#endif /* no HAVE_GETPAGESIZE */ +# endif +#endif int main (void) { char *data, *data2, *data3; const char *cdata2; - int i, pagesize; + long i, pagesize; int fd, fd2; pagesize = getpagesize (); @@ -60915,8 +65339,7 @@ main (void) if (*(data2 + i)) return 7; close (fd2); - if (munmap (data2, pagesize)) - return 8; + /* 'return 8;' not currently used. */ /* Next, try to mmap the file at a fixed address which already has something else allocated at it. If we can, also make sure that @@ -60953,13 +65376,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_mmap_fixed_mapped=yes -else $as_nop - ac_cv_func_mmap_fixed_mapped=no +else case e in #( + e) ac_cv_func_mmap_fixed_mapped=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 printf "%s\n" "$ac_cv_func_mmap_fixed_mapped" >&6; } @@ -60970,74 +65396,99 @@ printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h fi rm -f conftest.mmap conftest.txt -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -printf %s "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } -if test ${ac_cv_sys_largefile_source+y} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for declarations of fseeko and ftello" >&5 +printf %s "checking for declarations of fseeko and ftello... " >&6; } +if test ${ac_cv_func_fseeko_ftello+y} then : printf %s "(cached) " >&6 -else $as_nop - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + +#if defined __hpux && !defined _LARGEFILE_SOURCE +# include <limits.h> +# if LONG_MAX >> 31 == 0 +# error "32-bit HP-UX 11/ia64 needs _LARGEFILE_SOURCE for fseeko in C++" +# endif +#endif #include <sys/types.h> /* for off_t */ - #include <stdio.h> +#include <stdio.h> + int main (void) { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); + + int (*fp1) (FILE *, off_t, int) = fseeko; + off_t (*fp2) (FILE *) = ftello; + return fseeko (stdin, 0, 0) + && fp1 (stdin, 0, 0) + && ftello (stdin) >= 0 + && fp2 (stdin) >= 0; + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" +if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sys_largefile_source=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_cv_func_fseeko_ftello=yes +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE=1" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#define _LARGEFILE_SOURCE 1 + +#if defined __hpux && !defined _LARGEFILE_SOURCE +# include <limits.h> +# if LONG_MAX >> 31 == 0 +# error "32-bit HP-UX 11/ia64 needs _LARGEFILE_SOURCE for fseeko in C++" +# endif +#endif #include <sys/types.h> /* for off_t */ - #include <stdio.h> +#include <stdio.h> + int main (void) { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); + + int (*fp1) (FILE *, off_t, int) = fseeko; + off_t (*fp2) (FILE *) = ftello; + return fseeko (stdin, 0, 0) + && fp1 (stdin, 0, 0) + && ftello (stdin) >= 0 + && fp2 (stdin) >= 0; + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" +if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sys_largefile_source=1; break + ac_cv_func_fseeko_ftello="need _LARGEFILE_SOURCE" +else case e in #( + e) ac_cv_func_fseeko_ftello=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - ac_cv_sys_largefile_source=unknown - break -done +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 -printf "%s\n" "$ac_cv_sys_largefile_source" >&6; } -case $ac_cv_sys_largefile_source in #( - no | unknown) ;; - *) -printf "%s\n" "#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source" >>confdefs.h -;; +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac -rm -rf conftest* - -# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug -# in glibc 2.1.3, but that breaks too many other things. -# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -if test $ac_cv_sys_largefile_source != unknown; then +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fseeko_ftello" >&5 +printf "%s\n" "$ac_cv_func_fseeko_ftello" >&6; } +if test "$ac_cv_func_fseeko_ftello" != no +then : printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h fi +if test "$ac_cv_func_fseeko_ftello" = "need _LARGEFILE_SOURCE" +then : + +printf "%s\n" "#define _LARGEFILE_SOURCE 1" >>confdefs.h + +fi ac_fn_c_check_func "$LINENO" "strptime" "ac_cv_func_strptime" if test "x$ac_cv_func_strptime" = xyes @@ -61204,11 +65655,12 @@ then : esac wget_manywarnings=$enableval -else $as_nop - +else case e in #( + e) test -f .manywarnings && wget_manywarnings=yes || wget_manywarnings=no - + ;; +esac fi @@ -61419,8 +65871,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PKG_CONFIG+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PKG_CONFIG in +else case e in #( + e) case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; @@ -61445,6 +65897,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG @@ -61467,8 +65920,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_PKG_CONFIG in +else case e in #( + e) case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; @@ -61493,6 +65946,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG @@ -61539,8 +65993,8 @@ then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBPSL" >&5 -printf %s "checking for LIBPSL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpsl" >&5 +printf %s "checking for libpsl... " >&6; } if test -n "$LIBPSL_CFLAGS"; then pkg_cv_LIBPSL_CFLAGS="$LIBPSL_CFLAGS" @@ -61580,7 +66034,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -61589,12 +66043,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBPSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpsl" 2>&1` + LIBPSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpsl" 2>&1` else - LIBPSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpsl" 2>&1` + LIBPSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpsl" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBPSL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBPSL_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing psl_builtin" >&5 @@ -61602,15 +66056,21 @@ printf %s "checking for library containing psl_builtin... " >&6; } if test ${ac_cv_search_psl_builtin+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char psl_builtin (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char psl_builtin (void); int main (void) { @@ -61641,11 +66101,13 @@ done if test ${ac_cv_search_psl_builtin+y} then : -else $as_nop - ac_cv_search_psl_builtin=no +else case e in #( + e) ac_cv_search_psl_builtin=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_psl_builtin" >&5 printf "%s\n" "$ac_cv_search_psl_builtin" >&6; } @@ -61656,14 +66118,15 @@ then : with_libpsl=yes; printf "%s\n" "#define HAVE_LIBPSL 1" >>confdefs.h -else $as_nop - with_libpsl=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** libpsl was not found. Fallback to builtin cookie checking." >&5 -printf "%s\n" "$as_me: WARNING: *** libpsl was not found. Fallback to builtin cookie checking." >&2;} +else case e in #( + e) with_libpsl=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** libpsl was not found. Fallback to builtin cookie checking." >&5 +printf "%s\n" "$as_me: WARNING: *** libpsl was not found. Fallback to builtin cookie checking." >&2;} ;; +esac fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing psl_builtin" >&5 @@ -61671,15 +66134,21 @@ printf %s "checking for library containing psl_builtin... " >&6; } if test ${ac_cv_search_psl_builtin+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char psl_builtin (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char psl_builtin (void); int main (void) { @@ -61710,11 +66179,13 @@ done if test ${ac_cv_search_psl_builtin+y} then : -else $as_nop - ac_cv_search_psl_builtin=no +else case e in #( + e) ac_cv_search_psl_builtin=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_psl_builtin" >&5 printf "%s\n" "$ac_cv_search_psl_builtin" >&6; } @@ -61725,15 +66196,16 @@ then : with_libpsl=yes; printf "%s\n" "#define HAVE_LIBPSL 1" >>confdefs.h -else $as_nop - with_libpsl=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** libpsl was not found. Fallback to builtin cookie checking." >&5 -printf "%s\n" "$as_me: WARNING: *** libpsl was not found. Fallback to builtin cookie checking." >&2;} +else case e in #( + e) with_libpsl=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** libpsl was not found. Fallback to builtin cookie checking." >&5 +printf "%s\n" "$as_me: WARNING: *** libpsl was not found. Fallback to builtin cookie checking." >&2;} ;; +esac fi else - LIBPSL_CFLAGS=$pkg_cv_LIBPSL_CFLAGS - LIBPSL_LIBS=$pkg_cv_LIBPSL_LIBS + LIBPSL_CFLAGS=$pkg_cv_LIBPSL_CFLAGS + LIBPSL_LIBS=$pkg_cv_LIBPSL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -61772,8 +66244,8 @@ then : with_zlib=yes pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ZLIB" >&5 -printf %s "checking for ZLIB... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5 +printf %s "checking for zlib... " >&6; } if test -n "$ZLIB_CFLAGS"; then pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS" @@ -61813,7 +66285,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -61822,12 +66294,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ZLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib" 2>&1` + ZLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib" 2>&1` else - ZLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib" 2>&1` + ZLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ZLIB_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ZLIB_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 @@ -61835,16 +66307,22 @@ printf %s "checking for compress in -lz... " >&6; } if test ${ac_cv_lib_z_compress+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char compress (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char compress (void); int main (void) { @@ -61856,12 +66334,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_z_compress=yes -else $as_nop - ac_cv_lib_z_compress=no +else case e in #( + e) ac_cv_lib_z_compress=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 printf "%s\n" "$ac_cv_lib_z_compress" >&6; } @@ -61875,7 +66355,7 @@ fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 @@ -61883,16 +66363,22 @@ printf %s "checking for compress in -lz... " >&6; } if test ${ac_cv_lib_z_compress+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char compress (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char compress (void); int main (void) { @@ -61904,12 +66390,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_z_compress=yes -else $as_nop - ac_cv_lib_z_compress=no +else case e in #( + e) ac_cv_lib_z_compress=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 printf "%s\n" "$ac_cv_lib_z_compress" >&6; } @@ -61923,8 +66411,8 @@ fi else - ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS - ZLIB_LIBS=$pkg_cv_ZLIB_LIBS + ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS + ZLIB_LIBS=$pkg_cv_ZLIB_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -61944,8 +66432,8 @@ then : if test x"$with_libssl_prefix" = x; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5 -printf %s "checking for OPENSSL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5 +printf %s "checking for openssl... " >&6; } if test -n "$OPENSSL_CFLAGS"; then pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" @@ -61985,7 +66473,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -61994,14 +66482,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl" 2>&1` + OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl" 2>&1` else - OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl" 2>&1` + OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$OPENSSL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$OPENSSL_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (openssl) were not met: + as_fn_error $? "Package requirements (openssl) were not met: $OPENSSL_PKG_ERRORS @@ -62012,10 +66500,10 @@ Alternatively, you may set the environment variables OPENSSL_CFLAGS and OPENSSL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -62025,10 +66513,10 @@ and OPENSSL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } else - OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS - OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS + OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS + OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -62058,16 +66546,22 @@ printf %s "checking for dlopen in -ldl... " >&6; } if test ${ac_cv_lib_dl_dlopen+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char dlopen (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (void); int main (void) { @@ -62079,12 +66573,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dl_dlopen=yes -else $as_nop - ac_cv_lib_dl_dlopen=no +else case e in #( + e) ac_cv_lib_dl_dlopen=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } @@ -62094,23 +66590,29 @@ then : LIBS="-ldl $LIBS" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldl" >&5 printf %s "checking for shl_load in -ldl... " >&6; } if test ${ac_cv_lib_dl_shl_load+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char shl_load (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char shl_load (void); int main (void) { @@ -62122,12 +66624,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dl_shl_load=yes -else $as_nop - ac_cv_lib_dl_shl_load=no +else case e in #( + e) ac_cv_lib_dl_shl_load=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_shl_load" >&5 printf "%s\n" "$ac_cv_lib_dl_shl_load" >&6; } @@ -62139,7 +66643,8 @@ then : fi - + ;; +esac fi @@ -62152,16 +66657,22 @@ printf %s "checking for EVP_MD_CTX_init in -leay32... " >&6; } if test ${ac_cv_lib_eay32_EVP_MD_CTX_init+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-leay32 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char EVP_MD_CTX_init (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char EVP_MD_CTX_init (void); int main (void) { @@ -62173,12 +66684,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_eay32_EVP_MD_CTX_init=yes -else $as_nop - ac_cv_lib_eay32_EVP_MD_CTX_init=no +else case e in #( + e) ac_cv_lib_eay32_EVP_MD_CTX_init=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_eay32_EVP_MD_CTX_init" >&5 printf "%s\n" "$ac_cv_lib_eay32_EVP_MD_CTX_init" >&6; } @@ -62197,16 +66710,22 @@ printf %s "checking for SSL_connect in -lssl32... " >&6; } if test ${ac_cv_lib_ssl32_SSL_connect+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lssl32 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char SSL_connect (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char SSL_connect (void); int main (void) { @@ -62218,12 +66737,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ssl32_SSL_connect=yes -else $as_nop - ac_cv_lib_ssl32_SSL_connect=no +else case e in #( + e) ac_cv_lib_ssl32_SSL_connect=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl32_SSL_connect" >&5 printf "%s\n" "$ac_cv_lib_ssl32_SSL_connect" >&6; } @@ -62239,8 +66760,9 @@ printf "%s\n" "$as_me: Enabling support for SSL via OpenSSL (shared)" >&6;} printf "%s\n" "#define HAVE_LIBSSL32 1" >>confdefs.h -else $as_nop - as_fn_error $? "openssl not found: shared lib eay32 found but ssl32 not found" "$LINENO" 5 +else case e in #( + e) as_fn_error $? "openssl not found: shared lib eay32 found but ssl32 not found" "$LINENO" 5 ;; +esac fi @@ -62267,9 +66789,9 @@ then : use_additional=yes - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -62277,8 +66799,8 @@ then : eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" # Check whether --with-libssl-prefix was given. @@ -62290,9 +66812,9 @@ then : else if test "X$withval" = "X"; then - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -62300,8 +66822,8 @@ then : eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" else additional_includedir="$withval/include" @@ -62413,13 +66935,13 @@ fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIBSSL; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" case "$x" in -L*) @@ -62507,13 +67029,13 @@ fi haveit= for x in $LDFLAGS $LIBSSL; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$found_dir"; then haveit=yes @@ -62575,13 +67097,13 @@ fi if test -z "$haveit"; then for x in $CPPFLAGS $INCSSL; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-I$additional_includedir"; then haveit=yes @@ -62597,12 +67119,12 @@ fi fi fi if test -n "$found_la"; then - save_libdir="$libdir" + saved_libdir="$libdir" case "$found_la" in */* | *\\*) . "$found_la" ;; *) . "./$found_la" ;; esac - libdir="$save_libdir" + libdir="$saved_libdir" for dep in $dependency_libs; do case "$dep" in -L*) @@ -62624,13 +67146,13 @@ fi haveit= for x in $LDFLAGS $LIBSSL; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -62645,13 +67167,13 @@ fi haveit= for x in $LDFLAGS $LTLIBSSL; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -62725,17 +67247,17 @@ fi for found_dir in $rpathdirs; do alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBSSL="${LIBSSL}${LIBSSL:+ }$flag" else for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$found_dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBSSL="${LIBSSL}${LIBSSL:+ }$flag" done fi @@ -62751,19 +67273,19 @@ fi - ac_save_CPPFLAGS="$CPPFLAGS" + acl_saved_CPPFLAGS="$CPPFLAGS" for element in $INCSSL; do haveit= for x in $CPPFLAGS; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X$element"; then haveit=yes @@ -62781,9 +67303,9 @@ printf %s "checking for libssl... " >&6; } if test ${ac_cv_libssl+y} then : printf %s "(cached) " >&6 -else $as_nop - - ac_save_LIBS="$LIBS" +else case e in #( + e) + acl_saved_LIBS="$LIBS" case " $LIBSSL" in *" -l"*) LIBS="$LIBS $LIBSSL" ;; *) LIBS="$LIBSSL $LIBS" ;; @@ -62810,13 +67332,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_libssl=yes -else $as_nop - ac_cv_libssl='no' +else case e in #( + e) ac_cv_libssl='no' ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_save_LIBS" - + LIBS="$acl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libssl" >&5 printf "%s\n" "$ac_cv_libssl" >&6; } @@ -62831,7 +67355,7 @@ printf %s "checking how to link with libssl... " >&6; } printf "%s\n" "$LIBSSL" >&6; } else HAVE_LIBSSL=no - CPPFLAGS="$ac_save_CPPFLAGS" + CPPFLAGS="$acl_saved_CPPFLAGS" LIBSSL= LTLIBSSL= LIBSSL_PREFIX= @@ -62865,8 +67389,8 @@ fi fi fi -else $as_nop - +else case e in #( + e) # --with-ssl is not openssl: check if it's no if test x"$with_ssl" != xno then : @@ -62876,8 +67400,8 @@ then : if test x"$with_libgnutls_prefix" = x; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5 -printf %s "checking for GNUTLS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gnutls" >&5 +printf %s "checking for gnutls... " >&6; } if test -n "$GNUTLS_CFLAGS"; then pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS" @@ -62917,7 +67441,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -62926,14 +67450,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls" 2>&1` + GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls" 2>&1` else - GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls" 2>&1` + GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GNUTLS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GNUTLS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gnutls) were not met: + as_fn_error $? "Package requirements (gnutls) were not met: $GNUTLS_PKG_ERRORS @@ -62944,10 +67468,10 @@ Alternatively, you may set the environment variables GNUTLS_CFLAGS and GNUTLS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -62957,10 +67481,10 @@ and GNUTLS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } else - GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS - GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS + GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS + GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -62991,9 +67515,9 @@ fi use_additional=yes - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -63001,8 +67525,8 @@ fi eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" # Check whether --with-libgnutls-prefix was given. @@ -63014,9 +67538,9 @@ then : else if test "X$withval" = "X"; then - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -63024,8 +67548,8 @@ then : eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" else additional_includedir="$withval/include" @@ -63137,13 +67661,13 @@ fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIBGNUTLS; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" case "$x" in -L*) @@ -63231,13 +67755,13 @@ fi haveit= for x in $LDFLAGS $LIBGNUTLS; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$found_dir"; then haveit=yes @@ -63299,13 +67823,13 @@ fi if test -z "$haveit"; then for x in $CPPFLAGS $INCGNUTLS; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-I$additional_includedir"; then haveit=yes @@ -63321,12 +67845,12 @@ fi fi fi if test -n "$found_la"; then - save_libdir="$libdir" + saved_libdir="$libdir" case "$found_la" in */* | *\\*) . "$found_la" ;; *) . "./$found_la" ;; esac - libdir="$save_libdir" + libdir="$saved_libdir" for dep in $dependency_libs; do case "$dep" in -L*) @@ -63348,13 +67872,13 @@ fi haveit= for x in $LDFLAGS $LIBGNUTLS; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -63369,13 +67893,13 @@ fi haveit= for x in $LDFLAGS $LTLIBGNUTLS; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -63449,17 +67973,17 @@ fi for found_dir in $rpathdirs; do alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$flag" else for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$found_dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$flag" done fi @@ -63475,19 +67999,19 @@ fi - ac_save_CPPFLAGS="$CPPFLAGS" + acl_saved_CPPFLAGS="$CPPFLAGS" for element in $INCGNUTLS; do haveit= for x in $CPPFLAGS; do - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" if test "X$x" = "X$element"; then haveit=yes @@ -63505,9 +68029,9 @@ printf %s "checking for libgnutls... " >&6; } if test ${ac_cv_libgnutls+y} then : printf %s "(cached) " >&6 -else $as_nop - - ac_save_LIBS="$LIBS" +else case e in #( + e) + acl_saved_LIBS="$LIBS" case " $LIBGNUTLS" in *" -l"*) LIBS="$LIBS $LIBGNUTLS" ;; *) LIBS="$LIBGNUTLS $LIBS" ;; @@ -63528,13 +68052,15 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_libgnutls=yes -else $as_nop - ac_cv_libgnutls='no' +else case e in #( + e) ac_cv_libgnutls='no' ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_save_LIBS" - + LIBS="$acl_saved_LIBS" + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libgnutls" >&5 printf "%s\n" "$ac_cv_libgnutls" >&6; } @@ -63549,7 +68075,7 @@ printf %s "checking how to link with libgnutls... " >&6; } printf "%s\n" "$LIBGNUTLS" >&6; } else HAVE_LIBGNUTLS=no - CPPFLAGS="$ac_save_CPPFLAGS" + CPPFLAGS="$acl_saved_CPPFLAGS" LIBGNUTLS= LTLIBGNUTLS= LIBGNUTLS_PREFIX= @@ -63582,7 +68108,8 @@ fi fi # endif: --with-ssl != no? - + ;; +esac fi # endif: --with-ssl == openssl? if test x"$ENABLE_NTLM" != xno @@ -63596,8 +68123,8 @@ printf "%s\n" "#define ENABLE_NTLM 1" >>confdefs.h else pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NETTLE" >&5 -printf %s "checking for NETTLE... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nettle" >&5 +printf %s "checking for nettle... " >&6; } if test -n "$NETTLE_CFLAGS"; then pkg_cv_NETTLE_CFLAGS="$NETTLE_CFLAGS" @@ -63637,7 +68164,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -63646,12 +68173,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NETTLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nettle" 2>&1` + NETTLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nettle" 2>&1` else - NETTLE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nettle" 2>&1` + NETTLE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nettle" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$NETTLE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$NETTLE_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nettle_md4_init in -lnettle" >&5 @@ -63659,16 +68186,22 @@ printf %s "checking for nettle_md4_init in -lnettle... " >&6; } if test ${ac_cv_lib_nettle_nettle_md4_init+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lnettle $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char nettle_md4_init (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char nettle_md4_init (void); int main (void) { @@ -63680,21 +68213,24 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_nettle_nettle_md4_init=yes -else $as_nop - ac_cv_lib_nettle_nettle_md4_init=no +else case e in #( + e) ac_cv_lib_nettle_nettle_md4_init=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nettle_nettle_md4_init" >&5 printf "%s\n" "$ac_cv_lib_nettle_nettle_md4_init" >&6; } if test "x$ac_cv_lib_nettle_nettle_md4_init" = xyes then : HAVE_NETTLE=yes -else $as_nop - HAVE_NETTLE=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** libnettle was not found. You will not be able to use NTLM" >&5 -printf "%s\n" "$as_me: WARNING: *** libnettle was not found. You will not be able to use NTLM" >&2;} +else case e in #( + e) HAVE_NETTLE=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** libnettle was not found. You will not be able to use NTLM" >&5 +printf "%s\n" "$as_me: WARNING: *** libnettle was not found. You will not be able to use NTLM" >&2;} ;; +esac fi if test x"$HAVE_NETTLE" != xyes; then @@ -63708,7 +68244,7 @@ fi fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nettle_md4_init in -lnettle" >&5 @@ -63716,16 +68252,22 @@ printf %s "checking for nettle_md4_init in -lnettle... " >&6; } if test ${ac_cv_lib_nettle_nettle_md4_init+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lnettle $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char nettle_md4_init (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char nettle_md4_init (void); int main (void) { @@ -63737,21 +68279,24 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_nettle_nettle_md4_init=yes -else $as_nop - ac_cv_lib_nettle_nettle_md4_init=no +else case e in #( + e) ac_cv_lib_nettle_nettle_md4_init=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nettle_nettle_md4_init" >&5 printf "%s\n" "$ac_cv_lib_nettle_nettle_md4_init" >&6; } if test "x$ac_cv_lib_nettle_nettle_md4_init" = xyes then : HAVE_NETTLE=yes -else $as_nop - HAVE_NETTLE=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** libnettle was not found. You will not be able to use NTLM" >&5 -printf "%s\n" "$as_me: WARNING: *** libnettle was not found. You will not be able to use NTLM" >&2;} +else case e in #( + e) HAVE_NETTLE=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** libnettle was not found. You will not be able to use NTLM" >&5 +printf "%s\n" "$as_me: WARNING: *** libnettle was not found. You will not be able to use NTLM" >&2;} ;; +esac fi if test x"$HAVE_NETTLE" != xyes; then @@ -63765,8 +68310,8 @@ fi fi else - NETTLE_CFLAGS=$pkg_cv_NETTLE_CFLAGS - NETTLE_LIBS=$pkg_cv_NETTLE_LIBS + NETTLE_CFLAGS=$pkg_cv_NETTLE_CFLAGS + NETTLE_LIBS=$pkg_cv_NETTLE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -63811,11 +68356,12 @@ printf "%s\n" "$as_me: disabling IPv6 at user request" >&6;} ;; esac -else $as_nop - +else case e in #( + e) ipv6=yes - + ;; +esac fi @@ -63826,8 +68372,8 @@ printf %s "checking for INET6 protocol support... " >&6; } if test ${wget_cv_proto_inet6+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -63857,13 +68403,15 @@ then : wget_cv_proto_inet6=yes -else $as_nop - +else case e in #( + e) wget_cv_proto_inet6=no - + ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wget_cv_proto_inet6" >&5 printf "%s\n" "$wget_cv_proto_inet6" >&6; } @@ -63907,10 +68455,11 @@ printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_IN6 1" >>confdefs.h wget_have_sockaddr_in6=yes -else $as_nop - +else case e in #( + e) wget_have_sockaddr_in6=no - + ;; +esac fi @@ -63971,10 +68520,11 @@ then : wget_member_sin6_scope_id=yes -else $as_nop - +else case e in #( + e) wget_member_sin6_scope_id=no - + ;; +esac fi fi @@ -64011,8 +68561,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_MAKEINFO+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$MAKEINFO"; then +else case e in #( + e) if test -n "$MAKEINFO"; then ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -64034,7 +68584,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi MAKEINFO=$ac_cv_prog_MAKEINFO if test -n "$MAKEINFO"; then @@ -64061,8 +68612,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PERL+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PERL in +else case e in #( + e) case $PERL in [\\/]* | ?:[\\/]*) ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; @@ -64087,6 +68638,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PERL=$ac_cv_path_PERL @@ -64110,8 +68662,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_POD2MAN+y} then : printf %s "(cached) " >&6 -else $as_nop - case $POD2MAN in +else case e in #( + e) case $POD2MAN in [\\/]* | ?:[\\/]*) ac_cv_path_POD2MAN="$POD2MAN" # Let the user override the test with a path. ;; @@ -64137,6 +68689,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_POD2MAN" && ac_cv_path_POD2MAN="no" ;; +esac ;; esac fi POD2MAN=$ac_cv_path_POD2MAN @@ -64180,11 +68733,12 @@ printf "%s\n" "$as_me: disabling IRIs at user request" >&6;} ;; esac -else $as_nop - +else case e in #( + e) iri=yes - + ;; +esac fi @@ -64209,8 +68763,8 @@ then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBIDN2" >&5 -printf %s "checking for LIBIDN2... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libidn2 >= 0.14.0" >&5 +printf %s "checking for libidn2 >= 0.14.0... " >&6; } if test -n "$LIBIDN2_CFLAGS"; then pkg_cv_LIBIDN2_CFLAGS="$LIBIDN2_CFLAGS" @@ -64250,7 +68804,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -64259,12 +68813,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBIDN2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn2 >= 0.14.0" 2>&1` + LIBIDN2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn2 >= 0.14.0" 2>&1` else - LIBIDN2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn2 >= 0.14.0" 2>&1` + LIBIDN2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn2 >= 0.14.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBIDN2_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBIDN2_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing idn2_lookup_u8" >&5 @@ -64272,15 +68826,21 @@ printf %s "checking for library containing idn2_lookup_u8... " >&6; } if test ${ac_cv_search_idn2_lookup_u8+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char idn2_lookup_u8 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char idn2_lookup_u8 (void); int main (void) { @@ -64311,11 +68871,13 @@ done if test ${ac_cv_search_idn2_lookup_u8+y} then : -else $as_nop - ac_cv_search_idn2_lookup_u8=no +else case e in #( + e) ac_cv_search_idn2_lookup_u8=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_idn2_lookup_u8" >&5 printf "%s\n" "$ac_cv_search_idn2_lookup_u8" >&6; } @@ -64326,14 +68888,15 @@ then : with_libidn2=yes; printf "%s\n" "#define ENABLE_IRI 1" >>confdefs.h -else $as_nop - with_libidn2=no; iri=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** LIBIDN2 was not found. You will not be able to use IDN2008 support" >&5 -printf "%s\n" "$as_me: WARNING: *** LIBIDN2 was not found. You will not be able to use IDN2008 support" >&2;} +else case e in #( + e) with_libidn2=no; iri=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** LIBIDN2 was not found. You will not be able to use IDN2008 support" >&5 +printf "%s\n" "$as_me: WARNING: *** LIBIDN2 was not found. You will not be able to use IDN2008 support" >&2;} ;; +esac fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing idn2_lookup_u8" >&5 @@ -64341,15 +68904,21 @@ printf %s "checking for library containing idn2_lookup_u8... " >&6; } if test ${ac_cv_search_idn2_lookup_u8+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char idn2_lookup_u8 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char idn2_lookup_u8 (void); int main (void) { @@ -64380,11 +68949,13 @@ done if test ${ac_cv_search_idn2_lookup_u8+y} then : -else $as_nop - ac_cv_search_idn2_lookup_u8=no +else case e in #( + e) ac_cv_search_idn2_lookup_u8=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_idn2_lookup_u8" >&5 printf "%s\n" "$ac_cv_search_idn2_lookup_u8" >&6; } @@ -64395,15 +68966,16 @@ then : with_libidn2=yes; printf "%s\n" "#define ENABLE_IRI 1" >>confdefs.h -else $as_nop - with_libidn2=no; iri=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** LIBIDN2 was not found. You will not be able to use IDN2008 support" >&5 -printf "%s\n" "$as_me: WARNING: *** LIBIDN2 was not found. You will not be able to use IDN2008 support" >&2;} +else case e in #( + e) with_libidn2=no; iri=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** LIBIDN2 was not found. You will not be able to use IDN2008 support" >&5 +printf "%s\n" "$as_me: WARNING: *** LIBIDN2 was not found. You will not be able to use IDN2008 support" >&2;} ;; +esac fi else - LIBIDN2_CFLAGS=$pkg_cv_LIBIDN2_CFLAGS - LIBIDN2_LIBS=$pkg_cv_LIBIDN2_LIBS + LIBIDN2_CFLAGS=$pkg_cv_LIBIDN2_CFLAGS + LIBIDN2_LIBS=$pkg_cv_LIBIDN2_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -64434,8 +69006,8 @@ then : # libuuid was explicitly requested pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for UUID" >&5 -printf %s "checking for UUID... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid" >&5 +printf %s "checking for uuid... " >&6; } if test -n "$UUID_CFLAGS"; then pkg_cv_UUID_CFLAGS="$UUID_CFLAGS" @@ -64475,7 +69047,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -64484,12 +69056,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "uuid" 2>&1` + UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "uuid" 2>&1` else - UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "uuid" 2>&1` + UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "uuid" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$UUID_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$UUID_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_generate" >&5 @@ -64497,15 +69069,21 @@ printf %s "checking for library containing uuid_generate... " >&6; } if test ${ac_cv_search_uuid_generate+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char uuid_generate (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char uuid_generate (void); int main (void) { @@ -64536,11 +69114,13 @@ done if test ${ac_cv_search_uuid_generate+y} then : -else $as_nop - ac_cv_search_uuid_generate=no +else case e in #( + e) ac_cv_search_uuid_generate=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_generate" >&5 printf "%s\n" "$ac_cv_search_uuid_generate" >&6; } @@ -64549,13 +69129,14 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" uuid_mode=1 -else $as_nop - as_fn_error $? "*** libuuid was explicitly requested but wasn't found." "$LINENO" 5 +else case e in #( + e) as_fn_error $? "*** libuuid was explicitly requested but wasn't found." "$LINENO" 5 ;; +esac fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_generate" >&5 @@ -64563,15 +69144,21 @@ printf %s "checking for library containing uuid_generate... " >&6; } if test ${ac_cv_search_uuid_generate+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char uuid_generate (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char uuid_generate (void); int main (void) { @@ -64602,11 +69189,13 @@ done if test ${ac_cv_search_uuid_generate+y} then : -else $as_nop - ac_cv_search_uuid_generate=no +else case e in #( + e) ac_cv_search_uuid_generate=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_generate" >&5 printf "%s\n" "$ac_cv_search_uuid_generate" >&6; } @@ -64615,14 +69204,15 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" uuid_mode=1 -else $as_nop - as_fn_error $? "*** libuuid was explicitly requested but wasn't found." "$LINENO" 5 +else case e in #( + e) as_fn_error $? "*** libuuid was explicitly requested but wasn't found." "$LINENO" 5 ;; +esac fi else - UUID_CFLAGS=$pkg_cv_UUID_CFLAGS - UUID_LIBS=$pkg_cv_UUID_LIBS + UUID_CFLAGS=$pkg_cv_UUID_CFLAGS + UUID_LIBS=$pkg_cv_UUID_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -64648,8 +69238,8 @@ fi fi -else $as_nop - +else case e in #( + e) # default: ac_fn_c_check_header_compile "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default" if test "x$ac_cv_header_uuid_h" = xyes @@ -64662,8 +69252,8 @@ then : fi -else $as_nop - +else case e in #( + e) ac_fn_c_check_header_compile "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default" if test "x$ac_cv_header_uuid_uuid_h" = xyes then : @@ -64672,15 +69262,21 @@ printf %s "checking for library containing uuid_generate... " >&6; } if test ${ac_cv_search_uuid_generate+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char uuid_generate (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char uuid_generate (void); int main (void) { @@ -64711,11 +69307,13 @@ done if test ${ac_cv_search_uuid_generate+y} then : -else $as_nop - ac_cv_search_uuid_generate=no +else case e in #( + e) ac_cv_search_uuid_generate=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_generate" >&5 printf "%s\n" "$ac_cv_search_uuid_generate" >&6; } @@ -64728,10 +69326,12 @@ fi fi - + ;; +esac fi - + ;; +esac fi if test "x$uuid_mode" = x1 @@ -64770,8 +69370,8 @@ then : enable_pcre2=no pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PCRE2" >&5 -printf %s "checking for PCRE2... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpcre2-8" >&5 +printf %s "checking for libpcre2-8... " >&6; } if test -n "$PCRE2_CFLAGS"; then pkg_cv_PCRE2_CFLAGS="$PCRE2_CFLAGS" @@ -64811,7 +69411,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -64820,12 +69420,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PCRE2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre2-8" 2>&1` + PCRE2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre2-8" 2>&1` else - PCRE2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre2-8" 2>&1` + PCRE2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre2-8" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$PCRE2_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$PCRE2_PKG_ERRORS" >&5 ac_fn_c_check_header_compile "$LINENO" "pcre2.h" "ac_cv_header_pcre2_h" "$ac_includes_default" @@ -64837,16 +69437,22 @@ printf %s "checking for pcre2_compile_8 in -lpcre2-8... " >&6; } if test ${ac_cv_lib_pcre2_8_pcre2_compile_8+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpcre2-8 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pcre2_compile_8 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pcre2_compile_8 (void); int main (void) { @@ -64858,12 +69464,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pcre2_8_pcre2_compile_8=yes -else $as_nop - ac_cv_lib_pcre2_8_pcre2_compile_8=no +else case e in #( + e) ac_cv_lib_pcre2_8_pcre2_compile_8=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre2_8_pcre2_compile_8" >&5 printf "%s\n" "$ac_cv_lib_pcre2_8_pcre2_compile_8" >&6; } @@ -64883,7 +69491,7 @@ fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } ac_fn_c_check_header_compile "$LINENO" "pcre2.h" "ac_cv_header_pcre2_h" "$ac_includes_default" @@ -64895,16 +69503,22 @@ printf %s "checking for pcre2_compile_8 in -lpcre2-8... " >&6; } if test ${ac_cv_lib_pcre2_8_pcre2_compile_8+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpcre2-8 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pcre2_compile_8 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pcre2_compile_8 (void); int main (void) { @@ -64916,12 +69530,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pcre2_8_pcre2_compile_8=yes -else $as_nop - ac_cv_lib_pcre2_8_pcre2_compile_8=no +else case e in #( + e) ac_cv_lib_pcre2_8_pcre2_compile_8=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre2_8_pcre2_compile_8" >&5 printf "%s\n" "$ac_cv_lib_pcre2_8_pcre2_compile_8" >&6; } @@ -64941,8 +69557,8 @@ fi else - PCRE2_CFLAGS=$pkg_cv_PCRE2_CFLAGS - PCRE2_LIBS=$pkg_cv_PCRE2_LIBS + PCRE2_CFLAGS=$pkg_cv_PCRE2_CFLAGS + PCRE2_LIBS=$pkg_cv_PCRE2_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -64962,8 +69578,8 @@ then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PCRE" >&5 -printf %s "checking for PCRE... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpcre" >&5 +printf %s "checking for libpcre... " >&6; } if test -n "$PCRE_CFLAGS"; then pkg_cv_PCRE_CFLAGS="$PCRE_CFLAGS" @@ -65003,7 +69619,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -65012,12 +69628,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PCRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre" 2>&1` + PCRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre" 2>&1` else - PCRE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre" 2>&1` + PCRE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$PCRE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$PCRE_PKG_ERRORS" >&5 ac_fn_c_check_header_compile "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default" @@ -65029,16 +69645,22 @@ printf %s "checking for pcre_compile in -lpcre... " >&6; } if test ${ac_cv_lib_pcre_pcre_compile+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpcre $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pcre_compile (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pcre_compile (void); int main (void) { @@ -65050,12 +69672,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pcre_pcre_compile=yes -else $as_nop - ac_cv_lib_pcre_pcre_compile=no +else case e in #( + e) ac_cv_lib_pcre_pcre_compile=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_compile" >&5 printf "%s\n" "$ac_cv_lib_pcre_pcre_compile" >&6; } @@ -65074,7 +69698,7 @@ fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } ac_fn_c_check_header_compile "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default" @@ -65086,16 +69710,22 @@ printf %s "checking for pcre_compile in -lpcre... " >&6; } if test ${ac_cv_lib_pcre_pcre_compile+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpcre $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pcre_compile (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pcre_compile (void); int main (void) { @@ -65107,12 +69737,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pcre_pcre_compile=yes -else $as_nop - ac_cv_lib_pcre_pcre_compile=no +else case e in #( + e) ac_cv_lib_pcre_pcre_compile=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_compile" >&5 printf "%s\n" "$ac_cv_lib_pcre_pcre_compile" >&6; } @@ -65131,8 +69763,8 @@ fi else - PCRE_CFLAGS=$pkg_cv_PCRE_CFLAGS - PCRE_LIBS=$pkg_cv_PCRE_LIBS + PCRE_CFLAGS=$pkg_cv_PCRE_CFLAGS + PCRE_LIBS=$pkg_cv_PCRE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -65160,8 +69792,9 @@ then : elif test "X$enable_pcre" = Xyes then : PCRE_INFO="yes, via libpcre" -else $as_nop - PCRE_INFO=no +else case e in #( + e) PCRE_INFO=no ;; +esac fi @@ -65170,8 +69803,8 @@ then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CARES" >&5 -printf %s "checking for CARES... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcares" >&5 +printf %s "checking for libcares... " >&6; } if test -n "$CARES_CFLAGS"; then pkg_cv_CARES_CFLAGS="$CARES_CFLAGS" @@ -65211,7 +69844,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -65220,12 +69853,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcares" 2>&1` + CARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcares" 2>&1` else - CARES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcares" 2>&1` + CARES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcares" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$CARES_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$CARES_PKG_ERRORS" >&5 ac_fn_c_check_header_compile "$LINENO" "ares.h" "ac_cv_header_ares_h" "$ac_includes_default" @@ -65237,16 +69870,22 @@ printf %s "checking for ares_set_local_ip4 in -lcares... " >&6; } if test ${ac_cv_lib_cares_ares_set_local_ip4+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcares $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char ares_set_local_ip4 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char ares_set_local_ip4 (void); int main (void) { @@ -65258,12 +69897,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_cares_ares_set_local_ip4=yes -else $as_nop - ac_cv_lib_cares_ares_set_local_ip4=no +else case e in #( + e) ac_cv_lib_cares_ares_set_local_ip4=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cares_ares_set_local_ip4" >&5 printf "%s\n" "$ac_cv_lib_cares_ares_set_local_ip4" >&6; } @@ -65283,7 +69924,7 @@ fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } ac_fn_c_check_header_compile "$LINENO" "ares.h" "ac_cv_header_ares_h" "$ac_includes_default" @@ -65295,16 +69936,22 @@ printf %s "checking for ares_set_local_ip4 in -lcares... " >&6; } if test ${ac_cv_lib_cares_ares_set_local_ip4+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcares $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char ares_set_local_ip4 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char ares_set_local_ip4 (void); int main (void) { @@ -65316,12 +69963,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_cares_ares_set_local_ip4=yes -else $as_nop - ac_cv_lib_cares_ares_set_local_ip4=no +else case e in #( + e) ac_cv_lib_cares_ares_set_local_ip4=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cares_ares_set_local_ip4" >&5 printf "%s\n" "$ac_cv_lib_cares_ares_set_local_ip4" >&6; } @@ -65341,8 +69990,8 @@ fi else - CARES_CFLAGS=$pkg_cv_CARES_CFLAGS - CARES_LIBS=$pkg_cv_CARES_LIBS + CARES_CFLAGS=$pkg_cv_CARES_CFLAGS + CARES_LIBS=$pkg_cv_CARES_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -65362,10 +70011,11 @@ fi fi -else $as_nop - +else case e in #( + e) RESOLVER_INFO="libc, --bind-dns-address and --dns-servers not available" - + ;; +esac fi # Extract the first word of "gpgrt-config", so it can be a program name with args. @@ -65375,8 +70025,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_GPGRT_CONFIG+y} then : printf %s "(cached) " >&6 -else $as_nop - case $GPGRT_CONFIG in +else case e in #( + e) case $GPGRT_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_GPGRT_CONFIG="$GPGRT_CONFIG" # Let the user override the test with a path. ;; @@ -65403,6 +70053,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_GPGRT_CONFIG" && ac_cv_path_GPGRT_CONFIG="no" ;; +esac ;; esac fi GPGRT_CONFIG=$ac_cv_path_GPGRT_CONFIG @@ -65501,8 +70152,9 @@ printf "%s\n" "$as_me: Use gpgrt-config with $gpgrt_libdir as gpg-error-config" if test ${with_gpgme_prefix+y} then : withval=$with_gpgme_prefix; gpgme_config_prefix="$withval" -else $as_nop - gpgme_config_prefix="" +else case e in #( + e) gpgme_config_prefix="" ;; +esac fi if test x"${GPGME_CONFIG}" = x ; then @@ -65542,8 +70194,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_GPGME_CONFIG+y} then : printf %s "(cached) " >&6 -else $as_nop - case $GPGME_CONFIG in +else case e in #( + e) case $GPGME_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_GPGME_CONFIG="$GPGME_CONFIG" # Let the user override the test with a path. ;; @@ -65569,6 +70221,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_GPGME_CONFIG" && ac_cv_path_GPGME_CONFIG="no" ;; +esac ;; esac fi GPGME_CONFIG=$ac_cv_path_GPGME_CONFIG @@ -65602,8 +70255,8 @@ then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for METALINK" >&5 -printf %s "checking for METALINK... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmetalink" >&5 +printf %s "checking for libmetalink... " >&6; } if test -n "$METALINK_CFLAGS"; then pkg_cv_METALINK_CFLAGS="$METALINK_CFLAGS" @@ -65643,7 +70296,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -65652,25 +70305,25 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - METALINK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmetalink" 2>&1` + METALINK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmetalink" 2>&1` else - METALINK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmetalink" 2>&1` + METALINK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmetalink" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$METALINK_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$METALINK_PKG_ERRORS" >&5 with_metalink=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } with_metalink=no else - METALINK_CFLAGS=$pkg_cv_METALINK_CFLAGS - METALINK_LIBS=$pkg_cv_METALINK_LIBS + METALINK_CFLAGS=$pkg_cv_METALINK_CFLAGS + METALINK_LIBS=$pkg_cv_METALINK_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -65689,8 +70342,8 @@ then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GPGME" >&5 -printf %s "checking for GPGME... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gpgme" >&5 +printf %s "checking for gpgme... " >&6; } if test -n "$GPGME_CFLAGS"; then pkg_cv_GPGME_CFLAGS="$GPGME_CFLAGS" @@ -65730,7 +70383,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -65739,12 +70392,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GPGME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gpgme" 2>&1` + GPGME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gpgme" 2>&1` else - GPGME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gpgme" 2>&1` + GPGME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gpgme" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GPGME_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GPGME_PKG_ERRORS" >&5 @@ -65856,7 +70509,7 @@ printf "%s\n" "no" >&6; } elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } @@ -65968,8 +70621,8 @@ printf "%s\n" "no" >&6; } else - GPGME_CFLAGS=$pkg_cv_GPGME_CFLAGS - GPGME_LIBS=$pkg_cv_GPGME_LIBS + GPGME_CFLAGS=$pkg_cv_GPGME_CFLAGS + GPGME_LIBS=$pkg_cv_GPGME_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -65986,13 +70639,125 @@ fi fi +with_libproxy=no +# Check whether --enable-libproxy was given. +if test ${enable_libproxy+y} +then : + enableval=$enable_libproxy; +fi + +if test "${enable_libproxy}" = "yes" +then : + + with_libproxy=yes + +pkg_failed=no +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libproxy-1.0" >&5 +printf %s "checking for libproxy-1.0... " >&6; } + +if test -n "$LIBPROXY_CFLAGS"; then + pkg_cv_LIBPROXY_CFLAGS="$LIBPROXY_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libproxy-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libproxy-1.0") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBPROXY_CFLAGS=`$PKG_CONFIG --cflags "libproxy-1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBPROXY_LIBS"; then + pkg_cv_LIBPROXY_LIBS="$LIBPROXY_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libproxy-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libproxy-1.0") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBPROXY_LIBS=`$PKG_CONFIG --libs "libproxy-1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libproxy-1.0" 2>&1` + else + LIBPROXY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libproxy-1.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBPROXY_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (libproxy-1.0) were not met: + +$LIBPROXY_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables LIBPROXY_CFLAGS +and LIBPROXY_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables LIBPROXY_CFLAGS +and LIBPROXY_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See 'config.log' for more details" "$LINENO" 5; } +else + LIBPROXY_CFLAGS=$pkg_cv_LIBPROXY_CFLAGS + LIBPROXY_LIBS=$pkg_cv_LIBPROXY_LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + + LIBS="$LIBPROXY_LIBS $LIBS" + CFLAGS="$LIBPROXY_CFLAGS $CFLAGS" + +printf "%s\n" "#define HAVE_LIBPROXY 1" >>confdefs.h + + +fi + +fi + # Check whether --enable-xattr was given. if test ${enable_xattr+y} then : enableval=$enable_xattr; ENABLE_XATTR=$enableval -else $as_nop - ENABLE_XATTR=yes +else case e in #( + e) ENABLE_XATTR=yes ;; +esac fi @@ -66008,20 +70773,21 @@ if test "X${ENABLE_XATTR}" = "Xyes"; then for ac_func in $xattr_syscalls do : - as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | $as_tr_sh` + as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_sh"` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" if eval test \"x\$"$as_ac_var"\" = x"yes" then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1 _ACEOF -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Disabling Extended Attribute support: your system does not support $xattr_syscalls" >&5 printf "%s\n" "$as_me: Disabling Extended Attribute support: your system does not support $xattr_syscalls" >&6;} ENABLE_XATTR=no - + ;; +esac fi done @@ -66110,8 +70876,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the +# 'ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* 'ac_cv_foo' will be assigned the # following values. _ACEOF @@ -66141,14 +70907,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote + # 'set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # `set' quotes correctly as required by POSIX, so do not add quotes. + # 'set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -66388,7 +71154,6 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -66397,12 +71162,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -66474,7 +71240,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -66503,7 +71269,6 @@ as_fn_error () } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -66543,11 +71308,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -66561,11 +71327,12 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith @@ -66648,9 +71415,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -66731,10 +71498,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated exec 6>&1 @@ -66749,8 +71518,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wget $as_me 1.21.4, which was -generated by GNU Autoconf 2.71. Invocation command line was +This file was extended by wget $as_me 1.24.5, which was +generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -66783,7 +71552,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions +'$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -66821,11 +71590,11 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -wget config.status 1.21.4 -configured by $0, generated by GNU Autoconf 2.71, +wget config.status 1.24.5 +configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -66887,8 +71656,8 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; + as_fn_error $? "ambiguous option: '$1' +Try '$0 --help' for more information.";; --help | --hel | -h ) printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -66896,8 +71665,8 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: '$1' +Try '$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -66974,7 +71743,7 @@ do "tests/certs/rootca.conf") CONFIG_FILES="$CONFIG_FILES tests/certs/rootca.conf" ;; "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; esac done @@ -66995,7 +71764,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. +# after its creation but before its name has been assigned to '$tmp'. $debug || { tmp= ac_tmp= @@ -67019,7 +71788,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# This happens for instance with './config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -67177,13 +71946,13 @@ fi # test -n "$CONFIG_FILES" # Set up the scripts for CONFIG_HEADERS section. # No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. +# This happens for instance with './config.status Makefile'. if test -n "$CONFIG_HEADERS"; then cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF -# Transform confdefs.h into an awk script `defines.awk', embedded as +# Transform confdefs.h into an awk script 'defines.awk', embedded as # here-document in config.status, that substitutes the proper values into # config.h.in to produce config.h. @@ -67293,7 +72062,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -67315,19 +72084,19 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. + # because $ac_f cannot contain ':'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is `configure' which instantiates (i.e., don't + # Let's still pretend it is 'configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -67460,7 +72229,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when `$srcdir' = `.'. +# Neutralize VPATH when '$srcdir' = '.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -67491,9 +72260,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -67679,15 +72448,15 @@ printf "%s\n" X/"$am_mf" | (exit $ac_status); } || am_rc=$? done if test $am_rc -ne 0; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments for automatic dependency tracking. If GNU make was not used, consider re-running the configure script with MAKE=\"gmake\" (or whatever is necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } fi { am_dirpart=; unset am_dirpart;} { am_filepart=; unset am_filepart;} @@ -67873,6 +72642,7 @@ fi GPGME: $have_gpg IRI: $iri Fuzzing build: $enable_fuzzing, $LIB_FUZZING_ENGINE + libproxy: $with_libproxy " >&5 printf "%s\n" "$as_me: Summary of build options: @@ -67899,5 +72669,6 @@ printf "%s\n" "$as_me: Summary of build options: GPGME: $have_gpg IRI: $iri Fuzzing build: $enable_fuzzing, $LIB_FUZZING_ENGINE + libproxy: $with_libproxy " >&6;} diff --git a/configure.ac b/configure.ac index aff89c1..5ef12fe 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Template file for GNU Autoconf -dnl Copyright (C) 1995-1997, 2001, 2007-2014, 2018-2023 Free Software +dnl Copyright (C) 1995-1997, 2001, 2007-2014, 2018-2024 Free Software dnl Foundation, Inc. dnl This program is free software; you can redistribute it and/or modify @@ -952,6 +952,21 @@ AS_IF([test x"$with_metalink" != xno], [ ]) dnl +dnl libproxy support +dnl +with_libproxy=no +AC_ARG_ENABLE(libproxy, + [ --enable-libproxy libproxy support for system wide proxy configuration]) +AS_IF([test "${enable_libproxy}" = "yes"], [ + with_libproxy=yes + PKG_CHECK_MODULES([LIBPROXY], [libproxy-1.0], [ + LIBS="$LIBPROXY_LIBS $LIBS" + CFLAGS="$LIBPROXY_CFLAGS $CFLAGS" + AC_DEFINE([HAVE_LIBPROXY], [1], [Define if using libproxy.]) + ]) +]) + +dnl dnl Extended Attribute support dnl @@ -1022,4 +1037,5 @@ AC_MSG_NOTICE([Summary of build options: GPGME: $have_gpg IRI: $iri Fuzzing build: $enable_fuzzing, $LIB_FUZZING_ENGINE + libproxy: $with_libproxy ]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 3942b72..6133c5c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ # Makefile for `wget' utility -# Copyright (C) 1995-1997, 2007-2011, 2015, 2018-2023 Free Software +# Copyright (C) 1995-1997, 2007-2011, 2015, 2018-2024 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify diff --git a/doc/Makefile.in b/doc/Makefile.in index eaee007..829f6fa 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for `wget' utility -# Copyright (C) 1995-1997, 2007-2011, 2015, 2018-2023 Free Software +# Copyright (C) 1995-1997, 2007-2011, 2015, 2018-2024 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -117,7 +117,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 \ $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/base32.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 \ $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/clock_time.m4 \ @@ -165,7 +166,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \ $(top_srcdir)/m4/isblank.m4 $(top_srcdir)/m4/iswblank.m4 \ - $(top_srcdir)/m4/iswdigit.m4 $(top_srcdir)/m4/iswxdigit.m4 \ + $(top_srcdir)/m4/iswctype.m4 $(top_srcdir)/m4/iswdigit.m4 \ + $(top_srcdir)/m4/iswpunct.m4 $(top_srcdir)/m4/iswxdigit.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 \ @@ -179,15 +181,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbrtoc32.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ + $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -245,18 +248,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timegm.m4 $(top_srcdir)/m4/timespec.m4 \ $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tmpdir.m4 \ - $(top_srcdir)/m4/ungetc.m4 $(top_srcdir)/m4/unicase_h.m4 \ - $(top_srcdir)/m4/unictype_h.m4 $(top_srcdir)/m4/uninorm_h.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utime_h.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/uchar_h.m4 $(top_srcdir)/m4/ungetc.m4 \ + $(top_srcdir)/m4/unicase_h.m4 $(top_srcdir)/m4/unictype_h.m4 \ + $(top_srcdir)/m4/uninorm_h.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ + $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wctype_h.m4 \ $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ $(top_srcdir)/m4/wget_manywarnings.m4 \ $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/wmemchr.m4 \ @@ -402,6 +406,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ +CXX_HAS_CHAR8_TYPE = @CXX_HAS_CHAR8_TYPE@ +CXX_HAS_UCHAR_TYPES = @CXX_HAS_UCHAR_TYPES@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -417,7 +423,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ @@ -439,7 +444,33 @@ GL_GNULIB_ALIGNED_ALLOC = @GL_GNULIB_ALIGNED_ALLOC@ GL_GNULIB_ALPHASORT = @GL_GNULIB_ALPHASORT@ GL_GNULIB_ATOLL = @GL_GNULIB_ATOLL@ GL_GNULIB_BIND = @GL_GNULIB_BIND@ +GL_GNULIB_BTOC32 = @GL_GNULIB_BTOC32@ GL_GNULIB_BTOWC = @GL_GNULIB_BTOWC@ +GL_GNULIB_C32ISALNUM = @GL_GNULIB_C32ISALNUM@ +GL_GNULIB_C32ISALPHA = @GL_GNULIB_C32ISALPHA@ +GL_GNULIB_C32ISBLANK = @GL_GNULIB_C32ISBLANK@ +GL_GNULIB_C32ISCNTRL = @GL_GNULIB_C32ISCNTRL@ +GL_GNULIB_C32ISDIGIT = @GL_GNULIB_C32ISDIGIT@ +GL_GNULIB_C32ISGRAPH = @GL_GNULIB_C32ISGRAPH@ +GL_GNULIB_C32ISLOWER = @GL_GNULIB_C32ISLOWER@ +GL_GNULIB_C32ISPRINT = @GL_GNULIB_C32ISPRINT@ +GL_GNULIB_C32ISPUNCT = @GL_GNULIB_C32ISPUNCT@ +GL_GNULIB_C32ISSPACE = @GL_GNULIB_C32ISSPACE@ +GL_GNULIB_C32ISUPPER = @GL_GNULIB_C32ISUPPER@ +GL_GNULIB_C32ISXDIGIT = @GL_GNULIB_C32ISXDIGIT@ +GL_GNULIB_C32RTOMB = @GL_GNULIB_C32RTOMB@ +GL_GNULIB_C32SNRTOMBS = @GL_GNULIB_C32SNRTOMBS@ +GL_GNULIB_C32SRTOMBS = @GL_GNULIB_C32SRTOMBS@ +GL_GNULIB_C32STOMBS = @GL_GNULIB_C32STOMBS@ +GL_GNULIB_C32SWIDTH = @GL_GNULIB_C32SWIDTH@ +GL_GNULIB_C32TOB = @GL_GNULIB_C32TOB@ +GL_GNULIB_C32TOLOWER = @GL_GNULIB_C32TOLOWER@ +GL_GNULIB_C32TOUPPER = @GL_GNULIB_C32TOUPPER@ +GL_GNULIB_C32WIDTH = @GL_GNULIB_C32WIDTH@ +GL_GNULIB_C32_APPLY_MAPPING = @GL_GNULIB_C32_APPLY_MAPPING@ +GL_GNULIB_C32_APPLY_TYPE_TEST = @GL_GNULIB_C32_APPLY_TYPE_TEST@ +GL_GNULIB_C32_GET_MAPPING = @GL_GNULIB_C32_GET_MAPPING@ +GL_GNULIB_C32_GET_TYPE_TEST = @GL_GNULIB_C32_GET_TYPE_TEST@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ @@ -546,6 +577,7 @@ GL_GNULIB_ISBLANK = @GL_GNULIB_ISBLANK@ GL_GNULIB_ISWBLANK = @GL_GNULIB_ISWBLANK@ GL_GNULIB_ISWCTYPE = @GL_GNULIB_ISWCTYPE@ GL_GNULIB_ISWDIGIT = @GL_GNULIB_ISWDIGIT@ +GL_GNULIB_ISWPUNCT = @GL_GNULIB_ISWPUNCT@ GL_GNULIB_ISWXDIGIT = @GL_GNULIB_ISWXDIGIT@ GL_GNULIB_LCHMOD = @GL_GNULIB_LCHMOD@ GL_GNULIB_LCHOWN = @GL_GNULIB_LCHOWN@ @@ -553,13 +585,15 @@ GL_GNULIB_LINK = @GL_GNULIB_LINK@ GL_GNULIB_LINKAT = @GL_GNULIB_LINKAT@ GL_GNULIB_LISTEN = @GL_GNULIB_LISTEN@ GL_GNULIB_LOCALECONV = @GL_GNULIB_LOCALECONV@ -GL_GNULIB_LOCALENAME = @GL_GNULIB_LOCALENAME@ +GL_GNULIB_LOCALENAME_UNSAFE = @GL_GNULIB_LOCALENAME_UNSAFE@ GL_GNULIB_LOCALTIME = @GL_GNULIB_LOCALTIME@ GL_GNULIB_LSEEK = @GL_GNULIB_LSEEK@ GL_GNULIB_LSTAT = @GL_GNULIB_LSTAT@ GL_GNULIB_MALLOC_GNU = @GL_GNULIB_MALLOC_GNU@ GL_GNULIB_MALLOC_POSIX = @GL_GNULIB_MALLOC_POSIX@ GL_GNULIB_MBRLEN = @GL_GNULIB_MBRLEN@ +GL_GNULIB_MBRTOC16 = @GL_GNULIB_MBRTOC16@ +GL_GNULIB_MBRTOC32 = @GL_GNULIB_MBRTOC32@ GL_GNULIB_MBRTOWC = @GL_GNULIB_MBRTOWC@ GL_GNULIB_MBSCASECMP = @GL_GNULIB_MBSCASECMP@ GL_GNULIB_MBSCASESTR = @GL_GNULIB_MBSCASESTR@ @@ -569,16 +603,20 @@ GL_GNULIB_MBSINIT = @GL_GNULIB_MBSINIT@ GL_GNULIB_MBSLEN = @GL_GNULIB_MBSLEN@ GL_GNULIB_MBSNCASECMP = @GL_GNULIB_MBSNCASECMP@ GL_GNULIB_MBSNLEN = @GL_GNULIB_MBSNLEN@ +GL_GNULIB_MBSNRTOC32S = @GL_GNULIB_MBSNRTOC32S@ GL_GNULIB_MBSNRTOWCS = @GL_GNULIB_MBSNRTOWCS@ GL_GNULIB_MBSPBRK = @GL_GNULIB_MBSPBRK@ GL_GNULIB_MBSPCASECMP = @GL_GNULIB_MBSPCASECMP@ GL_GNULIB_MBSRCHR = @GL_GNULIB_MBSRCHR@ +GL_GNULIB_MBSRTOC32S = @GL_GNULIB_MBSRTOC32S@ GL_GNULIB_MBSRTOWCS = @GL_GNULIB_MBSRTOWCS@ GL_GNULIB_MBSSEP = @GL_GNULIB_MBSSEP@ GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@ GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@ +GL_GNULIB_MBSTOC32S = @GL_GNULIB_MBSTOC32S@ GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@ GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@ +GL_GNULIB_MBSZERO = @GL_GNULIB_MBSZERO@ GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@ GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@ GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@ @@ -692,6 +730,7 @@ GL_GNULIB_PUTS = @GL_GNULIB_PUTS@ GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@ GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@ GL_GNULIB_RAISE = @GL_GNULIB_RAISE@ +GL_GNULIB_RAND = @GL_GNULIB_RAND@ GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@ GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@ GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@ @@ -754,6 +793,7 @@ GL_GNULIB_STRSEP = @GL_GNULIB_STRSEP@ GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@ GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@ GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@ +GL_GNULIB_STRTOF = @GL_GNULIB_STRTOF@ GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@ GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@ GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@ @@ -867,6 +907,9 @@ GL_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_H GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@ @@ -892,6 +935,7 @@ GL_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYP GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@ @@ -967,6 +1011,7 @@ GL_GNULIB_WCTOMB = @GL_GNULIB_WCTOMB@ GL_GNULIB_WCTRANS = @GL_GNULIB_WCTRANS@ GL_GNULIB_WCTYPE = @GL_GNULIB_WCTYPE@ GL_GNULIB_WCWIDTH = @GL_GNULIB_WCWIDTH@ +GL_GNULIB_WGETCWD = @GL_GNULIB_WGETCWD@ GL_GNULIB_WMEMCHR = @GL_GNULIB_WMEMCHR@ GL_GNULIB_WMEMCMP = @GL_GNULIB_WMEMCMP@ GL_GNULIB_WMEMCPY = @GL_GNULIB_WMEMCPY@ @@ -977,8 +1022,10 @@ GL_GNULIB_WRITE = @GL_GNULIB_WRITE@ GL_GNULIB__EXIT = @GL_GNULIB__EXIT@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIBHEADERS_OVERRIDE_CHAR16_T = @GNULIBHEADERS_OVERRIDE_CHAR16_T@ +GNULIBHEADERS_OVERRIDE_CHAR32_T = @GNULIBHEADERS_OVERRIDE_CHAR32_T@ +GNULIBHEADERS_OVERRIDE_CHAR8_T = @GNULIBHEADERS_OVERRIDE_CHAR8_T@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ @@ -995,6 +1042,7 @@ HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C32RTOMB = @HAVE_C32RTOMB@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ @@ -1128,6 +1176,8 @@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOC16 = @HAVE_MBRTOC16@ +HAVE_MBRTOC32 = @HAVE_MBRTOC32@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ HAVE_MBSINIT = @HAVE_MBSINIT@ HAVE_MBSLEN = @HAVE_MBSLEN@ @@ -1218,6 +1268,7 @@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOF = @HAVE_STRTOF@ HAVE_STRTOL = @HAVE_STRTOL@ HAVE_STRTOLD = @HAVE_STRTOLD@ HAVE_STRTOLL = @HAVE_STRTOLL@ @@ -1251,6 +1302,7 @@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_UCHAR_H = @HAVE_UCHAR_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ @@ -1303,6 +1355,7 @@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ +HAVE_WORKING_MBRTOC32 = @HAVE_WORKING_MBRTOC32@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__EXIT = @HAVE__EXIT@ @@ -1322,6 +1375,10 @@ INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LCOV = @LCOV@ +LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@ +LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@ +LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@ +LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -1337,6 +1394,8 @@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPROXY_CFLAGS = @LIBPROXY_CFLAGS@ +LIBPROXY_LIBS = @LIBPROXY_LIBS@ LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ LIBPSL_LIBS = @LIBPSL_LIBS@ LIBPTHREAD = @LIBPTHREAD@ @@ -1433,6 +1492,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ +NEXT_AS_FIRST_DIRECTIVE_UCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_UCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ @@ -1472,6 +1532,7 @@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ +NEXT_UCHAR_H = @NEXT_UCHAR_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ @@ -1513,6 +1574,7 @@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ +REPLACE_C32RTOMB = @REPLACE_C32RTOMB@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ @@ -1539,6 +1601,7 @@ REPLACE_EXECVE = @REPLACE_EXECVE@ REPLACE_EXECVP = @REPLACE_EXECVP@ REPLACE_EXECVPE = @REPLACE_EXECVPE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ @@ -1596,6 +1659,7 @@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWPUNCT = @REPLACE_ISWPUNCT@ REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_ITOLD = @REPLACE_ITOLD@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ @@ -1609,6 +1673,8 @@ REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MALLOC_FOR_MALLOC_GNU = @REPLACE_MALLOC_FOR_MALLOC_GNU@ REPLACE_MALLOC_FOR_MALLOC_POSIX = @REPLACE_MALLOC_FOR_MALLOC_POSIX@ REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOC16 = @REPLACE_MBRTOC16@ +REPLACE_MBRTOC32 = @REPLACE_MBRTOC32@ REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ @@ -1620,6 +1686,7 @@ REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ +REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ @@ -1658,6 +1725,7 @@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_QSORT_R = @REPLACE_QSORT_R@ REPLACE_RAISE = @REPLACE_RAISE@ +REPLACE_RAND = @REPLACE_RAND@ REPLACE_RANDOM = @REPLACE_RANDOM@ REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ REPLACE_READ = @REPLACE_READ@ @@ -1700,6 +1768,7 @@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ +REPLACE_STRTOF = @REPLACE_STRTOF@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_STRTOL = @REPLACE_STRTOL@ @@ -1710,11 +1779,13 @@ REPLACE_STRTOULL = @REPLACE_STRTOULL@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ +REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ +REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1743,6 +1814,8 @@ REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ +REPLACE_WCTRANS = @REPLACE_WCTRANS@ +REPLACE_WCTYPE = @REPLACE_WCTYPE@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WMEMCMP = @REPLACE_WMEMCMP@ REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ @@ -1757,6 +1830,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ +SMALL_WCHAR_T = @SMALL_WCHAR_T@ STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ @@ -1833,6 +1907,8 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ diff --git a/doc/fdl.texi b/doc/fdl.texi index 9b1810f..d151a6a 100644 --- a/doc/fdl.texi +++ b/doc/fdl.texi @@ -5,7 +5,7 @@ @c hence no sectioning command or @node. @display -Copyright @copyright{} 2000--2002, 2007--2008, 2015, 2018--2023 Free +Copyright @copyright{} 2000--2002, 2007--2008, 2015, 2018--2024 Free Software Foundation, Inc. @uref{http://fsf.org/} diff --git a/doc/stamp-vti b/doc/stamp-vti index a9fa2b8..4e7caca 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 10 May 2023 -@set UPDATED-MONTH May 2023 -@set EDITION 1.21.4 -@set VERSION 1.21.4 +@set UPDATED 19 February 2024 +@set UPDATED-MONTH February 2024 +@set EDITION 1.24.5 +@set VERSION 1.24.5 diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl index 3f80d52..9325edb 100755 --- a/doc/texi2pod.pl +++ b/doc/texi2pod.pl @@ -1,6 +1,6 @@ #! /usr/bin/env perl -# Copyright (C) 1999-2001, 2003, 2007, 2009-2011, 2015, 2018-2023 Free +# Copyright (C) 1999-2001, 2003, 2007, 2009-2011, 2015, 2018-2024 Free # Software Foundation, Inc. # This file is part of GCC. diff --git a/doc/version.texi b/doc/version.texi index a9fa2b8..4e7caca 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 10 May 2023 -@set UPDATED-MONTH May 2023 -@set EDITION 1.21.4 -@set VERSION 1.21.4 +@set UPDATED 19 February 2024 +@set UPDATED-MONTH February 2024 +@set EDITION 1.24.5 +@set VERSION 1.24.5 diff --git a/doc/wget.info b/doc/wget.info index a6e2c6d..8e47756 100644 --- a/doc/wget.info +++ b/doc/wget.info @@ -1,15 +1,15 @@ -This is wget.info, produced by makeinfo version 7.0.3 from wget.texi. +This is wget.info, produced by makeinfo version 7.1 from wget.texi. This file documents the GNU Wget utility for downloading network data. - Copyright © 1996–2011, 2015, 2018–2023 Free Software Foundation, Inc. + Copyright © 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the section entitled “GNU -Free Documentation Licenseâ€. +Texts. A copy of the license is included in the section entitled "GNU +Free Documentation License". INFO-DIR-SECTION Network applications START-INFO-DIR-ENTRY * Wget: (wget). Non-interactive network downloader. @@ -18,19 +18,19 @@ END-INFO-DIR-ENTRY File: wget.info, Node: Top, Next: Overview, Prev: (dir), Up: (dir) -Wget 1.21.4 +Wget 1.24.5 *********** This file documents the GNU Wget utility for downloading network data. - Copyright © 1996–2011, 2015, 2018–2023 Free Software Foundation, Inc. + Copyright © 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the section entitled “GNU -Free Documentation Licenseâ€. +Texts. A copy of the license is included in the section entitled "GNU +Free Documentation License". * Menu: @@ -39,9 +39,9 @@ Free Documentation Licenseâ€. * Recursive Download:: Downloading interlinked pages. * Following Links:: The available methods of chasing links. * Time-Stamping:: Mirroring according to time-stamps. -* Startup File:: Wget’s initialization file. +* Startup File:: Wget's initialization file. * Examples:: Examples of usage. -* Various:: The stuff that doesn’t fit anywhere else. +* Various:: The stuff that doesn't fit anywhere else. * Appendices:: Some useful references. * Copying this manual:: You may give out copies of this manual. * Concept Index:: Topics covered by this manual. @@ -56,19 +56,19 @@ GNU Wget is a free utility for non-interactive download of files from the Web. It supports HTTP, HTTPS, and FTP protocols, as well as retrieval through HTTP proxies. - This chapter is a partial overview of Wget’s features. + This chapter is a partial overview of Wget's features. • Wget is non-interactive, meaning that it can work in the background, while the user is not logged on. This allows you to start a retrieval and disconnect from the system, letting Wget finish the work. By contrast, most of the Web browsers require - constant user’s presence, which can be a great hindrance when + constant user's presence, which can be a great hindrance when transferring a lot of data. • Wget can follow links in HTML, XHTML, and CSS pages, to create local versions of remote web sites, fully recreating the directory structure of the original site. This is sometimes referred to as - “recursive downloading.†While doing that, Wget respects the Robot + "recursive downloading." While doing that, Wget respects the Robot Exclusion Standard (‘/robots.txt’). Wget can be instructed to convert the links in downloaded files to point at the local files, for offline viewing. @@ -101,7 +101,7 @@ retrieval through HTTP proxies. • The progress of individual downloads is traced using a progress gauge. Interactive downloads are tracked using a - “thermometerâ€-style gauge, whereas non-interactive ones are traced + "thermometer"-style gauge, whereas non-interactive ones are traced with dots, each dot representing a fixed amount of data received (1KB by default). Either gauge can be customized to your preferences. @@ -110,9 +110,9 @@ retrieval through HTTP proxies. line options, or via the initialization file ‘.wgetrc’ (*note Startup File::). Wget allows you to define “global†startup files (‘/usr/local/etc/wgetrc’ by default) for site settings. You can - also specify the location of a startup file with the –config - option. To disable the reading of config files, use –no-config. - If both –config and –no-config are given, –no-config is ignored. + also specify the location of a startup file with the -config + option. To disable the reading of config files, use -no-config. + If both -config and -no-config are given, -no-config is ignored. • Finally, GNU Wget is free software. This means that everyone may use it, redistribute it and/or modify it under the terms of the GNU @@ -182,10 +182,10 @@ default password.(1) command line, the username and password will be plainly visible to all users on the system, by way of ‘ps’. On multi-user systems, this is a big security risk. To work around it, use ‘wget -i -’ and feed the URLs -to Wget’s standard input, each on a separate line, terminated by ‘C-d’. +to Wget's standard input, each on a separate line, terminated by ‘C-d’. You can encode unsafe characters in a URL as ‘%xy’, ‘xy’ being the -hexadecimal representation of the character’s ASCII value. Some common +hexadecimal representation of the character's ASCII value. Some common unsafe characters include ‘%’ (quoted as ‘%25’), ‘:’ (quoted as ‘%3A’), and ‘@’ (quoted as ‘%40’). Refer to RFC1738 for a comprehensive list of unsafe characters. @@ -261,7 +261,7 @@ You can also clear the lists in ‘.wgetrc’ (*note Wgetrc Syntax::). wget -X "" -X /~nobody,/~somebody Most options that do not accept arguments are “boolean†options, so -named because their state can be captured with a yes-or-no (“booleanâ€) +named because their state can be captured with a yes-or-no ("boolean") variable. For example, ‘--follow-ftp’ tells Wget to follow FTP links from HTML files and, on the other hand, ‘--no-glob’ tells it not to perform file globbing on FTP URLs. A boolean option is either @@ -275,7 +275,7 @@ _not_ follow FTP links from HTML pages. Affirmative options can be negated by prepending the ‘--no-’ to the option name; negative options can be negated by omitting the ‘--no-’ -prefix. This might seem superfluous—if the default for an affirmative +prefix. This might seem superfluous--if the default for an affirmative option is to not do something, then why provide a way to explicitly turn it off? But the startup file may in fact change the default. For instance, using ‘follow_ftp = on’ in ‘.wgetrc’ makes Wget _follow_ FTP @@ -294,7 +294,7 @@ File: wget.info, Node: Basic Startup Options, Next: Logging and Input File Opt ‘-h’ ‘--help’ - Print a help message describing all of Wget’s command-line options. + Print a help message describing all of Wget's command-line options. ‘-b’ ‘--background’ @@ -332,14 +332,14 @@ File: wget.info, Node: Logging and Input File Options, Next: Download Options, developers of Wget if it does not work properly. Your system administrator may have chosen to compile Wget without debug support, in which case ‘-d’ will not work. Please note that - compiling with debug support is always safe—Wget compiled with the + compiling with debug support is always safe--Wget compiled with the debug support will _not_ print any debug info unless requested with ‘-d’. *Note Reporting Bugs::, for more information on how to use ‘-d’ for sending bug reports. ‘-q’ ‘--quiet’ - Turn off Wget’s output. + Turn off Wget's output. ‘-v’ ‘--verbose’ @@ -375,7 +375,7 @@ File: wget.info, Node: Logging and Input File Options, Next: Download Options, If the FILE is an external one, the document will be automatically treated as ‘html’ if the Content-Type matches ‘text/html’. - Furthermore, the FILE’s location will be implicitly used as base + Furthermore, the FILE's location will be implicitly used as base href if none was specified. ‘--input-metalink=FILE’ @@ -383,8 +383,8 @@ File: wget.info, Node: Logging and Input File Options, Next: Download Options, and 4 are supported. ‘--keep-badhash’ - Keeps downloaded Metalink’s files with a bad hash. It appends - .badhash to the name of Metalink’s files which have a checksum + Keeps downloaded Metalink's files with a bad hash. It appends + .badhash to the name of Metalink's files which have a checksum mismatch, except without overwriting existing files. ‘--metalink-over-http’ @@ -396,10 +396,10 @@ File: wget.info, Node: Logging and Input File Options, Next: Download Options, ‘--metalink-index=NUMBER’ Set the Metalink ‘application/metalink4+xml’ metaurl ordinal - NUMBER. From 1 to the total number of “application/metalink4+xml†+ NUMBER. From 1 to the total number of "application/metalink4+xml" available. Specify 0 or ‘inf’ to choose the first good one. Metaurls, such as those from a ‘--metalink-over-http’, may have - been sorted by priority key’s value; keep this in mind to choose + been sorted by priority key's value; keep this in mind to choose the right NUMBER. ‘--preferred-location’ @@ -407,7 +407,7 @@ File: wget.info, Node: Logging and Input File Options, Next: Download Options, multiple resources with same priority are available. ‘--xattr’ - Enable use of file system’s extended attributes to save the + Enable use of file system's extended attributes to save the original URL and the Referer HTTP header value if used. Be aware that the URL might contain private information like access @@ -435,8 +435,8 @@ File: wget.info, Node: Logging and Input File Options, Next: Download Options, ‘--config=FILE’ Specify the location of a startup file you wish to use instead of - the default one(s). Use –no-config to disable reading of config - files. If both –config and –no-config are given, –no-config is + the default one(s). Use -no-config to disable reading of config + files. If both -config and -no-config are given, -no-config is ignored. ‘--rejected-log=LOGFILE’ @@ -474,7 +474,7 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi ‘--tries=NUMBER’ Set number of tries to NUMBER. Specify 0 or ‘inf’ for infinite retrying. The default is to retry 20 times, with the exception of - fatal errors like “connection refused†or “not found†(404), which + fatal errors like "connection refused" or "not found" (404), which are not retried. ‘-O FILE’ @@ -485,8 +485,8 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi link conversion. (Use ‘./-’ to print to a file literally named ‘-’.) - Use of ‘-O’ is _not_ intended to mean simply “use the name FILE - instead of the one in the URL;†rather, it is analogous to shell + Use of ‘-O’ is _not_ intended to mean simply "use the name FILE + instead of the one in the URL;" rather, it is analogous to shell redirection: ‘wget -O file http://foo’ is intended to work like ‘wget -O - http://foo > file’; ‘file’ will be truncated immediately, and _all_ downloaded content will be written there. @@ -497,7 +497,7 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi combination is used. Similarly, using ‘-r’ or ‘-p’ with ‘-O’ may not work as you expect: - Wget won’t just download the first file to FILE and then download + Wget won't just download the first file to FILE and then download the rest to their normal names: _all_ downloaded content will be placed in FILE. This was disabled in version 1.11, but has been reinstated (with a warning) in 1.11.2, as there are some cases @@ -509,13 +509,13 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi Note that a combination with ‘-k’ is only permitted when downloading a single document, as in that case it will just convert all relative URIs to external ones; ‘-k’ makes no sense for - multiple URIs when they’re all being downloaded to a single file; + multiple URIs when they're all being downloaded to a single file; ‘-k’ can be used only when the output is a regular file. ‘-nc’ ‘--no-clobber’ If a file is downloaded more than once in the same directory, - Wget’s behavior depends on a few options, including ‘-nc’. In + Wget's behavior depends on a few options, including ‘-nc’. In certain cases, the local file will be “clobberedâ€, or overwritten, upon repeated download. In other cases it will be preserved. @@ -526,10 +526,10 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi will be named ‘FILE.2’, and so on. (This is also the behavior with ‘-nd’, even if ‘-r’ or ‘-p’ are in effect.) When ‘-nc’ is specified, this behavior is suppressed, and Wget will refuse to - download newer copies of ‘FILE’. Therefore, “‘no-clobber’†is - actually a misnomer in this mode—it’s not clobbering that’s + download newer copies of ‘FILE’. Therefore, "‘no-clobber’" is + actually a misnomer in this mode--it's not clobbering that's prevented (as the numeric suffixes were already preventing - clobbering), but rather the multiple version saving that’s + clobbering), but rather the multiple version saving that's prevented. When running Wget with ‘-r’ or ‘-p’, but without ‘-N’, ‘-nd’, or @@ -575,7 +575,7 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi will ask the server to continue the retrieval from an offset equal to the length of the local file. - Note that you don’t need to specify this option if you just want + Note that you don't need to specify this option if you just want the current invocation of Wget to retry downloading a file should the connection be lost midway through. This is the default behavior. ‘-c’ only affects resumption of downloads started @@ -594,37 +594,37 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi the file and print an explanatory message. The same happens when the file is smaller on the server than locally (presumably because it was changed on the server since your last download - attempt)—because “continuing†is not meaningful, no download + attempt)--because "continuing" is not meaningful, no download occurs. - On the other side of the coin, while using ‘-c’, any file that’s + On the other side of the coin, while using ‘-c’, any file that's bigger on the server than locally will be considered an incomplete download and only ‘(length(remote) - length(local))’ bytes will be downloaded and tacked onto the end of the local file. This - behavior can be desirable in certain cases—for instance, you can - use ‘wget -c’ to download just the new portion that’s been appended + behavior can be desirable in certain cases--for instance, you can + use ‘wget -c’ to download just the new portion that's been appended to a data collection or log file. - However, if the file is bigger on the server because it’s been - _changed_, as opposed to just _appended_ to, you’ll end up with a + However, if the file is bigger on the server because it's been + _changed_, as opposed to just _appended_ to, you'll end up with a garbled file. Wget has no way of verifying that the local file is really a valid prefix of the remote file. You need to be especially careful of this when using ‘-c’ in conjunction with ‘-r’, since every file will be considered as an "incomplete download" candidate. - Another instance where you’ll get a garbled file if you try to use - ‘-c’ is if you have a lame HTTP proxy that inserts a “transfer - interrupted†string into the local file. In the future a - “rollback†option may be added to deal with this case. + Another instance where you'll get a garbled file if you try to use + ‘-c’ is if you have a lame HTTP proxy that inserts a "transfer + interrupted" string into the local file. In the future a + "rollback" option may be added to deal with this case. Note that ‘-c’ only works with FTP servers and with HTTP servers that support the ‘Range’ header. ‘--start-pos=OFFSET’ Start downloading at zero-based position OFFSET. Offset may be - expressed in bytes, kilobytes with the ‘k’ suffix, or megabytes - with the ‘m’ suffix, etc. + expressed in bytes, kilobytes with the 'k' suffix, or megabytes + with the 'm' suffix, etc. ‘--start-pos’ has higher precedence over ‘--continue’. When ‘--start-pos’ and ‘--continue’ are both specified, wget will emit a @@ -635,14 +635,14 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi ‘--progress=TYPE’ Select the type of the progress indicator you wish to use. Legal - indicators are “dot†and “barâ€. + indicators are "dot" and "bar". - The “bar†indicator is used by default. It draws an ASCII progress - bar graphics (a.k.a “thermometer†display) indicating the status of - retrieval. If the output is not a TTY, the “dot†bar will be used + The "bar" indicator is used by default. It draws an ASCII progress + bar graphics (a.k.a "thermometer" display) indicating the status of + retrieval. If the output is not a TTY, the "dot" bar will be used by default. - Use ‘--progress=dot’ to switch to the “dot†display. It traces the + Use ‘--progress=dot’ to switch to the "dot" display. It traces the retrieval by printing dots on the screen, each dot representing a fixed amount of downloaded data. @@ -655,29 +655,29 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi specifying the type as ‘dot:STYLE’. Different styles assign different meaning to one dot. With the ‘default’ style each dot represents 1K, there are ten dots in a cluster and 50 dots in a - line. The ‘binary’ style has a more “computerâ€-like orientation—8K - dots, 16-dots clusters and 48 dots per line (which makes for 384K - lines). The ‘mega’ style is suitable for downloading large - files—each dot represents 64K retrieved, there are eight dots in a - cluster, and 48 dots on each line (so each line contains 3M). If - ‘mega’ is not enough then you can use the ‘giga’ style—each dot - represents 1M retrieved, there are eight dots in a cluster, and 32 - dots on each line (so each line contains 32M). + line. The ‘binary’ style has a more "computer"-like + orientation--8K dots, 16-dots clusters and 48 dots per line (which + makes for 384K lines). The ‘mega’ style is suitable for + downloading large files--each dot represents 64K retrieved, there + are eight dots in a cluster, and 48 dots on each line (so each line + contains 3M). If ‘mega’ is not enough then you can use the ‘giga’ + style--each dot represents 1M retrieved, there are eight dots in a + cluster, and 32 dots on each line (so each line contains 32M). With ‘--progress=bar’, there are currently two possible parameters, FORCE and NOSCROLL. When the output is not a TTY, the progress bar always falls back to - “dotâ€, even if ‘--progress=bar’ was passed to Wget during - invocation. This behaviour can be overridden and the “bar†output - forced by using the “force†parameter as ‘--progress=bar:force’. + "dot", even if ‘--progress=bar’ was passed to Wget during + invocation. This behaviour can be overridden and the "bar" output + forced by using the "force" parameter as ‘--progress=bar:force’. By default, the ‘bar’ style progress bar scroll the name of the file from left to right for the file being downloaded if the filename exceeds the maximum length allotted for its display. In certain cases, such as with ‘--progress=bar:force’, one may not want the scrolling filename in the progress bar. By passing the - “noscroll†parameter, Wget can be forced to display as much of the + "noscroll" parameter, Wget can be forced to display as much of the filename as possible without scrolling through it. Note that you can set the default style using the ‘progress’ @@ -709,12 +709,12 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi mode. ‘--no-use-server-timestamps’ - Don’t set the local file’s timestamp by the one on the server. + Don't set the local file's timestamp by the one on the server. By default, when a file is downloaded, its timestamps are set to match those from the remote file. This allows the use of ‘--timestamping’ on subsequent invocations of wget. However, it is - sometimes useful to base the local file’s timestamp on when it was + sometimes useful to base the local file's timestamp on when it was actually downloaded; for that purpose, the ‘--no-use-server-timestamps’ option has been provided. @@ -754,7 +754,7 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi ‘--dns-timeout=SECONDS’ Set the DNS lookup timeout to SECONDS seconds. DNS lookups that - don’t complete within the specified time will fail. By default, + don't complete within the specified time will fail. By default, there is no timeout on DNS lookups, other than that implemented by system libraries. @@ -764,7 +764,7 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi connect timeout, other than that implemented by system libraries. ‘--read-timeout=SECONDS’ - Set the read (and write) timeout to SECONDS seconds. The “time†of + Set the read (and write) timeout to SECONDS seconds. The "time" of this timeout refers to “idle timeâ€: if, at any point in the download, no data is received for more than the specified number of seconds, reading fails and the download is restarted. This option @@ -779,7 +779,7 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi expressed in bytes, kilobytes with the ‘k’ suffix, or megabytes with the ‘m’ suffix. For example, ‘--limit-rate=20k’ will limit the retrieval rate to 20KB/s. This is useful when, for whatever - reason, you don’t want Wget to consume the entire available + reason, you don't want Wget to consume the entire available bandwidth. This option allows the use of decimal numbers, usually in @@ -791,7 +791,7 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi specified by the rate. Eventually this strategy causes the TCP transfer to slow down to approximately the specified rate. However, it may take some time for this balance to be achieved, so - don’t be surprised if limiting the rate doesn’t work well with very + don't be surprised if limiting the rate doesn't work well with very small files. ‘-w SECONDS’ @@ -809,7 +809,7 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi influenced by ‘--random-wait’, which see. ‘--waitretry=SECONDS’ - If you don’t want Wget to wait between _every_ retrieval, but only + If you don't want Wget to wait between _every_ retrieval, but only between retries of failed downloads, you can use this option. Wget will use “linear backoffâ€, waiting 1 second after the first failure on a given file, then waiting 2 seconds after the second failure on @@ -823,7 +823,7 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi similarities in the time between requests. This option causes the time between requests to vary between 0.5 and 1.5 * WAIT seconds, where WAIT was specified using the ‘--wait’ option, in order to - mask Wget’s presence from such analysis. + mask Wget's presence from such analysis. A 2001 article in a publication devoted to development on a popular consumer platform provided code to perform this analysis on the @@ -836,7 +836,7 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi the actions of one. ‘--no-proxy’ - Don’t use proxies, even if the appropriate ‘*_proxy’ environment + Don't use proxies, even if the appropriate ‘*_proxy’ environment variable is defined. *Note Proxies::, for more information about the use of proxies with @@ -854,14 +854,14 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi URLs are specified on the command-line. The quota is checked only at the end of each downloaded file, so it will never result in a partially downloaded file. Thus you may safely type ‘wget -Q2m -i - sites’—download will be aborted after the file that exhausts the + sites’--download will be aborted after the file that exhausts the quota is completely downloaded. Setting quota to 0 or to ‘inf’ unlimits the download quota. ‘--no-dns-cache’ Turn off caching of DNS lookups. Normally, Wget remembers the IP - addresses it looked up from DNS so it doesn’t have to repeatedly + addresses it looked up from DNS so it doesn't have to repeatedly contact the DNS server for the same (typically small) set of hosts it retrieves from. This cache exists in memory only; a new Wget run will contact DNS again. @@ -875,8 +875,8 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi by the resolving library or by an external caching layer, such as NSCD. - If you don’t understand exactly what this option does, you probably - won’t need it. + If you don't understand exactly what this option does, you probably + won't need it. ‘--restrict-file-names=MODES’ Change which characters found in remote URLs must be escaped during @@ -902,13 +902,13 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi the set of characters that would be escaped, but rather force local file paths to be converted either to lower- or uppercase. - When “unix†is specified, Wget escapes the character ‘/’ and the - control characters in the ranges 0–31 and 128–159. This is the + When "unix" is specified, Wget escapes the character ‘/’ and the + control characters in the ranges 0-31 and 128-159. This is the default on Unix-like operating systems. - When “windows†is given, Wget escapes the characters ‘\’, ‘|’, ‘/’, + When "windows" is given, Wget escapes the characters ‘\’, ‘|’, ‘/’, ‘:’, ‘?’, ‘"’, ‘*’, ‘<’, ‘>’, and the control characters in the - ranges 0–31 and 128–159. In addition to this, Wget in Windows mode + ranges 0-31 and 128-159. In addition to this, Wget in Windows mode uses ‘+’ instead of ‘:’ to separate host and port in local file names, and uses ‘@’ instead of ‘?’ to separate the query portion of the file name from the rest. Therefore, a URL that would be saved @@ -921,7 +921,7 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi you are downloading URLs whose names contain UTF-8 characters, on a system which can save and display filenames in UTF-8 (some possible byte values used in UTF-8 byte sequences fall in the range of - values designated by Wget as “controlsâ€). + values designated by Wget as "controls"). The ‘ascii’ mode is used to specify that any bytes whose values are outside the range of ASCII characters (that is, greater than 127) @@ -939,7 +939,7 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi connect to IPv6 hosts and ignore A records and IPv4 addresses. Neither options should be needed normally. By default, an - IPv6-aware Wget will use the address family specified by the host’s + IPv6-aware Wget will use the address family specified by the host's DNS record. If the DNS responds with both IPv4 and IPv6 addresses, Wget will try them in sequence until it finds one it can connect to. (Also see ‘--prefer-family’ option described below.) @@ -965,15 +965,15 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi used first; if the specified value is ‘none’, the address order returned by DNS is used without change. - Unlike ‘-4’ and ‘-6’, this option doesn’t inhibit access to any + Unlike ‘-4’ and ‘-6’, this option doesn't inhibit access to any address family, it only changes the _order_ in which the addresses are accessed. Also note that the reordering performed by this - option is “stableâ€â€”it doesn’t affect order of addresses of the same - family. That is, the relative order of all IPv4 addresses and of - all IPv6 addresses remains intact in all cases. + option is “stableâ€--it doesn't affect order of addresses of the + same family. That is, the relative order of all IPv4 addresses and + of all IPv6 addresses remains intact in all cases. ‘--retry-connrefused’ - Consider “connection refused†a transient error and try again. + Consider "connection refused" a transient error and try again. Normally Wget gives up on a URL when it is unable to connect to the site because failure to connect is taken as a sign that the server is not running at all and that retries would not help. This option @@ -1061,7 +1061,7 @@ File: wget.info, Node: Directory Options, Next: HTTP Options, Prev: Download ‘-x’ ‘--force-directories’ - The opposite of ‘-nd’—create a hierarchy of directories, even if + The opposite of ‘-nd’--create a hierarchy of directories, even if one would not have been created otherwise. E.g. ‘wget -x http://fly.srk.fer.hr/robots.txt’ will save the downloaded file to ‘fly.srk.fer.hr/robots.txt’. @@ -1088,7 +1088,7 @@ File: wget.info, Node: Directory Options, Next: HTTP Options, Prev: Download it will be saved locally under ‘ftp.xemacs.org/pub/xemacs/’. While the ‘-nH’ option can remove the ‘ftp.xemacs.org/’ part, you are still stuck with ‘pub/xemacs’. This is where ‘--cut-dirs’ comes in - handy; it makes Wget not “see†NUMBER remote directory components. + handy; it makes Wget not "see" NUMBER remote directory components. Here are several examples of how ‘--cut-dirs’ option works. No options -> ftp.xemacs.org/pub/xemacs/ @@ -1101,9 +1101,9 @@ File: wget.info, Node: Directory Options, Next: HTTP Options, Prev: Download If you just want to get rid of the directory structure, this option is similar to a combination of ‘-nd’ and ‘-P’. However, unlike - ‘-nd’, ‘--cut-dirs’ does not lose with subdirectories—for instance, - with ‘-nH --cut-dirs=1’, a ‘beta/’ subdirectory will be placed to - ‘xemacs/beta’, as one would expect. + ‘-nd’, ‘--cut-dirs’ does not lose with subdirectories--for + instance, with ‘-nH --cut-dirs=1’, a ‘beta/’ subdirectory will be + placed to ‘xemacs/beta’, as one would expect. ‘-P PREFIX’ ‘--directory-prefix=PREFIX’ @@ -1119,7 +1119,7 @@ File: wget.info, Node: HTTP Options, Next: HTTPS (SSL/TLS) Options, Prev: Dir ================ ‘--default-page=NAME’ - Use NAME as the default file name when it isn’t known (i.e., for + Use NAME as the default file name when it isn't known (i.e., for URLs that end in a slash), instead of ‘index.html’. ‘-E’ @@ -1128,15 +1128,15 @@ File: wget.info, Node: HTTP Options, Next: HTTPS (SSL/TLS) Options, Prev: Dir downloaded and the URL does not end with the regexp ‘\.[Hh][Tt][Mm][Ll]?’, this option will cause the suffix ‘.html’ to be appended to the local filename. This is useful, for instance, - when you’re mirroring a remote site that uses ‘.asp’ pages, but you + when you're mirroring a remote site that uses ‘.asp’ pages, but you want the mirrored pages to be viewable on your stock Apache server. - Another good use for this is when you’re downloading CGI-generated + Another good use for this is when you're downloading CGI-generated materials. A URL like ‘http://site.com/article.cgi?25’ will be saved as ‘article.cgi?25.html’. Note that filenames changed in this way will be re-downloaded every - time you re-mirror a site, because Wget can’t tell that the local - ‘X.html’ file corresponds to remote URL ‘X’ (since it doesn’t yet + time you re-mirror a site, because Wget can't tell that the local + ‘X.html’ file corresponds to remote URL ‘X’ (since it doesn't yet know that the URL produces output of type ‘text/html’ or ‘application/xhtml+xml’. @@ -1168,18 +1168,18 @@ File: wget.info, Node: HTTP Options, Next: HTTPS (SSL/TLS) Options, Prev: Dir being seen, use the ‘--use-askpass’ or store them in ‘.wgetrc’ or ‘.netrc’, and make sure to protect those files from other users with ‘chmod’. If the passwords are really important, do not leave - them lying in those files either—edit the files and delete them + them lying in those files either--edit the files and delete them after Wget has started the download. ‘--no-http-keep-alive’ - Turn off the “keep-alive†feature for HTTP downloads. Normally, + Turn off the "keep-alive" feature for HTTP downloads. Normally, Wget asks the server to keep the connection open so that, when you download more than one document from the same server, they get transferred over the same TCP connection. This saves time and at the same time reduces the load on the server. This option is useful when, for some reason, persistent - (keep-alive) connections don’t work for you, for example due to a + (keep-alive) connections don't work for you, for example due to a server bug or due to the inability of server-side scripts to cope with the connections. @@ -1204,7 +1204,7 @@ File: wget.info, Node: HTTP Options, Next: HTTPS (SSL/TLS) Options, Prev: Dir ‘--load-cookies FILE’ Load cookies from FILE before the first HTTP retrieval. FILE is a - textual file in the format originally used by Netscape’s + textual file in the format originally used by Netscape's ‘cookies.txt’ file. You will typically use this option when mirroring sites that @@ -1216,7 +1216,7 @@ File: wget.info, Node: HTTP Options, Next: HTTPS (SSL/TLS) Options, Prev: Dir Mirroring such a site requires Wget to send the same cookies your browser sends when communicating with the site. This is achieved - by ‘--load-cookies’—simply point Wget to the location of the + by ‘--load-cookies’--simply point Wget to the location of the ‘cookies.txt’ file, and it will send the same cookies your browser would send in the same situation. Different browsers keep textual cookie files in different locations: @@ -1225,7 +1225,7 @@ File: wget.info, Node: HTTP Options, Next: HTTPS (SSL/TLS) Options, Prev: Dir The cookies are in ‘~/.netscape/cookies.txt’. Mozilla and Netscape 6.x. - Mozilla’s cookie file is also named ‘cookies.txt’, located + Mozilla's cookie file is also named ‘cookies.txt’, located somewhere under ‘~/.mozilla’, in the directory of your profile. The full path usually ends up looking somewhat like ‘~/.mozilla/default/SOME-WEIRD-STRING/cookies.txt’. @@ -1242,18 +1242,18 @@ File: wget.info, Node: HTTP Options, Next: HTTPS (SSL/TLS) Options, Prev: Dir cookie file in the Netscape format that Wget expects. If you cannot use ‘--load-cookies’, there might still be an - alternative. If your browser supports a “cookie managerâ€, you can - use it to view the cookies used when accessing the site you’re + alternative. If your browser supports a "cookie manager", you can + use it to view the cookies used when accessing the site you're mirroring. Write down the name and value of the cookie, and manually instruct Wget to send those cookies, bypassing the - “official†cookie support: + "official" cookie support: wget --no-cookies --header "Cookie: NAME=VALUE" ‘--save-cookies FILE’ Save cookies to FILE before exiting. This will not save cookies - that have expired or that have no expiry time (so-called “session - cookiesâ€), but also see ‘--keep-session-cookies’. + that have expired or that have no expiry time (so-called "session + cookies"), but also see ‘--keep-session-cookies’. ‘--keep-session-cookies’ When specified, causes ‘--save-cookies’ to also save session @@ -1265,7 +1265,7 @@ File: wget.info, Node: HTTP Options, Next: HTTPS (SSL/TLS) Options, Prev: Dir as far as the site is concerned. Since the cookie file format does not normally carry session - cookies, Wget marks them with an expiry timestamp of 0. Wget’s + cookies, Wget marks them with an expiry timestamp of 0. Wget's ‘--load-cookies’ recognizes those as session cookies, but it might confuse other browsers. Also note that cookies so loaded will be treated as other session cookies, which means that if you want @@ -1280,7 +1280,7 @@ File: wget.info, Node: HTTP Options, Next: HTTPS (SSL/TLS) Options, Prev: Dir each time claiming that the (otherwise normal) connection has closed on the very same byte. - With this option, Wget will ignore the ‘Content-Length’ header—as + With this option, Wget will ignore the ‘Content-Length’ header--as if it never existed. ‘--header=HEADER-LINE’ @@ -1342,7 +1342,7 @@ File: wget.info, Node: HTTP Options, Next: HTTPS (SSL/TLS) Options, Prev: Dir pertain here as well. ‘--referer=URL’ - Include ‘Referer: URL’ header in HTTP request. Useful for + Include 'Referer: URL' header in HTTP request. Useful for retrieving documents with server-side processing that assume they are always being retrieved by interactive web browsers and only come out properly when Referer is set to one of the pages that @@ -1406,13 +1406,13 @@ File: wget.info, Node: HTTP Options, Next: HTTPS (SSL/TLS) Options, Prev: Dir Please be aware that Wget needs to know the size of the POST data in advance. Therefore the argument to ‘--post-file’ must be a regular file; specifying a FIFO or something like ‘/dev/stdin’ - won’t work. It’s not quite clear how to work around this + won't work. It's not quite clear how to work around this limitation inherent in HTTP/1.0. Although HTTP/1.1 introduces - “chunked†transfer that doesn’t require knowing the request length - in advance, a client can’t use chunked unless it knows it’s talking - to an HTTP/1.1 server. And it can’t know that until it receives a + “chunked†transfer that doesn't require knowing the request length + in advance, a client can't use chunked unless it knows it's talking + to an HTTP/1.1 server. And it can't know that until it receives a response, which in turn requires the request to have been completed - – a chicken-and-egg problem. + - a chicken-and-egg problem. Note: As of version 1.15 if Wget is redirected after the POST request is completed, its behaviour will depend on the response @@ -1517,8 +1517,8 @@ File: wget.info, Node: HTTP Options, Next: HTTPS (SSL/TLS) Options, Prev: Dir in addition to form-based authentication. ‘--retry-on-host-error’ - Consider host errors, such as “Temporary failure in name - resolutionâ€, as non-fatal, transient errors. + Consider host errors, such as "Temporary failure in name + resolution", as non-fatal, transient errors. ‘--retry-on-http-error=CODE[,CODE,...]’ Consider given HTTP response codes as non-fatal, transient errors. @@ -1573,38 +1573,38 @@ compiled without SSL support, none of these options are available. ‘--ciphers’ Set the cipher list string. Typically this string sets the cipher suites and other SSL/TLS options that the user wish should be used, - in a set order of preference (GnuTLS calls it ’priority string’). + in a set order of preference (GnuTLS calls it 'priority string'). This string will be fed verbatim to the SSL/TLS engine (OpenSSL or GnuTLS) and hence its format and syntax is dependent on that. Wget will not process or manipulate it in any way. Refer to the OpenSSL or GnuTLS documentation for more information. ‘--no-check-certificate’ - Don’t check the server certificate against the available - certificate authorities. Also don’t require the URL host name to + Don't check the server certificate against the available + certificate authorities. Also don't require the URL host name to match the common name presented by the certificate. - As of Wget 1.10, the default is to verify the server’s certificate + As of Wget 1.10, the default is to verify the server's certificate against the recognized certificate authorities, breaking the SSL handshake and aborting the download if the verification fails. Although this provides more secure downloads, it does break interoperability with some sites that worked with previous Wget versions, particularly those using self-signed, expired, or - otherwise invalid certificates. This option forces an “insecure†+ otherwise invalid certificates. This option forces an "insecure" mode of operation that turns the certificate verification errors into warnings and allows you to proceed. - If you encounter “certificate verification†errors or ones saying - that “common name doesn’t match requested host nameâ€, you can use + If you encounter "certificate verification" errors or ones saying + that "common name doesn't match requested host name", you can use this option to bypass the verification and proceed with the download. _Only use this option if you are otherwise convinced of - the site’s authenticity, or if you really don’t care about the + the site's authenticity, or if you really don't care about the validity of its certificate._ It is almost always a bad idea not to check the certificates when transmitting confidential or important data. For self-signed/internal certificates, you should download the certificate and verify against that instead of forcing this insecure mode. If you are really sure of not desiring any - certificate verification, you can specify –check-certificate=quiet + certificate verification, you can specify -check-certificate=quiet to tell wget to not print any warning about invalid certificates, albeit in most cases this is the wrong thing to do. @@ -1628,7 +1628,7 @@ compiled without SSL support, none of these options are available. ‘--ca-certificate=FILE’ Use FILE as the file with the bundle of certificate authorities - (“CAâ€) to verify the peers. The certificates must be in PEM + ("CA") to verify the peers. The certificates must be in PEM format. Without this option Wget looks for CA certificates at the @@ -1654,7 +1654,7 @@ compiled without SSL support, none of these options are available. Tells wget to use the specified public key file (or hashes) to verify the peer. This can be a path to a file which contains a single public key in PEM or DER format, or any number of base64 - encoded sha256 hashes preceded by “sha256//†and separated by “;†+ encoded sha256 hashes preceded by "sha256//" and separated by ";" When negotiating a TLS or SSL connection, the server sends a certificate indicating its identity. A public key is extracted @@ -1673,7 +1673,7 @@ compiled without SSL support, none of these options are available. the user. If this option is not specified, Wget looks for random data in ‘$RANDFILE’ or, if that is unset, in ‘$HOME/.rnd’. - If you’re getting the “Could not seed OpenSSL PRNG; disabling SSL.†+ If you're getting the "Could not seed OpenSSL PRNG; disabling SSL." error, you should provide random data using some of the methods described above. @@ -1710,7 +1710,7 @@ compiled without SSL support, none of these options are available. HSTS database format used by Wget. If Wget cannot parse the provided file, the behaviour is unspecified. - The Wget’s HSTS database is a plain text file. Each line contains + The Wget's HSTS database is a plain text file. Each line contains an HSTS entry (ie. a site that has issued a ‘Strict-Transport-Security’ header and that therefore has specified a concrete HSTS policy to be applied). Lines starting with a dash @@ -1734,7 +1734,7 @@ compiled without SSL support, none of these options are available. only be applied if both of them match. This feature has been included for testing/development purposes only. The Wget testsuite (in ‘testenv/’) creates HSTS databases with explicit ports with the - purpose of ensuring Wget’s correct behaviour. Applying HSTS + purpose of ensuring Wget's correct behaviour. Applying HSTS policies to ports other than the default ones is discouraged by RFC 6797 (see Appendix B "Differences between HSTS Policy and Same-Origin Policy"). Thus, this functionality should not be used @@ -1744,7 +1744,7 @@ compiled without SSL support, none of these options are available. the subdomains of the target domain should be part of the given HSTS policy as well. The CREATED and MAX-AGE fields hold the timestamp values of when such entry was created (first seen by - Wget) and the HSTS-defined value ’max-age’, which states how long + Wget) and the HSTS-defined value 'max-age', which states how long should that HSTS policy remain active, measured in seconds elapsed since the timestamp stored in CREATED. Once that time has passed, that HSTS policy will no longer be valid and will eventually be @@ -1821,16 +1821,16 @@ File: wget.info, Node: FTP Options, Next: Recursive Retrieval Options, Prev: being seen, store them in ‘.wgetrc’ or ‘.netrc’, and make sure to protect those files from other users with ‘chmod’. If the passwords are really important, do not leave them lying in those - files either—edit the files and delete them after Wget has started + files either--edit the files and delete them after Wget has started the download. ‘--no-remove-listing’ - Don’t remove the temporary ‘.listing’ files generated by FTP + Don't remove the temporary ‘.listing’ files generated by FTP retrievals. Normally, these files contain the raw directory listings received from FTP servers. Not removing them can be useful for debugging purposes, or when you want to be able to easily check on the contents of remote server directories (e.g. to - verify that a mirror you’re running is complete). + verify that a mirror you're running is complete). Note that even though Wget writes to a known filename for this file, this is not a security hole in the scenario of a user making @@ -1842,8 +1842,8 @@ File: wget.info, Node: FTP Options, Next: Recursive Retrieval Options, Prev: ‘.listing’ file, or the listing will be written to a ‘.listing.NUMBER’ file. - Even though this situation isn’t a problem, though, ‘root’ should - never run Wget in a non-trusted user’s directory. A user could do + Even though this situation isn't a problem, though, ‘root’ should + never run Wget in a non-trusted user's directory. A user could do something as simple as linking ‘index.html’ to ‘/etc/passwd’ and asking ‘root’ to run Wget with ‘-N’ or ‘-r’ so the file will be overwritten. @@ -1873,7 +1873,7 @@ File: wget.info, Node: FTP Options, Next: Recursive Retrieval Options, Prev: and active FTP should work equally well. Behind most firewall and NAT configurations passive FTP has a better chance of working. However, in some rare firewall configurations, active FTP actually - works when passive FTP doesn’t. If you suspect this to be the + works when passive FTP doesn't. If you suspect this to be the case, use this option, or set ‘passive_ftp=off’ in your init file. ‘--preserve-permissions’ @@ -1966,7 +1966,7 @@ File: wget.info, Node: Recursive Retrieval Options, Next: Recursive Accept/Rej Ideally, one would expect this to download just ‘1.html’. but unfortunately this is not the case, because ‘-l 0’ is equivalent to - ‘-l inf’—that is, infinite recursion. To download a single HTML + ‘-l inf’--that is, infinite recursion. To download a single HTML page (or a handful of them), specify them all on the command line and leave away ‘-r’ and ‘-l’. To download the essential items to view a single HTML page, see ‘page requisites’. @@ -2068,7 +2068,7 @@ File: wget.info, Node: Recursive Retrieval Options, Next: Recursive Accept/Rej documents that may be needed to display it properly are not downloaded. Using ‘-r’ together with ‘-l’ can help, but since Wget does not ordinarily distinguish between external and inlined - documents, one is generally left with “leaf documents†that are + documents, one is generally left with "leaf documents" that are missing their requisites. For instance, say document ‘1.html’ contains an ‘<IMG>’ tag @@ -2089,7 +2089,7 @@ File: wget.info, Node: Recursive Retrieval Options, Next: Recursive Accept/Rej wget -r -l 2 -p http://SITE/1.html - all the above files _and_ ‘3.html’’s requisite ‘3.gif’ will be + all the above files _and_ ‘3.html’'s requisite ‘3.gif’ will be downloaded. Similarly, wget -r -l 1 -p http://SITE/1.html @@ -2100,7 +2100,7 @@ File: wget.info, Node: Recursive Retrieval Options, Next: Recursive Accept/Rej wget -r -l 0 -p http://SITE/1.html would download just ‘1.html’ and ‘1.gif’, but unfortunately this is - not the case, because ‘-l 0’ is equivalent to ‘-l inf’—that is, + not the case, because ‘-l 0’ is equivalent to ‘-l inf’--that is, infinite recursion. To download a single HTML page (or a handful of them, all specified on the command-line or in a ‘-i’ URL input file) and its (or their) requisites, simply leave off ‘-r’ and @@ -2118,7 +2118,7 @@ File: wget.info, Node: Recursive Retrieval Options, Next: Recursive Accept/Rej wget -E -H -k -K -p http://SITE/DOCUMENT - To finish off this topic, it’s worth knowing that Wget’s idea of an + To finish off this topic, it's worth knowing that Wget's idea of an external document link is any URL specified in an ‘<A>’ tag, an ‘<AREA>’ tag, or a ‘<LINK>’ tag other than ‘<LINK REL="stylesheet">’. @@ -2131,11 +2131,11 @@ File: wget.info, Node: Recursive Retrieval Options, Next: Recursive Accept/Rej “declarationsâ€. Declaration is special markup that begins with ‘<!’ and ends with ‘>’, such as ‘<!DOCTYPE ...>’, that may contain comments between a pair of ‘--’ delimiters. HTML comments are - “empty declarationsâ€, SGML declarations without any non-comment + "empty declarations", SGML declarations without any non-comment text. Therefore, ‘<!--foo-->’ is a valid comment, and so is ‘<!--one-- --two-->’, but ‘<!--1--2-->’ is not. - On the other hand, most HTML writers don’t perceive comments as + On the other hand, most HTML writers don't perceive comments as anything other than text delimited with ‘<!--’ and ‘-->’, which is not quite the same. For example, something like ‘<!------------>’ works as a valid comment as long as the number of dashes is a @@ -2149,7 +2149,7 @@ File: wget.info, Node: Recursive Retrieval Options, Next: Recursive Accept/Rej resulted in missing links in many web pages that displayed fine in browsers, but had the misfortune of containing non-compliant comments. Beginning with version 1.9, Wget has joined the ranks of - clients that implements “naive†comments, terminating each comment + clients that implements "naive" comments, terminating each comment at the first occurrence of ‘-->’. If, for whatever reason, you want strict comment parsing, use this @@ -2212,7 +2212,7 @@ File: wget.info, Node: Recursive Accept/Reject Options, Next: Exit Status, Pr However, the author of this option came across a page with tags like ‘<LINK REL="home" HREF="/">’ and came to the realization that - specifying tags to ignore was not enough. One can’t just tell Wget + specifying tags to ignore was not enough. One can't just tell Wget to ignore ‘<LINK>’, because then stylesheets will not be downloaded. Now the best bet for downloading a single page and its requisites is the dedicated ‘--page-requisites’ option. @@ -2270,7 +2270,7 @@ Wget may return one of several error codes if it encounters problems. Generic error code. 2 - Parse error—for instance, when parsing command-line options, the + Parse error--for instance, when parsing command-line options, the ‘.wgetrc’ or ‘.netrc’... 3 @@ -2295,7 +2295,7 @@ Wget may return one of several error codes if it encounters problems. precedence over higher-numbered ones, when multiple types of errors are encountered. - In versions of Wget prior to 1.12, Wget’s exit status tended to be + In versions of Wget prior to 1.12, Wget's exit status tended to be unhelpful and inconsistent. Recursive downloads would virtually always return 0 (success), regardless of any issues encountered, and non-recursive fetches only returned the status corresponding to the most @@ -2362,7 +2362,7 @@ things from other directories. If you want to download all the files from one directory, use ‘-l 1’ to make sure the recursion depth never exceeds one. *Note Following Links::, for more information about this. - Recursive retrieval should be used with care. Don’t say you were not + Recursive retrieval should be used with care. Don't say you were not warned. @@ -2396,27 +2396,27 @@ File: wget.info, Node: Spanning Hosts, Next: Types of Files, Prev: Following 4.1 Spanning Hosts ================== -Wget’s recursive retrieval normally refuses to visit hosts different +Wget's recursive retrieval normally refuses to visit hosts different than the one you specified on the command line. This is a reasonable default; without it, every retrieval would have the potential to turn your Wget into a small version of google. However, visiting different hosts, or “host spanning,†is sometimes a useful option. Maybe the images are served from a different server. -Maybe you’re mirroring a site that consists of pages interlinked between +Maybe you're mirroring a site that consists of pages interlinked between three servers. Maybe the server has two equivalent names, and the HTML pages refer to both interchangeably. -Span to any host—‘-H’ +Span to any host--‘-H’ - The ‘-H’ option turns on host spanning, thus allowing Wget’s + The ‘-H’ option turns on host spanning, thus allowing Wget's recursive run to visit any host referenced by a link. Unless sufficient recursion-limiting criteria are applied depth, these foreign hosts will typically link to yet more hosts, and so on until Wget ends up sucking up much more data than you have intended. -Limit spanning to certain domains—‘-D’ +Limit spanning to certain domains--‘-D’ The ‘-D’ option allows you to specify the domains that will be followed, thus limiting the recursion only to the hosts that belong @@ -2430,7 +2430,7 @@ Limit spanning to certain domains—‘-D’ You can specify more than one address by separating them with a comma, e.g. ‘-Ddomain1.com,domain2.com’. -Keep download off certain domains—‘--exclude-domains’ +Keep download off certain domains--‘--exclude-domains’ If there are domains you want to exclude specifically, you can do it with ‘--exclude-domains’, which accepts the same type of @@ -2464,7 +2464,7 @@ in ‘.wgetrc’. ‘accept-regex = URLREGEX’ The argument to ‘--accept’ option is a list of file suffixes or patterns that Wget will download during recursive retrieval. A - suffix is the ending part of a file, and consists of “normal†+ suffix is the ending part of a file, and consists of "normal" letters, e.g. ‘gif’ or ‘.jpg’. A matching pattern contains shell-like wildcards, e.g. ‘books*’ or ‘zelazny*196[0-9]*’. @@ -2515,11 +2515,11 @@ accept/reject rules, even though these will actually contribute to the name chosen for the local file. It is expected that a future version of Wget will provide an option to allow matching against query strings. - Finally, it’s worth noting that the accept/reject lists are matched -_twice_ against downloaded files: once against the URL’s filename + Finally, it's worth noting that the accept/reject lists are matched +_twice_ against downloaded files: once against the URL's filename portion, to determine if the file should be downloaded in the first place; then, after it has been accepted and successfully downloaded, the -local file’s name is also checked against the accept/reject lists to see +local file's name is also checked against the accept/reject lists to see if it should be removed. The rationale was that, since ‘.htm’ and ‘.html’ files are always downloaded regardless of accept/reject rules, they should be removed _after_ being downloaded and scanned for links, @@ -2549,7 +2549,7 @@ File: wget.info, Node: Directory-Based Limits, Next: Relative Links, Prev: Ty Regardless of other link-following facilities, it is often useful to place the restriction of what files to retrieve based on the directories -those files are placed in. There can be many reasons for this—the home +those files are placed in. There can be many reasons for this--the home pages may be organized in a reasonable directory structure; or some directories may contain useless information, e.g. ‘/cgi-bin’ or ‘/dev’ directories. @@ -2566,7 +2566,7 @@ equivalent command in ‘.wgetrc’. The directories are absolute paths. So, if you wish to download from ‘http://host/people/bozo/’ - following only links to bozo’s colleagues in the ‘/people’ + following only links to bozo's colleagues in the ‘/people’ directory and the bogus scripts in ‘/cgi-bin’, you can specify: wget -I /people,/cgi-bin http://host/people/bozo/ @@ -2574,7 +2574,7 @@ equivalent command in ‘.wgetrc’. ‘-X LIST’ ‘--exclude LIST’ ‘exclude_directories = LIST’ - ‘-X’ option is exactly the reverse of ‘-I’—this is a list of + ‘-X’ option is exactly the reverse of ‘-I’--this is a list of directories _excluded_ from the download. E.g. if you do not want Wget to download things from ‘/cgi-bin’ directory, specify ‘-X /cgi-bin’ on the command line. @@ -2607,8 +2607,8 @@ equivalent command in ‘.wgetrc’. *Note* that, for HTTP (and HTTPS), the trailing slash is very important to ‘--no-parent’. HTTP has no concept of a - “directoryâ€â€”Wget relies on you to indicate what’s a directory and - what isn’t. In ‘http://foo/bar/’, Wget will consider ‘bar’ to be a + "directory"--Wget relies on you to indicate what's a directory and + what isn't. In ‘http://foo/bar/’, Wget will consider ‘bar’ to be a directory, while in ‘http://foo/bar’ (no trailing slash), ‘bar’ will be considered a filename (so ‘--no-parent’ would be meaningless, as its parent is ‘/’). @@ -2635,7 +2635,7 @@ server root. For example, these links are relative: Using this option guarantees that recursive retrieval will not span hosts, even without ‘-H’. In simple cases it also allows downloads to -“just work†without having to convert links. +"just work" without having to convert links. This option is probably not very useful and might be removed in a future release. @@ -2762,7 +2762,7 @@ File: wget.info, Node: HTTP Time-Stamping Internals, Next: FTP Time-Stamping I Time-stamping in HTTP is implemented by checking of the ‘Last-Modified’ header. If you wish to retrieve the file ‘foo.html’ through HTTP, Wget -will check whether ‘foo.html’ exists locally. If it doesn’t, ‘foo.html’ +will check whether ‘foo.html’ exists locally. If it doesn't, ‘foo.html’ will be retrieved unconditionally. If the file does exist locally, Wget will first check its local @@ -2771,13 +2771,13 @@ time-stamp (similar to the way ‘ls -l’ checks it), and then send a remote file. The ‘Last-Modified’ header is examined to find which file was -modified more recently (which makes it “newerâ€). If the remote file is +modified more recently (which makes it "newer"). If the remote file is newer, it will be downloaded; if it is older, Wget will give up.(1) When ‘--backup-converted’ (‘-K’) is specified in conjunction with ‘-N’, server file ‘X’ is compared to local file ‘X.orig’, if extant, rather than being compared to local file ‘X’, which will always differ -if it’s been converted by ‘--convert-links’ (‘-k’). +if it's been converted by ‘--convert-links’ (‘-k’). Arguably, HTTP time-stamping should be implemented using the ‘If-Modified-Since’ request. @@ -2795,7 +2795,7 @@ File: wget.info, Node: FTP Time-Stamping Internals, Prev: HTTP Time-Stamping I =============================== In theory, FTP time-stamping works much the same as HTTP, only FTP has -no headers—time-stamps must be ferreted out of directory listings. +no headers--time-stamps must be ferreted out of directory listings. If an FTP download is recursive or uses globbing, Wget will use the FTP ‘LIST’ command to get a file listing for the directory containing @@ -2827,9 +2827,9 @@ File: wget.info, Node: Startup File, Next: Examples, Prev: Time-Stamping, Up Once you know how to change default settings of Wget through command line arguments, you may wish to make some of those settings permanent. You can do that in a convenient way by creating the Wget startup -file—‘.wgetrc’. +file--‘.wgetrc’. - Besides ‘.wgetrc’ is the “main†initialization file, it is convenient + Besides ‘.wgetrc’ is the "main" initialization file, it is convenient to have a special facility for storing passwords. Thus Wget reads and interprets the contents of ‘$HOME/.netrc’, if it finds it. You can find ‘.netrc’ format in your system manuals. @@ -2855,14 +2855,14 @@ When initializing, Wget will look for a “global†startup file, ‘/usr/local’, if Wget was not installed there) and read commands from there, if it exists. - Then it will look for the user’s file. If the environmental variable + Then it will look for the user's file. If the environmental variable ‘WGETRC’ is set, Wget will try to load that file. Failing that, no further attempts will be made. If ‘WGETRC’ is not set, Wget will try to load ‘$HOME/.wgetrc’. - The fact that user’s settings are loaded after the system-wide ones -means that in case of collision user’s wgetrc _overrides_ the + The fact that user's settings are loaded after the system-wide ones +means that in case of collision user's wgetrc _overrides_ the system-wide wgetrc (in ‘/usr/local/etc/wgetrc’ by default). Fascist admins, away! @@ -2926,12 +2926,12 @@ auth_no_challenge = on/off See ‘--auth-no-challenge’. background = on/off - Enable/disable going to background—the same as ‘-b’ (which enables + Enable/disable going to background--the same as ‘-b’ (which enables it). backup_converted = on/off Enable/disable saving pre-converted files with the suffix - ‘.orig’—the same as ‘-K’ (which enables it). + ‘.orig’--the same as ‘-K’ (which enables it). backups = NUMBER Use up to NUMBER backups for a file. Backups are rotated by adding @@ -2940,7 +2940,7 @@ backups = NUMBER base = STRING Consider relative URLs in input files (specified via the ‘input’ command or the ‘--input-file’/‘-i’ option, together with - ‘force_html’ or ‘--force-html’) as being relative to STRING—the + ‘force_html’ or ‘--force-html’) as being relative to STRING--the same as ‘--base=STRING’. bind_address = ADDRESS @@ -2969,15 +2969,15 @@ certificate_type = STRING check_certificate = on/off If this is set to off, the server certificate is not checked - against the specified client authorities. The default is “onâ€. + against the specified client authorities. The default is "on". The same as ‘--check-certificate’. connect_timeout = N - Set the connect timeout—the same as ‘--connect-timeout’. + Set the connect timeout--the same as ‘--connect-timeout’. content_disposition = on/off Turn on recognition of the (non-standard) ‘Content-Disposition’ - HTTP header—if set to ‘on’, the same as ‘--content-disposition’. + HTTP header--if set to ‘on’, the same as ‘--content-disposition’. trust_server_names = on/off If set to on, construct the local file name from redirection URLs @@ -3001,16 +3001,16 @@ debug = on/off Debug mode, same as ‘-d’. default_page = STRING - Default page name—the same as ‘--default-page=STRING’. + Default page name--the same as ‘--default-page=STRING’. delete_after = on/off - Delete after download—the same as ‘--delete-after’. + Delete after download--the same as ‘--delete-after’. dir_prefix = STRING - Top of directory tree—the same as ‘-P STRING’. + Top of directory tree--the same as ‘-P STRING’. dirstruct = on/off - Turning dirstruct on or off—the same as ‘-x’ or ‘-nd’, + Turning dirstruct on or off--the same as ‘-x’ or ‘-nd’, respectively. dns_cache = on/off @@ -3019,13 +3019,13 @@ dns_cache = on/off ‘--no-dns-cache’. dns_timeout = N - Set the DNS timeout—the same as ‘--dns-timeout’. + Set the DNS timeout--the same as ‘--dns-timeout’. domains = STRING Same as ‘-D’ (*note Spanning Hosts::). dot_bytes = N - Specify the number of bytes “contained†in a dot, as seen + Specify the number of bytes "contained" in a dot, as seen throughout the retrieval (1024 by default). You can postfix the value with ‘k’ or ‘m’, representing kilobytes and megabytes, respectively. With dot settings you can tailor the dot retrieval @@ -3045,14 +3045,14 @@ egd_file = FILE exclude_directories = STRING Specify a comma-separated list of directories you wish to exclude - from download—the same as ‘-X STRING’ (*note Directory-Based + from download--the same as ‘-X STRING’ (*note Directory-Based Limits::). exclude_domains = STRING Same as ‘--exclude-domains=STRING’ (*note Spanning Hosts::). follow_ftp = on/off - Follow FTP links from HTML documents—the same as ‘--follow-ftp’. + Follow FTP links from HTML documents--the same as ‘--follow-ftp’. follow_tags = STRING Only follow certain HTML tags when doing a recursive retrieval, @@ -3060,7 +3060,7 @@ follow_tags = STRING force_html = on/off If set to on, force the input filename to be regarded as an HTML - document—the same as ‘-F’. + document--the same as ‘-F’. ftp_password = STRING Set your FTP password to STRING. Without this setting, the @@ -3079,7 +3079,7 @@ ftp_user = STRING This command used to be named ‘login’ prior to Wget 1.10. glob = on/off - Turn globbing on/off—the same as ‘--glob’ and ‘--no-glob’. + Turn globbing on/off--the same as ‘--glob’ and ‘--no-glob’. header = STRING Define a header for HTTP downloads, like using ‘--header=STRING’. @@ -3132,7 +3132,7 @@ ignore_tags = STRING include_directories = STRING Specify a comma-separated list of directories you wish to follow - when downloading—the same as ‘-I STRING’. + when downloading--the same as ‘-I STRING’. iri = on/off When set to on, enable internationalized URI (IRI) support; the @@ -3140,7 +3140,7 @@ iri = on/off inet4_only = on/off Force connecting to IPv4 addresses, off by default. You can put - this in the global init file to disable Wget’s attempts to resolve + this in the global init file to disable Wget's attempts to resolve and connect to IPv6 hosts. Available only if Wget was compiled with IPv6 support. The same as ‘--inet4-only’ or ‘-4’. @@ -3192,11 +3192,11 @@ no_proxy = STRING loading, instead of the one specified in environment. output_document = FILE - Set the output filename—the same as ‘-O FILE’. + Set the output filename--the same as ‘-O FILE’. page_requisites = on/off Download all ancillary documents necessary for a single HTML page - to display properly—the same as ‘-p’. + to display properly--the same as ‘-p’. passive_ftp = on/off Change setting of passive FTP, equivalent to the ‘--passive-ftp’ @@ -3248,7 +3248,7 @@ proxy_user = STRING ‘--proxy-user=STRING’. quiet = on/off - Quiet mode—the same as ‘-q’. + Quiet mode--the same as ‘-q’. quota = QUOTA Specify the download quota, which is useful to put in the global @@ -3256,7 +3256,7 @@ quota = QUOTA retrieving after the download sum has become greater than quota. The quota can be specified in bytes (default), kbytes ‘k’ appended) or mbytes (‘m’ appended). Thus ‘quota = 5m’ will set the quota to - 5 megabytes. Note that the user’s startup file overrides system + 5 megabytes. Note that the user's startup file overrides system settings. random_file = FILE @@ -3268,21 +3268,21 @@ random_wait = on/off ‘--random-wait’. read_timeout = N - Set the read (and write) timeout—the same as ‘--read-timeout=N’. + Set the read (and write) timeout--the same as ‘--read-timeout=N’. reclevel = N - Recursion level (depth)—the same as ‘-l N’. + Recursion level (depth)--the same as ‘-l N’. recursive = on/off - Recursive on/off—the same as ‘-r’. + Recursive on/off--the same as ‘-r’. referer = STRING Set HTTP ‘Referer:’ header just like ‘--referer=STRING’. (Note that it was the folks who wrote the HTTP spec who got the spelling - of “referrer†wrong.) + of "referrer" wrong.) relative_only = on/off - Follow only relative links—the same as ‘-L’ (*note Relative + Follow only relative links--the same as ‘-L’ (*note Relative Links::). remote_encoding = ENCODING @@ -3302,11 +3302,11 @@ retr_symlinks = on/off files; the same as ‘--retr-symlinks’. retry_connrefused = on/off - When set to on, consider “connection refused†a transient error—the - same as ‘--retry-connrefused’. + When set to on, consider "connection refused" a transient + error--the same as ‘--retry-connrefused’. robots = on/off - Specify whether the norobots convention is respected by Wget, “on†+ Specify whether the norobots convention is respected by Wget, "on" by default. This switch controls both the ‘/robots.txt’ and the ‘nofollow’ aspect of the spec. *Note Robot Exclusion::, for more details about this. Be sure you know what you are doing before @@ -3325,7 +3325,7 @@ secure_protocol = STRING server_response = on/off Choose whether or not to print the HTTP and FTP server - responses—the same as ‘-S’. + responses--the same as ‘-S’. show_all_dns_entries = on/off When a DNS name is resolved, show all the IP addresses, not just @@ -3348,14 +3348,14 @@ timestamping = on/off Time-Stamping::). use_server_timestamps = on/off - If set to ‘off’, Wget won’t set the local file’s timestamp by the + If set to ‘off’, Wget won't set the local file's timestamp by the one on the server (same as ‘--no-use-server-timestamps’). tries = N - Set number of retries per URL—the same as ‘-t N’. + Set number of retries per URL--the same as ‘-t N’. use_proxy = on/off - When set to off, don’t use proxy even when proxy-related + When set to off, don't use proxy even when proxy-related environment variables are set. In that case it is the same as using ‘--no-proxy’. @@ -3365,17 +3365,17 @@ user = STRING command for FTP and HTTP respectively. user_agent = STRING - User agent identification sent to the HTTP Server—the same as + User agent identification sent to the HTTP Server--the same as ‘--user-agent=STRING’. verbose = on/off - Turn verbose on/off—the same as ‘-v’/‘-nv’. + Turn verbose on/off--the same as ‘-v’/‘-nv’. wait = N - Wait N seconds between retrievals—the same as ‘-w N’. + Wait N seconds between retrievals--the same as ‘-w N’. wait_retry = N - Wait up to N seconds between retries of failed retrievals only—the + Wait up to N seconds between retries of failed retrievals only--the same as ‘--waitretry=N’. Note that this is turned on by default in the global ‘wgetrc’. @@ -3386,7 +3386,7 @@ File: wget.info, Node: Sample Wgetrc, Prev: Wgetrc Commands, Up: Startup File ================= This is the sample initialization file, as given in the distribution. -It is divided in two section—one for global usage (suitable for global +It is divided in two section--one for global usage (suitable for global startup file), and one for local usage (suitable for ‘$HOME/.wgetrc’). Be careful about the things you change. @@ -3567,7 +3567,7 @@ File: wget.info, Node: Simple Usage, Next: Advanced Usage, Prev: Examples, U wget --tries=45 http://fly.srk.fer.hr/jpg/flyweb.jpg - • Now let’s leave Wget to work in the background, and write its + • Now let's leave Wget to work in the background, and write its progress to log file ‘log’. It is tiring to type ‘--tries’, so we shall use ‘-t’. @@ -3625,8 +3625,8 @@ File: wget.info, Node: Advanced Usage, Next: Very Advanced Usage, Prev: Simpl depending on where they were on the remote server. • The same as the above, but without the ‘www.example.com/’ - directory. In fact, I don’t want to have all those random server - directories anyway—just save _all_ those files under a ‘download/’ + directory. In fact, I don't want to have all those random server + directories anyway--just save _all_ those files under a ‘download/’ subdirectory of the current directory. wget -p --convert-links -nH -nd -Pdownload \ @@ -3649,7 +3649,7 @@ File: wget.info, Node: Advanced Usage, Next: Very Advanced Usage, Prev: Simpl • You want to download all the GIFs from a directory on an HTTP server. You tried ‘wget http://www.example.com/dir/*.gif’, but - that didn’t work because HTTP retrieval does not support globbing. + that didn't work because HTTP retrieval does not support globbing. In that case, use: wget -r -l1 --no-parent -A.gif http://www.example.com/dir/ @@ -3702,16 +3702,16 @@ File: wget.info, Node: Very Advanced Usage, Prev: Advanced Usage, Up: Example • In addition to the above, you want the links to be converted for local viewing. But, after having read this manual, you know that - link conversion doesn’t play well with timestamping, so you also + link conversion doesn't play well with timestamping, so you also want Wget to back up the original HTML files before the conversion. Wget invocation would look like this: wget --mirror --convert-links --backup-converted \ https://www.gnu.org/ -o /home/me/weeklog - • But you’ve also noticed that local viewing doesn’t work all that + • But you've also noticed that local viewing doesn't work all that well when HTML files are saved under extensions other than ‘.html’, - perhaps because they were served as ‘index.cgi’. So you’d like + perhaps because they were served as ‘index.cgi’. So you'd like Wget to rename all the files served with content-type ‘text/html’ or ‘application/xhtml+xml’ to ‘NAME.html’. @@ -3735,9 +3735,9 @@ This chapter contains all the stuff that could not fit anywhere else. * Proxies:: Support for proxy servers. * Distribution:: Getting the latest version. -* Web Site:: GNU Wget’s presence on the World Wide Web. +* Web Site:: GNU Wget's presence on the World Wide Web. * Mailing Lists:: Wget mailing list for announcements and discussion. -* Internet Relay Chat:: Wget’s presence on IRC. +* Internet Relay Chat:: Wget's presence on IRC. * Reporting Bugs:: How and where to report bugs. * Portability:: The systems Wget works on. * Signals:: Signal-handling performed by Wget. @@ -3802,7 +3802,7 @@ schemes exist. For proxy authorization only the ‘Basic’ authentication scheme is currently implemented. You may specify your username and password either through the proxy -URL or through the command-line options. Assuming that the company’s +URL or through the command-line options. Assuming that the company's proxy is located at ‘proxy.company.com’ at port 8001, a proxy URL location containing authorization data might look like this: @@ -3820,8 +3820,8 @@ File: wget.info, Node: Distribution, Next: Web Site, Prev: Proxies, Up: Vari Like all GNU utilities, the latest version of Wget can be found at the master GNU archive site ftp.gnu.org, and its mirrors. For example, Wget -1.21.4 can be found at -<https://ftp.gnu.org/pub/gnu/wget/wget-1.21.4.tar.gz> +1.24.5 can be found at +<https://ftp.gnu.org/pub/gnu/wget/wget-1.24.5.tar.gz> File: wget.info, Node: Web Site, Next: Mailing Lists, Prev: Distribution, Up: Various @@ -3831,7 +3831,7 @@ File: wget.info, Node: Web Site, Next: Mailing Lists, Prev: Distribution, Up The official web site for GNU Wget is at <https//www.gnu.org/software/wget/>. However, most useful information -resides at “The Wget Wgikiâ€, <http://wget.addictivecode.org/>. +resides at "The Wget Wgiki", <http://wget.addictivecode.org/>. File: wget.info, Node: Mailing Lists, Next: Internet Relay Chat, Prev: Web Site, Up: Various @@ -3849,8 +3849,8 @@ GNU Wget is at <bug-wget@gnu.org>. To subscribe, send an email to You do not need to subscribe to send a message to the list; however, please note that unsubscribed messages are moderated, and may take a -while before they hit the list—*usually around a day*. If you want your -message to show up immediately, please subscribe to the list before +while before they hit the list--*usually around a day*. If you want +your message to show up immediately, please subscribe to the list before posting. Archives for the list may be found at <https://lists.gnu.org/archive/html/bug-wget/>. @@ -3902,8 +3902,8 @@ info (how to subscribe, list archives, ...). simple guidelines. 1. Please try to ascertain that the behavior you see really is a bug. - If Wget crashes, it’s a bug. If Wget does not behave as - documented, it’s a bug. If things work strange, but you are not + If Wget crashes, it's a bug. If Wget does not behave as + documented, it's a bug. If things work strange, but you are not sure about the way they are supposed to work, it might well be a bug, but you might want to double-check the documentation and the mailing lists (*note Mailing Lists::). @@ -3924,14 +3924,14 @@ simple guidelines. 3. Please start Wget with ‘-d’ option and send us the resulting output (or relevant parts thereof). If Wget was compiled without debug - support, recompile it—it is _much_ easier to trace bugs with debug + support, recompile it--it is _much_ easier to trace bugs with debug support on. Note: please make sure to remove any potentially sensitive information from the debug log before sending it to the bug - address. The ‘-d’ won’t go out of its way to collect sensitive + address. The ‘-d’ won't go out of its way to collect sensitive information, but the log _will_ contain a fairly complete - transcript of Wget’s communication with the server, which may + transcript of Wget's communication with the server, which may include passwords and pieces of downloaded data. Since the bug address is publicly archived, you may assume that all bug reports are visible to the public. @@ -3949,7 +3949,7 @@ File: wget.info, Node: Portability, Next: Signals, Prev: Reporting Bugs, Up: Like all GNU software, Wget works on the GNU system. However, since it uses GNU Autoconf for building and configuring, and mostly avoids using -“special†features of any particular Unix, it should compile (and work) +"special" features of any particular Unix, it should compile (and work) on all common Unix flavors. Various Wget versions have been compiled and tested under many kinds @@ -4004,7 +4004,7 @@ This chapter contains some references I consider useful. * Menu: -* Robot Exclusion:: Wget’s support for RES. +* Robot Exclusion:: Wget's support for RES. * Security Considerations:: Security with Wget. * Contributors:: People who helped. @@ -4015,16 +4015,16 @@ File: wget.info, Node: Robot Exclusion, Next: Security Considerations, Prev: =================== It is extremely easy to make Wget wander aimlessly around a web site, -sucking all the available data in progress. ‘wget -r SITE’, and you’re +sucking all the available data in progress. ‘wget -r SITE’, and you're set. Great? Not for the server admin. As long as Wget is only retrieving static pages, and doing it at a -reasonable rate (see the ‘--wait’ option), there’s not much of a -problem. The trouble is that Wget can’t tell the difference between the +reasonable rate (see the ‘--wait’ option), there's not much of a +problem. The trouble is that Wget can't tell the difference between the smallest static page and the most demanding CGI. A site I know has a section handled by a CGI Perl script that converts Info files to HTML on the fly. The script is slow, but works well enough for human users -viewing an occasional Info file. However, when someone’s recursive Wget +viewing an occasional Info file. However, when someone's recursive Wget download stumbles upon the index page that links to all the Info files through the script, the system is brought to its knees without providing anything useful to the user (This task of converting Info files could be @@ -4038,7 +4038,7 @@ administrators and document authors can specify which portions of the site they wish to protect from robots and those they will permit access. The most popular mechanism, and the de facto standard supported by -all the major robots, is the “Robots Exclusion Standard†(RES) written +all the major robots, is the "Robots Exclusion Standard" (RES) written by Martijn Koster et al. in 1994. It specifies the format of a text file containing directives that instruct the robots which URL paths to avoid. To be found by the robots, the specifications must be placed in @@ -4046,7 +4046,7 @@ avoid. To be found by the robots, the specifications must be placed in download and parse. Although Wget is not a web robot in the strictest sense of the word, -it can download large parts of the site without the user’s intervention +it can download large parts of the site without the user's intervention to download an individual page. Because of that, Wget honors RES when downloading recursively. For instance, when you issue: @@ -4061,7 +4061,7 @@ further downloads. ‘robots.txt’ is loaded only once per each server. written by Martijn Koster in 1994 and available at <http://www.robotstxt.org/orig.html>. As of version 1.8, Wget has supported the additional directives specified in the internet draft -‘<draft-koster-robots-00.txt>’ titled “A Method for Web Robots Controlâ€. +‘<draft-koster-robots-00.txt>’ titled "A Method for Web Robots Control". The draft, which has as far as I know never made to an RFC, is available at <http://www.robotstxt.org/norobots-rfc.txt>. @@ -4094,7 +4094,7 @@ through the network, which may present a security problem. Here are the main issues, and some solutions. 1. The passwords on the command line are visible using ‘ps’. The best - way around it is to use ‘wget -i -’ and feed the URLs to Wget’s + way around it is to use ‘wget -i -’ and feed the URLs to Wget's standard input, each on a separate line, terminated by ‘C-d’. Another workaround is to use ‘.netrc’ to store passwords; however, storing unencrypted passwords is also considered a security risk. @@ -4105,7 +4105,7 @@ main issues, and some solutions. 3. The FTP passwords are also in no way encrypted. There is no good solution for this at the moment. - 4. Although the “normal†output of Wget tries to hide the passwords, + 4. Although the "normal" output of Wget tries to hide the passwords, debugging logs show them, in all forms. This problem is avoided by being careful when you send debug logs (yes, even when you send them to me). @@ -4120,83 +4120,83 @@ GNU Wget was written by Hrvoje NikÅ¡ić <hniksic@xemacs.org>, However, the development of Wget could never have gone as far as it has, were it not for the help of many people, either with bug reports, -feature proposals, patches, or letters saying “Thanks!â€. +feature proposals, patches, or letters saying "Thanks!". Special thanks goes to the following people (no particular order): - • Dan Harkless—contributed a lot of code and documentation of + • Dan Harkless--contributed a lot of code and documentation of extremely high quality, as well as the ‘--page-requisites’ and related options. He was the principal maintainer for some time and released Wget 1.6. - • Ian Abbott—contributed bug fixes, Windows-related fixes, and + • Ian Abbott--contributed bug fixes, Windows-related fixes, and provided a prototype implementation of the breadth-first recursive download. Co-maintained Wget during the 1.8 release cycle. - • The dotsrc.org crew, in particular Karsten Thygesen—donated system + • The dotsrc.org crew, in particular Karsten Thygesen--donated system resources such as the mailing list, web space, FTP space, and version control repositories, along with a lot of time to make these actually work. Christian Reiniger was of invaluable help with setting up Subversion. - • Heiko Herold—provided high-quality Windows builds and contributed + • Heiko Herold--provided high-quality Windows builds and contributed bug and build reports for many years. - • Shawn McHorse—bug reports and patches. + • Shawn McHorse--bug reports and patches. - • Kaveh R. Ghazi—on-the-fly ‘ansi2knr’-ization. Lots of portability + • Kaveh R. Ghazi--on-the-fly ‘ansi2knr’-ization. Lots of portability fixes. - • Gordon Matzigkeit—‘.netrc’ support. + • Gordon Matzigkeit--‘.netrc’ support. - • Zlatko ÄŒaluÅ¡ić, Tomislav Vujec and Dražen KaÄar—feature suggestions - and “philosophical†discussions. + • Zlatko ÄŒaluÅ¡ić, Tomislav Vujec and Dražen KaÄar--feature + suggestions and "philosophical" discussions. - • Darko Budor—initial port to Windows. + • Darko Budor--initial port to Windows. - • Antonio Rosella—help and suggestions, plus the initial Italian + • Antonio Rosella--help and suggestions, plus the initial Italian translation. - • Tomislav Petrović, Mario MikoÄević—many bug reports and + • Tomislav Petrović, Mario MikoÄević--many bug reports and suggestions. - • Françis Pinard—many thorough bug reports and discussions. + • Françis Pinard--many thorough bug reports and discussions. - • Karl Eichwalder—lots of help with internationalization, Makefile + • Karl Eichwalder--lots of help with internationalization, Makefile layout and many other things. - • Junio Hamano—donated support for Opie and HTTP ‘Digest’ + • Junio Hamano--donated support for Opie and HTTP ‘Digest’ authentication. - • Mauro Tortonesi—improved IPv6 support, adding support for dual + • Mauro Tortonesi--improved IPv6 support, adding support for dual family systems. Refactored and enhanced FTP IPv6 code. Maintained - GNU Wget from 2004–2007. + GNU Wget from 2004-2007. - • Christopher G. Lewis—maintenance of the Windows version of GNU + • Christopher G. Lewis--maintenance of the Windows version of GNU WGet. - • Gisle Vanem—many helpful patches and improvements, especially for + • Gisle Vanem--many helpful patches and improvements, especially for Windows and MS-DOS support. - • Ralf Wildenhues—contributed patches to convert Wget to use Automake - as part of its build process, and various bugfixes. + • Ralf Wildenhues--contributed patches to convert Wget to use + Automake as part of its build process, and various bugfixes. - • Steven Schubiger—Many helpful patches, bugfixes and improvements. + • Steven Schubiger--Many helpful patches, bugfixes and improvements. Notably, conversion of Wget to use the Gnulib quotes and quoteargs modules, and the addition of password prompts at the console, via the Gnulib getpasswd-gnu module. - • Ted Mielczarek—donated support for CSS. + • Ted Mielczarek--donated support for CSS. - • Saint Xavier—Support for IRIs (RFC 3987). + • Saint Xavier--Support for IRIs (RFC 3987). - • Tim Rühsen—Loads of helpful patches, especially fuzzing support and - Continuous Integration. Maintainer since 2014. + • Tim Rühsen--Loads of helpful patches, especially fuzzing support + and Continuous Integration. Maintainer since 2014. - • Darshit Shah—Many helpful patches. Community support on various + • Darshit Shah--Many helpful patches. Community support on various platforms. Maintainer since 2014. - • People who provided donations for development—including Brian + • People who provided donations for development--including Brian Gough. The following people have provided patches, bug/build reports, useful @@ -4258,7 +4258,7 @@ A.1 GNU Free Documentation License Version 1.3, 3 November 2008 - Copyright © 2000–2002, 2007–2008, 2015, 2018–2023 Free + Copyright © 2000-2002, 2007-2008, 2015, 2018-2024 Free Software Foundation, Inc. <http://fsf.org/> @@ -4275,7 +4275,7 @@ A.1 GNU Free Documentation License author and publisher a way to get credit for their work, while not being considered responsible for modifications made by others. - This License is a kind of “copyleftâ€, which means that derivative + This License is a kind of "copyleft", which means that derivative works of the document must themselves be free in the same sense. It complements the GNU General Public License, which is a copyleft license designed for free software. @@ -4296,18 +4296,18 @@ A.1 GNU Free Documentation License be distributed under the terms of this License. Such a notice grants a world-wide, royalty-free license, unlimited in duration, to use that work under the conditions stated herein. The - “Documentâ€, below, refers to any such manual or work. Any member - of the public is a licensee, and is addressed as “youâ€. You accept + "Document", below, refers to any such manual or work. Any member + of the public is a licensee, and is addressed as "you". You accept the license if you copy, modify or distribute the work in a way requiring permission under copyright law. - A “Modified Version†of the Document means any work containing the + A "Modified Version" of the Document means any work containing the Document or a portion of it, either copied verbatim, or with modifications and/or translated into another language. - A “Secondary Section†is a named appendix or a front-matter section + A "Secondary Section" is a named appendix or a front-matter section of the Document that deals exclusively with the relationship of the - publishers or authors of the Document to the Document’s overall + publishers or authors of the Document to the Document's overall subject (or to related matters) and contains nothing that could fall directly within that overall subject. (Thus, if the Document is in part a textbook of mathematics, a Secondary Section may not @@ -4316,7 +4316,7 @@ A.1 GNU Free Documentation License of legal, commercial, philosophical, ethical or political position regarding them. - The “Invariant Sections†are certain Secondary Sections whose + The "Invariant Sections" are certain Secondary Sections whose titles are designated, as being those of Invariant Sections, in the notice that says that the Document is released under this License. If a section does not fit the above definition of Secondary then it @@ -4324,13 +4324,13 @@ A.1 GNU Free Documentation License contain zero Invariant Sections. If the Document does not identify any Invariant Sections then there are none. - The “Cover Texts†are certain short passages of text that are + The "Cover Texts" are certain short passages of text that are listed, as Front-Cover Texts or Back-Cover Texts, in the notice that says that the Document is released under this License. A Front-Cover Text may be at most 5 words, and a Back-Cover Text may be at most 25 words. - A “Transparent†copy of the Document means a machine-readable copy, + A "Transparent" copy of the Document means a machine-readable copy, represented in a format whose specification is available to the general public, that is suitable for revising the document straightforwardly with generic text editors or (for images composed @@ -4342,7 +4342,7 @@ A.1 GNU Free Documentation License been arranged to thwart or discourage subsequent modification by readers is not Transparent. An image format is not Transparent if used for any substantial amount of text. A copy that is not - “Transparent†is called “Opaqueâ€. + "Transparent" is called "Opaque". Examples of suitable formats for Transparent copies include plain ASCII without markup, Texinfo input format, LaTeX input format, @@ -4355,23 +4355,23 @@ A.1 GNU Free Documentation License the machine-generated HTML, PostScript or PDF produced by some word processors for output purposes only. - The “Title Page†means, for a printed book, the title page itself, + The "Title Page" means, for a printed book, the title page itself, plus such following pages as are needed to hold, legibly, the material this License requires to appear in the title page. For - works in formats which do not have any title page as such, “Title - Page†means the text near the most prominent appearance of the - work’s title, preceding the beginning of the body of the text. + works in formats which do not have any title page as such, "Title + Page" means the text near the most prominent appearance of the + work's title, preceding the beginning of the body of the text. - The “publisher†means any person or entity that distributes copies + The "publisher" means any person or entity that distributes copies of the Document to the public. - A section “Entitled XYZ†means a named subunit of the Document + A section "Entitled XYZ" means a named subunit of the Document whose title either is precisely XYZ or contains XYZ in parentheses following text that translates XYZ in another language. (Here XYZ stands for a specific section name mentioned below, such as - “Acknowledgementsâ€, “Dedicationsâ€, “Endorsementsâ€, or “Historyâ€.) - To “Preserve the Title†of such a section when you modify the - Document means that it remains a section “Entitled XYZ†according + "Acknowledgements", "Dedications", "Endorsements", or "History".) + To "Preserve the Title" of such a section when you modify the + Document means that it remains a section "Entitled XYZ" according to this definition. The Document may include Warranty Disclaimers next to the notice @@ -4401,7 +4401,7 @@ A.1 GNU Free Documentation License If you publish printed copies (or copies in media that commonly have printed covers) of the Document, numbering more than 100, and - the Document’s license notice requires Cover Texts, you must + the Document's license notice requires Cover Texts, you must enclose the copies in covers that carry, clearly and legibly, all these Cover Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on the back cover. Both covers must also clearly @@ -4473,15 +4473,15 @@ A.1 GNU Free Documentation License the Addendum below. G. Preserve in that license notice the full lists of Invariant - Sections and required Cover Texts given in the Document’s + Sections and required Cover Texts given in the Document's license notice. H. Include an unaltered copy of this License. - I. Preserve the section Entitled “Historyâ€, Preserve its Title, + I. Preserve the section Entitled "History", Preserve its Title, and add to it an item stating at least the title, year, new authors, and publisher of the Modified Version as given on the - Title Page. If there is no section Entitled “History†in the + Title Page. If there is no section Entitled "History" in the Document, create one stating the title, year, authors, and publisher of the Document as given on its Title Page, then add an item describing the Modified Version as stated in the @@ -4491,12 +4491,12 @@ A.1 GNU Free Documentation License for public access to a Transparent copy of the Document, and likewise the network locations given in the Document for previous versions it was based on. These may be placed in the - “History†section. You may omit a network location for a work + "History" section. You may omit a network location for a work that was published at least four years before the Document itself, or if the original publisher of the version it refers to gives permission. - K. For any section Entitled “Acknowledgements†or “Dedicationsâ€, + K. For any section Entitled "Acknowledgements" or "Dedications", Preserve the Title of the section, and preserve in the section all the substance and tone of each of the contributor acknowledgements and/or dedications given therein. @@ -4505,11 +4505,11 @@ A.1 GNU Free Documentation License in their text and in their titles. Section numbers or the equivalent are not considered part of the section titles. - M. Delete any section Entitled “Endorsementsâ€. Such a section + M. Delete any section Entitled "Endorsements". Such a section may not be included in the Modified Version. N. Do not retitle any existing section to be Entitled - “Endorsements†or to conflict in title with any Invariant + "Endorsements" or to conflict in title with any Invariant Section. O. Preserve any Warranty Disclaimers. @@ -4518,15 +4518,15 @@ A.1 GNU Free Documentation License appendices that qualify as Secondary Sections and contain no material copied from the Document, you may at your option designate some or all of these sections as invariant. To do this, add their - titles to the list of Invariant Sections in the Modified Version’s + titles to the list of Invariant Sections in the Modified Version's license notice. These titles must be distinct from any other section titles. - You may add a section Entitled “Endorsementsâ€, provided it contains + You may add a section Entitled "Endorsements", provided it contains nothing but endorsements of your Modified Version by various - parties—for example, statements of peer review or that the text has - been approved by an organization as the authoritative definition of - a standard. + parties--for example, statements of peer review or that the text + has been approved by an organization as the authoritative + definition of a standard. You may add a passage of up to five words as a Front-Cover Text, and a passage of up to 25 words as a Back-Cover Text, to the end of @@ -4564,10 +4564,10 @@ A.1 GNU Free Documentation License combined work. In the combination, you must combine any sections Entitled - “History†in the various original documents, forming one section - Entitled “Historyâ€; likewise combine any sections Entitled - “Acknowledgementsâ€, and any sections Entitled “Dedicationsâ€. You - must delete all sections Entitled “Endorsements.†+ "History" in the various original documents, forming one section + Entitled "History"; likewise combine any sections Entitled + "Acknowledgements", and any sections Entitled "Dedications". You + must delete all sections Entitled "Endorsements." 6. COLLECTIONS OF DOCUMENTS @@ -4588,16 +4588,16 @@ A.1 GNU Free Documentation License A compilation of the Document or its derivatives with other separate and independent documents or works, in or on a volume of a - storage or distribution medium, is called an “aggregate†if the + storage or distribution medium, is called an "aggregate" if the copyright resulting from the compilation is not used to limit the - legal rights of the compilation’s users beyond what the individual + legal rights of the compilation's users beyond what the individual works permit. When the Document is included in an aggregate, this License does not apply to the other works in the aggregate which are not themselves derivative works of the Document. If the Cover Text requirement of section 3 is applicable to these copies of the Document, then if the Document is less than one half - of the entire aggregate, the Document’s Cover Texts may be placed + of the entire aggregate, the Document's Cover Texts may be placed on covers that bracket the Document within the aggregate, or the electronic equivalent of covers if the Document is in electronic form. Otherwise they must appear on printed covers that bracket @@ -4619,8 +4619,8 @@ A.1 GNU Free Documentation License this License or a notice or disclaimer, the original version will prevail. - If a section in the Document is Entitled “Acknowledgementsâ€, - “Dedicationsâ€, or “Historyâ€, the requirement (section 4) to + If a section in the Document is Entitled "Acknowledgements", + "Dedications", or "History", the requirement (section 4) to Preserve its Title (section 1) will typically require changing the actual title. @@ -4661,7 +4661,7 @@ A.1 GNU Free Documentation License Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered - version of this License “or any later version†applies to it, you + version of this License "or any later version" applies to it, you have the option of following the terms and conditions either of that specified version or of any later version that has been published (not as a draft) by the Free Software Foundation. If the @@ -4669,29 +4669,29 @@ A.1 GNU Free Documentation License choose any version ever published (not as a draft) by the Free Software Foundation. If the Document specifies that a proxy can decide which future versions of this License can be used, that - proxy’s public statement of acceptance of a version permanently + proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Document. 11. RELICENSING - “Massive Multiauthor Collaboration Site†(or “MMC Siteâ€) means any + "Massive Multiauthor Collaboration Site" (or "MMC Site") means any World Wide Web server that publishes copyrightable works and also provides prominent facilities for anybody to edit those works. A public wiki that anybody can edit is an example of such a server. - A “Massive Multiauthor Collaboration†(or “MMCâ€) contained in the + A "Massive Multiauthor Collaboration" (or "MMC") contained in the site means any set of copyrightable works thus published on the MMC site. - “CC-BY-SA†means the Creative Commons Attribution-Share Alike 3.0 + "CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 license published by Creative Commons Corporation, a not-for-profit corporation with a principal place of business in San Francisco, California, as well as future copyleft versions of that license published by that same organization. - “Incorporate†means to publish or republish a Document, in whole or + "Incorporate" means to publish or republish a Document, in whole or in part, as part of another Document. - An MMC is “eligible for relicensing†if it is licensed under this + An MMC is "eligible for relicensing" if it is licensed under this License, and if all works that were first published under this License somewhere other than this MMC, and subsequently incorporated in whole or in part into the MMC, (1) had no cover @@ -4718,7 +4718,7 @@ notices just after the title page: Free Documentation License''. If you have Invariant Sections, Front-Cover Texts and Back-Cover -Texts, replace the “with...Texts.†line with this: +Texts, replace the "with...Texts." line with this: with the Invariant Sections being LIST THEIR TITLES, with the Front-Cover Texts being LIST, and with the Back-Cover Texts @@ -4742,12 +4742,12 @@ Concept Index * Menu: -* #wget: Internet Relay Chat. (line 6) * .css extension: HTTP Options. (line 10) * .html extension: HTTP Options. (line 10) * .listing files, removing: FTP Options. (line 21) * .netrc: Startup File. (line 6) * .wgetrc: Startup File. (line 6) +* #wget: Internet Relay Chat. (line 6) * accept directories: Directory-Based Limits. (line 17) * accept suffixes: Types of Files. (line 15) @@ -5034,59 +5034,59 @@ Concept Index Tag Table: -Node: Top755 -Node: Overview2096 -Node: Invoking5788 -Node: URL Format6648 -Ref: URL Format-Footnote-19327 -Node: Option Syntax9433 -Node: Basic Startup Options12211 -Node: Logging and Input File Options13069 -Node: Download Options18698 -Node: Directory Options48341 -Node: HTTP Options51192 -Node: HTTPS (SSL/TLS) Options71876 -Node: FTP Options85033 -Node: Recursive Retrieval Options92101 -Node: Recursive Accept/Reject Options102142 -Node: Exit Status106347 -Node: Recursive Download107382 -Node: Following Links110621 -Node: Spanning Hosts111587 -Node: Types of Files113856 -Node: Directory-Based Limits118750 -Node: Relative Links122017 -Node: FTP Links122867 -Node: Time-Stamping123758 -Node: Time-Stamping Usage125430 -Node: HTTP Time-Stamping Internals127301 -Ref: HTTP Time-Stamping Internals-Footnote-1128649 -Node: FTP Time-Stamping Internals128852 -Node: Startup File130339 -Node: Wgetrc Location131279 -Node: Wgetrc Syntax132133 -Node: Wgetrc Commands132898 -Node: Sample Wgetrc149491 -Node: Examples155519 -Node: Simple Usage155880 -Node: Advanced Usage157329 -Node: Very Advanced Usage161145 -Node: Various162689 -Node: Proxies163398 -Node: Distribution166355 -Node: Web Site166699 -Node: Mailing Lists166999 -Node: Internet Relay Chat168736 -Node: Reporting Bugs169031 -Node: Portability171757 -Node: Signals173404 -Node: Appendices174111 -Node: Robot Exclusion174459 -Node: Security Considerations178321 -Node: Contributors179531 -Node: Copying this manual185507 -Node: GNU Free Documentation License185747 -Node: Concept Index211110 +Node: Top745 +Node: Overview2074 +Node: Invoking5745 +Node: URL Format6605 +Ref: URL Format-Footnote-19280 +Node: Option Syntax9386 +Node: Basic Startup Options12159 +Node: Logging and Input File Options13015 +Node: Download Options18619 +Node: Directory Options48090 +Node: HTTP Options50935 +Node: HTTPS (SSL/TLS) Options71558 +Node: FTP Options84659 +Node: Recursive Retrieval Options91716 +Node: Recursive Accept/Reject Options101735 +Node: Exit Status105938 +Node: Recursive Download106970 +Node: Following Links110207 +Node: Spanning Hosts111173 +Node: Types of Files113433 +Node: Directory-Based Limits118317 +Node: Relative Links121571 +Node: FTP Links122417 +Node: Time-Stamping123308 +Node: Time-Stamping Usage124980 +Node: HTTP Time-Stamping Internals126851 +Ref: HTTP Time-Stamping Internals-Footnote-1128191 +Node: FTP Time-Stamping Internals128394 +Node: Startup File129880 +Node: Wgetrc Location130815 +Node: Wgetrc Syntax131663 +Node: Wgetrc Commands132428 +Node: Sample Wgetrc148962 +Node: Examples154989 +Node: Simple Usage155350 +Node: Advanced Usage156797 +Node: Very Advanced Usage160608 +Node: Various162144 +Node: Proxies162849 +Node: Distribution165804 +Node: Web Site166148 +Node: Mailing Lists166444 +Node: Internet Relay Chat168180 +Node: Reporting Bugs168475 +Node: Portability171192 +Node: Signals172835 +Node: Appendices173542 +Node: Robot Exclusion173888 +Node: Security Considerations177732 +Node: Contributors178936 +Node: Copying this manual184878 +Node: GNU Free Documentation License185118 +Node: Concept Index210274 End Tag Table diff --git a/doc/wget.texi b/doc/wget.texi index 3c24de2..6d26fbb 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -31,7 +31,7 @@ This file documents the GNU Wget utility for downloading network data. @c man begin COPYRIGHT -Copyright @copyright{} 1996--2011, 2015, 2018--2023 Free Software +Copyright @copyright{} 1996--2011, 2015, 2018--2024 Free Software Foundation, Inc. @iftex diff --git a/fuzz/Makefile.in b/fuzz/Makefile.in index 9ad5f9b..8bd1e11 100644 --- a/fuzz/Makefile.in +++ b/fuzz/Makefile.in @@ -101,7 +101,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 \ $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/base32.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 \ $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/clock_time.m4 \ @@ -149,7 +150,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \ $(top_srcdir)/m4/isblank.m4 $(top_srcdir)/m4/iswblank.m4 \ - $(top_srcdir)/m4/iswdigit.m4 $(top_srcdir)/m4/iswxdigit.m4 \ + $(top_srcdir)/m4/iswctype.m4 $(top_srcdir)/m4/iswdigit.m4 \ + $(top_srcdir)/m4/iswpunct.m4 $(top_srcdir)/m4/iswxdigit.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 \ @@ -163,15 +165,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbrtoc32.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ + $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -229,18 +232,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timegm.m4 $(top_srcdir)/m4/timespec.m4 \ $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tmpdir.m4 \ - $(top_srcdir)/m4/ungetc.m4 $(top_srcdir)/m4/unicase_h.m4 \ - $(top_srcdir)/m4/unictype_h.m4 $(top_srcdir)/m4/uninorm_h.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utime_h.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/uchar_h.m4 $(top_srcdir)/m4/ungetc.m4 \ + $(top_srcdir)/m4/unicase_h.m4 $(top_srcdir)/m4/unictype_h.m4 \ + $(top_srcdir)/m4/uninorm_h.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ + $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wctype_h.m4 \ $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ $(top_srcdir)/m4/wget_manywarnings.m4 \ $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/wmemchr.m4 \ @@ -669,6 +673,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ +CXX_HAS_CHAR8_TYPE = @CXX_HAS_CHAR8_TYPE@ +CXX_HAS_UCHAR_TYPES = @CXX_HAS_UCHAR_TYPES@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -684,7 +690,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ @@ -706,7 +711,33 @@ GL_GNULIB_ALIGNED_ALLOC = @GL_GNULIB_ALIGNED_ALLOC@ GL_GNULIB_ALPHASORT = @GL_GNULIB_ALPHASORT@ GL_GNULIB_ATOLL = @GL_GNULIB_ATOLL@ GL_GNULIB_BIND = @GL_GNULIB_BIND@ +GL_GNULIB_BTOC32 = @GL_GNULIB_BTOC32@ GL_GNULIB_BTOWC = @GL_GNULIB_BTOWC@ +GL_GNULIB_C32ISALNUM = @GL_GNULIB_C32ISALNUM@ +GL_GNULIB_C32ISALPHA = @GL_GNULIB_C32ISALPHA@ +GL_GNULIB_C32ISBLANK = @GL_GNULIB_C32ISBLANK@ +GL_GNULIB_C32ISCNTRL = @GL_GNULIB_C32ISCNTRL@ +GL_GNULIB_C32ISDIGIT = @GL_GNULIB_C32ISDIGIT@ +GL_GNULIB_C32ISGRAPH = @GL_GNULIB_C32ISGRAPH@ +GL_GNULIB_C32ISLOWER = @GL_GNULIB_C32ISLOWER@ +GL_GNULIB_C32ISPRINT = @GL_GNULIB_C32ISPRINT@ +GL_GNULIB_C32ISPUNCT = @GL_GNULIB_C32ISPUNCT@ +GL_GNULIB_C32ISSPACE = @GL_GNULIB_C32ISSPACE@ +GL_GNULIB_C32ISUPPER = @GL_GNULIB_C32ISUPPER@ +GL_GNULIB_C32ISXDIGIT = @GL_GNULIB_C32ISXDIGIT@ +GL_GNULIB_C32RTOMB = @GL_GNULIB_C32RTOMB@ +GL_GNULIB_C32SNRTOMBS = @GL_GNULIB_C32SNRTOMBS@ +GL_GNULIB_C32SRTOMBS = @GL_GNULIB_C32SRTOMBS@ +GL_GNULIB_C32STOMBS = @GL_GNULIB_C32STOMBS@ +GL_GNULIB_C32SWIDTH = @GL_GNULIB_C32SWIDTH@ +GL_GNULIB_C32TOB = @GL_GNULIB_C32TOB@ +GL_GNULIB_C32TOLOWER = @GL_GNULIB_C32TOLOWER@ +GL_GNULIB_C32TOUPPER = @GL_GNULIB_C32TOUPPER@ +GL_GNULIB_C32WIDTH = @GL_GNULIB_C32WIDTH@ +GL_GNULIB_C32_APPLY_MAPPING = @GL_GNULIB_C32_APPLY_MAPPING@ +GL_GNULIB_C32_APPLY_TYPE_TEST = @GL_GNULIB_C32_APPLY_TYPE_TEST@ +GL_GNULIB_C32_GET_MAPPING = @GL_GNULIB_C32_GET_MAPPING@ +GL_GNULIB_C32_GET_TYPE_TEST = @GL_GNULIB_C32_GET_TYPE_TEST@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ @@ -813,6 +844,7 @@ GL_GNULIB_ISBLANK = @GL_GNULIB_ISBLANK@ GL_GNULIB_ISWBLANK = @GL_GNULIB_ISWBLANK@ GL_GNULIB_ISWCTYPE = @GL_GNULIB_ISWCTYPE@ GL_GNULIB_ISWDIGIT = @GL_GNULIB_ISWDIGIT@ +GL_GNULIB_ISWPUNCT = @GL_GNULIB_ISWPUNCT@ GL_GNULIB_ISWXDIGIT = @GL_GNULIB_ISWXDIGIT@ GL_GNULIB_LCHMOD = @GL_GNULIB_LCHMOD@ GL_GNULIB_LCHOWN = @GL_GNULIB_LCHOWN@ @@ -820,13 +852,15 @@ GL_GNULIB_LINK = @GL_GNULIB_LINK@ GL_GNULIB_LINKAT = @GL_GNULIB_LINKAT@ GL_GNULIB_LISTEN = @GL_GNULIB_LISTEN@ GL_GNULIB_LOCALECONV = @GL_GNULIB_LOCALECONV@ -GL_GNULIB_LOCALENAME = @GL_GNULIB_LOCALENAME@ +GL_GNULIB_LOCALENAME_UNSAFE = @GL_GNULIB_LOCALENAME_UNSAFE@ GL_GNULIB_LOCALTIME = @GL_GNULIB_LOCALTIME@ GL_GNULIB_LSEEK = @GL_GNULIB_LSEEK@ GL_GNULIB_LSTAT = @GL_GNULIB_LSTAT@ GL_GNULIB_MALLOC_GNU = @GL_GNULIB_MALLOC_GNU@ GL_GNULIB_MALLOC_POSIX = @GL_GNULIB_MALLOC_POSIX@ GL_GNULIB_MBRLEN = @GL_GNULIB_MBRLEN@ +GL_GNULIB_MBRTOC16 = @GL_GNULIB_MBRTOC16@ +GL_GNULIB_MBRTOC32 = @GL_GNULIB_MBRTOC32@ GL_GNULIB_MBRTOWC = @GL_GNULIB_MBRTOWC@ GL_GNULIB_MBSCASECMP = @GL_GNULIB_MBSCASECMP@ GL_GNULIB_MBSCASESTR = @GL_GNULIB_MBSCASESTR@ @@ -836,16 +870,20 @@ GL_GNULIB_MBSINIT = @GL_GNULIB_MBSINIT@ GL_GNULIB_MBSLEN = @GL_GNULIB_MBSLEN@ GL_GNULIB_MBSNCASECMP = @GL_GNULIB_MBSNCASECMP@ GL_GNULIB_MBSNLEN = @GL_GNULIB_MBSNLEN@ +GL_GNULIB_MBSNRTOC32S = @GL_GNULIB_MBSNRTOC32S@ GL_GNULIB_MBSNRTOWCS = @GL_GNULIB_MBSNRTOWCS@ GL_GNULIB_MBSPBRK = @GL_GNULIB_MBSPBRK@ GL_GNULIB_MBSPCASECMP = @GL_GNULIB_MBSPCASECMP@ GL_GNULIB_MBSRCHR = @GL_GNULIB_MBSRCHR@ +GL_GNULIB_MBSRTOC32S = @GL_GNULIB_MBSRTOC32S@ GL_GNULIB_MBSRTOWCS = @GL_GNULIB_MBSRTOWCS@ GL_GNULIB_MBSSEP = @GL_GNULIB_MBSSEP@ GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@ GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@ +GL_GNULIB_MBSTOC32S = @GL_GNULIB_MBSTOC32S@ GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@ GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@ +GL_GNULIB_MBSZERO = @GL_GNULIB_MBSZERO@ GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@ GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@ GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@ @@ -959,6 +997,7 @@ GL_GNULIB_PUTS = @GL_GNULIB_PUTS@ GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@ GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@ GL_GNULIB_RAISE = @GL_GNULIB_RAISE@ +GL_GNULIB_RAND = @GL_GNULIB_RAND@ GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@ GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@ GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@ @@ -1021,6 +1060,7 @@ GL_GNULIB_STRSEP = @GL_GNULIB_STRSEP@ GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@ GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@ GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@ +GL_GNULIB_STRTOF = @GL_GNULIB_STRTOF@ GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@ GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@ GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@ @@ -1134,6 +1174,9 @@ GL_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_H GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@ @@ -1159,6 +1202,7 @@ GL_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYP GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@ @@ -1234,6 +1278,7 @@ GL_GNULIB_WCTOMB = @GL_GNULIB_WCTOMB@ GL_GNULIB_WCTRANS = @GL_GNULIB_WCTRANS@ GL_GNULIB_WCTYPE = @GL_GNULIB_WCTYPE@ GL_GNULIB_WCWIDTH = @GL_GNULIB_WCWIDTH@ +GL_GNULIB_WGETCWD = @GL_GNULIB_WGETCWD@ GL_GNULIB_WMEMCHR = @GL_GNULIB_WMEMCHR@ GL_GNULIB_WMEMCMP = @GL_GNULIB_WMEMCMP@ GL_GNULIB_WMEMCPY = @GL_GNULIB_WMEMCPY@ @@ -1244,8 +1289,10 @@ GL_GNULIB_WRITE = @GL_GNULIB_WRITE@ GL_GNULIB__EXIT = @GL_GNULIB__EXIT@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIBHEADERS_OVERRIDE_CHAR16_T = @GNULIBHEADERS_OVERRIDE_CHAR16_T@ +GNULIBHEADERS_OVERRIDE_CHAR32_T = @GNULIBHEADERS_OVERRIDE_CHAR32_T@ +GNULIBHEADERS_OVERRIDE_CHAR8_T = @GNULIBHEADERS_OVERRIDE_CHAR8_T@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ @@ -1262,6 +1309,7 @@ HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C32RTOMB = @HAVE_C32RTOMB@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ @@ -1395,6 +1443,8 @@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOC16 = @HAVE_MBRTOC16@ +HAVE_MBRTOC32 = @HAVE_MBRTOC32@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ HAVE_MBSINIT = @HAVE_MBSINIT@ HAVE_MBSLEN = @HAVE_MBSLEN@ @@ -1485,6 +1535,7 @@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOF = @HAVE_STRTOF@ HAVE_STRTOL = @HAVE_STRTOL@ HAVE_STRTOLD = @HAVE_STRTOLD@ HAVE_STRTOLL = @HAVE_STRTOLL@ @@ -1518,6 +1569,7 @@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_UCHAR_H = @HAVE_UCHAR_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ @@ -1570,6 +1622,7 @@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ +HAVE_WORKING_MBRTOC32 = @HAVE_WORKING_MBRTOC32@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__EXIT = @HAVE__EXIT@ @@ -1589,6 +1642,10 @@ INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LCOV = @LCOV@ +LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@ +LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@ +LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@ +LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -1604,6 +1661,8 @@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPROXY_CFLAGS = @LIBPROXY_CFLAGS@ +LIBPROXY_LIBS = @LIBPROXY_LIBS@ LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ LIBPSL_LIBS = @LIBPSL_LIBS@ LIBPTHREAD = @LIBPTHREAD@ @@ -1700,6 +1759,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ +NEXT_AS_FIRST_DIRECTIVE_UCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_UCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ @@ -1739,6 +1799,7 @@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ +NEXT_UCHAR_H = @NEXT_UCHAR_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ @@ -1780,6 +1841,7 @@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ +REPLACE_C32RTOMB = @REPLACE_C32RTOMB@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ @@ -1806,6 +1868,7 @@ REPLACE_EXECVE = @REPLACE_EXECVE@ REPLACE_EXECVP = @REPLACE_EXECVP@ REPLACE_EXECVPE = @REPLACE_EXECVPE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ @@ -1863,6 +1926,7 @@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWPUNCT = @REPLACE_ISWPUNCT@ REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_ITOLD = @REPLACE_ITOLD@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ @@ -1876,6 +1940,8 @@ REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MALLOC_FOR_MALLOC_GNU = @REPLACE_MALLOC_FOR_MALLOC_GNU@ REPLACE_MALLOC_FOR_MALLOC_POSIX = @REPLACE_MALLOC_FOR_MALLOC_POSIX@ REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOC16 = @REPLACE_MBRTOC16@ +REPLACE_MBRTOC32 = @REPLACE_MBRTOC32@ REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ @@ -1887,6 +1953,7 @@ REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ +REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ @@ -1925,6 +1992,7 @@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_QSORT_R = @REPLACE_QSORT_R@ REPLACE_RAISE = @REPLACE_RAISE@ +REPLACE_RAND = @REPLACE_RAND@ REPLACE_RANDOM = @REPLACE_RANDOM@ REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ REPLACE_READ = @REPLACE_READ@ @@ -1967,6 +2035,7 @@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ +REPLACE_STRTOF = @REPLACE_STRTOF@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_STRTOL = @REPLACE_STRTOL@ @@ -1977,11 +2046,13 @@ REPLACE_STRTOULL = @REPLACE_STRTOULL@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ +REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ +REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -2010,6 +2081,8 @@ REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ +REPLACE_WCTRANS = @REPLACE_WCTRANS@ +REPLACE_WCTYPE = @REPLACE_WCTYPE@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WMEMCMP = @REPLACE_WMEMCMP@ REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ @@ -2024,6 +2097,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ +SMALL_WCHAR_T = @SMALL_WCHAR_T@ STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ @@ -2100,6 +2174,8 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ diff --git a/fuzz/fuzzer.h b/fuzz/fuzzer.h index 842a6c5..cae9726 100644 --- a/fuzz/fuzzer.h +++ b/fuzz/fuzzer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2023 Free Software Foundation, Inc. + * Copyright (c) 2017-2024 Free Software Foundation, Inc. * * This file is part of GNU Wget. * diff --git a/fuzz/main.c b/fuzz/main.c index ebeaf11..4f240bf 100644 --- a/fuzz/main.c +++ b/fuzz/main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2023 Free Software Foundation, Inc. + * Copyright (c) 2017-2024 Free Software Foundation, Inc. * * This file is part of GNU Wget. * diff --git a/fuzz/wget_cookie_fuzzer.c b/fuzz/wget_cookie_fuzzer.c index 7dcc1cc..9fc3e6d 100644 --- a/fuzz/wget_cookie_fuzzer.c +++ b/fuzz/wget_cookie_fuzzer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2023 Free Software Foundation, Inc. + * Copyright (c) 2017-2024 Free Software Foundation, Inc. * * This file is part of GNU Wget. * diff --git a/fuzz/wget_css_fuzzer.c b/fuzz/wget_css_fuzzer.c index 2c9fa90..46f37c4 100644 --- a/fuzz/wget_css_fuzzer.c +++ b/fuzz/wget_css_fuzzer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2023 Free Software Foundation, Inc. + * Copyright (c) 2017-2024 Free Software Foundation, Inc. * * This file is part of GNU Wget. * diff --git a/fuzz/wget_ftpls_fuzzer.c b/fuzz/wget_ftpls_fuzzer.c index f0486cb..dcc69e6 100644 --- a/fuzz/wget_ftpls_fuzzer.c +++ b/fuzz/wget_ftpls_fuzzer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2023 Free Software Foundation, Inc. + * Copyright (c) 2017-2024 Free Software Foundation, Inc. * * This file is part of GNU Wget. * diff --git a/fuzz/wget_html_fuzzer.c b/fuzz/wget_html_fuzzer.c index 0eb8042..0f321f2 100644 --- a/fuzz/wget_html_fuzzer.c +++ b/fuzz/wget_html_fuzzer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2023 Free Software Foundation, Inc. + * Copyright (c) 2017-2024 Free Software Foundation, Inc. * * This file is part of GNU Wget. * diff --git a/fuzz/wget_netrc_fuzzer.c b/fuzz/wget_netrc_fuzzer.c index 63d698c..1baf816 100644 --- a/fuzz/wget_netrc_fuzzer.c +++ b/fuzz/wget_netrc_fuzzer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2023 Free Software Foundation, Inc. + * Copyright (c) 2017-2024 Free Software Foundation, Inc. * * This file is part of GNU Wget. * diff --git a/fuzz/wget_ntlm_fuzzer.c b/fuzz/wget_ntlm_fuzzer.c index a981c6b..ef01e4e 100644 --- a/fuzz/wget_ntlm_fuzzer.c +++ b/fuzz/wget_ntlm_fuzzer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019, 2021-2023 Free Software Foundation, Inc. + * Copyright (c) 2017-2019, 2021-2024 Free Software Foundation, Inc. * * This file is part of GNU Wget. * diff --git a/fuzz/wget_options_fuzzer.c b/fuzz/wget_options_fuzzer.c index 9acfff2..7f51240 100644 --- a/fuzz/wget_options_fuzzer.c +++ b/fuzz/wget_options_fuzzer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2023 Free Software Foundation, Inc. + * Copyright (c) 2017-2024 Free Software Foundation, Inc. * * This file is part of GNU Wget. * diff --git a/fuzz/wget_progress_fuzzer.c b/fuzz/wget_progress_fuzzer.c index d3fd06c..d01cad6 100644 --- a/fuzz/wget_progress_fuzzer.c +++ b/fuzz/wget_progress_fuzzer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019, 2021-2023 Free Software Foundation, Inc. + * Copyright (c) 2017-2019, 2021-2024 Free Software Foundation, Inc. * * This file is part of GNU Wget. * diff --git a/fuzz/wget_read_hunk_fuzzer.c b/fuzz/wget_read_hunk_fuzzer.c index 5d1b420..4315925 100644 --- a/fuzz/wget_read_hunk_fuzzer.c +++ b/fuzz/wget_read_hunk_fuzzer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023 Free Software Foundation, Inc. + * Copyright (c) 2019-2024 Free Software Foundation, Inc. * * This file is part of GNU Wget. * diff --git a/fuzz/wget_robots_fuzzer.c b/fuzz/wget_robots_fuzzer.c index a0dd848..24dd4cf 100644 --- a/fuzz/wget_robots_fuzzer.c +++ b/fuzz/wget_robots_fuzzer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2023 Free Software Foundation, Inc. + * Copyright (c) 2017-2024 Free Software Foundation, Inc. * * This file is part of GNU Wget. * diff --git a/fuzz/wget_url_fuzzer.c b/fuzz/wget_url_fuzzer.c index d5a5534..d6eb42c 100644 --- a/fuzz/wget_url_fuzzer.c +++ b/fuzz/wget_url_fuzzer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2023 Free Software Foundation, Inc. + * Copyright (c) 2017-2024 Free Software Foundation, Inc. * * This file is part of GNU Wget. * diff --git a/gnulib_po/Makefile.in.in b/gnulib_po/Makefile.in.in index 6b25f0d..2b36b11 100644 --- a/gnulib_po/Makefile.in.in +++ b/gnulib_po/Makefile.in.in @@ -1,13 +1,13 @@ # Makefile for PO directory in any package using GNU gettext. # Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu> -# Copyright (C) 2000-2020 Free Software Foundation, Inc. +# Copyright (C) 2000-2023 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright # notice and this notice are preserved. This file is offered as-is, # without any warranty. # -# Origin: gettext-0.21 +# Origin: gettext-0.22 GETTEXT_MACRO_VERSION = 0.20 PACKAGE = @PACKAGE@ @@ -248,15 +248,17 @@ $(POFILES): $(POFILESDEPS) @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.10 | 0.10.*) \ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + 0.1[1-5] | 0.1[1-5].*) \ + $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ esac; \ }; \ else \ @@ -464,15 +466,17 @@ update-po: Makefile tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.10 | 0.10.*) \ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + 0.1[1-5] | 0.1[1-5].*) \ + $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ esac; \ }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ diff --git a/gnulib_po/Makevars b/gnulib_po/Makevars index 12fd775..e7fb540 100644 --- a/gnulib_po/Makevars +++ b/gnulib_po/Makevars @@ -1,5 +1,5 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2023 Free Software Foundation, Inc. +# Copyright (C) 2002-2024 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -34,6 +34,7 @@ XGETTEXT_OPTIONS = \ --keyword=_ --flag=_:1:pass-c-format \ --keyword=N_ --flag=N_:1:pass-c-format \ --keyword='proper_name:1,"This is a proper name. See the gettext manual, section Names."' \ + --keyword='proper_name_lite:1,"This is a proper name. See the gettext manual, section Names."' \ --keyword='proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."' \ --flag=error:3:c-format --flag=error_at_line:5:c-format diff --git a/gnulib_po/POTFILES.in b/gnulib_po/POTFILES.in index 7fb10af..4a14873 100644 --- a/gnulib_po/POTFILES.in +++ b/gnulib_po/POTFILES.in @@ -1,5 +1,5 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2023 Free Software Foundation, Inc. +# Copyright (C) 2002-2024 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -48,6 +48,7 @@ lib/binary-io.h lib/bind.c lib/bitrotate.c lib/bitrotate.h +lib/btoc32.c lib/btowc.c lib/byteswap.in.h lib/c++defs.h @@ -59,6 +60,24 @@ lib/c-strcaseeq.h lib/c-strcasestr.c lib/c-strcasestr.h lib/c-strncasecmp.c +lib/c32_apply_type_test.c +lib/c32_get_type_test.c +lib/c32is-impl.h +lib/c32isalnum.c +lib/c32isalpha.c +lib/c32isblank.c +lib/c32iscntrl.c +lib/c32isdigit.c +lib/c32isgraph.c +lib/c32islower.c +lib/c32isprint.c +lib/c32ispunct.c +lib/c32isspace.c +lib/c32isupper.c +lib/c32isxdigit.c +lib/c32to-impl.h +lib/c32tolower.c +lib/c32width.c lib/calloc.c lib/canonicalize-lgpl.c lib/canonicalize.c @@ -180,7 +199,10 @@ lib/inttypes.in.h lib/ioctl.c lib/isblank.c lib/iswblank.c +lib/iswctype-impl.h +lib/iswctype.c lib/iswdigit.c +lib/iswpunct.c lib/iswxdigit.c lib/itold.c lib/langinfo.in.h @@ -215,13 +237,17 @@ lib/mbchar.c lib/mbchar.h lib/mbiter.c lib/mbiter.h +lib/mbrtoc32.c lib/mbrtowc-impl-utf8.h lib/mbrtowc-impl.h lib/mbrtowc.c lib/mbsinit.c +lib/mbsrtoc32s-state.c +lib/mbsrtoc32s.c lib/mbsrtowcs-impl.h lib/mbsrtowcs-state.c lib/mbsrtowcs.c +lib/mbszero.c lib/mbtowc-impl.h lib/mbtowc-lock.c lib/mbtowc-lock.h @@ -294,6 +320,7 @@ lib/regexec.c lib/rename.c lib/rewinddir.c lib/rmdir.c +lib/same-inode.c lib/same-inode.h lib/save-cwd.c lib/save-cwd.h @@ -303,6 +330,7 @@ lib/secure_getenv.c lib/select.c lib/send.c lib/setlocale-lock.c +lib/setlocale_null-unlocked.c lib/setlocale_null.c lib/setlocale_null.h lib/setsockopt.c @@ -405,6 +433,7 @@ lib/tmpdir.c lib/tmpdir.h lib/u64.c lib/u64.h +lib/uchar.in.h lib/unicase.in.h lib/unicase/cased.c lib/unicase/cased.h @@ -428,6 +457,30 @@ lib/unictype.in.h lib/unictype/bitmap.h lib/unictype/combiningclass.c lib/unictype/combiningclass.h +lib/unictype/ctype_alnum.c +lib/unictype/ctype_alnum.h +lib/unictype/ctype_alpha.c +lib/unictype/ctype_alpha.h +lib/unictype/ctype_blank.c +lib/unictype/ctype_blank.h +lib/unictype/ctype_cntrl.c +lib/unictype/ctype_cntrl.h +lib/unictype/ctype_digit.c +lib/unictype/ctype_digit.h +lib/unictype/ctype_graph.c +lib/unictype/ctype_graph.h +lib/unictype/ctype_lower.c +lib/unictype/ctype_lower.h +lib/unictype/ctype_print.c +lib/unictype/ctype_print.h +lib/unictype/ctype_punct.c +lib/unictype/ctype_punct.h +lib/unictype/ctype_space.c +lib/unictype/ctype_space.h +lib/unictype/ctype_upper.c +lib/unictype/ctype_upper.h +lib/unictype/ctype_xdigit.c +lib/unictype/ctype_xdigit.h lib/unictype/pr_soft_dotted.c lib/unictype/pr_soft_dotted.h lib/uninorm.in.h @@ -442,6 +495,14 @@ lib/unistd.c lib/unistd.in.h lib/unistr.in.h lib/unistr/u-cpy.h +lib/unistr/u-pcpy.h +lib/unistr/u-strcat.h +lib/unistr/u-strlen.h +lib/unistr/u32-chr.c +lib/unistr/u32-cpy.c +lib/unistr/u32-pcpy.c +lib/unistr/u32-strcat.c +lib/unistr/u32-strlen.c lib/unistr/u8-cpy.c lib/unistr/u8-mbtouc-unsafe-aux.c lib/unistr/u8-mbtouc-unsafe.c @@ -473,6 +534,8 @@ lib/warn-on-use.h lib/wchar.in.h lib/wcrtomb.c lib/wctype-h.c +lib/wctype-impl.h +lib/wctype.c lib/wctype.in.h lib/wcwidth.c lib/windows-initguard.h diff --git a/gnulib_po/af.gmo b/gnulib_po/af.gmo Binary files differindex 303e31c..bc50466 100644 --- a/gnulib_po/af.gmo +++ b/gnulib_po/af.gmo diff --git a/gnulib_po/af.po b/gnulib_po/af.po index 8852e51..d17b0bc 100644 --- a/gnulib_po/af.po +++ b/gnulib_po/af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.2.1\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2004-03-17 11:58+0200\n" "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n" "Language-Team: Afrikaans <i18n@af.org.za>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Onbekende stelselfout" @@ -102,43 +102,43 @@ msgstr "" msgid "Unknown error" msgstr "Onbekende stelselfout" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: opsie `%s' is dubbelsinnig\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: opsie `%s' is dubbelsinnig\n" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option `%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: onbekende opsie `%c%s'\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option `%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: opsie `%c%s' laat nie 'n parameter toe nie\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option `%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: opsie `%s' benodig 'n parameter\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, fuzzy, c-format #| msgid "%s: invalid option -- %c\n" msgid "%s: invalid option -- '%c'\n" msgstr "%s: ongeldige opsie -- %c\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, fuzzy, c-format #| msgid "%s: option requires an argument -- %c\n" msgid "%s: option requires an argument -- '%c'\n" diff --git a/gnulib_po/be.po b/gnulib_po/be.po index e3e979e..d6e4857 100644 --- a/gnulib_po/be.po +++ b/gnulib_po/be.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.0.91\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2003-10-30 01:10+0200\n" "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n" "Language-Team: Belarusian <i18n@mova.org>\n" @@ -20,7 +20,7 @@ msgstr "" "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: KBabel 1.0.2\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "ÐевÑÐ´Ð¾Ð¼Ð°Ñ ÑÑ‹ÑÑ‚ÑÐ¼Ð½Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°" @@ -105,43 +105,43 @@ msgstr "" msgid "Unknown error" msgstr "ÐевÑÐ´Ð¾Ð¼Ð°Ñ ÑÑ‹ÑÑ‚ÑÐ¼Ð½Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: выбар `%s' неадназначны\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: выбар `%s' неадназначны\n" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option `%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: нераÑпазнаны выбар `%c%s'\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option `%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: выбар `%c%s' не дазвалÑе довад\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option `%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: выбар `%s' патрабуе довад\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, fuzzy, c-format #| msgid "%s: invalid option -- %c\n" msgid "%s: invalid option -- '%c'\n" msgstr "%s: нерÑчаіÑны выбар -- %c\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, fuzzy, c-format #| msgid "%s: option requires an argument -- %c\n" msgid "%s: option requires an argument -- '%c'\n" diff --git a/gnulib_po/bg.gmo b/gnulib_po/bg.gmo Binary files differindex d264491..b9baa94 100644 --- a/gnulib_po/bg.gmo +++ b/gnulib_po/bg.gmo diff --git a/gnulib_po/bg.po b/gnulib_po/bg.po index f4c0472..c02ada5 100644 --- a/gnulib_po/bg.po +++ b/gnulib_po/bg.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2020-03-10 09:45+0100\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" +"PO-Revision-Date: 2023-06-18 17:55+0300\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@ludost.net>\n" "Language: bg\n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "ÐеизвеÑтна ÑиÑтемна грешка" @@ -98,37 +98,37 @@ msgstr "Ðеправилно кодиран низ на аргумент" msgid "Unknown error" msgstr "ÐеизвеÑтна грешка" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: опциÑта „%s%s“ не е еднозначна\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: опциÑта „%s%s“ не е еднозначна. ВъзможноÑти:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: непозната Ð¾Ð¿Ñ†Ð¸Ñ â€ž%s%s“\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: опциÑта „%s%s“ Ñе използва без аргументи\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: опциÑта „%s%s“ изиÑква аргумент\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: неправилна Ð¾Ð¿Ñ†Ð¸Ñ â€” „%c“\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: опциÑта изиÑква аргумент — „%c“\n" @@ -136,7 +136,7 @@ msgstr "%s: опциÑта изиÑква аргумент — „%c“\n" #: lib/openat-die.c:38 #, c-format msgid "unable to record current working directory" -msgstr "текущата работна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ може да Ñе запише" +msgstr "не може да Ñе запише ÐºÐ¾Ñ Ðµ текущата работна директориÑ" #: lib/openat-die.c:57 #, c-format @@ -535,7 +535,7 @@ msgstr "паметта е изчерпана" #~ msgstr "блоков Ñпециален файл" #~ msgid "character special file" -#~ msgstr "знаков Ñпециален Ñайт" +#~ msgstr "знаков Ñпециален файл" #~ msgid "contiguous data" #~ msgstr "поÑледователни данни" @@ -839,13 +839,9 @@ msgstr "паметта е изчерпана" #~ "This is free software: you are free to change and redistribute it.\n" #~ "There is NO WARRANTY, to the extent permitted by law.\n" #~ msgstr "" -#~ "Лиценз — Общ публичен лиценз на GNU (GNU GPL), както е публикуван от " -#~ "ФондациÑта\n" -#~ "за Ñвободен Ñофтуер — верÑÐ¸Ñ 3 на лиценза или (по ваше решение) по-къÑна " -#~ "верÑиÑ.\n" -#~ "<%s>\n" -#~ "Тази програма е Ñвободен Ñофтуер. Можете да Ñ Ñ€Ð°Ð·Ð¿Ñ€Ð¾ÑтранÑвате и/или " -#~ "променÑте.\n" +#~ "Лиценз GPLv3+: GNU GPL — верÑÐ¸Ñ 3 или по-къÑна верÑÐ¸Ñ <%s>.\n" +#~ "Тази програма е Ñвободен Ñофтуер. Може да Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñте и/или " +#~ "разпроÑтранÑвате.\n" #~ "Ð¢Ñ Ñе разпроÑтранÑва БЕЗ ÐИКÐКВИ ГÐÐ ÐÐЦИИ доколкото е позволено от " #~ "закона.\n" diff --git a/gnulib_po/ca.po b/gnulib_po/ca.po index f4c5465..f02bf95 100644 --- a/gnulib_po/ca.po +++ b/gnulib_po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mailutils 0.6.90\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2005-05-21 04:10+0200\n" "Last-Translator: Jordi Mallach <jordi@gnu.org>\n" "Language-Team: Catalan <ca@dodds.net>\n" @@ -18,7 +18,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=n!=1;\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "S'ha produït un error desconegut del sistema" @@ -106,43 +106,43 @@ msgstr "" msgid "Unknown error" msgstr "S'ha produït un error desconegut del sistema" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: l'opció «%s» és ambigua\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: l'opció «%s» és ambigua\n" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option `%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: l'opció «%c%s» no es reconeix\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option `%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: l'opció «%c%s» no accepta arguments\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option `%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: l'opció «%s» requereix un argument\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, fuzzy, c-format #| msgid "%s: invalid option -- %c\n" msgid "%s: invalid option -- '%c'\n" msgstr "%s: l'opció no és và lida -- %c\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, fuzzy, c-format #| msgid "%s: option requires an argument -- %c\n" msgid "%s: option requires an argument -- '%c'\n" diff --git a/gnulib_po/cs.po b/gnulib_po/cs.po index b8f4035..42280e7 100644 --- a/gnulib_po/cs.po +++ b/gnulib_po/cs.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2011-12-04 08:50+0100\n" "Last-Translator: Marek ÄŒernocký <marek@manet.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" @@ -20,7 +20,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Neznámá chyba systému" @@ -100,42 +100,42 @@ msgstr "ŘetÄ›zec s parametry nenà správnÄ› kódován" msgid "Unknown error" msgstr "Neznámá chyba" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option '-W %s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: pÅ™epÃnaÄ â€ž-W %s“ nenà jednoznaÄný\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option '%s' is ambiguous; possibilities:" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: pÅ™epÃnaÄ â€ž%s“ nenà jednoznaÄný; možnosti:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option '%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: neznámý pÅ™epÃnaÄ â€ž%c%s“\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option '%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: pÅ™epÃnaÄ â€ž%c%s“ musà být zadán bez argumentu\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option '--%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: pÅ™epÃnaÄ â€ž--%s“ vyžaduje argument\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neplatný pÅ™epÃnaÄ -- „%c“\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: pÅ™epÃnaÄ vyžaduje argument -- „%c“\n" diff --git a/gnulib_po/da.gmo b/gnulib_po/da.gmo Binary files differindex 3a6099c..07d6f45 100644 --- a/gnulib_po/da.gmo +++ b/gnulib_po/da.gmo diff --git a/gnulib_po/da.po b/gnulib_po/da.po index 2fd60cd..42c31ac 100644 --- a/gnulib_po/da.po +++ b/gnulib_po/da.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 2.0.0.3462.e9796\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2011-01-20 22:11+0100\n" "Last-Translator: Keld Simonsen <keld@keldix.com>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" @@ -24,7 +24,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Ukendt systemfejl" @@ -104,42 +104,42 @@ msgstr "Parameterstreng ikke korrekt kodet" msgid "Unknown error" msgstr "Ukendt fejl" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option '%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: flaget '%s' er flertydigt\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option '%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: flaget '%s' er flertydigt\n" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option '%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: ukendt flag '%c%s'\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option '%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: flaget '%c%s' tager intet argument\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option '%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: flaget '%s' kræver et argument\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ugyldig flag -- '%c'\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flaget kræver et argument -- '%c'\n" diff --git a/gnulib_po/de.po b/gnulib_po/de.po index 99cbe94..219a3b3 100644 --- a/gnulib_po/de.po +++ b/gnulib_po/de.po @@ -35,7 +35,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gnulib-4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2019-05-22 20:00+0200\n" "Last-Translator: Roland Illig <roland.illig@gmx.de>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" @@ -47,7 +47,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2.3\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Unbekannter Systemfehler" @@ -127,37 +127,37 @@ msgstr "Parameterzeichenkette nicht korrekt kodiert" msgid "Unknown error" msgstr "Unbekannter Fehler" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: Option »%s%s« ist mehrdeutig\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: Option »%s%s« ist mehrdeutig; Möglichkeiten:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: unbekannte Option »%s%s«\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: Option »%s%s« erlaubt kein Argument\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: Option »%s%s« erfordert ein Argument\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ungültige Option -- »%c«\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: Option erfordert ein Argument -- »%c«\n" diff --git a/gnulib_po/el.po b/gnulib_po/el.po index beabe7c..a71f129 100644 --- a/gnulib_po/el.po +++ b/gnulib_po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2012-03-11 11:25+0100\n" "Last-Translator: Simos Xenitellis <simos.lists@googlemail.com>\n" "Language-Team: Greek <team@lists.gnome.gr>\n" @@ -18,7 +18,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" # -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Άγνωστο σφάλμα συστήματος" @@ -106,43 +106,43 @@ msgid "Unknown error" msgstr "Άγνωστο σφάλμα συστήματος" # -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: η επιλογή `-W %s' είναι ασαφής\n" # -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: η επιλογή `%s' είναι ασαφής\n" # -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: μη αναγνωÏίσιμη επιλογή `%c%s'\n" # -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: η επιλογή `%c%s' δεν επιτÏÎπει οÏίσματα\n" # -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: η επιλογή `-%s' απαιτεί Îνα ÏŒÏισμα\n" # -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: μη ÎγκυÏη επιλογή -- %c\n" # -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: η επιλογή απαιτεί Îνα ÏŒÏισμα -- %c\n" diff --git a/gnulib_po/eo.po b/gnulib_po/eo.po index fa0f62c..20bc204 100644 --- a/gnulib_po/eo.po +++ b/gnulib_po/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2019-05-19 18:26-0300\n" "Last-Translator: Felipe Castro <fefcas@gmail.com>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" @@ -18,7 +18,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 1.8.11\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Nekonata sistem-eraro" @@ -98,37 +98,37 @@ msgstr "Parametra ĉeno ne estas Äuste enkodita" msgid "Unknown error" msgstr "Nekonata eraro" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: la modifilo '%s%s' estas plursenca\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: la modifilo '%s%s' estas plursenca; eblecoj:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: nerekonata modifilo '%s%s'\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: la modifilo '%s%s' ne permesas argumenton\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: la modifilo '%s%s' postulas argumenton\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: malvalida modifilo -- '%c'\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: la modifilo postulas argumenton -- '%c'\n" diff --git a/gnulib_po/es.po b/gnulib_po/es.po index feade9e..4e37300 100644 --- a/gnulib_po/es.po +++ b/gnulib_po/es.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2022-04-06 18:22-0500\n" "Last-Translator: Cristian Othón MartÃnez Vera <cfuga@cfuga.mx>\n" "Language-Team: Spanish <es@tp.org.es>\n" @@ -24,7 +24,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Error desconocido de sistema" @@ -104,37 +104,37 @@ msgstr "La cadena de parámetro no está codificada correctamente" msgid "Unknown error" msgstr "Error desconocido" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: la opción '%s%s' es ambigua\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: la opción '%s%s' es ambigua; posibilidades:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: no se reconoce la opción '%s%s'\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: la opción '%s%s' no admite un argumento\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: la opción '%s%s' requiere de un argumento\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opción inválida -- '%c'\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: la opción requiere de un argumento -- '%c'\n" diff --git a/gnulib_po/et.gmo b/gnulib_po/et.gmo Binary files differindex 145b359..ace6292 100644 --- a/gnulib_po/et.gmo +++ b/gnulib_po/et.gmo diff --git a/gnulib_po/et.po b/gnulib_po/et.po index 989f431..0566c5f 100644 --- a/gnulib_po/et.po +++ b/gnulib_po/et.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 2.0.0.3462.e9796\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2011-05-19 15:10+0300\n" "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n" "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n" @@ -18,7 +18,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Tundmatu süsteemne viga" @@ -98,42 +98,42 @@ msgstr "Parameetersõne ei ole korrektselt kodeeritud" msgid "Unknown error" msgstr "Tundmatu viga" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option '%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: võti '%s' on segane\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option '%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: võti '%s' on segane\n" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option '%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: tundmatu võti '%c%s'\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option '%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: võti '%c%s' ei luba kasutada argumenti\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option '%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: võti '%s' nõuab argumenti\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: vigane võti -- '%c'\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: võti nõuab argumenti -- '%c'\n" diff --git a/gnulib_po/eu.gmo b/gnulib_po/eu.gmo Binary files differindex 0da0aef..943e90c 100644 --- a/gnulib_po/eu.gmo +++ b/gnulib_po/eu.gmo diff --git a/gnulib_po/eu.po b/gnulib_po/eu.po index ac8b509..0f8b53e 100644 --- a/gnulib_po/eu.po +++ b/gnulib_po/eu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils-5.2.1\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2005-01-04 20:27+0100\n" "Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n" "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n" @@ -19,7 +19,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Sistema-errore ezezaguna" @@ -104,43 +104,43 @@ msgstr "" msgid "Unknown error" msgstr "Sistema-errore ezezaguna" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: '%s' aukera anbiguoa da\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: '%s' aukera anbiguoa da\n" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option `%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: '%c%s' aukera ezezaguna\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option `%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: '%c%s' aukerak ez du argumenturik onartzen\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option `%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: '%s' aukerak argumentu bat behar du\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, fuzzy, c-format #| msgid "%s: invalid option -- %c\n" msgid "%s: invalid option -- '%c'\n" msgstr "%s: -- %c aukera baliogabea\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, fuzzy, c-format #| msgid "%s: option requires an argument -- %c\n" msgid "%s: option requires an argument -- '%c'\n" diff --git a/gnulib_po/fi.po b/gnulib_po/fi.po index d3a7e6b..1e89166 100644 --- a/gnulib_po/fi.po +++ b/gnulib_po/fi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2019-12-26 12:28+0200\n" "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural= ( n!=1) ;\n" "X-Generator: Poedit 2.2.4\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Tuntematon järjestelmävirhe" @@ -101,37 +101,37 @@ msgstr "Parametrimerkkijono on väärin koodattu" msgid "Unknown error" msgstr "Tuntematon virhe" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: valitsin â€%s%s†on moniselitteinen\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: valitsin â€%s%s†on moniselitteinen; vaihtoehdot:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: tunnistamaton valitsin â€%s%sâ€\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: valitsin â€%s%s†ei salli argumenttia\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: valitsin â€%s%s†vaatii argumentin\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: virheellinen valitsin -- â€%câ€\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: valitsin vaatii argumentin -- â€%câ€\n" diff --git a/gnulib_po/fr.po b/gnulib_po/fr.po index be1bf35..891f8f0 100644 --- a/gnulib_po/fr.po +++ b/gnulib_po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib-4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2019-05-21 20:15+0200\n" "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n" "Language-Team: French <traduc@traduc.org>\n" @@ -23,7 +23,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.2\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Erreur système inconnue" @@ -103,37 +103,37 @@ msgstr "Chaîne de paramètre mal encodé" msgid "Unknown error" msgstr "Erreur inconnue" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s : l'option « %s%s » est ambiguë\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s : l'option « %s%s » est ambiguë, possibilités :" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s : option « %s%s » non reconnue\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s : l'option « %s%s » ne prend pas d'argument\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s : l'option « %s%s » nécessite un argument\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s : option non valable -- « %c »\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s : l'option nécessite un argument -- « %c »\n" diff --git a/gnulib_po/ga.gmo b/gnulib_po/ga.gmo Binary files differindex 880c3f5..ca119ad 100644 --- a/gnulib_po/ga.gmo +++ b/gnulib_po/ga.gmo diff --git a/gnulib_po/ga.po b/gnulib_po/ga.po index 08c18a9..7122134 100644 --- a/gnulib_po/ga.po +++ b/gnulib_po/ga.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 1.1\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2007-07-20 12:24-0600\n" "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n" "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :" "(n>6 && n<11) ? 3 : 4;\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Earráid chórais anaithnid" @@ -99,43 +99,43 @@ msgstr "Níl an teaghrán paraiméadair ionchódaithe i gceart" msgid "Unknown error" msgstr "Earráid anaithnid" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: Tá an rogha `%s' débhríoch\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: Tá an rogha `%s' débhríoch\n" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option `%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: rogha anaithnid `%c%s'\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option `%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `%c%s'\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option `%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: tá argóint de dhíth i ndiaidh na rogha `%s'\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, fuzzy, c-format #| msgid "%s: invalid option -- %c\n" msgid "%s: invalid option -- '%c'\n" msgstr "%s: rogha neamhbhailí -- %c\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, fuzzy, c-format #| msgid "%s: option requires an argument -- %c\n" msgid "%s: option requires an argument -- '%c'\n" diff --git a/gnulib_po/gl.po b/gnulib_po/gl.po index 60c2669..7d2c87b 100644 --- a/gnulib_po/gl.po +++ b/gnulib_po/gl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2012-11-11 13:26+0200\n" "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -24,7 +24,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Erro do sistema descoñecido" @@ -104,42 +104,42 @@ msgstr "" msgid "Unknown error" msgstr "Erro descoñecido" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option '-W %s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: a opción «-W %s» é ambigua\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option '%s' is ambiguous; possibilities:" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: a opción «%s» é ambigua; as posibilidades son:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option '%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: opción «%c%s» non recoñecida\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option '%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: a opción «%c%s» non permite ningún argumento\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option '--%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: a opción «--%s» require un argumento\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opción incorrecta -- «%c»\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a opción require un argumento -- «%c»\n" diff --git a/gnulib_po/hu.po b/gnulib_po/hu.po index f9bd0c2..b57c64b 100644 --- a/gnulib_po/hu.po +++ b/gnulib_po/hu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2014-06-25 19:51+0200\n" "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Ismeretlen rendszerhiba" @@ -101,42 +101,42 @@ msgstr "A paraméter-karakterlánc nem megfelelÅ‘ kódolású" msgid "Unknown error" msgstr "Ismeretlen hiba" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option '-W %s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: a „-W %s†kapcsoló nem egyértelmű\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option '%s' is ambiguous; possibilities:" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: a(z) „%s†kapcsoló nem egyértelmű; lehetÅ‘ségek:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option '%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: a(z) „%c%s†kapcsoló ismeretlen\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option '%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: a(z) „%c%s†kapcsoló nem enged meg argumentumot\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option '--%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: a(z) „--%s†kapcsolóhoz egy argumentum szükséges\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: érvénytelen kapcsoló -- „%câ€\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a kapcsoló egy argumentumot igényel -- „%câ€\n" diff --git a/gnulib_po/it.po b/gnulib_po/it.po index 1169897..e2e40d9 100644 --- a/gnulib_po/it.po +++ b/gnulib_po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib-4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2019-05-21 14:07+0200\n" "Last-Translator: Milo Casagrande <milo@milo.name>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2.1\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Errore di sistema sconosciuto" @@ -104,37 +104,37 @@ msgstr "Stringa del parametro non codificata correttamente" msgid "Unknown error" msgstr "Errore sconosciuto" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: l'opzione «%s%s» è ambigua\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: l'opzione «%s%s» è ambigua. Possibilità :" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: opzione «%s%s» non riconosciuta\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: l'opzione «%s%s» non accetta un argomento\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: l'opzione «%s%s» richiede un argomento\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opzione non valida -- %c\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l'opzione richiede un argomento -- %c\n" diff --git a/gnulib_po/ja.po b/gnulib_po/ja.po index ba1c210..1be5572 100644 --- a/gnulib_po/ja.po +++ b/gnulib_po/ja.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2011-09-02 18:39+0900\n" "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" @@ -22,7 +22,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "ä¸æ˜Žãªã‚·ã‚¹ãƒ†ãƒ エラー" @@ -102,42 +102,42 @@ msgstr "パラメーター文å—列ãŒæ£ã—ãエンコードã•ã‚Œã¦ã„ã¾ã› msgid "Unknown error" msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option '-W %s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: オプション '-W %s' ã¯æ›–昧ã§ã™\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option '%s' is ambiguous; possibilities:" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: オプション '%s' ã¯æ›–昧ã§ã™:次ã®ã‚‚ã®ãŒå¯èƒ½ã§ã™:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option '%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: オプション '%c%s' ã‚’èªè˜ã§ãã¾ã›ã‚“\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option '%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: オプション '%c%s' ã¯å¼•æ•°ã‚’å–ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option '--%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: オプション '--%s' ã¯å¼•æ•°ãŒå¿…è¦ã§ã™\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 無効ãªã‚ªãƒ—ション -- '%c'\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: オプションã«ã¯å¼•æ•°ãŒå¿…è¦ã§ã™ -- '%c'\n" diff --git a/gnulib_po/ka.po b/gnulib_po/ka.po index 0941cbb..7f5f417 100644 --- a/gnulib_po/ka.po +++ b/gnulib_po/ka.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2022-12-23 14:32+0100\n" "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n" "Language-Team: Georgian <(nothing)>\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 3.2.2\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "სისტემის უცნáƒáƒ‘ი შეცდáƒáƒ›áƒ" @@ -99,37 +99,37 @@ msgstr "პáƒáƒ áƒáƒ›áƒ”ტრის სტრიქáƒáƒœáƒ˜ áƒáƒ áƒáƒ¡áƒ¬á msgid "Unknown error" msgstr "უცნáƒáƒ‘ი შეცდáƒáƒ›áƒ" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: პáƒáƒ áƒáƒ›áƒ”ტრი '%s%s' გáƒáƒ£áƒ კვეველიáƒ\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: პáƒáƒ áƒáƒ›áƒ”ტრი '%s%s' გáƒáƒ£áƒ კვეველიáƒ; შესáƒáƒ«áƒšáƒ ვáƒáƒ იáƒáƒœáƒ¢áƒ”ბი:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: უცნáƒáƒ‘ი პáƒáƒ áƒáƒ›áƒ”ტრი '%s%s'\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: პáƒáƒ áƒáƒ›áƒ”ტრს \"%s%s' áƒáƒ გუმენტი áƒáƒ სáƒáƒ˜áƒ დებáƒ\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: პáƒáƒ áƒáƒ›áƒ”ტრს \"%s%s\" áƒáƒ გუმენტი ესáƒáƒáƒ˜áƒ áƒáƒ”ბáƒ\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი პáƒáƒ áƒáƒ›áƒ”ტრი -- '%c'\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: პáƒáƒ áƒáƒ›áƒ”ტრს ესáƒáƒáƒ˜áƒ áƒáƒ”ბრáƒáƒ გუმენტი -- '%c'\n" diff --git a/gnulib_po/ko.gmo b/gnulib_po/ko.gmo Binary files differindex ee46f1f..ec49165 100644 --- a/gnulib_po/ko.gmo +++ b/gnulib_po/ko.gmo diff --git a/gnulib_po/ko.po b/gnulib_po/ko.po index d718bf5..9febcfb 100644 --- a/gnulib_po/ko.po +++ b/gnulib_po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU textutils 2.0.22\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2002-07-22 20:02+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ ¿À·ù" @@ -102,43 +102,43 @@ msgstr "" msgid "Unknown error" msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ ¿À·ù" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: `%s'Àº(´Â) ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: `%s'Àº(´Â) ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option `%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `%c%s'\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option `%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: `%c%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option `%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: `%s' ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, fuzzy, c-format #| msgid "%s: invalid option -- %c\n" msgid "%s: invalid option -- '%c'\n" msgstr "%s: ºÎÀûÀýÇÑ ¿É¼Ç -- %c\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, fuzzy, c-format #| msgid "%s: option requires an argument -- %c\n" msgid "%s: option requires an argument -- '%c'\n" diff --git a/gnulib_po/ms.po b/gnulib_po/ms.po index 9598d11..f5a6dd2 100644 --- a/gnulib_po/ms.po +++ b/gnulib_po/ms.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.0.90\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2003-08-10 16:00+0800\n" "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n" "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Ralat sistem yang tidak diketahui" @@ -101,43 +101,43 @@ msgstr "" msgid "Unknown error" msgstr "Ralat sistem yang tidak diketahui" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: opsyen `%s' adalah ambiguous\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: opsyen `%s' adalah ambiguous\n" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option `%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: opensyen tidak dikenali `%c%s'\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option `%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: opsyen `%c%s' tidak mengizinkan hujah\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option `%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: opsyen `%s' memerlukan hujah\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, fuzzy, c-format #| msgid "%s: invalid option -- %c\n" msgid "%s: invalid option -- '%c'\n" msgstr "%s: opsyen tidak sah -- %c\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, fuzzy, c-format #| msgid "%s: option requires an argument -- %c\n" msgid "%s: option requires an argument -- '%c'\n" diff --git a/gnulib_po/nb.gmo b/gnulib_po/nb.gmo Binary files differindex c31fa1b..35f005f 100644 --- a/gnulib_po/nb.gmo +++ b/gnulib_po/nb.gmo diff --git a/gnulib_po/nb.po b/gnulib_po/nb.po index 5c7beb5..541b580 100644 --- a/gnulib_po/nb.po +++ b/gnulib_po/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU textutils 2.0.20\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2002-01-27 21:35+0100\n" "Last-Translator: Eivind Tagseth <eivindt@multinet.no>\n" "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Ukjent systemfeil" @@ -101,43 +101,43 @@ msgstr "" msgid "Unknown error" msgstr "Ukjent systemfeil" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: flagget «%s» er flertydig\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: flagget «%s» er flertydig\n" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option `%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: ukjent flagg «%c%s»\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option `%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: flagget «%c%s» trenger et argument\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option `%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: flagget «%s» trenger et argument\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, fuzzy, c-format #| msgid "%s: invalid option -- %c\n" msgid "%s: invalid option -- '%c'\n" msgstr "%s: ukjent flagg -- %c\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, fuzzy, c-format #| msgid "%s: option requires an argument -- %c\n" msgid "%s: option requires an argument -- '%c'\n" diff --git a/gnulib_po/nl.po b/gnulib_po/nl.po index 9a1211b..6e72dca 100644 --- a/gnulib_po/nl.po +++ b/gnulib_po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib-4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2019-05-29 13:31+0200\n" "Last-Translator: Benno Schulenberg <vertaling@coevern.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" @@ -22,7 +22,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Onbekende systeemfout" @@ -102,37 +102,37 @@ msgstr "Parametertekst is niet juist gecodeerd" msgid "Unknown error" msgstr "Onbekende fout" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: optie '%s%s' is niet eenduidig\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: optie '%s%s' is niet eenduidig; mogelijkheden zijn:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: onbekende optie '%s%s'\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: optie '%s%s' staat geen argument toe\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: optie '%s%s' vereist een argument\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ongeldige optie -- '%c'\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: optie vereist een argument -- '%c'\n" diff --git a/gnulib_po/pl.po b/gnulib_po/pl.po index 5cf3965..b672786 100644 --- a/gnulib_po/pl.po +++ b/gnulib_po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2019-05-19 20:02+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" @@ -23,7 +23,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Nieznany bÅ‚Ä…d systemowy" @@ -103,37 +103,37 @@ msgstr "ÅaÅ„cuch parametru niepoprawnie zakodowany" msgid "Unknown error" msgstr "Nieznany bÅ‚Ä…d" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: opcja '%s%s' jest niejednoznaczna\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: opcja '%s%s' jest niejednoznaczna; możliwoÅ›ci:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: nieznana opcja '%s%s'\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: opcja '%s%s' nie może mieć argumentów\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: opcja '%s%s' musi mieć argument\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: bÅ‚Ä™dna opcja -- '%c'\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcja musi mieć argument -- '%c'\n" diff --git a/gnulib_po/pt.po b/gnulib_po/pt.po index 1863c10..8ea2b9d 100644 --- a/gnulib_po/pt.po +++ b/gnulib_po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2019-05-26 10:40+0100\n" "Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n" "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Gtranslator 2.91.7\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Erro de sistema desconhecido" @@ -99,37 +99,37 @@ msgstr "Cadeia de parâmetros incorrectamente codificada" msgid "Unknown error" msgstr "Erro desconhecido" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: a opção \"%s%s\" é ambÃgua\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: a opção \"%s%s\" é ambÃgua; possibilidades:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: opção não reconhecida \"%s%s\"\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: a opção \"%s%s\" não permite um argumento\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "\"%s: a opção \"%s%s\" requer um argumento\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opção inválida -- \"%c\"\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a opção requer um argumento -- \"%c\"\n" diff --git a/gnulib_po/pt_BR.po b/gnulib_po/pt_BR.po index ce6cec0..4694f81 100644 --- a/gnulib_po/pt_BR.po +++ b/gnulib_po/pt_BR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2019-08-28 15:29-0300\n" "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n" "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge." @@ -23,7 +23,7 @@ msgstr "" "X-Generator: Virtaal 1.0.0-beta1\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Erro desconhecido de sistema" @@ -103,39 +103,39 @@ msgstr "Texto do parâmetro codificado incorretamente" msgid "Unknown error" msgstr "Erro desconhecido" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: a opção \"%s%s\" é ambÃgua\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: a opção \"%s%s\" é ambÃgua; possibilidades:" # , c-format -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: opção desconhecida \"%s%s\"\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: a opção \"%s%s\" não permite um argumento\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: a opção \"%s%s\" exige um argumento\n" # , c-format -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opção inválida -- \"%c\"\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a opção exige um argumento -- \"%c\"\n" diff --git a/gnulib_po/ro.po b/gnulib_po/ro.po index 702e833..0452c65 100644 --- a/gnulib_po/ro.po +++ b/gnulib_po/ro.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib-4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2022-02-19 23:11+0100\n" "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" @@ -32,7 +32,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 3.0.1\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Eroare de sistem necunoscută" @@ -123,37 +123,37 @@ msgstr "Șirul parametrului este codificat greÈ™it" msgid "Unknown error" msgstr "Eroare necunoscută" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: opÈ›iunea „%s%s†este ambiguă\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: opÈ›iunea „%s%s†este ambiguă; posibilități:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: opÈ›iune nerecunoscută „%s%sâ€\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: opÈ›iunea „%s%s†nu permite un argument\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: opÈ›iunea „%s%s†necesită un argument\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opÈ›iune nevalidă -- „%câ€\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opÈ›iunea necesită un argument -- „%câ€\n" diff --git a/gnulib_po/ru.gmo b/gnulib_po/ru.gmo Binary files differindex 4f27a92..44c4312 100644 --- a/gnulib_po/ru.gmo +++ b/gnulib_po/ru.gmo diff --git a/gnulib_po/ru.po b/gnulib_po/ru.po index 00e0cb5..eba2149 100644 --- a/gnulib_po/ru.po +++ b/gnulib_po/ru.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the gnulib package. # # Sergey Poznyakoff <gray@gnu.org>, 2003,2004,2005. -# Yuri Kozlov <yuray@komyakino.ru>, 2010, 2011, 2019. +# Yuri Kozlov <yuray@komyakino.ru>, 2010, 2011, 2019, 2023. msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2019-05-21 18:46+0300\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" +"PO-Revision-Date: 2023-07-07 05:18+0300\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <gnu@d07.ru>\n" "Language: ru\n" @@ -19,9 +19,9 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 22.12.3\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" @@ -71,7 +71,7 @@ msgstr "СиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" #: lib/gai_strerror.c:68 msgid "Argument buffer too small" -msgstr "Слишком маленький буфер, указанный в аргументе" +msgstr "Буфер аргументов Ñлишком мал" #: lib/gai_strerror.c:70 msgid "Processing request in progress" @@ -101,37 +101,37 @@ msgstr "Строковый параметр неправильно Ð·Ð°ÐºÐ¾Ð´Ð¸Ñ msgid "Unknown error" msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: двуÑмыÑленный параметр «%s%s»\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: двуÑмыÑленный параметр «%s%s»; возможные варианты:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: нераÑпознанный параметр «%s%s»\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать аргумент\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s%s» требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: неправильный параметр -- «%c»\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ -- «%c»\n" diff --git a/gnulib_po/rw.po b/gnulib_po/rw.po index 13a3e65..1f8dfe9 100644 --- a/gnulib_po/rw.po +++ b/gnulib_po/rw.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: mailutils 0.6\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2005-04-04 10:55-0700\n" "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" @@ -27,7 +27,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:193 +#: lib/error.c:194 #, fuzzy msgid "Unknown system error" msgstr "Sisitemu Ikosa" @@ -117,37 +117,37 @@ msgstr "" msgid "Unknown error" msgstr "Sisitemu Ikosa" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s:Ihitamo ni" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s:Ihitamo ni" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s:Ihitamo" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s:Ihitamo Kwemerera" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s:Ihitamo" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s:Sibyo Ihitamo" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s:Ihitamo" diff --git a/gnulib_po/sk.gmo b/gnulib_po/sk.gmo Binary files differindex 36cd7aa..d450e60 100644 --- a/gnulib_po/sk.gmo +++ b/gnulib_po/sk.gmo diff --git a/gnulib_po/sk.po b/gnulib_po/sk.po index 472e3d9..a157b60 100644 --- a/gnulib_po/sk.po +++ b/gnulib_po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: textutils 2.0.14\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2001-06-08 22:10 +02:00\n" "Last-Translator: Stanislav Meduna <stano@trillian.eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Neznáma systémová chyba" @@ -101,43 +101,43 @@ msgstr "" msgid "Unknown error" msgstr "Neznáma systémová chyba" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: voµba `%s' nie je jednoznaèná\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: voµba `%s' nie je jednoznaèná\n" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option `%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: neznámy prepínaè `%c%s'\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option `%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: prepínaè `%c%s' nepovoµuje argument\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option `%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: prepínaè `%s' vy¾aduje argument\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, fuzzy, c-format #| msgid "%s: invalid option -- %c\n" msgid "%s: invalid option -- '%c'\n" msgstr "%s: chybný prepínaè -- %c\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, fuzzy, c-format #| msgid "%s: option requires an argument -- %c\n" msgid "%s: option requires an argument -- '%c'\n" diff --git a/gnulib_po/sl.po b/gnulib_po/sl.po index 59a148f..3b38b6d 100644 --- a/gnulib_po/sl.po +++ b/gnulib_po/sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2012-05-20 13:08+0200\n" "Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n" "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || " "n%100==4 ? 3 : 0);\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Neznana sistemska napaka" @@ -100,42 +100,42 @@ msgstr "ParametriÄni niz nepravilno kodiran" msgid "Unknown error" msgstr "Neznana napaka" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option '-W %s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: izbira »-W %s« je dvoumna\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option '%s' is ambiguous; possibilities:" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: izbira »%s« je dvoumna; možnosti:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option '%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: neprepoznana izbira »%c%s«\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option '%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: izbira »%c%s« ne dovoljuje argumenta\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option '--%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: izbira »--%s« zahteva argument\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neveljavna izbira -- '%c'\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: izbira zahteva argument -- '%c'\n" diff --git a/gnulib_po/sr.po b/gnulib_po/sr.po index c0c7f45..fd99ffe 100644 --- a/gnulib_po/sr.po +++ b/gnulib_po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib-4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2020-04-20 09:38+0200\n" "Last-Translator: МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" @@ -19,7 +19,7 @@ msgstr "" "X-Generator: Virtaal 0.7.1\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Ðепозната грешка ÑиÑтема" @@ -99,37 +99,37 @@ msgstr "ÐиÑка параметра није иÑправно кодирана msgid "Unknown error" msgstr "Ðепозната грешка" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: опција „%s%s“ је нејаÑна\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: опција „%s%s“ је нејаÑна; могућноÑти:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: непозната опција „%s%s“\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: опција „%s%s“ не дозвољава аргумент\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: опција „%s%s“ захтева аргумент\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: неиÑправна опција -- „%c“\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: опција захтева аргумент -- „%c“\n" diff --git a/gnulib_po/sv.po b/gnulib_po/sv.po index fe9b7f4..1cf8973 100644 --- a/gnulib_po/sv.po +++ b/gnulib_po/sv.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2020-05-28 21:40+0200\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n" "Language-Team: Swedish <tp-sv-list@lists.sourceforge.net>\n" @@ -23,7 +23,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Okänt systemfel" @@ -103,37 +103,37 @@ msgstr "Parametersträng inte korrekt kodad" msgid "Unknown error" msgstr "Okänt fel" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: flaggan â€%s%s†är tvetydig\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: flaggan â€%s%s†är tvetydig: möjligheter:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: okänd flagga â€%s%sâ€\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: flaggan â€%s%s†tar inget argument\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: flaggan â€%s%s†kräver ett argument\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ogiltig flagga -- â€%câ€\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flaggan kräver ett argument -- â€%câ€\n" diff --git a/gnulib_po/tr.po b/gnulib_po/tr.po index ca1e292..df64f41 100644 --- a/gnulib_po/tr.po +++ b/gnulib_po/tr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.3.0\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2005-03-14 04:17+0200\n" "Last-Translator: Deniz Akkus Kanca <deniz@arayan.com>\n" "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.9.1\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Bilinmeyen sistem hatası" @@ -106,43 +106,43 @@ msgstr "" msgid "Unknown error" msgstr "Bilinmeyen sistem hatası" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: `%s' seçeneÄŸi belirsiz\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option `%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: `%s' seçeneÄŸi belirsiz\n" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option `%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: `%c%s' seçeneÄŸi bilinmiyor\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option `%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: seçenek `%c%s' argümansız kullanılır\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option `%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: `%s' seçeneÄŸi bir argümanla kullanılır\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, fuzzy, c-format #| msgid "%s: invalid option -- %c\n" msgid "%s: invalid option -- '%c'\n" msgstr "%s: geçersiz seçenek -- %c\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, fuzzy, c-format #| msgid "%s: option requires an argument -- %c\n" msgid "%s: option requires an argument -- '%c'\n" diff --git a/gnulib_po/uk.po b/gnulib_po/uk.po index 370525a..cd9d5c2 100644 --- a/gnulib_po/uk.po +++ b/gnulib_po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2019-05-19 14:26+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n" @@ -21,7 +21,7 @@ msgstr "" "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 19.03.70\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Ðевідома ÑиÑтемна помилка" @@ -101,37 +101,37 @@ msgstr "Ðеправильно закодований Ñ€Ñдок Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ msgid "Unknown error" msgstr "Ðевідома помилка" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: параметр «%s%s» не Ñ” однозначним\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: неоднозначний параметр «%s%s»; можливі варіанти:" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: невідомий параметр «%s%s»\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² до параметра «%s%s» не передбачено\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: до параметра «%s%s» Ñлід додати аргумент\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: Ðекоректний параметр -- '%c'\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: параметр вимагає аргументу -- '%c'\n" diff --git a/gnulib_po/vi.po b/gnulib_po/vi.po index 970415f..c5ba116 100644 --- a/gnulib_po/vi.po +++ b/gnulib_po/vi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib-3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2014-01-13 08:31+0700\n" "Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -22,7 +22,7 @@ msgstr "" "X-Generator: Poedit 1.5.5\n" "X-Poedit-SourceCharset: utf-8\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "Gặp lá»—i hệ thống chÆ°a biết" @@ -102,42 +102,42 @@ msgstr "Chuá»—i tham số không phải được mã hóa đúng" msgid "Unknown error" msgstr "Gặp lá»—i không rõ" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option '-W %s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: tùy chá»n “-W %s†chÆ°a rõ rà ng\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option '%s' is ambiguous; possibilities:" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: tùy chá»n “%s†chÆ°a rõ rà ng; khả năng là :" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option '%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: không nháºn ra tùy chá»n “%c%sâ€\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option '%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: tùy chá»n “%c%s†không cho phép đối số\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option '--%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: tùy chá»n “--%s†yêu cầu má»™t đối số\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: tùy chá»n không hợp lệ -- “%câ€\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: tùy chá»n yêu cầu má»™t đối số -- “%câ€\n" diff --git a/gnulib_po/wget-gnulib.pot b/gnulib_po/wget-gnulib.pot index 32a9585..c4d9f20 100644 --- a/gnulib_po/wget-gnulib.pot +++ b/gnulib_po/wget-gnulib.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNU wget 1.21.4\n" +"Project-Id-Version: GNU wget 1.24.5\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "" @@ -97,37 +97,37 @@ msgstr "" msgid "Unknown error" msgstr "" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "" diff --git a/gnulib_po/zh_CN.po b/gnulib_po/zh_CN.po index 9f7f0b5..f5d3612 100644 --- a/gnulib_po/zh_CN.po +++ b/gnulib_po/zh_CN.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 2.0.0.3462.e9796\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2010-02-26 09:54+0800\n" "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -21,7 +21,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "未知的系统错误" @@ -101,42 +101,42 @@ msgstr "å‚æ•°å—符串未æ£ç¡®ç¼–ç " msgid "Unknown error" msgstr "未知错误" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, fuzzy, c-format #| msgid "%s: option '%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: 选项\"%s\"æ§ä¹‰\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, fuzzy, c-format #| msgid "%s: option '%s' is ambiguous\n" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: 选项\"%s\"æ§ä¹‰\n" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, fuzzy, c-format #| msgid "%s: unrecognized option '%c%s'\n" msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: æ— æ³•è¯†åˆ«çš„é€‰é¡¹\"%c%s\"\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, fuzzy, c-format #| msgid "%s: option '%c%s' doesn't allow an argument\n" msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: 选项\"%c%s\"ä¸è¦å‚æ•°\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, fuzzy, c-format #| msgid "%s: option '%s' requires an argument\n" msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: 选项\"%s\"必须带å‚æ•°\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: æ— æ•ˆé€‰é¡¹ -- \"%c\"\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 选项需è¦å‚æ•° -- \"%c\"\n" diff --git a/gnulib_po/zh_TW.po b/gnulib_po/zh_TW.po index 757bc74..5f6f35a 100644 --- a/gnulib_po/zh_TW.po +++ b/gnulib_po/zh_TW.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:09+0100\n" "PO-Revision-Date: 2019-12-15 13:01+0800\n" "Last-Translator: pan93412 <pan93412@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n" @@ -26,7 +26,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 19.12.0\n" -#: lib/error.c:193 +#: lib/error.c:194 msgid "Unknown system error" msgstr "未知系統錯誤" @@ -106,37 +106,37 @@ msgstr "未æ£ç¢ºç·¨ç¢¼åƒæ•¸å—串" msgid "Unknown error" msgstr "未知錯誤" -#: lib/getopt.c:278 +#: lib/getopt.c:282 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s：「%s%sã€é¸é …ä¸æ˜Žç¢º\n" -#: lib/getopt.c:284 +#: lib/getopt.c:288 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s：「%s%sã€é¸é …ä¸æ˜Žç¢ºï¼›å¯èƒ½æ˜¯ï¼š" -#: lib/getopt.c:319 +#: lib/getopt.c:322 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s：無法è˜åˆ¥ã€Œ%s%sã€é¸é …\n" -#: lib/getopt.c:345 +#: lib/getopt.c:348 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s：「%s%sã€é¸é …ä¸æŽ¥å—åƒæ•¸\n" -#: lib/getopt.c:360 +#: lib/getopt.c:363 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s：「%s%sã€é¸é …需è¦åƒæ•¸\n" -#: lib/getopt.c:621 +#: lib/getopt.c:624 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s：無效é¸é … -- '%c'\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:639 lib/getopt.c:685 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s：é¸é …需è¦åƒæ•¸ -- '%c'\n" diff --git a/lib/Makefile.in b/lib/Makefile.in index 8b7a5ae..fc5ccf5 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2023 Free Software Foundation, Inc. +# Copyright (C) 2002-2024 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -66,6 +66,7 @@ # crypto/sha256 \ # crypto/sha512 \ # dirname \ +# do-release-commit-and-tag \ # fcntl \ # flock \ # fnmatch-gnu \ @@ -274,112 +275,133 @@ host_triplet = @host@ @GL_COND_OBJ_IOCTL_TRUE@am__append_46 = ioctl.c @GL_COND_OBJ_ISBLANK_TRUE@am__append_47 = isblank.c @GL_COND_OBJ_ISWBLANK_TRUE@am__append_48 = iswblank.c -@GL_COND_OBJ_ISWDIGIT_TRUE@am__append_49 = iswdigit.c -@GL_COND_OBJ_ISWXDIGIT_TRUE@am__append_50 = iswxdigit.c -@GL_COND_OBJ_LINK_TRUE@am__append_51 = link.c -@GL_COND_OBJ_LISTEN_TRUE@am__append_52 = listen.c -@GL_COND_OBJ_LOCALECONV_TRUE@am__append_53 = localeconv.c -@GL_COND_OBJ_LSEEK_TRUE@am__append_54 = lseek.c -@GL_COND_OBJ_LSTAT_TRUE@am__append_55 = lstat.c -@GL_COND_OBJ_MBRTOWC_TRUE@am__append_56 = mbrtowc.c -@GL_COND_OBJ_MBSINIT_TRUE@am__append_57 = mbsinit.c -@GL_COND_OBJ_MBSRTOWCS_TRUE@am__append_58 = mbsrtowcs.c -@GL_COND_OBJ_MBTOWC_TRUE@am__append_59 = mbtowc.c -@GL_COND_OBJ_MEMCHR_TRUE@am__append_60 = memchr.c -@GL_COND_OBJ_MEMPCPY_TRUE@am__append_61 = mempcpy.c -@GL_COND_OBJ_MEMRCHR_TRUE@am__append_62 = memrchr.c -@GL_COND_OBJ_MKDIR_TRUE@am__append_63 = mkdir.c -@GL_COND_OBJ_MKOSTEMP_TRUE@am__append_64 = mkostemp.c -@GL_COND_OBJ_MKSTEMP_TRUE@am__append_65 = mkstemp.c -@GL_COND_OBJ_MSVC_INVAL_TRUE@am__append_66 = msvc-inval.c -@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__append_67 = msvc-nothrow.c -@GL_COND_OBJ_NANOSLEEP_TRUE@am__append_68 = nanosleep.c -@GL_COND_OBJ_NL_LANGINFO_TRUE@am__append_69 = nl_langinfo.c -@GL_COND_OBJ_NL_LANGINFO_LOCK_TRUE@am__append_70 = nl_langinfo-lock.c -@GL_COND_OBJ_OPEN_TRUE@am__append_71 = open.c -@GL_COND_OBJ_OPENAT_TRUE@am__append_72 = openat.c -@GL_COND_OBJ_OPENDIR_TRUE@am__append_73 = opendir.c -@GL_COND_OBJ_PIPE_TRUE@am__append_74 = pipe.c -@GL_COND_OBJ_SPAWN_TRUE@am__append_75 = spawn.c -@GL_COND_OBJ_SPAWNI_TRUE@am__append_76 = spawni.c -@GL_COND_OBJ_SPAWN_FACTION_ADDCHDIR_TRUE@am__append_77 = spawn_faction_addchdir.c -@GL_COND_OBJ_SPAWN_FACTION_ADDCLOSE_TRUE@am__append_78 = spawn_faction_addclose.c -@GL_COND_OBJ_SPAWN_FACTION_ADDDUP2_TRUE@am__append_79 = spawn_faction_adddup2.c -@GL_COND_OBJ_SPAWN_FACTION_ADDOPEN_TRUE@am__append_80 = spawn_faction_addopen.c -@GL_COND_OBJ_SPAWN_FACTION_DESTROY_TRUE@am__append_81 = spawn_faction_destroy.c -@GL_COND_OBJ_SPAWN_FACTION_INIT_TRUE@am__append_82 = spawn_faction_init.c -@GL_COND_OBJ_SPAWNATTR_DESTROY_TRUE@am__append_83 = spawnattr_destroy.c -@GL_COND_OBJ_SPAWNATTR_INIT_TRUE@am__append_84 = spawnattr_init.c -@GL_COND_OBJ_SPAWNATTR_SETFLAGS_TRUE@am__append_85 = spawnattr_setflags.c -@GL_COND_OBJ_SPAWNATTR_SETPGROUP_TRUE@am__append_86 = spawnattr_setpgroup.c -@GL_COND_OBJ_SPAWNATTR_SETSIGMASK_TRUE@am__append_87 = spawnattr_setsigmask.c -@GL_COND_OBJ_SPAWNP_TRUE@am__append_88 = spawnp.c -@GL_COND_OBJ_PSELECT_TRUE@am__append_89 = pselect.c -@GL_COND_OBJ_PTHREAD_SIGMASK_TRUE@am__append_90 = pthread_sigmask.c -@GL_COND_OBJ_RAISE_TRUE@am__append_91 = raise.c -@GL_COND_OBJ_RAWMEMCHR_TRUE@am__append_92 = rawmemchr.c -@GL_COND_OBJ_READDIR_TRUE@am__append_93 = readdir.c -@GL_COND_OBJ_READLINK_TRUE@am__append_94 = readlink.c -@GL_COND_OBJ_REALLOCARRAY_TRUE@am__append_95 = reallocarray.c -@GL_COND_OBJ_RECV_TRUE@am__append_96 = recv.c -@GL_COND_OBJ_REGEX_TRUE@am__append_97 = regex.c -@GL_COND_OBJ_RENAME_TRUE@am__append_98 = rename.c -@GL_COND_OBJ_REWINDDIR_TRUE@am__append_99 = rewinddir.c -@GL_COND_OBJ_RMDIR_TRUE@am__append_100 = rmdir.c -@GL_COND_OBJ_SECURE_GETENV_TRUE@am__append_101 = secure_getenv.c -@GL_COND_OBJ_SELECT_TRUE@am__append_102 = select.c -@GL_COND_OBJ_SEND_TRUE@am__append_103 = send.c -@GL_COND_OBJ_SETLOCALE_LOCK_TRUE@am__append_104 = setlocale-lock.c -@GL_COND_OBJ_SETSOCKOPT_TRUE@am__append_105 = setsockopt.c -@GL_COND_OBJ_SIGACTION_TRUE@am__append_106 = sigaction.c -@GL_COND_OBJ_SIGPROCMASK_TRUE@am__append_107 = sigprocmask.c -@GL_COND_OBJ_SOCKET_TRUE@am__append_108 = socket.c -@GL_COND_OBJ_OS2_SPAWN_TRUE@am__append_109 = os2-spawn.c -@GL_COND_OBJ_STAT_TRUE@am__append_110 = stat.c -@GL_COND_OBJ_STDIO_READ_TRUE@am__append_111 = stdio-read.c -@GL_COND_OBJ_STDIO_WRITE_TRUE@am__append_112 = stdio-write.c -@GL_COND_OBJ_STPCPY_TRUE@am__append_113 = stpcpy.c -@GL_COND_OBJ_STRCASECMP_TRUE@am__append_114 = strcasecmp.c -@GL_COND_OBJ_STRNCASECMP_TRUE@am__append_115 = strncasecmp.c -@GL_COND_OBJ_STRCHRNUL_TRUE@am__append_116 = strchrnul.c -@GL_COND_OBJ_STRDUP_TRUE@am__append_117 = strdup.c -@GL_COND_OBJ_STRERROR_TRUE@am__append_118 = strerror.c -@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__append_119 = strerror-override.c -@GL_COND_OBJ_STRNDUP_TRUE@am__append_120 = strndup.c -@GL_COND_OBJ_STRNLEN_TRUE@am__append_121 = strnlen.c -@GL_COND_OBJ_STRPBRK_TRUE@am__append_122 = strpbrk.c -@GL_COND_OBJ_STRPTIME_TRUE@am__append_123 = strptime.c -@GL_COND_OBJ_STRTOK_R_TRUE@am__append_124 = strtok_r.c -@GL_COND_OBJ_STRTOL_TRUE@am__append_125 = strtol.c -@GL_COND_OBJ_STRTOLL_TRUE@am__append_126 = strtoll.c -@GL_COND_OBJ_SYMLINK_TRUE@am__append_127 = symlink.c -@GL_COND_OBJ_TIME_R_TRUE@am__append_128 = time_r.c -@GL_COND_OBJ_TIMEGM_TRUE@am__append_129 = timegm.c -@LIBUNISTRING_COMPILE_UNICASE_EMPTY_PREFIX_CONTEXT_TRUE@am__append_130 = unicase/empty-prefix-context.c -@LIBUNISTRING_COMPILE_UNICASE_EMPTY_SUFFIX_CONTEXT_TRUE@am__append_131 = unicase/empty-suffix-context.c -@LIBUNISTRING_COMPILE_UNICASE_TOLOWER_TRUE@am__append_132 = unicase/tolower.c -@LIBUNISTRING_COMPILE_UNICASE_U8_TOLOWER_TRUE@am__append_133 = unicase/u8-tolower.c -@LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_TRUE@am__append_134 = unictype/combiningclass.c -@LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SOFT_DOTTED_TRUE@am__append_135 = unictype/pr_soft_dotted.c -@LIBUNISTRING_COMPILE_UNINORM_U8_NORMALIZE_TRUE@am__append_136 = uninorm/u8-normalize.c -@LIBUNISTRING_COMPILE_UNISTR_U8_CPY_TRUE@am__append_137 = unistr/u8-cpy.c -@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__append_138 = unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c -@LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE@am__append_139 = unistr/u8-strlen.c -@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_140 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c -@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_141 = uniwidth/width.c -@GL_COND_OBJ_UNLINK_TRUE@am__append_142 = unlink.c -@GL_COND_OBJ_UTIME_TRUE@am__append_143 = utime.c -@GL_COND_OBJ_WAITPID_TRUE@am__append_144 = waitpid.c -@GL_COND_OBJ_WCRTOMB_TRUE@am__append_145 = wcrtomb.c -@GL_COND_OBJ_WCWIDTH_TRUE@am__append_146 = wcwidth.c -@GL_COND_OBJ_WINDOWS_MUTEX_TRUE@am__append_147 = windows-mutex.c -@GL_COND_OBJ_WINDOWS_ONCE_TRUE@am__append_148 = windows-once.c -@GL_COND_OBJ_WINDOWS_RECMUTEX_TRUE@am__append_149 = windows-recmutex.c -@GL_COND_OBJ_WINDOWS_RWLOCK_TRUE@am__append_150 = windows-rwlock.c -@GL_COND_OBJ_WINDOWS_SPAWN_TRUE@am__append_151 = windows-spawn.c -@GL_COND_OBJ_WMEMCHR_TRUE@am__append_152 = wmemchr.c -@GL_COND_OBJ_WMEMPCPY_TRUE@am__append_153 = wmempcpy.c -@GL_COND_OBJ_WRITE_TRUE@am__append_154 = write.c +@GL_COND_OBJ_ISWCTYPE_TRUE@am__append_49 = iswctype.c +@GL_COND_OBJ_ISWDIGIT_TRUE@am__append_50 = iswdigit.c +@GL_COND_OBJ_ISWPUNCT_TRUE@am__append_51 = iswpunct.c +@GL_COND_OBJ_ISWXDIGIT_TRUE@am__append_52 = iswxdigit.c +@GL_COND_OBJ_LINK_TRUE@am__append_53 = link.c +@GL_COND_OBJ_LISTEN_TRUE@am__append_54 = listen.c +@GL_COND_OBJ_LOCALECONV_TRUE@am__append_55 = localeconv.c +@GL_COND_OBJ_LSEEK_TRUE@am__append_56 = lseek.c +@GL_COND_OBJ_LSTAT_TRUE@am__append_57 = lstat.c +@GL_COND_OBJ_MBRTOC32_TRUE@am__append_58 = mbrtoc32.c +@GL_COND_OBJ_MBRTOWC_TRUE@am__append_59 = mbrtowc.c +@GL_COND_OBJ_MBSINIT_TRUE@am__append_60 = mbsinit.c +@GL_COND_OBJ_MBSRTOWCS_TRUE@am__append_61 = mbsrtowcs.c +@GL_COND_OBJ_MBTOWC_TRUE@am__append_62 = mbtowc.c +@GL_COND_OBJ_MEMCHR_TRUE@am__append_63 = memchr.c +@GL_COND_OBJ_MEMPCPY_TRUE@am__append_64 = mempcpy.c +@GL_COND_OBJ_MEMRCHR_TRUE@am__append_65 = memrchr.c +@GL_COND_OBJ_MKDIR_TRUE@am__append_66 = mkdir.c +@GL_COND_OBJ_MKOSTEMP_TRUE@am__append_67 = mkostemp.c +@GL_COND_OBJ_MKSTEMP_TRUE@am__append_68 = mkstemp.c +@GL_COND_OBJ_MSVC_INVAL_TRUE@am__append_69 = msvc-inval.c +@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__append_70 = msvc-nothrow.c +@GL_COND_OBJ_NANOSLEEP_TRUE@am__append_71 = nanosleep.c +@GL_COND_OBJ_NL_LANGINFO_TRUE@am__append_72 = nl_langinfo.c +@GL_COND_OBJ_NL_LANGINFO_LOCK_TRUE@am__append_73 = nl_langinfo-lock.c +@GL_COND_OBJ_OPEN_TRUE@am__append_74 = open.c +@GL_COND_OBJ_OPENAT_TRUE@am__append_75 = openat.c +@GL_COND_OBJ_OPENDIR_TRUE@am__append_76 = opendir.c +@GL_COND_OBJ_PIPE_TRUE@am__append_77 = pipe.c +@GL_COND_OBJ_SPAWN_TRUE@am__append_78 = spawn.c +@GL_COND_OBJ_SPAWNI_TRUE@am__append_79 = spawni.c +@GL_COND_OBJ_SPAWN_FACTION_ADDCHDIR_TRUE@am__append_80 = spawn_faction_addchdir.c +@GL_COND_OBJ_SPAWN_FACTION_ADDCLOSE_TRUE@am__append_81 = spawn_faction_addclose.c +@GL_COND_OBJ_SPAWN_FACTION_ADDDUP2_TRUE@am__append_82 = spawn_faction_adddup2.c +@GL_COND_OBJ_SPAWN_FACTION_ADDOPEN_TRUE@am__append_83 = spawn_faction_addopen.c +@GL_COND_OBJ_SPAWN_FACTION_DESTROY_TRUE@am__append_84 = spawn_faction_destroy.c +@GL_COND_OBJ_SPAWN_FACTION_INIT_TRUE@am__append_85 = spawn_faction_init.c +@GL_COND_OBJ_SPAWNATTR_DESTROY_TRUE@am__append_86 = spawnattr_destroy.c +@GL_COND_OBJ_SPAWNATTR_INIT_TRUE@am__append_87 = spawnattr_init.c +@GL_COND_OBJ_SPAWNATTR_SETFLAGS_TRUE@am__append_88 = spawnattr_setflags.c +@GL_COND_OBJ_SPAWNATTR_SETPGROUP_TRUE@am__append_89 = spawnattr_setpgroup.c +@GL_COND_OBJ_SPAWNATTR_SETSIGMASK_TRUE@am__append_90 = spawnattr_setsigmask.c +@GL_COND_OBJ_SPAWNP_TRUE@am__append_91 = spawnp.c +@GL_COND_OBJ_PSELECT_TRUE@am__append_92 = pselect.c +@GL_COND_OBJ_PTHREAD_SIGMASK_TRUE@am__append_93 = pthread_sigmask.c +@GL_COND_OBJ_RAISE_TRUE@am__append_94 = raise.c +@GL_COND_OBJ_RAWMEMCHR_TRUE@am__append_95 = rawmemchr.c +@GL_COND_OBJ_READDIR_TRUE@am__append_96 = readdir.c +@GL_COND_OBJ_READLINK_TRUE@am__append_97 = readlink.c +@GL_COND_OBJ_REALLOCARRAY_TRUE@am__append_98 = reallocarray.c +@GL_COND_OBJ_RECV_TRUE@am__append_99 = recv.c +@GL_COND_OBJ_REGEX_TRUE@am__append_100 = regex.c +@GL_COND_OBJ_RENAME_TRUE@am__append_101 = rename.c +@GL_COND_OBJ_REWINDDIR_TRUE@am__append_102 = rewinddir.c +@GL_COND_OBJ_RMDIR_TRUE@am__append_103 = rmdir.c +@GL_COND_OBJ_SECURE_GETENV_TRUE@am__append_104 = secure_getenv.c +@GL_COND_OBJ_SELECT_TRUE@am__append_105 = select.c +@GL_COND_OBJ_SEND_TRUE@am__append_106 = send.c +@GL_COND_OBJ_SETLOCALE_LOCK_TRUE@am__append_107 = setlocale-lock.c +@GL_COND_OBJ_SETSOCKOPT_TRUE@am__append_108 = setsockopt.c +@GL_COND_OBJ_SIGACTION_TRUE@am__append_109 = sigaction.c +@GL_COND_OBJ_SIGPROCMASK_TRUE@am__append_110 = sigprocmask.c +@GL_COND_OBJ_SOCKET_TRUE@am__append_111 = socket.c +@GL_COND_OBJ_OS2_SPAWN_TRUE@am__append_112 = os2-spawn.c +@GL_COND_OBJ_STAT_TRUE@am__append_113 = stat.c +@GL_COND_OBJ_STDIO_READ_TRUE@am__append_114 = stdio-read.c +@GL_COND_OBJ_STDIO_WRITE_TRUE@am__append_115 = stdio-write.c +@GL_COND_OBJ_STPCPY_TRUE@am__append_116 = stpcpy.c +@GL_COND_OBJ_STRCASECMP_TRUE@am__append_117 = strcasecmp.c +@GL_COND_OBJ_STRNCASECMP_TRUE@am__append_118 = strncasecmp.c +@GL_COND_OBJ_STRCHRNUL_TRUE@am__append_119 = strchrnul.c +@GL_COND_OBJ_STRDUP_TRUE@am__append_120 = strdup.c +@GL_COND_OBJ_STRERROR_TRUE@am__append_121 = strerror.c +@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__append_122 = strerror-override.c +@GL_COND_OBJ_STRNDUP_TRUE@am__append_123 = strndup.c +@GL_COND_OBJ_STRNLEN_TRUE@am__append_124 = strnlen.c +@GL_COND_OBJ_STRPBRK_TRUE@am__append_125 = strpbrk.c +@GL_COND_OBJ_STRPTIME_TRUE@am__append_126 = strptime.c +@GL_COND_OBJ_STRTOK_R_TRUE@am__append_127 = strtok_r.c +@GL_COND_OBJ_STRTOL_TRUE@am__append_128 = strtol.c +@GL_COND_OBJ_STRTOLL_TRUE@am__append_129 = strtoll.c +@GL_COND_OBJ_SYMLINK_TRUE@am__append_130 = symlink.c +@GL_COND_OBJ_TIME_R_TRUE@am__append_131 = time_r.c +@GL_COND_OBJ_TIMEGM_TRUE@am__append_132 = timegm.c +@LIBUNISTRING_COMPILE_UNICASE_EMPTY_PREFIX_CONTEXT_TRUE@am__append_133 = unicase/empty-prefix-context.c +@LIBUNISTRING_COMPILE_UNICASE_EMPTY_SUFFIX_CONTEXT_TRUE@am__append_134 = unicase/empty-suffix-context.c +@LIBUNISTRING_COMPILE_UNICASE_TOLOWER_TRUE@am__append_135 = unicase/tolower.c +@LIBUNISTRING_COMPILE_UNICASE_U8_TOLOWER_TRUE@am__append_136 = unicase/u8-tolower.c +@LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_TRUE@am__append_137 = unictype/combiningclass.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM_TRUE@am__append_138 = unictype/ctype_alnum.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_TRUE@am__append_139 = unictype/ctype_alpha.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK_TRUE@am__append_140 = unictype/ctype_blank.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL_TRUE@am__append_141 = unictype/ctype_cntrl.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT_TRUE@am__append_142 = unictype/ctype_digit.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH_TRUE@am__append_143 = unictype/ctype_graph.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER_TRUE@am__append_144 = unictype/ctype_lower.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT_TRUE@am__append_145 = unictype/ctype_print.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT_TRUE@am__append_146 = unictype/ctype_punct.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_TRUE@am__append_147 = unictype/ctype_space.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER_TRUE@am__append_148 = unictype/ctype_upper.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT_TRUE@am__append_149 = unictype/ctype_xdigit.c +@LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SOFT_DOTTED_TRUE@am__append_150 = unictype/pr_soft_dotted.c +@LIBUNISTRING_COMPILE_UNINORM_U8_NORMALIZE_TRUE@am__append_151 = uninorm/u8-normalize.c +@LIBUNISTRING_COMPILE_UNISTR_U32_CHR_TRUE@am__append_152 = unistr/u32-chr.c +@LIBUNISTRING_COMPILE_UNISTR_U32_CPY_TRUE@am__append_153 = unistr/u32-cpy.c +@LIBUNISTRING_COMPILE_UNISTR_U32_PCPY_TRUE@am__append_154 = unistr/u32-pcpy.c +@LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT_TRUE@am__append_155 = unistr/u32-strcat.c +@LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_TRUE@am__append_156 = unistr/u32-strlen.c +@LIBUNISTRING_COMPILE_UNISTR_U8_CPY_TRUE@am__append_157 = unistr/u8-cpy.c +@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__append_158 = unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c +@LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE@am__append_159 = unistr/u8-strlen.c +@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_160 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c +@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_161 = uniwidth/width.c +@GL_COND_OBJ_UNLINK_TRUE@am__append_162 = unlink.c +@GL_COND_OBJ_UTIME_TRUE@am__append_163 = utime.c +@GL_COND_OBJ_WAITPID_TRUE@am__append_164 = waitpid.c +@GL_COND_OBJ_WCRTOMB_TRUE@am__append_165 = wcrtomb.c +@GL_COND_OBJ_WCTYPE_TRUE@am__append_166 = wctype.c +@GL_COND_OBJ_WCWIDTH_TRUE@am__append_167 = wcwidth.c +@GL_COND_OBJ_WINDOWS_MUTEX_TRUE@am__append_168 = windows-mutex.c +@GL_COND_OBJ_WINDOWS_ONCE_TRUE@am__append_169 = windows-once.c +@GL_COND_OBJ_WINDOWS_RECMUTEX_TRUE@am__append_170 = windows-recmutex.c +@GL_COND_OBJ_WINDOWS_RWLOCK_TRUE@am__append_171 = windows-rwlock.c +@GL_COND_OBJ_WINDOWS_SPAWN_TRUE@am__append_172 = windows-spawn.c +@GL_COND_OBJ_WMEMCHR_TRUE@am__append_173 = wmemchr.c +@GL_COND_OBJ_WMEMPCPY_TRUE@am__append_174 = wmempcpy.c +@GL_COND_OBJ_WRITE_TRUE@am__append_175 = write.c subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ @@ -389,7 +411,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 \ $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/base32.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 \ $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/clock_time.m4 \ @@ -437,7 +460,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \ $(top_srcdir)/m4/isblank.m4 $(top_srcdir)/m4/iswblank.m4 \ - $(top_srcdir)/m4/iswdigit.m4 $(top_srcdir)/m4/iswxdigit.m4 \ + $(top_srcdir)/m4/iswctype.m4 $(top_srcdir)/m4/iswdigit.m4 \ + $(top_srcdir)/m4/iswpunct.m4 $(top_srcdir)/m4/iswxdigit.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 \ @@ -451,15 +475,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbrtoc32.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ + $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -517,18 +542,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timegm.m4 $(top_srcdir)/m4/timespec.m4 \ $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tmpdir.m4 \ - $(top_srcdir)/m4/ungetc.m4 $(top_srcdir)/m4/unicase_h.m4 \ - $(top_srcdir)/m4/unictype_h.m4 $(top_srcdir)/m4/uninorm_h.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utime_h.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/uchar_h.m4 $(top_srcdir)/m4/ungetc.m4 \ + $(top_srcdir)/m4/unicase_h.m4 $(top_srcdir)/m4/unictype_h.m4 \ + $(top_srcdir)/m4/uninorm_h.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ + $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wctype_h.m4 \ $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ $(top_srcdir)/m4/wget_manywarnings.m4 \ $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/wmemchr.m4 \ @@ -553,9 +579,13 @@ libgnu_a_AR = $(AR) $(ARFLAGS) am__DEPENDENCIES_1 = am__libgnu_a_SOURCES_DIST = accept.c access.c openat-priv.h \ openat-proc.c base32.h base32.c basename-lgpl.c binary-io.h \ - binary-io.c bind.c bitrotate.h bitrotate.c btowc.c c-ctype.h \ - c-ctype.c c-strcase.h c-strcasecmp.c c-strncasecmp.c \ - c-strcasestr.h c-strcasestr.c canonicalize.c \ + binary-io.c bind.c bitrotate.h bitrotate.c btoc32.c btowc.c \ + c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c c-strncasecmp.c \ + c-strcasestr.h c-strcasestr.c c32_apply_type_test.c \ + c32_get_type_test.c c32isalnum.c c32isalpha.c c32isblank.c \ + c32iscntrl.c c32isdigit.c c32isgraph.c c32islower.c \ + c32isprint.c c32ispunct.c c32isspace.c c32isupper.c \ + c32isxdigit.c c32tolower.c c32width.c canonicalize.c \ canonicalize-lgpl.c chdir-long.c cloexec.c close.c closedir.c \ concat-filename.c connect.c af_alg.c md2-stream.c md2.c \ md4-stream.c md4.c md5-stream.c md5.c sha1-stream.c sha1.c \ @@ -577,11 +607,12 @@ am__libgnu_a_SOURCES_DIST = accept.c access.c openat-priv.h \ malloc/scratch_buffer_set_array_size.c group-member.c \ hard-locale.c hash.c hash-pjw.h hash-pjw.c \ hash-triple-simple.c ialloc.c idx.h inet_ntop.c ioctl.c \ - isblank.c iswblank.c iswdigit.c iswxdigit.c link.c listen.c \ - localcharset.c localeconv.c glthread/lock.h glthread/lock.c \ - lseek.c lstat.c malloca.c mbchar.c mbiter.h mbiter.c mbrtowc.c \ - mbsinit.c mbsrtowcs.c mbtowc.c memchr.c mempcpy.c memrchr.c \ - minmax.h mkdir.c mkostemp.c mkstemp.c msvc-inval.c \ + isblank.c iswblank.c iswctype.c iswdigit.c iswpunct.c \ + iswxdigit.c link.c listen.c localcharset.c localeconv.c \ + glthread/lock.h glthread/lock.c lseek.c lstat.c malloca.c \ + mbchar.c mbiter.h mbiter.c mbrtoc32.c mbrtowc.c mbsinit.c \ + mbsrtoc32s.c mbsrtowcs.c mbszero.c mbtowc.c memchr.c mempcpy.c \ + memrchr.c minmax.h mkdir.c mkostemp.c mkstemp.c msvc-inval.c \ msvc-nothrow.c nanosleep.c nl_langinfo.c nl_langinfo-lock.c \ open.c openat.c openat-die.c opendir.c pipe.c pipe2.c \ pipe2-safer.c spawn.c spawni.c spawn_faction_addchdir.c \ @@ -592,26 +623,35 @@ am__libgnu_a_SOURCES_DIST = accept.c access.c openat-priv.h \ spawnattr_setsigmask.c spawnp.c pselect.c pthread_sigmask.c \ quotearg.c raise.c rawmemchr.c readdir.c readlink.c \ reallocarray.c recv.c regex.c rename.c rewinddir.c rmdir.c \ - save-cwd.c secure_getenv.c select.c send.c setlocale_null.c \ - setlocale-lock.c setsockopt.c sigaction.c sig-handler.c \ - sigprocmask.c size_max.h socket.c sockets.h sockets.c \ - spawn-pipe.h spawn-pipe.c os2-spawn.c stat.c stat-time.c \ - stdio-read.c stdio-write.c stpcpy.c strcasecmp.c strncasecmp.c \ - strchrnul.c strdup.c strerror.c strerror-override.c strndup.c \ - strnlen.c strnlen1.h strnlen1.c strpbrk.c strptime.c \ - strtok_r.c strtol.c strtoll.c symlink.c sys_socket.c \ - tempname.c glthread/threadlib.c time_r.c timegm.c timespec.c \ - tmpdir.h tmpdir.c u64.c unicase/cased.c \ + same-inode.h same-inode.c save-cwd.c secure_getenv.c select.c \ + send.c setlocale_null.c setlocale-lock.c \ + setlocale_null-unlocked.c setsockopt.c sigaction.c \ + sig-handler.c sigprocmask.c size_max.h socket.c sockets.h \ + sockets.c spawn-pipe.h spawn-pipe.c os2-spawn.c stat.c \ + stat-time.c stdio-read.c stdio-write.c stpcpy.c strcasecmp.c \ + strncasecmp.c strchrnul.c strdup.c strerror.c \ + strerror-override.c strndup.c strnlen.c strnlen1.h strnlen1.c \ + strpbrk.c strptime.c strtok_r.c strtol.c strtoll.c symlink.c \ + sys_socket.c tempname.c glthread/threadlib.c time_r.c timegm.c \ + timespec.c tmpdir.h tmpdir.c u64.c unicase/cased.c \ unicase/empty-prefix-context.c unicase/empty-suffix-context.c \ unicase/ignorable.c unicase/special-casing.c unicase/tolower.c \ unicase/u8-casemap.c unicase/u8-tolower.c \ - unictype/combiningclass.c unictype/pr_soft_dotted.c \ + unictype/combiningclass.c unictype/ctype_alnum.c \ + unictype/ctype_alpha.c unictype/ctype_blank.c \ + unictype/ctype_cntrl.c unictype/ctype_digit.c \ + unictype/ctype_graph.c unictype/ctype_lower.c \ + unictype/ctype_print.c unictype/ctype_punct.c \ + unictype/ctype_space.c unictype/ctype_upper.c \ + unictype/ctype_xdigit.c unictype/pr_soft_dotted.c \ uninorm/decompose-internal.c uninorm/u8-normalize.c unistd.c \ - dup-safer.c fd-safer.c pipe-safer.c unistr/u8-cpy.c \ - unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c \ - unistr/u8-strlen.c unistr/u8-uctomb.c unistr/u8-uctomb-aux.c \ - uniwidth/width.c unlink.c utime.c utimens.c wait-process.h \ - wait-process.c waitpid.c wcrtomb.c wctype-h.c wcwidth.c \ + dup-safer.c fd-safer.c pipe-safer.c unistr/u32-chr.c \ + unistr/u32-cpy.c unistr/u32-pcpy.c unistr/u32-strcat.c \ + unistr/u32-strlen.c unistr/u8-cpy.c unistr/u8-mbtouc-unsafe.c \ + unistr/u8-mbtouc-unsafe-aux.c unistr/u8-strlen.c \ + unistr/u8-uctomb.c unistr/u8-uctomb-aux.c uniwidth/width.c \ + unlink.c utime.c utimens.c wait-process.h wait-process.c \ + waitpid.c wcrtomb.c wctype.c wctype-h.c wcwidth.c \ windows-mutex.c windows-once.c windows-recmutex.c \ windows-rwlock.c windows-spawn.c wmemchr.c wmempcpy.c write.c \ xmalloc.c xalloc-die.c xmemdup0.h xmemdup0.c xsize.h xsize.c \ @@ -680,154 +720,188 @@ am__dirstamp = $(am__leading_dot)dirstamp @GL_COND_OBJ_ISBLANK_TRUE@am__objects_47 = libgnu_a-isblank.$(OBJEXT) @GL_COND_OBJ_ISWBLANK_TRUE@am__objects_48 = \ @GL_COND_OBJ_ISWBLANK_TRUE@ libgnu_a-iswblank.$(OBJEXT) -@GL_COND_OBJ_ISWDIGIT_TRUE@am__objects_49 = \ +@GL_COND_OBJ_ISWCTYPE_TRUE@am__objects_49 = \ +@GL_COND_OBJ_ISWCTYPE_TRUE@ libgnu_a-iswctype.$(OBJEXT) +@GL_COND_OBJ_ISWDIGIT_TRUE@am__objects_50 = \ @GL_COND_OBJ_ISWDIGIT_TRUE@ libgnu_a-iswdigit.$(OBJEXT) -@GL_COND_OBJ_ISWXDIGIT_TRUE@am__objects_50 = \ +@GL_COND_OBJ_ISWPUNCT_TRUE@am__objects_51 = \ +@GL_COND_OBJ_ISWPUNCT_TRUE@ libgnu_a-iswpunct.$(OBJEXT) +@GL_COND_OBJ_ISWXDIGIT_TRUE@am__objects_52 = \ @GL_COND_OBJ_ISWXDIGIT_TRUE@ libgnu_a-iswxdigit.$(OBJEXT) -@GL_COND_OBJ_LINK_TRUE@am__objects_51 = libgnu_a-link.$(OBJEXT) -@GL_COND_OBJ_LISTEN_TRUE@am__objects_52 = libgnu_a-listen.$(OBJEXT) -@GL_COND_OBJ_LOCALECONV_TRUE@am__objects_53 = \ +@GL_COND_OBJ_LINK_TRUE@am__objects_53 = libgnu_a-link.$(OBJEXT) +@GL_COND_OBJ_LISTEN_TRUE@am__objects_54 = libgnu_a-listen.$(OBJEXT) +@GL_COND_OBJ_LOCALECONV_TRUE@am__objects_55 = \ @GL_COND_OBJ_LOCALECONV_TRUE@ libgnu_a-localeconv.$(OBJEXT) -@GL_COND_OBJ_LSEEK_TRUE@am__objects_54 = libgnu_a-lseek.$(OBJEXT) -@GL_COND_OBJ_LSTAT_TRUE@am__objects_55 = libgnu_a-lstat.$(OBJEXT) -@GL_COND_OBJ_MBRTOWC_TRUE@am__objects_56 = libgnu_a-mbrtowc.$(OBJEXT) -@GL_COND_OBJ_MBSINIT_TRUE@am__objects_57 = libgnu_a-mbsinit.$(OBJEXT) -@GL_COND_OBJ_MBSRTOWCS_TRUE@am__objects_58 = \ +@GL_COND_OBJ_LSEEK_TRUE@am__objects_56 = libgnu_a-lseek.$(OBJEXT) +@GL_COND_OBJ_LSTAT_TRUE@am__objects_57 = libgnu_a-lstat.$(OBJEXT) +@GL_COND_OBJ_MBRTOC32_TRUE@am__objects_58 = \ +@GL_COND_OBJ_MBRTOC32_TRUE@ libgnu_a-mbrtoc32.$(OBJEXT) +@GL_COND_OBJ_MBRTOWC_TRUE@am__objects_59 = libgnu_a-mbrtowc.$(OBJEXT) +@GL_COND_OBJ_MBSINIT_TRUE@am__objects_60 = libgnu_a-mbsinit.$(OBJEXT) +@GL_COND_OBJ_MBSRTOWCS_TRUE@am__objects_61 = \ @GL_COND_OBJ_MBSRTOWCS_TRUE@ libgnu_a-mbsrtowcs.$(OBJEXT) -@GL_COND_OBJ_MBTOWC_TRUE@am__objects_59 = libgnu_a-mbtowc.$(OBJEXT) -@GL_COND_OBJ_MEMCHR_TRUE@am__objects_60 = libgnu_a-memchr.$(OBJEXT) -@GL_COND_OBJ_MEMPCPY_TRUE@am__objects_61 = libgnu_a-mempcpy.$(OBJEXT) -@GL_COND_OBJ_MEMRCHR_TRUE@am__objects_62 = libgnu_a-memrchr.$(OBJEXT) -@GL_COND_OBJ_MKDIR_TRUE@am__objects_63 = libgnu_a-mkdir.$(OBJEXT) -@GL_COND_OBJ_MKOSTEMP_TRUE@am__objects_64 = \ +@GL_COND_OBJ_MBTOWC_TRUE@am__objects_62 = libgnu_a-mbtowc.$(OBJEXT) +@GL_COND_OBJ_MEMCHR_TRUE@am__objects_63 = libgnu_a-memchr.$(OBJEXT) +@GL_COND_OBJ_MEMPCPY_TRUE@am__objects_64 = libgnu_a-mempcpy.$(OBJEXT) +@GL_COND_OBJ_MEMRCHR_TRUE@am__objects_65 = libgnu_a-memrchr.$(OBJEXT) +@GL_COND_OBJ_MKDIR_TRUE@am__objects_66 = libgnu_a-mkdir.$(OBJEXT) +@GL_COND_OBJ_MKOSTEMP_TRUE@am__objects_67 = \ @GL_COND_OBJ_MKOSTEMP_TRUE@ libgnu_a-mkostemp.$(OBJEXT) -@GL_COND_OBJ_MKSTEMP_TRUE@am__objects_65 = libgnu_a-mkstemp.$(OBJEXT) -@GL_COND_OBJ_MSVC_INVAL_TRUE@am__objects_66 = \ +@GL_COND_OBJ_MKSTEMP_TRUE@am__objects_68 = libgnu_a-mkstemp.$(OBJEXT) +@GL_COND_OBJ_MSVC_INVAL_TRUE@am__objects_69 = \ @GL_COND_OBJ_MSVC_INVAL_TRUE@ libgnu_a-msvc-inval.$(OBJEXT) -@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__objects_67 = libgnu_a-msvc-nothrow.$(OBJEXT) -@GL_COND_OBJ_NANOSLEEP_TRUE@am__objects_68 = \ +@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__objects_70 = libgnu_a-msvc-nothrow.$(OBJEXT) +@GL_COND_OBJ_NANOSLEEP_TRUE@am__objects_71 = \ @GL_COND_OBJ_NANOSLEEP_TRUE@ libgnu_a-nanosleep.$(OBJEXT) -@GL_COND_OBJ_NL_LANGINFO_TRUE@am__objects_69 = \ +@GL_COND_OBJ_NL_LANGINFO_TRUE@am__objects_72 = \ @GL_COND_OBJ_NL_LANGINFO_TRUE@ libgnu_a-nl_langinfo.$(OBJEXT) -@GL_COND_OBJ_NL_LANGINFO_LOCK_TRUE@am__objects_70 = libgnu_a-nl_langinfo-lock.$(OBJEXT) -@GL_COND_OBJ_OPEN_TRUE@am__objects_71 = libgnu_a-open.$(OBJEXT) -@GL_COND_OBJ_OPENAT_TRUE@am__objects_72 = libgnu_a-openat.$(OBJEXT) -@GL_COND_OBJ_OPENDIR_TRUE@am__objects_73 = libgnu_a-opendir.$(OBJEXT) -@GL_COND_OBJ_PIPE_TRUE@am__objects_74 = libgnu_a-pipe.$(OBJEXT) -@GL_COND_OBJ_SPAWN_TRUE@am__objects_75 = libgnu_a-spawn.$(OBJEXT) -@GL_COND_OBJ_SPAWNI_TRUE@am__objects_76 = libgnu_a-spawni.$(OBJEXT) -@GL_COND_OBJ_SPAWN_FACTION_ADDCHDIR_TRUE@am__objects_77 = libgnu_a-spawn_faction_addchdir.$(OBJEXT) -@GL_COND_OBJ_SPAWN_FACTION_ADDCLOSE_TRUE@am__objects_78 = libgnu_a-spawn_faction_addclose.$(OBJEXT) -@GL_COND_OBJ_SPAWN_FACTION_ADDDUP2_TRUE@am__objects_79 = libgnu_a-spawn_faction_adddup2.$(OBJEXT) -@GL_COND_OBJ_SPAWN_FACTION_ADDOPEN_TRUE@am__objects_80 = libgnu_a-spawn_faction_addopen.$(OBJEXT) -@GL_COND_OBJ_SPAWN_FACTION_DESTROY_TRUE@am__objects_81 = libgnu_a-spawn_faction_destroy.$(OBJEXT) -@GL_COND_OBJ_SPAWN_FACTION_INIT_TRUE@am__objects_82 = libgnu_a-spawn_faction_init.$(OBJEXT) -@GL_COND_OBJ_SPAWNATTR_DESTROY_TRUE@am__objects_83 = libgnu_a-spawnattr_destroy.$(OBJEXT) -@GL_COND_OBJ_SPAWNATTR_INIT_TRUE@am__objects_84 = libgnu_a-spawnattr_init.$(OBJEXT) -@GL_COND_OBJ_SPAWNATTR_SETFLAGS_TRUE@am__objects_85 = libgnu_a-spawnattr_setflags.$(OBJEXT) -@GL_COND_OBJ_SPAWNATTR_SETPGROUP_TRUE@am__objects_86 = libgnu_a-spawnattr_setpgroup.$(OBJEXT) -@GL_COND_OBJ_SPAWNATTR_SETSIGMASK_TRUE@am__objects_87 = libgnu_a-spawnattr_setsigmask.$(OBJEXT) -@GL_COND_OBJ_SPAWNP_TRUE@am__objects_88 = libgnu_a-spawnp.$(OBJEXT) -@GL_COND_OBJ_PSELECT_TRUE@am__objects_89 = libgnu_a-pselect.$(OBJEXT) -@GL_COND_OBJ_PTHREAD_SIGMASK_TRUE@am__objects_90 = libgnu_a-pthread_sigmask.$(OBJEXT) -@GL_COND_OBJ_RAISE_TRUE@am__objects_91 = libgnu_a-raise.$(OBJEXT) -@GL_COND_OBJ_RAWMEMCHR_TRUE@am__objects_92 = \ +@GL_COND_OBJ_NL_LANGINFO_LOCK_TRUE@am__objects_73 = libgnu_a-nl_langinfo-lock.$(OBJEXT) +@GL_COND_OBJ_OPEN_TRUE@am__objects_74 = libgnu_a-open.$(OBJEXT) +@GL_COND_OBJ_OPENAT_TRUE@am__objects_75 = libgnu_a-openat.$(OBJEXT) +@GL_COND_OBJ_OPENDIR_TRUE@am__objects_76 = libgnu_a-opendir.$(OBJEXT) +@GL_COND_OBJ_PIPE_TRUE@am__objects_77 = libgnu_a-pipe.$(OBJEXT) +@GL_COND_OBJ_SPAWN_TRUE@am__objects_78 = libgnu_a-spawn.$(OBJEXT) +@GL_COND_OBJ_SPAWNI_TRUE@am__objects_79 = libgnu_a-spawni.$(OBJEXT) +@GL_COND_OBJ_SPAWN_FACTION_ADDCHDIR_TRUE@am__objects_80 = libgnu_a-spawn_faction_addchdir.$(OBJEXT) +@GL_COND_OBJ_SPAWN_FACTION_ADDCLOSE_TRUE@am__objects_81 = libgnu_a-spawn_faction_addclose.$(OBJEXT) +@GL_COND_OBJ_SPAWN_FACTION_ADDDUP2_TRUE@am__objects_82 = libgnu_a-spawn_faction_adddup2.$(OBJEXT) +@GL_COND_OBJ_SPAWN_FACTION_ADDOPEN_TRUE@am__objects_83 = libgnu_a-spawn_faction_addopen.$(OBJEXT) +@GL_COND_OBJ_SPAWN_FACTION_DESTROY_TRUE@am__objects_84 = libgnu_a-spawn_faction_destroy.$(OBJEXT) +@GL_COND_OBJ_SPAWN_FACTION_INIT_TRUE@am__objects_85 = libgnu_a-spawn_faction_init.$(OBJEXT) +@GL_COND_OBJ_SPAWNATTR_DESTROY_TRUE@am__objects_86 = libgnu_a-spawnattr_destroy.$(OBJEXT) +@GL_COND_OBJ_SPAWNATTR_INIT_TRUE@am__objects_87 = libgnu_a-spawnattr_init.$(OBJEXT) +@GL_COND_OBJ_SPAWNATTR_SETFLAGS_TRUE@am__objects_88 = libgnu_a-spawnattr_setflags.$(OBJEXT) +@GL_COND_OBJ_SPAWNATTR_SETPGROUP_TRUE@am__objects_89 = libgnu_a-spawnattr_setpgroup.$(OBJEXT) +@GL_COND_OBJ_SPAWNATTR_SETSIGMASK_TRUE@am__objects_90 = libgnu_a-spawnattr_setsigmask.$(OBJEXT) +@GL_COND_OBJ_SPAWNP_TRUE@am__objects_91 = libgnu_a-spawnp.$(OBJEXT) +@GL_COND_OBJ_PSELECT_TRUE@am__objects_92 = libgnu_a-pselect.$(OBJEXT) +@GL_COND_OBJ_PTHREAD_SIGMASK_TRUE@am__objects_93 = libgnu_a-pthread_sigmask.$(OBJEXT) +@GL_COND_OBJ_RAISE_TRUE@am__objects_94 = libgnu_a-raise.$(OBJEXT) +@GL_COND_OBJ_RAWMEMCHR_TRUE@am__objects_95 = \ @GL_COND_OBJ_RAWMEMCHR_TRUE@ libgnu_a-rawmemchr.$(OBJEXT) -@GL_COND_OBJ_READDIR_TRUE@am__objects_93 = libgnu_a-readdir.$(OBJEXT) -@GL_COND_OBJ_READLINK_TRUE@am__objects_94 = \ +@GL_COND_OBJ_READDIR_TRUE@am__objects_96 = libgnu_a-readdir.$(OBJEXT) +@GL_COND_OBJ_READLINK_TRUE@am__objects_97 = \ @GL_COND_OBJ_READLINK_TRUE@ libgnu_a-readlink.$(OBJEXT) -@GL_COND_OBJ_REALLOCARRAY_TRUE@am__objects_95 = libgnu_a-reallocarray.$(OBJEXT) -@GL_COND_OBJ_RECV_TRUE@am__objects_96 = libgnu_a-recv.$(OBJEXT) -@GL_COND_OBJ_REGEX_TRUE@am__objects_97 = libgnu_a-regex.$(OBJEXT) -@GL_COND_OBJ_RENAME_TRUE@am__objects_98 = libgnu_a-rename.$(OBJEXT) -@GL_COND_OBJ_REWINDDIR_TRUE@am__objects_99 = \ +@GL_COND_OBJ_REALLOCARRAY_TRUE@am__objects_98 = libgnu_a-reallocarray.$(OBJEXT) +@GL_COND_OBJ_RECV_TRUE@am__objects_99 = libgnu_a-recv.$(OBJEXT) +@GL_COND_OBJ_REGEX_TRUE@am__objects_100 = libgnu_a-regex.$(OBJEXT) +@GL_COND_OBJ_RENAME_TRUE@am__objects_101 = libgnu_a-rename.$(OBJEXT) +@GL_COND_OBJ_REWINDDIR_TRUE@am__objects_102 = \ @GL_COND_OBJ_REWINDDIR_TRUE@ libgnu_a-rewinddir.$(OBJEXT) -@GL_COND_OBJ_RMDIR_TRUE@am__objects_100 = libgnu_a-rmdir.$(OBJEXT) -@GL_COND_OBJ_SECURE_GETENV_TRUE@am__objects_101 = libgnu_a-secure_getenv.$(OBJEXT) -@GL_COND_OBJ_SELECT_TRUE@am__objects_102 = libgnu_a-select.$(OBJEXT) -@GL_COND_OBJ_SEND_TRUE@am__objects_103 = libgnu_a-send.$(OBJEXT) -@GL_COND_OBJ_SETLOCALE_LOCK_TRUE@am__objects_104 = libgnu_a-setlocale-lock.$(OBJEXT) -@GL_COND_OBJ_SETSOCKOPT_TRUE@am__objects_105 = \ +@GL_COND_OBJ_RMDIR_TRUE@am__objects_103 = libgnu_a-rmdir.$(OBJEXT) +@GL_COND_OBJ_SECURE_GETENV_TRUE@am__objects_104 = libgnu_a-secure_getenv.$(OBJEXT) +@GL_COND_OBJ_SELECT_TRUE@am__objects_105 = libgnu_a-select.$(OBJEXT) +@GL_COND_OBJ_SEND_TRUE@am__objects_106 = libgnu_a-send.$(OBJEXT) +@GL_COND_OBJ_SETLOCALE_LOCK_TRUE@am__objects_107 = libgnu_a-setlocale-lock.$(OBJEXT) +@GL_COND_OBJ_SETSOCKOPT_TRUE@am__objects_108 = \ @GL_COND_OBJ_SETSOCKOPT_TRUE@ libgnu_a-setsockopt.$(OBJEXT) -@GL_COND_OBJ_SIGACTION_TRUE@am__objects_106 = \ +@GL_COND_OBJ_SIGACTION_TRUE@am__objects_109 = \ @GL_COND_OBJ_SIGACTION_TRUE@ libgnu_a-sigaction.$(OBJEXT) -@GL_COND_OBJ_SIGPROCMASK_TRUE@am__objects_107 = \ +@GL_COND_OBJ_SIGPROCMASK_TRUE@am__objects_110 = \ @GL_COND_OBJ_SIGPROCMASK_TRUE@ libgnu_a-sigprocmask.$(OBJEXT) -@GL_COND_OBJ_SOCKET_TRUE@am__objects_108 = libgnu_a-socket.$(OBJEXT) -@GL_COND_OBJ_OS2_SPAWN_TRUE@am__objects_109 = \ +@GL_COND_OBJ_SOCKET_TRUE@am__objects_111 = libgnu_a-socket.$(OBJEXT) +@GL_COND_OBJ_OS2_SPAWN_TRUE@am__objects_112 = \ @GL_COND_OBJ_OS2_SPAWN_TRUE@ libgnu_a-os2-spawn.$(OBJEXT) -@GL_COND_OBJ_STAT_TRUE@am__objects_110 = libgnu_a-stat.$(OBJEXT) -@GL_COND_OBJ_STDIO_READ_TRUE@am__objects_111 = \ +@GL_COND_OBJ_STAT_TRUE@am__objects_113 = libgnu_a-stat.$(OBJEXT) +@GL_COND_OBJ_STDIO_READ_TRUE@am__objects_114 = \ @GL_COND_OBJ_STDIO_READ_TRUE@ libgnu_a-stdio-read.$(OBJEXT) -@GL_COND_OBJ_STDIO_WRITE_TRUE@am__objects_112 = \ +@GL_COND_OBJ_STDIO_WRITE_TRUE@am__objects_115 = \ @GL_COND_OBJ_STDIO_WRITE_TRUE@ libgnu_a-stdio-write.$(OBJEXT) -@GL_COND_OBJ_STPCPY_TRUE@am__objects_113 = libgnu_a-stpcpy.$(OBJEXT) -@GL_COND_OBJ_STRCASECMP_TRUE@am__objects_114 = \ +@GL_COND_OBJ_STPCPY_TRUE@am__objects_116 = libgnu_a-stpcpy.$(OBJEXT) +@GL_COND_OBJ_STRCASECMP_TRUE@am__objects_117 = \ @GL_COND_OBJ_STRCASECMP_TRUE@ libgnu_a-strcasecmp.$(OBJEXT) -@GL_COND_OBJ_STRNCASECMP_TRUE@am__objects_115 = \ +@GL_COND_OBJ_STRNCASECMP_TRUE@am__objects_118 = \ @GL_COND_OBJ_STRNCASECMP_TRUE@ libgnu_a-strncasecmp.$(OBJEXT) -@GL_COND_OBJ_STRCHRNUL_TRUE@am__objects_116 = \ +@GL_COND_OBJ_STRCHRNUL_TRUE@am__objects_119 = \ @GL_COND_OBJ_STRCHRNUL_TRUE@ libgnu_a-strchrnul.$(OBJEXT) -@GL_COND_OBJ_STRDUP_TRUE@am__objects_117 = libgnu_a-strdup.$(OBJEXT) -@GL_COND_OBJ_STRERROR_TRUE@am__objects_118 = \ +@GL_COND_OBJ_STRDUP_TRUE@am__objects_120 = libgnu_a-strdup.$(OBJEXT) +@GL_COND_OBJ_STRERROR_TRUE@am__objects_121 = \ @GL_COND_OBJ_STRERROR_TRUE@ libgnu_a-strerror.$(OBJEXT) -@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__objects_119 = libgnu_a-strerror-override.$(OBJEXT) -@GL_COND_OBJ_STRNDUP_TRUE@am__objects_120 = \ +@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__objects_122 = libgnu_a-strerror-override.$(OBJEXT) +@GL_COND_OBJ_STRNDUP_TRUE@am__objects_123 = \ @GL_COND_OBJ_STRNDUP_TRUE@ libgnu_a-strndup.$(OBJEXT) -@GL_COND_OBJ_STRNLEN_TRUE@am__objects_121 = \ +@GL_COND_OBJ_STRNLEN_TRUE@am__objects_124 = \ @GL_COND_OBJ_STRNLEN_TRUE@ libgnu_a-strnlen.$(OBJEXT) -@GL_COND_OBJ_STRPBRK_TRUE@am__objects_122 = \ +@GL_COND_OBJ_STRPBRK_TRUE@am__objects_125 = \ @GL_COND_OBJ_STRPBRK_TRUE@ libgnu_a-strpbrk.$(OBJEXT) -@GL_COND_OBJ_STRPTIME_TRUE@am__objects_123 = \ +@GL_COND_OBJ_STRPTIME_TRUE@am__objects_126 = \ @GL_COND_OBJ_STRPTIME_TRUE@ libgnu_a-strptime.$(OBJEXT) -@GL_COND_OBJ_STRTOK_R_TRUE@am__objects_124 = \ +@GL_COND_OBJ_STRTOK_R_TRUE@am__objects_127 = \ @GL_COND_OBJ_STRTOK_R_TRUE@ libgnu_a-strtok_r.$(OBJEXT) -@GL_COND_OBJ_STRTOL_TRUE@am__objects_125 = libgnu_a-strtol.$(OBJEXT) -@GL_COND_OBJ_STRTOLL_TRUE@am__objects_126 = \ +@GL_COND_OBJ_STRTOL_TRUE@am__objects_128 = libgnu_a-strtol.$(OBJEXT) +@GL_COND_OBJ_STRTOLL_TRUE@am__objects_129 = \ @GL_COND_OBJ_STRTOLL_TRUE@ libgnu_a-strtoll.$(OBJEXT) -@GL_COND_OBJ_SYMLINK_TRUE@am__objects_127 = \ +@GL_COND_OBJ_SYMLINK_TRUE@am__objects_130 = \ @GL_COND_OBJ_SYMLINK_TRUE@ libgnu_a-symlink.$(OBJEXT) -@GL_COND_OBJ_TIME_R_TRUE@am__objects_128 = libgnu_a-time_r.$(OBJEXT) -@GL_COND_OBJ_TIMEGM_TRUE@am__objects_129 = libgnu_a-timegm.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNICASE_EMPTY_PREFIX_CONTEXT_TRUE@am__objects_130 = unicase/libgnu_a-empty-prefix-context.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNICASE_EMPTY_SUFFIX_CONTEXT_TRUE@am__objects_131 = unicase/libgnu_a-empty-suffix-context.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNICASE_TOLOWER_TRUE@am__objects_132 = unicase/libgnu_a-tolower.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNICASE_U8_TOLOWER_TRUE@am__objects_133 = unicase/libgnu_a-u8-tolower.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_TRUE@am__objects_134 = unictype/libgnu_a-combiningclass.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SOFT_DOTTED_TRUE@am__objects_135 = unictype/libgnu_a-pr_soft_dotted.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNINORM_U8_NORMALIZE_TRUE@am__objects_136 = uninorm/libgnu_a-u8-normalize.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNISTR_U8_CPY_TRUE@am__objects_137 = unistr/libgnu_a-u8-cpy.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__objects_138 = unistr/libgnu_a-u8-mbtouc-unsafe.$(OBJEXT) \ +@GL_COND_OBJ_TIME_R_TRUE@am__objects_131 = libgnu_a-time_r.$(OBJEXT) +@GL_COND_OBJ_TIMEGM_TRUE@am__objects_132 = libgnu_a-timegm.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICASE_EMPTY_PREFIX_CONTEXT_TRUE@am__objects_133 = unicase/libgnu_a-empty-prefix-context.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICASE_EMPTY_SUFFIX_CONTEXT_TRUE@am__objects_134 = unicase/libgnu_a-empty-suffix-context.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICASE_TOLOWER_TRUE@am__objects_135 = unicase/libgnu_a-tolower.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICASE_U8_TOLOWER_TRUE@am__objects_136 = unicase/libgnu_a-u8-tolower.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_TRUE@am__objects_137 = unictype/libgnu_a-combiningclass.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM_TRUE@am__objects_138 = unictype/libgnu_a-ctype_alnum.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_TRUE@am__objects_139 = unictype/libgnu_a-ctype_alpha.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK_TRUE@am__objects_140 = unictype/libgnu_a-ctype_blank.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL_TRUE@am__objects_141 = unictype/libgnu_a-ctype_cntrl.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT_TRUE@am__objects_142 = unictype/libgnu_a-ctype_digit.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH_TRUE@am__objects_143 = unictype/libgnu_a-ctype_graph.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER_TRUE@am__objects_144 = unictype/libgnu_a-ctype_lower.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT_TRUE@am__objects_145 = unictype/libgnu_a-ctype_print.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT_TRUE@am__objects_146 = unictype/libgnu_a-ctype_punct.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_TRUE@am__objects_147 = unictype/libgnu_a-ctype_space.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER_TRUE@am__objects_148 = unictype/libgnu_a-ctype_upper.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT_TRUE@am__objects_149 = unictype/libgnu_a-ctype_xdigit.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SOFT_DOTTED_TRUE@am__objects_150 = unictype/libgnu_a-pr_soft_dotted.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNINORM_U8_NORMALIZE_TRUE@am__objects_151 = uninorm/libgnu_a-u8-normalize.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNISTR_U32_CHR_TRUE@am__objects_152 = unistr/libgnu_a-u32-chr.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNISTR_U32_CPY_TRUE@am__objects_153 = unistr/libgnu_a-u32-cpy.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNISTR_U32_PCPY_TRUE@am__objects_154 = unistr/libgnu_a-u32-pcpy.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT_TRUE@am__objects_155 = unistr/libgnu_a-u32-strcat.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_TRUE@am__objects_156 = unistr/libgnu_a-u32-strlen.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNISTR_U8_CPY_TRUE@am__objects_157 = unistr/libgnu_a-u8-cpy.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__objects_158 = unistr/libgnu_a-u8-mbtouc-unsafe.$(OBJEXT) \ @LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@ unistr/libgnu_a-u8-mbtouc-unsafe-aux.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE@am__objects_139 = unistr/libgnu_a-u8-strlen.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_140 = unistr/libgnu_a-u8-uctomb.$(OBJEXT) \ +@LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE@am__objects_159 = unistr/libgnu_a-u8-strlen.$(OBJEXT) +@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_160 = unistr/libgnu_a-u8-uctomb.$(OBJEXT) \ @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@ unistr/libgnu_a-u8-uctomb-aux.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_141 = uniwidth/libgnu_a-width.$(OBJEXT) -@GL_COND_OBJ_UNLINK_TRUE@am__objects_142 = libgnu_a-unlink.$(OBJEXT) -@GL_COND_OBJ_UTIME_TRUE@am__objects_143 = libgnu_a-utime.$(OBJEXT) -@GL_COND_OBJ_WAITPID_TRUE@am__objects_144 = \ +@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_161 = uniwidth/libgnu_a-width.$(OBJEXT) +@GL_COND_OBJ_UNLINK_TRUE@am__objects_162 = libgnu_a-unlink.$(OBJEXT) +@GL_COND_OBJ_UTIME_TRUE@am__objects_163 = libgnu_a-utime.$(OBJEXT) +@GL_COND_OBJ_WAITPID_TRUE@am__objects_164 = \ @GL_COND_OBJ_WAITPID_TRUE@ libgnu_a-waitpid.$(OBJEXT) -@GL_COND_OBJ_WCRTOMB_TRUE@am__objects_145 = \ +@GL_COND_OBJ_WCRTOMB_TRUE@am__objects_165 = \ @GL_COND_OBJ_WCRTOMB_TRUE@ libgnu_a-wcrtomb.$(OBJEXT) -@GL_COND_OBJ_WCWIDTH_TRUE@am__objects_146 = \ +@GL_COND_OBJ_WCTYPE_TRUE@am__objects_166 = libgnu_a-wctype.$(OBJEXT) +@GL_COND_OBJ_WCWIDTH_TRUE@am__objects_167 = \ @GL_COND_OBJ_WCWIDTH_TRUE@ libgnu_a-wcwidth.$(OBJEXT) -@GL_COND_OBJ_WINDOWS_MUTEX_TRUE@am__objects_147 = libgnu_a-windows-mutex.$(OBJEXT) -@GL_COND_OBJ_WINDOWS_ONCE_TRUE@am__objects_148 = libgnu_a-windows-once.$(OBJEXT) -@GL_COND_OBJ_WINDOWS_RECMUTEX_TRUE@am__objects_149 = libgnu_a-windows-recmutex.$(OBJEXT) -@GL_COND_OBJ_WINDOWS_RWLOCK_TRUE@am__objects_150 = libgnu_a-windows-rwlock.$(OBJEXT) -@GL_COND_OBJ_WINDOWS_SPAWN_TRUE@am__objects_151 = libgnu_a-windows-spawn.$(OBJEXT) -@GL_COND_OBJ_WMEMCHR_TRUE@am__objects_152 = \ +@GL_COND_OBJ_WINDOWS_MUTEX_TRUE@am__objects_168 = libgnu_a-windows-mutex.$(OBJEXT) +@GL_COND_OBJ_WINDOWS_ONCE_TRUE@am__objects_169 = libgnu_a-windows-once.$(OBJEXT) +@GL_COND_OBJ_WINDOWS_RECMUTEX_TRUE@am__objects_170 = libgnu_a-windows-recmutex.$(OBJEXT) +@GL_COND_OBJ_WINDOWS_RWLOCK_TRUE@am__objects_171 = libgnu_a-windows-rwlock.$(OBJEXT) +@GL_COND_OBJ_WINDOWS_SPAWN_TRUE@am__objects_172 = libgnu_a-windows-spawn.$(OBJEXT) +@GL_COND_OBJ_WMEMCHR_TRUE@am__objects_173 = \ @GL_COND_OBJ_WMEMCHR_TRUE@ libgnu_a-wmemchr.$(OBJEXT) -@GL_COND_OBJ_WMEMPCPY_TRUE@am__objects_153 = \ +@GL_COND_OBJ_WMEMPCPY_TRUE@am__objects_174 = \ @GL_COND_OBJ_WMEMPCPY_TRUE@ libgnu_a-wmempcpy.$(OBJEXT) -@GL_COND_OBJ_WRITE_TRUE@am__objects_154 = libgnu_a-write.$(OBJEXT) +@GL_COND_OBJ_WRITE_TRUE@am__objects_175 = libgnu_a-write.$(OBJEXT) am_libgnu_a_OBJECTS = $(am__objects_1) $(am__objects_2) \ libgnu_a-openat-proc.$(OBJEXT) libgnu_a-base32.$(OBJEXT) \ libgnu_a-basename-lgpl.$(OBJEXT) libgnu_a-binary-io.$(OBJEXT) \ - $(am__objects_3) libgnu_a-bitrotate.$(OBJEXT) $(am__objects_4) \ + $(am__objects_3) libgnu_a-bitrotate.$(OBJEXT) \ + libgnu_a-btoc32.$(OBJEXT) $(am__objects_4) \ libgnu_a-c-ctype.$(OBJEXT) libgnu_a-c-strcasecmp.$(OBJEXT) \ libgnu_a-c-strncasecmp.$(OBJEXT) \ libgnu_a-c-strcasestr.$(OBJEXT) \ + libgnu_a-c32_apply_type_test.$(OBJEXT) \ + libgnu_a-c32_get_type_test.$(OBJEXT) \ + libgnu_a-c32isalnum.$(OBJEXT) libgnu_a-c32isalpha.$(OBJEXT) \ + libgnu_a-c32isblank.$(OBJEXT) libgnu_a-c32iscntrl.$(OBJEXT) \ + libgnu_a-c32isdigit.$(OBJEXT) libgnu_a-c32isgraph.$(OBJEXT) \ + libgnu_a-c32islower.$(OBJEXT) libgnu_a-c32isprint.$(OBJEXT) \ + libgnu_a-c32ispunct.$(OBJEXT) libgnu_a-c32isspace.$(OBJEXT) \ + libgnu_a-c32isupper.$(OBJEXT) libgnu_a-c32isxdigit.$(OBJEXT) \ + libgnu_a-c32tolower.$(OBJEXT) libgnu_a-c32width.$(OBJEXT) \ libgnu_a-canonicalize.$(OBJEXT) $(am__objects_5) \ $(am__objects_6) libgnu_a-cloexec.$(OBJEXT) $(am__objects_7) \ $(am__objects_8) libgnu_a-concat-filename.$(OBJEXT) \ @@ -873,64 +947,72 @@ am_libgnu_a_OBJECTS = $(am__objects_1) $(am__objects_2) \ libgnu_a-ialloc.$(OBJEXT) $(am__objects_45) $(am__objects_46) \ $(am__objects_47) $(am__objects_48) $(am__objects_49) \ $(am__objects_50) $(am__objects_51) $(am__objects_52) \ - libgnu_a-localcharset.$(OBJEXT) $(am__objects_53) \ - glthread/libgnu_a-lock.$(OBJEXT) $(am__objects_54) \ - $(am__objects_55) libgnu_a-malloca.$(OBJEXT) \ + $(am__objects_53) $(am__objects_54) \ + libgnu_a-localcharset.$(OBJEXT) $(am__objects_55) \ + glthread/libgnu_a-lock.$(OBJEXT) $(am__objects_56) \ + $(am__objects_57) libgnu_a-malloca.$(OBJEXT) \ libgnu_a-mbchar.$(OBJEXT) libgnu_a-mbiter.$(OBJEXT) \ - $(am__objects_56) $(am__objects_57) $(am__objects_58) \ - $(am__objects_59) $(am__objects_60) $(am__objects_61) \ - $(am__objects_62) $(am__objects_63) $(am__objects_64) \ - $(am__objects_65) $(am__objects_66) $(am__objects_67) \ - $(am__objects_68) $(am__objects_69) $(am__objects_70) \ - $(am__objects_71) $(am__objects_72) \ - libgnu_a-openat-die.$(OBJEXT) $(am__objects_73) \ - $(am__objects_74) libgnu_a-pipe2.$(OBJEXT) \ - libgnu_a-pipe2-safer.$(OBJEXT) $(am__objects_75) \ - $(am__objects_76) $(am__objects_77) $(am__objects_78) \ + $(am__objects_58) $(am__objects_59) $(am__objects_60) \ + libgnu_a-mbsrtoc32s.$(OBJEXT) $(am__objects_61) \ + libgnu_a-mbszero.$(OBJEXT) $(am__objects_62) $(am__objects_63) \ + $(am__objects_64) $(am__objects_65) $(am__objects_66) \ + $(am__objects_67) $(am__objects_68) $(am__objects_69) \ + $(am__objects_70) $(am__objects_71) $(am__objects_72) \ + $(am__objects_73) $(am__objects_74) $(am__objects_75) \ + libgnu_a-openat-die.$(OBJEXT) $(am__objects_76) \ + $(am__objects_77) libgnu_a-pipe2.$(OBJEXT) \ + libgnu_a-pipe2-safer.$(OBJEXT) $(am__objects_78) \ $(am__objects_79) $(am__objects_80) $(am__objects_81) \ $(am__objects_82) $(am__objects_83) $(am__objects_84) \ $(am__objects_85) $(am__objects_86) $(am__objects_87) \ $(am__objects_88) $(am__objects_89) $(am__objects_90) \ - libgnu_a-quotearg.$(OBJEXT) $(am__objects_91) \ - $(am__objects_92) $(am__objects_93) $(am__objects_94) \ + $(am__objects_91) $(am__objects_92) $(am__objects_93) \ + libgnu_a-quotearg.$(OBJEXT) $(am__objects_94) \ $(am__objects_95) $(am__objects_96) $(am__objects_97) \ $(am__objects_98) $(am__objects_99) $(am__objects_100) \ - libgnu_a-save-cwd.$(OBJEXT) $(am__objects_101) \ - $(am__objects_102) $(am__objects_103) \ - libgnu_a-setlocale_null.$(OBJEXT) $(am__objects_104) \ - $(am__objects_105) $(am__objects_106) \ - libgnu_a-sig-handler.$(OBJEXT) $(am__objects_107) \ - $(am__objects_108) libgnu_a-sockets.$(OBJEXT) \ - libgnu_a-spawn-pipe.$(OBJEXT) $(am__objects_109) \ - $(am__objects_110) libgnu_a-stat-time.$(OBJEXT) \ - $(am__objects_111) $(am__objects_112) $(am__objects_113) \ - $(am__objects_114) $(am__objects_115) $(am__objects_116) \ - $(am__objects_117) $(am__objects_118) $(am__objects_119) \ - $(am__objects_120) $(am__objects_121) \ - libgnu_a-strnlen1.$(OBJEXT) $(am__objects_122) \ - $(am__objects_123) $(am__objects_124) $(am__objects_125) \ - $(am__objects_126) $(am__objects_127) \ + $(am__objects_101) $(am__objects_102) $(am__objects_103) \ + libgnu_a-same-inode.$(OBJEXT) libgnu_a-save-cwd.$(OBJEXT) \ + $(am__objects_104) $(am__objects_105) $(am__objects_106) \ + libgnu_a-setlocale_null.$(OBJEXT) $(am__objects_107) \ + libgnu_a-setlocale_null-unlocked.$(OBJEXT) $(am__objects_108) \ + $(am__objects_109) libgnu_a-sig-handler.$(OBJEXT) \ + $(am__objects_110) $(am__objects_111) \ + libgnu_a-sockets.$(OBJEXT) libgnu_a-spawn-pipe.$(OBJEXT) \ + $(am__objects_112) $(am__objects_113) \ + libgnu_a-stat-time.$(OBJEXT) $(am__objects_114) \ + $(am__objects_115) $(am__objects_116) $(am__objects_117) \ + $(am__objects_118) $(am__objects_119) $(am__objects_120) \ + $(am__objects_121) $(am__objects_122) $(am__objects_123) \ + $(am__objects_124) libgnu_a-strnlen1.$(OBJEXT) \ + $(am__objects_125) $(am__objects_126) $(am__objects_127) \ + $(am__objects_128) $(am__objects_129) $(am__objects_130) \ libgnu_a-sys_socket.$(OBJEXT) libgnu_a-tempname.$(OBJEXT) \ - glthread/libgnu_a-threadlib.$(OBJEXT) $(am__objects_128) \ - $(am__objects_129) libgnu_a-timespec.$(OBJEXT) \ + glthread/libgnu_a-threadlib.$(OBJEXT) $(am__objects_131) \ + $(am__objects_132) libgnu_a-timespec.$(OBJEXT) \ libgnu_a-tmpdir.$(OBJEXT) libgnu_a-u64.$(OBJEXT) \ - unicase/libgnu_a-cased.$(OBJEXT) $(am__objects_130) \ - $(am__objects_131) unicase/libgnu_a-ignorable.$(OBJEXT) \ - unicase/libgnu_a-special-casing.$(OBJEXT) $(am__objects_132) \ - unicase/libgnu_a-u8-casemap.$(OBJEXT) $(am__objects_133) \ - $(am__objects_134) $(am__objects_135) \ + unicase/libgnu_a-cased.$(OBJEXT) $(am__objects_133) \ + $(am__objects_134) unicase/libgnu_a-ignorable.$(OBJEXT) \ + unicase/libgnu_a-special-casing.$(OBJEXT) $(am__objects_135) \ + unicase/libgnu_a-u8-casemap.$(OBJEXT) $(am__objects_136) \ + $(am__objects_137) $(am__objects_138) $(am__objects_139) \ + $(am__objects_140) $(am__objects_141) $(am__objects_142) \ + $(am__objects_143) $(am__objects_144) $(am__objects_145) \ + $(am__objects_146) $(am__objects_147) $(am__objects_148) \ + $(am__objects_149) $(am__objects_150) \ uninorm/libgnu_a-decompose-internal.$(OBJEXT) \ - $(am__objects_136) libgnu_a-unistd.$(OBJEXT) \ + $(am__objects_151) libgnu_a-unistd.$(OBJEXT) \ libgnu_a-dup-safer.$(OBJEXT) libgnu_a-fd-safer.$(OBJEXT) \ - libgnu_a-pipe-safer.$(OBJEXT) $(am__objects_137) \ - $(am__objects_138) $(am__objects_139) $(am__objects_140) \ - $(am__objects_141) $(am__objects_142) $(am__objects_143) \ + libgnu_a-pipe-safer.$(OBJEXT) $(am__objects_152) \ + $(am__objects_153) $(am__objects_154) $(am__objects_155) \ + $(am__objects_156) $(am__objects_157) $(am__objects_158) \ + $(am__objects_159) $(am__objects_160) $(am__objects_161) \ + $(am__objects_162) $(am__objects_163) \ libgnu_a-utimens.$(OBJEXT) libgnu_a-wait-process.$(OBJEXT) \ - $(am__objects_144) $(am__objects_145) \ - libgnu_a-wctype-h.$(OBJEXT) $(am__objects_146) \ - $(am__objects_147) $(am__objects_148) $(am__objects_149) \ - $(am__objects_150) $(am__objects_151) $(am__objects_152) \ - $(am__objects_153) $(am__objects_154) \ + $(am__objects_164) $(am__objects_165) $(am__objects_166) \ + libgnu_a-wctype-h.$(OBJEXT) $(am__objects_167) \ + $(am__objects_168) $(am__objects_169) $(am__objects_170) \ + $(am__objects_171) $(am__objects_172) $(am__objects_173) \ + $(am__objects_174) $(am__objects_175) \ libgnu_a-xmalloc.$(OBJEXT) libgnu_a-xalloc-die.$(OBJEXT) \ libgnu_a-xmemdup0.$(OBJEXT) libgnu_a-xsize.$(OBJEXT) \ libgnu_a-xstrndup.$(OBJEXT) @@ -960,10 +1042,27 @@ am__depfiles_remade = ./$(DEPDIR)/alloca.Po \ ./$(DEPDIR)/libgnu_a-basename.Po \ ./$(DEPDIR)/libgnu_a-binary-io.Po ./$(DEPDIR)/libgnu_a-bind.Po \ ./$(DEPDIR)/libgnu_a-bitrotate.Po \ - ./$(DEPDIR)/libgnu_a-btowc.Po ./$(DEPDIR)/libgnu_a-c-ctype.Po \ + ./$(DEPDIR)/libgnu_a-btoc32.Po ./$(DEPDIR)/libgnu_a-btowc.Po \ + ./$(DEPDIR)/libgnu_a-c-ctype.Po \ ./$(DEPDIR)/libgnu_a-c-strcasecmp.Po \ ./$(DEPDIR)/libgnu_a-c-strcasestr.Po \ ./$(DEPDIR)/libgnu_a-c-strncasecmp.Po \ + ./$(DEPDIR)/libgnu_a-c32_apply_type_test.Po \ + ./$(DEPDIR)/libgnu_a-c32_get_type_test.Po \ + ./$(DEPDIR)/libgnu_a-c32isalnum.Po \ + ./$(DEPDIR)/libgnu_a-c32isalpha.Po \ + ./$(DEPDIR)/libgnu_a-c32isblank.Po \ + ./$(DEPDIR)/libgnu_a-c32iscntrl.Po \ + ./$(DEPDIR)/libgnu_a-c32isdigit.Po \ + ./$(DEPDIR)/libgnu_a-c32isgraph.Po \ + ./$(DEPDIR)/libgnu_a-c32islower.Po \ + ./$(DEPDIR)/libgnu_a-c32isprint.Po \ + ./$(DEPDIR)/libgnu_a-c32ispunct.Po \ + ./$(DEPDIR)/libgnu_a-c32isspace.Po \ + ./$(DEPDIR)/libgnu_a-c32isupper.Po \ + ./$(DEPDIR)/libgnu_a-c32isxdigit.Po \ + ./$(DEPDIR)/libgnu_a-c32tolower.Po \ + ./$(DEPDIR)/libgnu_a-c32width.Po \ ./$(DEPDIR)/libgnu_a-calloc.Po \ ./$(DEPDIR)/libgnu_a-canonicalize-lgpl.Po \ ./$(DEPDIR)/libgnu_a-canonicalize.Po \ @@ -1021,7 +1120,9 @@ am__depfiles_remade = ./$(DEPDIR)/alloca.Po \ ./$(DEPDIR)/libgnu_a-inet_ntop.Po \ ./$(DEPDIR)/libgnu_a-ioctl.Po ./$(DEPDIR)/libgnu_a-isblank.Po \ ./$(DEPDIR)/libgnu_a-iswblank.Po \ + ./$(DEPDIR)/libgnu_a-iswctype.Po \ ./$(DEPDIR)/libgnu_a-iswdigit.Po \ + ./$(DEPDIR)/libgnu_a-iswpunct.Po \ ./$(DEPDIR)/libgnu_a-iswxdigit.Po \ ./$(DEPDIR)/libgnu_a-itold.Po \ ./$(DEPDIR)/libgnu_a-lc-charset-dispatch.Po \ @@ -1031,10 +1132,14 @@ am__depfiles_remade = ./$(DEPDIR)/alloca.Po \ ./$(DEPDIR)/libgnu_a-lseek.Po ./$(DEPDIR)/libgnu_a-lstat.Po \ ./$(DEPDIR)/libgnu_a-malloc.Po ./$(DEPDIR)/libgnu_a-malloca.Po \ ./$(DEPDIR)/libgnu_a-mbchar.Po ./$(DEPDIR)/libgnu_a-mbiter.Po \ + ./$(DEPDIR)/libgnu_a-mbrtoc32.Po \ ./$(DEPDIR)/libgnu_a-mbrtowc.Po \ ./$(DEPDIR)/libgnu_a-mbsinit.Po \ + ./$(DEPDIR)/libgnu_a-mbsrtoc32s-state.Po \ + ./$(DEPDIR)/libgnu_a-mbsrtoc32s.Po \ ./$(DEPDIR)/libgnu_a-mbsrtowcs-state.Po \ ./$(DEPDIR)/libgnu_a-mbsrtowcs.Po \ + ./$(DEPDIR)/libgnu_a-mbszero.Po \ ./$(DEPDIR)/libgnu_a-mbtowc-lock.Po \ ./$(DEPDIR)/libgnu_a-mbtowc.Po \ ./$(DEPDIR)/libgnu_a-md2-stream.Po ./$(DEPDIR)/libgnu_a-md2.Po \ @@ -1073,10 +1178,13 @@ am__depfiles_remade = ./$(DEPDIR)/alloca.Po \ ./$(DEPDIR)/libgnu_a-regex_internal.Po \ ./$(DEPDIR)/libgnu_a-regexec.Po ./$(DEPDIR)/libgnu_a-rename.Po \ ./$(DEPDIR)/libgnu_a-rewinddir.Po \ - ./$(DEPDIR)/libgnu_a-rmdir.Po ./$(DEPDIR)/libgnu_a-save-cwd.Po \ + ./$(DEPDIR)/libgnu_a-rmdir.Po \ + ./$(DEPDIR)/libgnu_a-same-inode.Po \ + ./$(DEPDIR)/libgnu_a-save-cwd.Po \ ./$(DEPDIR)/libgnu_a-secure_getenv.Po \ ./$(DEPDIR)/libgnu_a-select.Po ./$(DEPDIR)/libgnu_a-send.Po \ ./$(DEPDIR)/libgnu_a-setlocale-lock.Po \ + ./$(DEPDIR)/libgnu_a-setlocale_null-unlocked.Po \ ./$(DEPDIR)/libgnu_a-setlocale_null.Po \ ./$(DEPDIR)/libgnu_a-setsockopt.Po \ ./$(DEPDIR)/libgnu_a-sha1-stream.Po \ @@ -1139,7 +1247,7 @@ am__depfiles_remade = ./$(DEPDIR)/alloca.Po \ ./$(DEPDIR)/libgnu_a-waitpid.Po \ ./$(DEPDIR)/libgnu_a-wcrtomb.Po \ ./$(DEPDIR)/libgnu_a-wctype-h.Po \ - ./$(DEPDIR)/libgnu_a-wcwidth.Po \ + ./$(DEPDIR)/libgnu_a-wctype.Po ./$(DEPDIR)/libgnu_a-wcwidth.Po \ ./$(DEPDIR)/libgnu_a-windows-mutex.Po \ ./$(DEPDIR)/libgnu_a-windows-once.Po \ ./$(DEPDIR)/libgnu_a-windows-recmutex.Po \ @@ -1171,9 +1279,26 @@ am__depfiles_remade = ./$(DEPDIR)/alloca.Po \ unicase/$(DEPDIR)/libgnu_a-u8-casemap.Po \ unicase/$(DEPDIR)/libgnu_a-u8-tolower.Po \ unictype/$(DEPDIR)/libgnu_a-combiningclass.Po \ + unictype/$(DEPDIR)/libgnu_a-ctype_alnum.Po \ + unictype/$(DEPDIR)/libgnu_a-ctype_alpha.Po \ + unictype/$(DEPDIR)/libgnu_a-ctype_blank.Po \ + unictype/$(DEPDIR)/libgnu_a-ctype_cntrl.Po \ + unictype/$(DEPDIR)/libgnu_a-ctype_digit.Po \ + unictype/$(DEPDIR)/libgnu_a-ctype_graph.Po \ + unictype/$(DEPDIR)/libgnu_a-ctype_lower.Po \ + unictype/$(DEPDIR)/libgnu_a-ctype_print.Po \ + unictype/$(DEPDIR)/libgnu_a-ctype_punct.Po \ + unictype/$(DEPDIR)/libgnu_a-ctype_space.Po \ + unictype/$(DEPDIR)/libgnu_a-ctype_upper.Po \ + unictype/$(DEPDIR)/libgnu_a-ctype_xdigit.Po \ unictype/$(DEPDIR)/libgnu_a-pr_soft_dotted.Po \ uninorm/$(DEPDIR)/libgnu_a-decompose-internal.Po \ uninorm/$(DEPDIR)/libgnu_a-u8-normalize.Po \ + unistr/$(DEPDIR)/libgnu_a-u32-chr.Po \ + unistr/$(DEPDIR)/libgnu_a-u32-cpy.Po \ + unistr/$(DEPDIR)/libgnu_a-u32-pcpy.Po \ + unistr/$(DEPDIR)/libgnu_a-u32-strcat.Po \ + unistr/$(DEPDIR)/libgnu_a-u32-strlen.Po \ unistr/$(DEPDIR)/libgnu_a-u8-cpy.Po \ unistr/$(DEPDIR)/libgnu_a-u8-mbtouc-unsafe-aux.Po \ unistr/$(DEPDIR)/libgnu_a-u8-mbtouc-unsafe.Po \ @@ -1263,6 +1388,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ +CXX_HAS_CHAR8_TYPE = @CXX_HAS_CHAR8_TYPE@ +CXX_HAS_UCHAR_TYPES = @CXX_HAS_UCHAR_TYPES@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1278,7 +1405,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ @@ -1300,7 +1426,33 @@ GL_GNULIB_ALIGNED_ALLOC = @GL_GNULIB_ALIGNED_ALLOC@ GL_GNULIB_ALPHASORT = @GL_GNULIB_ALPHASORT@ GL_GNULIB_ATOLL = @GL_GNULIB_ATOLL@ GL_GNULIB_BIND = @GL_GNULIB_BIND@ +GL_GNULIB_BTOC32 = @GL_GNULIB_BTOC32@ GL_GNULIB_BTOWC = @GL_GNULIB_BTOWC@ +GL_GNULIB_C32ISALNUM = @GL_GNULIB_C32ISALNUM@ +GL_GNULIB_C32ISALPHA = @GL_GNULIB_C32ISALPHA@ +GL_GNULIB_C32ISBLANK = @GL_GNULIB_C32ISBLANK@ +GL_GNULIB_C32ISCNTRL = @GL_GNULIB_C32ISCNTRL@ +GL_GNULIB_C32ISDIGIT = @GL_GNULIB_C32ISDIGIT@ +GL_GNULIB_C32ISGRAPH = @GL_GNULIB_C32ISGRAPH@ +GL_GNULIB_C32ISLOWER = @GL_GNULIB_C32ISLOWER@ +GL_GNULIB_C32ISPRINT = @GL_GNULIB_C32ISPRINT@ +GL_GNULIB_C32ISPUNCT = @GL_GNULIB_C32ISPUNCT@ +GL_GNULIB_C32ISSPACE = @GL_GNULIB_C32ISSPACE@ +GL_GNULIB_C32ISUPPER = @GL_GNULIB_C32ISUPPER@ +GL_GNULIB_C32ISXDIGIT = @GL_GNULIB_C32ISXDIGIT@ +GL_GNULIB_C32RTOMB = @GL_GNULIB_C32RTOMB@ +GL_GNULIB_C32SNRTOMBS = @GL_GNULIB_C32SNRTOMBS@ +GL_GNULIB_C32SRTOMBS = @GL_GNULIB_C32SRTOMBS@ +GL_GNULIB_C32STOMBS = @GL_GNULIB_C32STOMBS@ +GL_GNULIB_C32SWIDTH = @GL_GNULIB_C32SWIDTH@ +GL_GNULIB_C32TOB = @GL_GNULIB_C32TOB@ +GL_GNULIB_C32TOLOWER = @GL_GNULIB_C32TOLOWER@ +GL_GNULIB_C32TOUPPER = @GL_GNULIB_C32TOUPPER@ +GL_GNULIB_C32WIDTH = @GL_GNULIB_C32WIDTH@ +GL_GNULIB_C32_APPLY_MAPPING = @GL_GNULIB_C32_APPLY_MAPPING@ +GL_GNULIB_C32_APPLY_TYPE_TEST = @GL_GNULIB_C32_APPLY_TYPE_TEST@ +GL_GNULIB_C32_GET_MAPPING = @GL_GNULIB_C32_GET_MAPPING@ +GL_GNULIB_C32_GET_TYPE_TEST = @GL_GNULIB_C32_GET_TYPE_TEST@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ @@ -1407,6 +1559,7 @@ GL_GNULIB_ISBLANK = @GL_GNULIB_ISBLANK@ GL_GNULIB_ISWBLANK = @GL_GNULIB_ISWBLANK@ GL_GNULIB_ISWCTYPE = @GL_GNULIB_ISWCTYPE@ GL_GNULIB_ISWDIGIT = @GL_GNULIB_ISWDIGIT@ +GL_GNULIB_ISWPUNCT = @GL_GNULIB_ISWPUNCT@ GL_GNULIB_ISWXDIGIT = @GL_GNULIB_ISWXDIGIT@ GL_GNULIB_LCHMOD = @GL_GNULIB_LCHMOD@ GL_GNULIB_LCHOWN = @GL_GNULIB_LCHOWN@ @@ -1414,13 +1567,15 @@ GL_GNULIB_LINK = @GL_GNULIB_LINK@ GL_GNULIB_LINKAT = @GL_GNULIB_LINKAT@ GL_GNULIB_LISTEN = @GL_GNULIB_LISTEN@ GL_GNULIB_LOCALECONV = @GL_GNULIB_LOCALECONV@ -GL_GNULIB_LOCALENAME = @GL_GNULIB_LOCALENAME@ +GL_GNULIB_LOCALENAME_UNSAFE = @GL_GNULIB_LOCALENAME_UNSAFE@ GL_GNULIB_LOCALTIME = @GL_GNULIB_LOCALTIME@ GL_GNULIB_LSEEK = @GL_GNULIB_LSEEK@ GL_GNULIB_LSTAT = @GL_GNULIB_LSTAT@ GL_GNULIB_MALLOC_GNU = @GL_GNULIB_MALLOC_GNU@ GL_GNULIB_MALLOC_POSIX = @GL_GNULIB_MALLOC_POSIX@ GL_GNULIB_MBRLEN = @GL_GNULIB_MBRLEN@ +GL_GNULIB_MBRTOC16 = @GL_GNULIB_MBRTOC16@ +GL_GNULIB_MBRTOC32 = @GL_GNULIB_MBRTOC32@ GL_GNULIB_MBRTOWC = @GL_GNULIB_MBRTOWC@ GL_GNULIB_MBSCASECMP = @GL_GNULIB_MBSCASECMP@ GL_GNULIB_MBSCASESTR = @GL_GNULIB_MBSCASESTR@ @@ -1430,16 +1585,20 @@ GL_GNULIB_MBSINIT = @GL_GNULIB_MBSINIT@ GL_GNULIB_MBSLEN = @GL_GNULIB_MBSLEN@ GL_GNULIB_MBSNCASECMP = @GL_GNULIB_MBSNCASECMP@ GL_GNULIB_MBSNLEN = @GL_GNULIB_MBSNLEN@ +GL_GNULIB_MBSNRTOC32S = @GL_GNULIB_MBSNRTOC32S@ GL_GNULIB_MBSNRTOWCS = @GL_GNULIB_MBSNRTOWCS@ GL_GNULIB_MBSPBRK = @GL_GNULIB_MBSPBRK@ GL_GNULIB_MBSPCASECMP = @GL_GNULIB_MBSPCASECMP@ GL_GNULIB_MBSRCHR = @GL_GNULIB_MBSRCHR@ +GL_GNULIB_MBSRTOC32S = @GL_GNULIB_MBSRTOC32S@ GL_GNULIB_MBSRTOWCS = @GL_GNULIB_MBSRTOWCS@ GL_GNULIB_MBSSEP = @GL_GNULIB_MBSSEP@ GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@ GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@ +GL_GNULIB_MBSTOC32S = @GL_GNULIB_MBSTOC32S@ GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@ GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@ +GL_GNULIB_MBSZERO = @GL_GNULIB_MBSZERO@ GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@ GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@ GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@ @@ -1553,6 +1712,7 @@ GL_GNULIB_PUTS = @GL_GNULIB_PUTS@ GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@ GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@ GL_GNULIB_RAISE = @GL_GNULIB_RAISE@ +GL_GNULIB_RAND = @GL_GNULIB_RAND@ GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@ GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@ GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@ @@ -1615,6 +1775,7 @@ GL_GNULIB_STRSEP = @GL_GNULIB_STRSEP@ GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@ GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@ GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@ +GL_GNULIB_STRTOF = @GL_GNULIB_STRTOF@ GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@ GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@ GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@ @@ -1728,6 +1889,9 @@ GL_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_H GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@ @@ -1753,6 +1917,7 @@ GL_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYP GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@ @@ -1828,6 +1993,7 @@ GL_GNULIB_WCTOMB = @GL_GNULIB_WCTOMB@ GL_GNULIB_WCTRANS = @GL_GNULIB_WCTRANS@ GL_GNULIB_WCTYPE = @GL_GNULIB_WCTYPE@ GL_GNULIB_WCWIDTH = @GL_GNULIB_WCWIDTH@ +GL_GNULIB_WGETCWD = @GL_GNULIB_WGETCWD@ GL_GNULIB_WMEMCHR = @GL_GNULIB_WMEMCHR@ GL_GNULIB_WMEMCMP = @GL_GNULIB_WMEMCMP@ GL_GNULIB_WMEMCPY = @GL_GNULIB_WMEMCPY@ @@ -1838,8 +2004,10 @@ GL_GNULIB_WRITE = @GL_GNULIB_WRITE@ GL_GNULIB__EXIT = @GL_GNULIB__EXIT@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIBHEADERS_OVERRIDE_CHAR16_T = @GNULIBHEADERS_OVERRIDE_CHAR16_T@ +GNULIBHEADERS_OVERRIDE_CHAR32_T = @GNULIBHEADERS_OVERRIDE_CHAR32_T@ +GNULIBHEADERS_OVERRIDE_CHAR8_T = @GNULIBHEADERS_OVERRIDE_CHAR8_T@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ @@ -1856,6 +2024,7 @@ HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C32RTOMB = @HAVE_C32RTOMB@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ @@ -1989,6 +2158,8 @@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOC16 = @HAVE_MBRTOC16@ +HAVE_MBRTOC32 = @HAVE_MBRTOC32@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ HAVE_MBSINIT = @HAVE_MBSINIT@ HAVE_MBSLEN = @HAVE_MBSLEN@ @@ -2079,6 +2250,7 @@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOF = @HAVE_STRTOF@ HAVE_STRTOL = @HAVE_STRTOL@ HAVE_STRTOLD = @HAVE_STRTOLD@ HAVE_STRTOLL = @HAVE_STRTOLL@ @@ -2112,6 +2284,7 @@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_UCHAR_H = @HAVE_UCHAR_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ @@ -2164,6 +2337,7 @@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ +HAVE_WORKING_MBRTOC32 = @HAVE_WORKING_MBRTOC32@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__EXIT = @HAVE__EXIT@ @@ -2183,6 +2357,10 @@ INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LCOV = @LCOV@ +LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@ +LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@ +LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@ +LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -2198,6 +2376,8 @@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPROXY_CFLAGS = @LIBPROXY_CFLAGS@ +LIBPROXY_LIBS = @LIBPROXY_LIBS@ LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ LIBPSL_LIBS = @LIBPSL_LIBS@ LIBPTHREAD = @LIBPTHREAD@ @@ -2294,6 +2474,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ +NEXT_AS_FIRST_DIRECTIVE_UCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_UCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ @@ -2333,6 +2514,7 @@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ +NEXT_UCHAR_H = @NEXT_UCHAR_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ @@ -2374,6 +2556,7 @@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ +REPLACE_C32RTOMB = @REPLACE_C32RTOMB@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ @@ -2400,6 +2583,7 @@ REPLACE_EXECVE = @REPLACE_EXECVE@ REPLACE_EXECVP = @REPLACE_EXECVP@ REPLACE_EXECVPE = @REPLACE_EXECVPE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ @@ -2457,6 +2641,7 @@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWPUNCT = @REPLACE_ISWPUNCT@ REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_ITOLD = @REPLACE_ITOLD@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ @@ -2470,6 +2655,8 @@ REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MALLOC_FOR_MALLOC_GNU = @REPLACE_MALLOC_FOR_MALLOC_GNU@ REPLACE_MALLOC_FOR_MALLOC_POSIX = @REPLACE_MALLOC_FOR_MALLOC_POSIX@ REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOC16 = @REPLACE_MBRTOC16@ +REPLACE_MBRTOC32 = @REPLACE_MBRTOC32@ REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ @@ -2481,6 +2668,7 @@ REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ +REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ @@ -2519,6 +2707,7 @@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_QSORT_R = @REPLACE_QSORT_R@ REPLACE_RAISE = @REPLACE_RAISE@ +REPLACE_RAND = @REPLACE_RAND@ REPLACE_RANDOM = @REPLACE_RANDOM@ REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ REPLACE_READ = @REPLACE_READ@ @@ -2561,6 +2750,7 @@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ +REPLACE_STRTOF = @REPLACE_STRTOF@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_STRTOL = @REPLACE_STRTOL@ @@ -2571,11 +2761,13 @@ REPLACE_STRTOULL = @REPLACE_STRTOULL@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ +REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ +REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -2604,6 +2796,8 @@ REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ +REPLACE_WCTRANS = @REPLACE_WCTRANS@ +REPLACE_WCTYPE = @REPLACE_WCTYPE@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WMEMCMP = @REPLACE_WMEMCMP@ REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ @@ -2618,6 +2812,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ +SMALL_WCHAR_T = @SMALL_WCHAR_T@ STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ @@ -2694,6 +2889,8 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -2728,37 +2925,44 @@ MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t arpa/inet.h \ netdb.h-t netinet/in.h netinet/in.h-t sched.h sched.h-t \ signal.h signal.h-t spawn.h spawn.h-t stdckdint.h \ stdckdint.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdio.h \ - stdio.h-t stdlib.h stdlib.h-t string.h string.h-t strings.h \ - strings.h-t sys/file.h sys/file.h-t sys/ioctl.h sys/ioctl.h-t \ - sys/random.h sys/random.h-t sys/select.h sys/select.h-t \ - sys/socket.h sys/socket.h-t sys/stat.h sys/stat.h-t sys/time.h \ - sys/time.h-t sys/types.h sys/types.h-t sys/uio.h sys/uio.h-t \ - sys/wait.h sys/wait.h-t time.h time.h-t unicase.h unicase.h-t \ + stdio.h-t1 stdio.h-t2 stdio.h-t3 stdlib.h stdlib.h-t1 \ + stdlib.h-t2 stdlib.h-t3 string.h string.h-t1 string.h-t2 \ + strings.h strings.h-t sys/file.h sys/file.h-t sys/ioctl.h \ + sys/ioctl.h-t sys/random.h sys/random.h-t sys/select.h \ + sys/select.h-t sys/socket.h sys/socket.h-t sys/stat.h \ + sys/stat.h-t sys/time.h sys/time.h-t sys/types.h sys/types.h-t \ + sys/uio.h sys/uio.h-t sys/wait.h sys/wait.h-t time.h time.h-t \ + uchar.h uchar.h-t unicase.h unicase.h-t \ unicase/special-casing-table.h-t unicase/special-casing.h \ - unicase/special-casing.h-t unictype.h unictype.h-t uninorm.h \ - uninorm.h-t unistd.h unistd.h-t unistr.h unistr.h-t unitypes.h \ - unitypes.h-t uniwidth.h uniwidth.h-t utime.h utime.h-t wchar.h \ - wchar.h-t wctype.h wctype.h-t + unicase/special-casing.h-t unictype.h unictype.h-t1 \ + unictype.h-t2 unictype.h-t3 unictype.h-t4 uninorm.h \ + uninorm.h-t unistd.h unistd.h-t1 unistd.h-t2 unistd.h-t3 \ + unistd.h-t4 unistr.h unistr.h-t unitypes.h unitypes.h-t \ + uniwidth.h uniwidth.h-t utime.h utime.h-t wchar.h wchar.h-t1 \ + wchar.h-t2 wchar.h-t3 wctype.h wctype.h-t noinst_LTLIBRARIES = EXTRA_DIST = w32sock.h alloca.c alloca.in.h \ $(top_srcdir)/build-aux/announce-gen arpa_inet.in.h \ array-mergesort.h assert.in.h verify.h assure.h attribute.h \ basename-lgpl.h w32sock.h byteswap.in.h c-strcaseeq.h \ - str-two-way.h calloc.c calloc.c canonicalize.h chdir-long.h \ - cloexec.h dirent-private.h concat-filename.h w32sock.h \ - af_alg.h sys-limits.h md2.h md4.h gl_openssl.h md5.h \ + str-two-way.h c32is-impl.h c32is-impl.h c32is-impl.h \ + c32is-impl.h c32is-impl.h c32is-impl.h c32is-impl.h \ + c32is-impl.h c32is-impl.h c32is-impl.h c32is-impl.h \ + c32is-impl.h c32to-impl.h calloc.c calloc.c canonicalize.h \ + chdir-long.h cloexec.h dirent-private.h concat-filename.h \ + w32sock.h af_alg.h sys-limits.h md2.h md4.h gl_openssl.h md5.h \ gl_openssl.h sha1.h gl_openssl.h sha256.h gl_openssl.h \ sha512.h ctype.in.h dirent.in.h dirent-private.h stripslash.c \ - dirname.h eloop-threshold.h errno.in.h error.in.h exitfail.h \ - fcntl.in.h fd-hook.h dirent-private.h stdio-impl.h file-set.h \ - filename.h filenamecat.h flexmember.h float.in.h fnmatch.c \ - fnmatch_loop.c fnmatch.c fnmatch.in.h fopen.c fopen.c \ - stdio-impl.h freading.h stdio-impl.h stdio-impl.h stat-w32.c \ - stat-w32.h at-func.c stdio-impl.h \ - $(top_srcdir)/build-aux/gendocs.sh getopt-cdefs.in.h \ - getopt-core.h getopt-ext.h getopt-pfx-core.h getopt-pfx-ext.h \ - getopt.in.h getopt_int.h getpass.c getpass.h getpass.c \ - getpass.h w32sock.h getprogname.h w32sock.h \ + dirname.h $(top_srcdir)/build-aux/do-release-commit-and-tag \ + eloop-threshold.h errno.in.h error.in.h exitfail.h fcntl.in.h \ + fd-hook.h dirent-private.h stdio-impl.h file-set.h filename.h \ + filenamecat.h flexmember.h float.in.h fnmatch.c fnmatch_loop.c \ + fnmatch.c fnmatch.in.h fopen.c fopen.c stdio-impl.h freading.h \ + stdio-impl.h stdio-impl.h stat-w32.c stat-w32.h at-func.c \ + stdio-impl.h $(top_srcdir)/build-aux/gendocs.sh \ + getopt-cdefs.in.h getopt-core.h getopt-ext.h getopt-pfx-core.h \ + getopt-pfx-ext.h getopt.in.h getopt_int.h getpass.c getpass.h \ + getpass.c getpass.h w32sock.h getprogname.h w32sock.h \ $(top_srcdir)/build-aux/git-version-gen \ $(top_srcdir)/build-aux/gitlog-to-changelog dynarray.h \ malloc/dynarray-skeleton.c malloc/dynarray.h \ @@ -2768,22 +2972,26 @@ EXTRA_DIST = w32sock.h alloca.c alloca.in.h \ hard-locale.h hash.h hash-triple.h \ $(top_srcdir)/build-aux/config.rpath ialloc.h iconv.in.h \ intprops-internal.h intprops.h inttypes.in.h w32sock.h \ - langinfo.in.h cdefs.h libc-config.h libunistring.valgrind \ - limits.in.h w32sock.h localcharset.h locale.in.h \ - $(top_srcdir)/maint.mk malloc.c malloc.c malloca.h mbchar.h \ - lc-charset-dispatch.c lc-charset-dispatch.h \ + iswctype-impl.h langinfo.in.h cdefs.h libc-config.h \ + libunistring.valgrind limits.in.h w32sock.h localcharset.h \ + locale.in.h $(top_srcdir)/maint.mk malloc.c malloc.c malloca.h \ + mbchar.h lc-charset-dispatch.c lc-charset-dispatch.h \ mbrtowc-impl-utf8.h mbrtowc-impl.h mbtowc-lock.c mbtowc-lock.h \ - windows-initguard.h mbsrtowcs-impl.h mbsrtowcs-state.c \ - mbtowc-impl.h memchr.valgrind mktime-internal.h mktime.c \ - mktime-internal.h mktime.c msvc-inval.h msvc-nothrow.h \ - netdb.in.h netinet_in.in.h windows-initguard.h openat.h \ - dirent-private.h pathmax.h spawn_int.h spawn_int.h spawn_int.h \ - spawn_int.h spawn_int.h spawn_int.h quote.h quote.h quotearg.h \ - rawmemchr.valgrind dirent-private.h realloc.c realloc.c \ - w32sock.h regcomp.c regex.h regex_internal.c regex_internal.h \ - regexec.c dirent-private.h same-inode.h save-cwd.h sched.in.h \ - w32sock.h setlocale_null.h windows-initguard.h w32sock.h \ - sig-handler.h signal.in.h stdio-write.c _Noreturn.h \ + windows-initguard.h lc-charset-dispatch.c \ + lc-charset-dispatch.h mbrtowc-impl-utf8.h mbrtowc-impl.h \ + mbtowc-lock.c mbtowc-lock.h windows-initguard.h \ + mbsrtoc32s-state.c mbsrtowcs-impl.h mbsrtowcs-impl.h \ + mbsrtowcs-state.c mbtowc-impl.h memchr.valgrind \ + mktime-internal.h mktime.c mktime-internal.h mktime.c \ + msvc-inval.h msvc-nothrow.h netdb.in.h netinet_in.in.h \ + windows-initguard.h openat.h dirent-private.h pathmax.h \ + spawn_int.h spawn_int.h spawn_int.h spawn_int.h spawn_int.h \ + spawn_int.h quote.h quote.h quotearg.h rawmemchr.valgrind \ + dirent-private.h realloc.c realloc.c w32sock.h regcomp.c \ + regex.h regex_internal.c regex_internal.h regexec.c \ + dirent-private.h save-cwd.h sched.in.h w32sock.h \ + setlocale_null.h windows-initguard.h setlocale_null.h \ + w32sock.h sig-handler.h signal.in.h stdio-write.c _Noreturn.h \ arg-nonnull.h c++defs.h warn-on-use.h snprintf.c w32sock.h \ w32sock.h spawn.in.h os2-spawn.h stat-w32.c stat-w32.h \ stat-time.h intprops-internal.h stdckdint.in.h stddef.in.h \ @@ -2793,31 +3001,44 @@ EXTRA_DIST = w32sock.h alloca.c alloca.in.h \ sys_select.in.h sys_socket.in.h sys_stat.in.h sys_time.in.h \ sys_types.in.h sys_uio.in.h sys_wait.in.h tempname.h \ thread-optim.h time.in.h mktime-internal.h timespec.h u64.h \ - unicase.in.h unicase/cased.h unicase/caseprop.h \ + uchar.in.h unicase.in.h unicase/cased.h unicase/caseprop.h \ unictype/bitmap.h unicase/caseprop.h unicase/ignorable.h \ unictype/bitmap.h unicase/special-casing-table.h \ unicase/special-casing-table.gperf unicase/special-casing.in.h \ unicase/simple-mapping.h unicase/tolower.h unicase/context.h \ unicase/u-casemap.h unicase/unicasemap.h unictype.in.h \ unictype/combiningclass.h unictype/bitmap.h \ + unictype/ctype_alnum.h unictype/bitmap.h \ + unictype/ctype_alpha.h unictype/bitmap.h \ + unictype/ctype_blank.h unictype/bitmap.h \ + unictype/ctype_cntrl.h unictype/bitmap.h \ + unictype/ctype_digit.h unictype/bitmap.h \ + unictype/ctype_graph.h unictype/bitmap.h \ + unictype/ctype_lower.h unictype/bitmap.h \ + unictype/ctype_print.h unictype/bitmap.h \ + unictype/ctype_punct.h unictype/bitmap.h \ + unictype/ctype_space.h unictype/bitmap.h \ + unictype/ctype_upper.h unictype/bitmap.h \ + unictype/ctype_xdigit.h unictype/bitmap.h \ unictype/pr_soft_dotted.h uninorm.in.h \ uninorm/decompose-internal.h uninorm/normalize-internal.h \ uninorm/u-normalize-internal.h unistd.in.h unistd--.h \ - unistd-safer.h unistr.in.h unistr/u-cpy.h unitypes.in.h \ - localcharset.h uniwidth.in.h unictype/bitmap.h uniwidth/cjk.h \ - uniwidth/width0.h uniwidth/width2.h unlocked-io.h \ - $(top_srcdir)/build-aux/update-copyright \ + unistd-safer.h unistr.in.h unistr/u-cpy.h unistr/u-pcpy.h \ + unistr/u-strcat.h unistr/u-strlen.h unistr/u-cpy.h \ + unitypes.in.h localcharset.h uniwidth.in.h unictype/bitmap.h \ + uniwidth/cjk.h uniwidth/width0.h uniwidth/width2.h \ + unlocked-io.h $(top_srcdir)/build-aux/update-copyright \ $(top_srcdir)/build-aux/useless-if-before-free utime.in.h \ utimens.h asnprintf.c float+.h printf-args.c printf-args.h \ printf-parse.c printf-parse.h vasnprintf.c vasnprintf.h \ asprintf.c vasprintf.c $(top_srcdir)/build-aux/vc-list-files \ - verify.h vsnprintf.c wchar.in.h wctype.in.h \ + verify.h vsnprintf.c wchar.in.h wctype-impl.h wctype.in.h \ windows-initguard.h windows-mutex.h windows-once.h \ windows-initguard.h windows-recmutex.h windows-initguard.h \ windows-rwlock.h windows-spawn.h wmemchr-impl.h xalloc.h \ xalloc.h xalloc-oversized.h BUILT_SOURCES = $(ALLOCA_H) arpa/inet.h $(ASSERT_H) $(BYTESWAP_H) \ - ctype.h dirent.h $(ERRNO_H) $(ERROR_H) fcntl.h $(FLOAT_H) \ + ctype.h dirent.h $(ERRNO_H) error.h fcntl.h $(FLOAT_H) \ $(FNMATCH_H) $(GETOPT_H) $(GETOPT_CDEFS_H) \ malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h \ malloc/scratch_buffer.gl.h $(ICONV_H) inttypes.h langinfo.h \ @@ -2825,7 +3046,7 @@ BUILT_SOURCES = $(ALLOCA_H) arpa/inet.h $(ASSERT_H) $(BYTESWAP_H) \ spawn.h $(STDCKDINT_H) $(STDDEF_H) $(STDINT_H) stdio.h \ stdlib.h string.h strings.h sys/file.h sys/ioctl.h \ sys/random.h sys/select.h sys/socket.h sys/stat.h sys/time.h \ - sys/types.h sys/uio.h sys/wait.h time.h \ + sys/types.h sys/uio.h sys/wait.h time.h uchar.h \ $(LIBUNISTRING_UNICASE_H) unicase/special-casing-table.h \ unicase/special-casing.h $(LIBUNISTRING_UNICTYPE_H) \ $(LIBUNISTRING_UNINORM_H) unistd.h $(LIBUNISTRING_UNISTR_H) \ @@ -2841,28 +3062,33 @@ AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) AM_CPPFLAGS = -DDEFAULT_TEXT_DOMAIN=\"wget-gnulib\" libgnu_a_SOURCES = $(am__append_1) $(am__append_2) openat-priv.h \ openat-proc.c base32.h base32.c basename-lgpl.c binary-io.h \ - binary-io.c $(am__append_3) bitrotate.h bitrotate.c \ + binary-io.c $(am__append_3) bitrotate.h bitrotate.c btoc32.c \ $(am__append_4) c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c \ - c-strncasecmp.c c-strcasestr.h c-strcasestr.c canonicalize.c \ - $(am__append_5) $(am__append_6) cloexec.c $(am__append_7) \ - $(am__append_8) concat-filename.c $(am__append_9) af_alg.c \ - md2-stream.c md2.c md4-stream.c md4.c md5-stream.c md5.c \ - sha1-stream.c sha1.c sha256-stream.c sha256.c sha512-stream.c \ - sha512.c $(am__append_10) dirname.c basename.c dirname-lgpl.c \ - stripslash.c $(am__append_11) $(am__append_12) \ - $(am__append_13) exitfail.c fatal-signal.h fatal-signal.c \ - $(am__append_14) $(am__append_15) fd-hook.c fd-safer-flag.c \ - dup-safer-flag.c $(am__append_16) $(am__append_17) file-set.c \ - filenamecat-lgpl.c findprog.h findprog-in.c $(am__append_18) \ - $(am__append_19) $(am__append_20) $(am__append_21) freading.c \ - $(am__append_22) $(am__append_23) $(am__append_24) \ - $(am__append_25) $(am__append_26) $(am__append_27) \ - $(am__append_28) $(am__append_29) $(am__append_30) \ - $(am__append_31) $(am__append_32) $(am__append_33) \ - $(am__append_34) $(am__append_35) $(am__append_36) \ - $(am__append_37) $(am__append_38) $(am__append_39) \ - $(am__append_40) $(am__append_41) $(am__append_42) gettext.h \ - gettime.c $(am__append_43) malloc/dynarray_at_failure.c \ + c-strncasecmp.c c-strcasestr.h c-strcasestr.c \ + c32_apply_type_test.c c32_get_type_test.c c32isalnum.c \ + c32isalpha.c c32isblank.c c32iscntrl.c c32isdigit.c \ + c32isgraph.c c32islower.c c32isprint.c c32ispunct.c \ + c32isspace.c c32isupper.c c32isxdigit.c c32tolower.c \ + c32width.c canonicalize.c $(am__append_5) $(am__append_6) \ + cloexec.c $(am__append_7) $(am__append_8) concat-filename.c \ + $(am__append_9) af_alg.c md2-stream.c md2.c md4-stream.c md4.c \ + md5-stream.c md5.c sha1-stream.c sha1.c sha256-stream.c \ + sha256.c sha512-stream.c sha512.c $(am__append_10) dirname.c \ + basename.c dirname-lgpl.c stripslash.c $(am__append_11) \ + $(am__append_12) $(am__append_13) exitfail.c fatal-signal.h \ + fatal-signal.c $(am__append_14) $(am__append_15) fd-hook.c \ + fd-safer-flag.c dup-safer-flag.c $(am__append_16) \ + $(am__append_17) file-set.c filenamecat-lgpl.c findprog.h \ + findprog-in.c $(am__append_18) $(am__append_19) \ + $(am__append_20) $(am__append_21) freading.c $(am__append_22) \ + $(am__append_23) $(am__append_24) $(am__append_25) \ + $(am__append_26) $(am__append_27) $(am__append_28) \ + $(am__append_29) $(am__append_30) $(am__append_31) \ + $(am__append_32) $(am__append_33) $(am__append_34) \ + $(am__append_35) $(am__append_36) $(am__append_37) \ + $(am__append_38) $(am__append_39) $(am__append_40) \ + $(am__append_41) $(am__append_42) gettext.h gettime.c \ + $(am__append_43) malloc/dynarray_at_failure.c \ malloc/dynarray_emplace_enlarge.c malloc/dynarray_finalize.c \ malloc/dynarray_resize.c malloc/dynarray_resize_clear.c \ malloc/scratch_buffer_grow.c \ @@ -2872,50 +3098,58 @@ libgnu_a_SOURCES = $(am__append_1) $(am__append_2) openat-priv.h \ hash-triple-simple.c ialloc.c idx.h $(am__append_45) \ $(am__append_46) $(am__append_47) $(am__append_48) \ $(am__append_49) $(am__append_50) $(am__append_51) \ - $(am__append_52) localcharset.c $(am__append_53) \ - glthread/lock.h glthread/lock.c $(am__append_54) \ - $(am__append_55) malloca.c mbchar.c mbiter.h mbiter.c \ - $(am__append_56) $(am__append_57) $(am__append_58) \ - $(am__append_59) $(am__append_60) $(am__append_61) \ - $(am__append_62) minmax.h $(am__append_63) $(am__append_64) \ - $(am__append_65) $(am__append_66) $(am__append_67) \ + $(am__append_52) $(am__append_53) $(am__append_54) \ + localcharset.c $(am__append_55) glthread/lock.h \ + glthread/lock.c $(am__append_56) $(am__append_57) malloca.c \ + mbchar.c mbiter.h mbiter.c $(am__append_58) $(am__append_59) \ + $(am__append_60) mbsrtoc32s.c $(am__append_61) mbszero.c \ + $(am__append_62) $(am__append_63) $(am__append_64) \ + $(am__append_65) minmax.h $(am__append_66) $(am__append_67) \ $(am__append_68) $(am__append_69) $(am__append_70) \ - $(am__append_71) $(am__append_72) openat-die.c \ - $(am__append_73) $(am__append_74) pipe2.c pipe2-safer.c \ - $(am__append_75) $(am__append_76) $(am__append_77) \ + $(am__append_71) $(am__append_72) $(am__append_73) \ + $(am__append_74) $(am__append_75) openat-die.c \ + $(am__append_76) $(am__append_77) pipe2.c pipe2-safer.c \ $(am__append_78) $(am__append_79) $(am__append_80) \ $(am__append_81) $(am__append_82) $(am__append_83) \ $(am__append_84) $(am__append_85) $(am__append_86) \ $(am__append_87) $(am__append_88) $(am__append_89) \ - $(am__append_90) quotearg.c $(am__append_91) $(am__append_92) \ - $(am__append_93) $(am__append_94) $(am__append_95) \ + $(am__append_90) $(am__append_91) $(am__append_92) \ + $(am__append_93) quotearg.c $(am__append_94) $(am__append_95) \ $(am__append_96) $(am__append_97) $(am__append_98) \ - $(am__append_99) $(am__append_100) save-cwd.c \ - $(am__append_101) $(am__append_102) $(am__append_103) \ - setlocale_null.c $(am__append_104) $(am__append_105) \ - $(am__append_106) sig-handler.c $(am__append_107) size_max.h \ - $(am__append_108) sockets.h sockets.c spawn-pipe.h \ - spawn-pipe.c $(am__append_109) $(am__append_110) stat-time.c \ - $(am__append_111) $(am__append_112) $(am__append_113) \ + $(am__append_99) $(am__append_100) $(am__append_101) \ + $(am__append_102) $(am__append_103) same-inode.h same-inode.c \ + save-cwd.c $(am__append_104) $(am__append_105) \ + $(am__append_106) setlocale_null.c $(am__append_107) \ + setlocale_null-unlocked.c $(am__append_108) $(am__append_109) \ + sig-handler.c $(am__append_110) size_max.h $(am__append_111) \ + sockets.h sockets.c spawn-pipe.h spawn-pipe.c \ + $(am__append_112) $(am__append_113) stat-time.c \ $(am__append_114) $(am__append_115) $(am__append_116) \ $(am__append_117) $(am__append_118) $(am__append_119) \ - $(am__append_120) $(am__append_121) strnlen1.h strnlen1.c \ - $(am__append_122) $(am__append_123) $(am__append_124) \ + $(am__append_120) $(am__append_121) $(am__append_122) \ + $(am__append_123) $(am__append_124) strnlen1.h strnlen1.c \ $(am__append_125) $(am__append_126) $(am__append_127) \ - sys_socket.c tempname.c glthread/threadlib.c $(am__append_128) \ - $(am__append_129) timespec.c tmpdir.h tmpdir.c u64.c \ - unicase/cased.c $(am__append_130) $(am__append_131) \ - unicase/ignorable.c unicase/special-casing.c $(am__append_132) \ - unicase/u8-casemap.c $(am__append_133) $(am__append_134) \ - $(am__append_135) uninorm/decompose-internal.c \ - $(am__append_136) unistd.c dup-safer.c fd-safer.c pipe-safer.c \ - $(am__append_137) $(am__append_138) $(am__append_139) \ - $(am__append_140) $(am__append_141) $(am__append_142) \ - $(am__append_143) utimens.c wait-process.h wait-process.c \ - $(am__append_144) $(am__append_145) wctype-h.c \ - $(am__append_146) $(am__append_147) $(am__append_148) \ - $(am__append_149) $(am__append_150) $(am__append_151) \ + $(am__append_128) $(am__append_129) $(am__append_130) \ + sys_socket.c tempname.c glthread/threadlib.c $(am__append_131) \ + $(am__append_132) timespec.c tmpdir.h tmpdir.c u64.c \ + unicase/cased.c $(am__append_133) $(am__append_134) \ + unicase/ignorable.c unicase/special-casing.c $(am__append_135) \ + unicase/u8-casemap.c $(am__append_136) $(am__append_137) \ + $(am__append_138) $(am__append_139) $(am__append_140) \ + $(am__append_141) $(am__append_142) $(am__append_143) \ + $(am__append_144) $(am__append_145) $(am__append_146) \ + $(am__append_147) $(am__append_148) $(am__append_149) \ + $(am__append_150) uninorm/decompose-internal.c \ + $(am__append_151) unistd.c dup-safer.c fd-safer.c pipe-safer.c \ $(am__append_152) $(am__append_153) $(am__append_154) \ + $(am__append_155) $(am__append_156) $(am__append_157) \ + $(am__append_158) $(am__append_159) $(am__append_160) \ + $(am__append_161) $(am__append_162) $(am__append_163) \ + utimens.c wait-process.h wait-process.c $(am__append_164) \ + $(am__append_165) $(am__append_166) wctype-h.c \ + $(am__append_167) $(am__append_168) $(am__append_169) \ + $(am__append_170) $(am__append_171) $(am__append_172) \ + $(am__append_173) $(am__append_174) $(am__append_175) \ xmalloc.c xalloc-die.c xmemdup0.h xmemdup0.c xsize.h xsize.c \ xstrndup.h xstrndup.c libgnu_a_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS) @@ -2925,6 +3159,7 @@ EXTRA_libgnu_a_SOURCES = alloca.c calloc.c calloc.c stripslash.c \ fnmatch.c fnmatch_loop.c fnmatch.c fopen.c fopen.c stat-w32.c \ at-func.c getpass.c getpass.c malloc/dynarray-skeleton.c \ malloc.c malloc.c lc-charset-dispatch.c mbtowc-lock.c \ + lc-charset-dispatch.c mbtowc-lock.c mbsrtoc32s-state.c \ mbsrtowcs-state.c mktime.c mktime.c realloc.c realloc.c \ regcomp.c regex_internal.c regexec.c stdio-write.c snprintf.c \ stat-w32.c strerror_r.c strtol.c asnprintf.c printf-args.c \ @@ -2948,6 +3183,7 @@ SED_HEADER_STDOUT = sed -e 1h -e '1$(SED_HEADER_NOEDIT)' -e 1G SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) -n -e 'w $@-t' # Use $(gl_V_at) instead of $(AM_V_GEN) or $(AM_V_at) on a line that +# is its recipe's first line if and only if @NMD@ lines are absent. gl_V_at = $(AM_V_GEN) GPERF = gperf V_GPERF = $(V_GPERF_@AM_V@) @@ -3084,6 +3320,30 @@ unictype/$(DEPDIR)/$(am__dirstamp): @: > unictype/$(DEPDIR)/$(am__dirstamp) unictype/libgnu_a-combiningclass.$(OBJEXT): unictype/$(am__dirstamp) \ unictype/$(DEPDIR)/$(am__dirstamp) +unictype/libgnu_a-ctype_alnum.$(OBJEXT): unictype/$(am__dirstamp) \ + unictype/$(DEPDIR)/$(am__dirstamp) +unictype/libgnu_a-ctype_alpha.$(OBJEXT): unictype/$(am__dirstamp) \ + unictype/$(DEPDIR)/$(am__dirstamp) +unictype/libgnu_a-ctype_blank.$(OBJEXT): unictype/$(am__dirstamp) \ + unictype/$(DEPDIR)/$(am__dirstamp) +unictype/libgnu_a-ctype_cntrl.$(OBJEXT): unictype/$(am__dirstamp) \ + unictype/$(DEPDIR)/$(am__dirstamp) +unictype/libgnu_a-ctype_digit.$(OBJEXT): unictype/$(am__dirstamp) \ + unictype/$(DEPDIR)/$(am__dirstamp) +unictype/libgnu_a-ctype_graph.$(OBJEXT): unictype/$(am__dirstamp) \ + unictype/$(DEPDIR)/$(am__dirstamp) +unictype/libgnu_a-ctype_lower.$(OBJEXT): unictype/$(am__dirstamp) \ + unictype/$(DEPDIR)/$(am__dirstamp) +unictype/libgnu_a-ctype_print.$(OBJEXT): unictype/$(am__dirstamp) \ + unictype/$(DEPDIR)/$(am__dirstamp) +unictype/libgnu_a-ctype_punct.$(OBJEXT): unictype/$(am__dirstamp) \ + unictype/$(DEPDIR)/$(am__dirstamp) +unictype/libgnu_a-ctype_space.$(OBJEXT): unictype/$(am__dirstamp) \ + unictype/$(DEPDIR)/$(am__dirstamp) +unictype/libgnu_a-ctype_upper.$(OBJEXT): unictype/$(am__dirstamp) \ + unictype/$(DEPDIR)/$(am__dirstamp) +unictype/libgnu_a-ctype_xdigit.$(OBJEXT): unictype/$(am__dirstamp) \ + unictype/$(DEPDIR)/$(am__dirstamp) unictype/libgnu_a-pr_soft_dotted.$(OBJEXT): unictype/$(am__dirstamp) \ unictype/$(DEPDIR)/$(am__dirstamp) uninorm/$(am__dirstamp): @@ -3102,6 +3362,16 @@ unistr/$(am__dirstamp): unistr/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) unistr/$(DEPDIR) @: > unistr/$(DEPDIR)/$(am__dirstamp) +unistr/libgnu_a-u32-chr.$(OBJEXT): unistr/$(am__dirstamp) \ + unistr/$(DEPDIR)/$(am__dirstamp) +unistr/libgnu_a-u32-cpy.$(OBJEXT): unistr/$(am__dirstamp) \ + unistr/$(DEPDIR)/$(am__dirstamp) +unistr/libgnu_a-u32-pcpy.$(OBJEXT): unistr/$(am__dirstamp) \ + unistr/$(DEPDIR)/$(am__dirstamp) +unistr/libgnu_a-u32-strcat.$(OBJEXT): unistr/$(am__dirstamp) \ + unistr/$(DEPDIR)/$(am__dirstamp) +unistr/libgnu_a-u32-strlen.$(OBJEXT): unistr/$(am__dirstamp) \ + unistr/$(DEPDIR)/$(am__dirstamp) unistr/libgnu_a-u8-cpy.$(OBJEXT): unistr/$(am__dirstamp) \ unistr/$(DEPDIR)/$(am__dirstamp) unistr/libgnu_a-u8-mbtouc-unsafe.$(OBJEXT): unistr/$(am__dirstamp) \ @@ -3157,11 +3427,28 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-binary-io.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-bind.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-bitrotate.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-btoc32.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-btowc.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c-ctype.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c-strcasecmp.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c-strcasestr.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c-strncasecmp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32_apply_type_test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32_get_type_test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32isalnum.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32isalpha.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32isblank.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32iscntrl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32isdigit.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32isgraph.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32islower.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32isprint.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32ispunct.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32isspace.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32isupper.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32isxdigit.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32tolower.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-c32width.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-calloc.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-canonicalize-lgpl.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-canonicalize.Po@am__quote@ # am--include-marker @@ -3233,7 +3520,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-ioctl.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-isblank.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-iswblank.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-iswctype.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-iswdigit.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-iswpunct.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-iswxdigit.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-itold.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-lc-charset-dispatch.Po@am__quote@ # am--include-marker @@ -3247,10 +3536,14 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-malloca.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-mbchar.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-mbiter.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-mbrtoc32.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-mbrtowc.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-mbsinit.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-mbsrtoc32s-state.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-mbsrtoc32s.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-mbsrtowcs-state.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-mbsrtowcs.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-mbszero.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-mbtowc-lock.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-mbtowc.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-md2-stream.Po@am__quote@ # am--include-marker @@ -3300,11 +3593,13 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-rename.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-rewinddir.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-rmdir.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-same-inode.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-save-cwd.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-secure_getenv.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-select.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-send.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-setlocale-lock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-setlocale_null-unlocked.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-setlocale_null.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-setsockopt.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-sha1-stream.Po@am__quote@ # am--include-marker @@ -3375,6 +3670,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-waitpid.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-wcrtomb.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-wctype-h.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-wctype.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-wcwidth.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-windows-mutex.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-windows-once.Po@am__quote@ # am--include-marker @@ -3409,9 +3705,26 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/libgnu_a-u8-casemap.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/libgnu_a-u8-tolower.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-combiningclass.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-ctype_alnum.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-ctype_alpha.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-ctype_blank.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-ctype_cntrl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-ctype_digit.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-ctype_graph.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-ctype_lower.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-ctype_print.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-ctype_punct.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-ctype_space.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-ctype_upper.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-ctype_xdigit.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/libgnu_a-pr_soft_dotted.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@uninorm/$(DEPDIR)/libgnu_a-decompose-internal.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@uninorm/$(DEPDIR)/libgnu_a-u8-normalize.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/libgnu_a-u32-chr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/libgnu_a-u32-cpy.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/libgnu_a-u32-pcpy.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/libgnu_a-u32-strcat.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/libgnu_a-u32-strlen.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/libgnu_a-u8-cpy.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/libgnu_a-u8-mbtouc-unsafe-aux.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/libgnu_a-u8-mbtouc-unsafe.Po@am__quote@ # am--include-marker @@ -3554,6 +3867,20 @@ libgnu_a-bitrotate.obj: bitrotate.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-bitrotate.obj `if test -f 'bitrotate.c'; then $(CYGPATH_W) 'bitrotate.c'; else $(CYGPATH_W) '$(srcdir)/bitrotate.c'; fi` +libgnu_a-btoc32.o: btoc32.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-btoc32.o -MD -MP -MF $(DEPDIR)/libgnu_a-btoc32.Tpo -c -o libgnu_a-btoc32.o `test -f 'btoc32.c' || echo '$(srcdir)/'`btoc32.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-btoc32.Tpo $(DEPDIR)/libgnu_a-btoc32.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='btoc32.c' object='libgnu_a-btoc32.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-btoc32.o `test -f 'btoc32.c' || echo '$(srcdir)/'`btoc32.c + +libgnu_a-btoc32.obj: btoc32.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-btoc32.obj -MD -MP -MF $(DEPDIR)/libgnu_a-btoc32.Tpo -c -o libgnu_a-btoc32.obj `if test -f 'btoc32.c'; then $(CYGPATH_W) 'btoc32.c'; else $(CYGPATH_W) '$(srcdir)/btoc32.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-btoc32.Tpo $(DEPDIR)/libgnu_a-btoc32.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='btoc32.c' object='libgnu_a-btoc32.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-btoc32.obj `if test -f 'btoc32.c'; then $(CYGPATH_W) 'btoc32.c'; else $(CYGPATH_W) '$(srcdir)/btoc32.c'; fi` + libgnu_a-btowc.o: btowc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-btowc.o -MD -MP -MF $(DEPDIR)/libgnu_a-btowc.Tpo -c -o libgnu_a-btowc.o `test -f 'btowc.c' || echo '$(srcdir)/'`btowc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-btowc.Tpo $(DEPDIR)/libgnu_a-btowc.Po @@ -3624,6 +3951,230 @@ libgnu_a-c-strcasestr.obj: c-strcasestr.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c-strcasestr.obj `if test -f 'c-strcasestr.c'; then $(CYGPATH_W) 'c-strcasestr.c'; else $(CYGPATH_W) '$(srcdir)/c-strcasestr.c'; fi` +libgnu_a-c32_apply_type_test.o: c32_apply_type_test.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32_apply_type_test.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32_apply_type_test.Tpo -c -o libgnu_a-c32_apply_type_test.o `test -f 'c32_apply_type_test.c' || echo '$(srcdir)/'`c32_apply_type_test.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32_apply_type_test.Tpo $(DEPDIR)/libgnu_a-c32_apply_type_test.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32_apply_type_test.c' object='libgnu_a-c32_apply_type_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32_apply_type_test.o `test -f 'c32_apply_type_test.c' || echo '$(srcdir)/'`c32_apply_type_test.c + +libgnu_a-c32_apply_type_test.obj: c32_apply_type_test.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32_apply_type_test.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32_apply_type_test.Tpo -c -o libgnu_a-c32_apply_type_test.obj `if test -f 'c32_apply_type_test.c'; then $(CYGPATH_W) 'c32_apply_type_test.c'; else $(CYGPATH_W) '$(srcdir)/c32_apply_type_test.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32_apply_type_test.Tpo $(DEPDIR)/libgnu_a-c32_apply_type_test.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32_apply_type_test.c' object='libgnu_a-c32_apply_type_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32_apply_type_test.obj `if test -f 'c32_apply_type_test.c'; then $(CYGPATH_W) 'c32_apply_type_test.c'; else $(CYGPATH_W) '$(srcdir)/c32_apply_type_test.c'; fi` + +libgnu_a-c32_get_type_test.o: c32_get_type_test.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32_get_type_test.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32_get_type_test.Tpo -c -o libgnu_a-c32_get_type_test.o `test -f 'c32_get_type_test.c' || echo '$(srcdir)/'`c32_get_type_test.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32_get_type_test.Tpo $(DEPDIR)/libgnu_a-c32_get_type_test.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32_get_type_test.c' object='libgnu_a-c32_get_type_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32_get_type_test.o `test -f 'c32_get_type_test.c' || echo '$(srcdir)/'`c32_get_type_test.c + +libgnu_a-c32_get_type_test.obj: c32_get_type_test.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32_get_type_test.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32_get_type_test.Tpo -c -o libgnu_a-c32_get_type_test.obj `if test -f 'c32_get_type_test.c'; then $(CYGPATH_W) 'c32_get_type_test.c'; else $(CYGPATH_W) '$(srcdir)/c32_get_type_test.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32_get_type_test.Tpo $(DEPDIR)/libgnu_a-c32_get_type_test.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32_get_type_test.c' object='libgnu_a-c32_get_type_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32_get_type_test.obj `if test -f 'c32_get_type_test.c'; then $(CYGPATH_W) 'c32_get_type_test.c'; else $(CYGPATH_W) '$(srcdir)/c32_get_type_test.c'; fi` + +libgnu_a-c32isalnum.o: c32isalnum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isalnum.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32isalnum.Tpo -c -o libgnu_a-c32isalnum.o `test -f 'c32isalnum.c' || echo '$(srcdir)/'`c32isalnum.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isalnum.Tpo $(DEPDIR)/libgnu_a-c32isalnum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isalnum.c' object='libgnu_a-c32isalnum.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isalnum.o `test -f 'c32isalnum.c' || echo '$(srcdir)/'`c32isalnum.c + +libgnu_a-c32isalnum.obj: c32isalnum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isalnum.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32isalnum.Tpo -c -o libgnu_a-c32isalnum.obj `if test -f 'c32isalnum.c'; then $(CYGPATH_W) 'c32isalnum.c'; else $(CYGPATH_W) '$(srcdir)/c32isalnum.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isalnum.Tpo $(DEPDIR)/libgnu_a-c32isalnum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isalnum.c' object='libgnu_a-c32isalnum.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isalnum.obj `if test -f 'c32isalnum.c'; then $(CYGPATH_W) 'c32isalnum.c'; else $(CYGPATH_W) '$(srcdir)/c32isalnum.c'; fi` + +libgnu_a-c32isalpha.o: c32isalpha.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isalpha.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32isalpha.Tpo -c -o libgnu_a-c32isalpha.o `test -f 'c32isalpha.c' || echo '$(srcdir)/'`c32isalpha.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isalpha.Tpo $(DEPDIR)/libgnu_a-c32isalpha.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isalpha.c' object='libgnu_a-c32isalpha.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isalpha.o `test -f 'c32isalpha.c' || echo '$(srcdir)/'`c32isalpha.c + +libgnu_a-c32isalpha.obj: c32isalpha.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isalpha.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32isalpha.Tpo -c -o libgnu_a-c32isalpha.obj `if test -f 'c32isalpha.c'; then $(CYGPATH_W) 'c32isalpha.c'; else $(CYGPATH_W) '$(srcdir)/c32isalpha.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isalpha.Tpo $(DEPDIR)/libgnu_a-c32isalpha.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isalpha.c' object='libgnu_a-c32isalpha.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isalpha.obj `if test -f 'c32isalpha.c'; then $(CYGPATH_W) 'c32isalpha.c'; else $(CYGPATH_W) '$(srcdir)/c32isalpha.c'; fi` + +libgnu_a-c32isblank.o: c32isblank.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isblank.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32isblank.Tpo -c -o libgnu_a-c32isblank.o `test -f 'c32isblank.c' || echo '$(srcdir)/'`c32isblank.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isblank.Tpo $(DEPDIR)/libgnu_a-c32isblank.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isblank.c' object='libgnu_a-c32isblank.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isblank.o `test -f 'c32isblank.c' || echo '$(srcdir)/'`c32isblank.c + +libgnu_a-c32isblank.obj: c32isblank.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isblank.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32isblank.Tpo -c -o libgnu_a-c32isblank.obj `if test -f 'c32isblank.c'; then $(CYGPATH_W) 'c32isblank.c'; else $(CYGPATH_W) '$(srcdir)/c32isblank.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isblank.Tpo $(DEPDIR)/libgnu_a-c32isblank.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isblank.c' object='libgnu_a-c32isblank.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isblank.obj `if test -f 'c32isblank.c'; then $(CYGPATH_W) 'c32isblank.c'; else $(CYGPATH_W) '$(srcdir)/c32isblank.c'; fi` + +libgnu_a-c32iscntrl.o: c32iscntrl.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32iscntrl.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32iscntrl.Tpo -c -o libgnu_a-c32iscntrl.o `test -f 'c32iscntrl.c' || echo '$(srcdir)/'`c32iscntrl.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32iscntrl.Tpo $(DEPDIR)/libgnu_a-c32iscntrl.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32iscntrl.c' object='libgnu_a-c32iscntrl.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32iscntrl.o `test -f 'c32iscntrl.c' || echo '$(srcdir)/'`c32iscntrl.c + +libgnu_a-c32iscntrl.obj: c32iscntrl.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32iscntrl.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32iscntrl.Tpo -c -o libgnu_a-c32iscntrl.obj `if test -f 'c32iscntrl.c'; then $(CYGPATH_W) 'c32iscntrl.c'; else $(CYGPATH_W) '$(srcdir)/c32iscntrl.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32iscntrl.Tpo $(DEPDIR)/libgnu_a-c32iscntrl.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32iscntrl.c' object='libgnu_a-c32iscntrl.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32iscntrl.obj `if test -f 'c32iscntrl.c'; then $(CYGPATH_W) 'c32iscntrl.c'; else $(CYGPATH_W) '$(srcdir)/c32iscntrl.c'; fi` + +libgnu_a-c32isdigit.o: c32isdigit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isdigit.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32isdigit.Tpo -c -o libgnu_a-c32isdigit.o `test -f 'c32isdigit.c' || echo '$(srcdir)/'`c32isdigit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isdigit.Tpo $(DEPDIR)/libgnu_a-c32isdigit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isdigit.c' object='libgnu_a-c32isdigit.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isdigit.o `test -f 'c32isdigit.c' || echo '$(srcdir)/'`c32isdigit.c + +libgnu_a-c32isdigit.obj: c32isdigit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isdigit.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32isdigit.Tpo -c -o libgnu_a-c32isdigit.obj `if test -f 'c32isdigit.c'; then $(CYGPATH_W) 'c32isdigit.c'; else $(CYGPATH_W) '$(srcdir)/c32isdigit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isdigit.Tpo $(DEPDIR)/libgnu_a-c32isdigit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isdigit.c' object='libgnu_a-c32isdigit.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isdigit.obj `if test -f 'c32isdigit.c'; then $(CYGPATH_W) 'c32isdigit.c'; else $(CYGPATH_W) '$(srcdir)/c32isdigit.c'; fi` + +libgnu_a-c32isgraph.o: c32isgraph.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isgraph.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32isgraph.Tpo -c -o libgnu_a-c32isgraph.o `test -f 'c32isgraph.c' || echo '$(srcdir)/'`c32isgraph.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isgraph.Tpo $(DEPDIR)/libgnu_a-c32isgraph.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isgraph.c' object='libgnu_a-c32isgraph.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isgraph.o `test -f 'c32isgraph.c' || echo '$(srcdir)/'`c32isgraph.c + +libgnu_a-c32isgraph.obj: c32isgraph.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isgraph.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32isgraph.Tpo -c -o libgnu_a-c32isgraph.obj `if test -f 'c32isgraph.c'; then $(CYGPATH_W) 'c32isgraph.c'; else $(CYGPATH_W) '$(srcdir)/c32isgraph.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isgraph.Tpo $(DEPDIR)/libgnu_a-c32isgraph.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isgraph.c' object='libgnu_a-c32isgraph.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isgraph.obj `if test -f 'c32isgraph.c'; then $(CYGPATH_W) 'c32isgraph.c'; else $(CYGPATH_W) '$(srcdir)/c32isgraph.c'; fi` + +libgnu_a-c32islower.o: c32islower.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32islower.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32islower.Tpo -c -o libgnu_a-c32islower.o `test -f 'c32islower.c' || echo '$(srcdir)/'`c32islower.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32islower.Tpo $(DEPDIR)/libgnu_a-c32islower.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32islower.c' object='libgnu_a-c32islower.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32islower.o `test -f 'c32islower.c' || echo '$(srcdir)/'`c32islower.c + +libgnu_a-c32islower.obj: c32islower.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32islower.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32islower.Tpo -c -o libgnu_a-c32islower.obj `if test -f 'c32islower.c'; then $(CYGPATH_W) 'c32islower.c'; else $(CYGPATH_W) '$(srcdir)/c32islower.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32islower.Tpo $(DEPDIR)/libgnu_a-c32islower.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32islower.c' object='libgnu_a-c32islower.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32islower.obj `if test -f 'c32islower.c'; then $(CYGPATH_W) 'c32islower.c'; else $(CYGPATH_W) '$(srcdir)/c32islower.c'; fi` + +libgnu_a-c32isprint.o: c32isprint.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isprint.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32isprint.Tpo -c -o libgnu_a-c32isprint.o `test -f 'c32isprint.c' || echo '$(srcdir)/'`c32isprint.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isprint.Tpo $(DEPDIR)/libgnu_a-c32isprint.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isprint.c' object='libgnu_a-c32isprint.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isprint.o `test -f 'c32isprint.c' || echo '$(srcdir)/'`c32isprint.c + +libgnu_a-c32isprint.obj: c32isprint.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isprint.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32isprint.Tpo -c -o libgnu_a-c32isprint.obj `if test -f 'c32isprint.c'; then $(CYGPATH_W) 'c32isprint.c'; else $(CYGPATH_W) '$(srcdir)/c32isprint.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isprint.Tpo $(DEPDIR)/libgnu_a-c32isprint.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isprint.c' object='libgnu_a-c32isprint.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isprint.obj `if test -f 'c32isprint.c'; then $(CYGPATH_W) 'c32isprint.c'; else $(CYGPATH_W) '$(srcdir)/c32isprint.c'; fi` + +libgnu_a-c32ispunct.o: c32ispunct.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32ispunct.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32ispunct.Tpo -c -o libgnu_a-c32ispunct.o `test -f 'c32ispunct.c' || echo '$(srcdir)/'`c32ispunct.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32ispunct.Tpo $(DEPDIR)/libgnu_a-c32ispunct.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32ispunct.c' object='libgnu_a-c32ispunct.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32ispunct.o `test -f 'c32ispunct.c' || echo '$(srcdir)/'`c32ispunct.c + +libgnu_a-c32ispunct.obj: c32ispunct.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32ispunct.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32ispunct.Tpo -c -o libgnu_a-c32ispunct.obj `if test -f 'c32ispunct.c'; then $(CYGPATH_W) 'c32ispunct.c'; else $(CYGPATH_W) '$(srcdir)/c32ispunct.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32ispunct.Tpo $(DEPDIR)/libgnu_a-c32ispunct.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32ispunct.c' object='libgnu_a-c32ispunct.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32ispunct.obj `if test -f 'c32ispunct.c'; then $(CYGPATH_W) 'c32ispunct.c'; else $(CYGPATH_W) '$(srcdir)/c32ispunct.c'; fi` + +libgnu_a-c32isspace.o: c32isspace.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isspace.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32isspace.Tpo -c -o libgnu_a-c32isspace.o `test -f 'c32isspace.c' || echo '$(srcdir)/'`c32isspace.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isspace.Tpo $(DEPDIR)/libgnu_a-c32isspace.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isspace.c' object='libgnu_a-c32isspace.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isspace.o `test -f 'c32isspace.c' || echo '$(srcdir)/'`c32isspace.c + +libgnu_a-c32isspace.obj: c32isspace.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isspace.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32isspace.Tpo -c -o libgnu_a-c32isspace.obj `if test -f 'c32isspace.c'; then $(CYGPATH_W) 'c32isspace.c'; else $(CYGPATH_W) '$(srcdir)/c32isspace.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isspace.Tpo $(DEPDIR)/libgnu_a-c32isspace.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isspace.c' object='libgnu_a-c32isspace.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isspace.obj `if test -f 'c32isspace.c'; then $(CYGPATH_W) 'c32isspace.c'; else $(CYGPATH_W) '$(srcdir)/c32isspace.c'; fi` + +libgnu_a-c32isupper.o: c32isupper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isupper.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32isupper.Tpo -c -o libgnu_a-c32isupper.o `test -f 'c32isupper.c' || echo '$(srcdir)/'`c32isupper.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isupper.Tpo $(DEPDIR)/libgnu_a-c32isupper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isupper.c' object='libgnu_a-c32isupper.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isupper.o `test -f 'c32isupper.c' || echo '$(srcdir)/'`c32isupper.c + +libgnu_a-c32isupper.obj: c32isupper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isupper.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32isupper.Tpo -c -o libgnu_a-c32isupper.obj `if test -f 'c32isupper.c'; then $(CYGPATH_W) 'c32isupper.c'; else $(CYGPATH_W) '$(srcdir)/c32isupper.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isupper.Tpo $(DEPDIR)/libgnu_a-c32isupper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isupper.c' object='libgnu_a-c32isupper.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isupper.obj `if test -f 'c32isupper.c'; then $(CYGPATH_W) 'c32isupper.c'; else $(CYGPATH_W) '$(srcdir)/c32isupper.c'; fi` + +libgnu_a-c32isxdigit.o: c32isxdigit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isxdigit.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32isxdigit.Tpo -c -o libgnu_a-c32isxdigit.o `test -f 'c32isxdigit.c' || echo '$(srcdir)/'`c32isxdigit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isxdigit.Tpo $(DEPDIR)/libgnu_a-c32isxdigit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isxdigit.c' object='libgnu_a-c32isxdigit.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isxdigit.o `test -f 'c32isxdigit.c' || echo '$(srcdir)/'`c32isxdigit.c + +libgnu_a-c32isxdigit.obj: c32isxdigit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32isxdigit.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32isxdigit.Tpo -c -o libgnu_a-c32isxdigit.obj `if test -f 'c32isxdigit.c'; then $(CYGPATH_W) 'c32isxdigit.c'; else $(CYGPATH_W) '$(srcdir)/c32isxdigit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32isxdigit.Tpo $(DEPDIR)/libgnu_a-c32isxdigit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32isxdigit.c' object='libgnu_a-c32isxdigit.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32isxdigit.obj `if test -f 'c32isxdigit.c'; then $(CYGPATH_W) 'c32isxdigit.c'; else $(CYGPATH_W) '$(srcdir)/c32isxdigit.c'; fi` + +libgnu_a-c32tolower.o: c32tolower.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32tolower.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32tolower.Tpo -c -o libgnu_a-c32tolower.o `test -f 'c32tolower.c' || echo '$(srcdir)/'`c32tolower.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32tolower.Tpo $(DEPDIR)/libgnu_a-c32tolower.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32tolower.c' object='libgnu_a-c32tolower.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32tolower.o `test -f 'c32tolower.c' || echo '$(srcdir)/'`c32tolower.c + +libgnu_a-c32tolower.obj: c32tolower.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32tolower.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32tolower.Tpo -c -o libgnu_a-c32tolower.obj `if test -f 'c32tolower.c'; then $(CYGPATH_W) 'c32tolower.c'; else $(CYGPATH_W) '$(srcdir)/c32tolower.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32tolower.Tpo $(DEPDIR)/libgnu_a-c32tolower.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32tolower.c' object='libgnu_a-c32tolower.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32tolower.obj `if test -f 'c32tolower.c'; then $(CYGPATH_W) 'c32tolower.c'; else $(CYGPATH_W) '$(srcdir)/c32tolower.c'; fi` + +libgnu_a-c32width.o: c32width.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32width.o -MD -MP -MF $(DEPDIR)/libgnu_a-c32width.Tpo -c -o libgnu_a-c32width.o `test -f 'c32width.c' || echo '$(srcdir)/'`c32width.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32width.Tpo $(DEPDIR)/libgnu_a-c32width.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32width.c' object='libgnu_a-c32width.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32width.o `test -f 'c32width.c' || echo '$(srcdir)/'`c32width.c + +libgnu_a-c32width.obj: c32width.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-c32width.obj -MD -MP -MF $(DEPDIR)/libgnu_a-c32width.Tpo -c -o libgnu_a-c32width.obj `if test -f 'c32width.c'; then $(CYGPATH_W) 'c32width.c'; else $(CYGPATH_W) '$(srcdir)/c32width.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-c32width.Tpo $(DEPDIR)/libgnu_a-c32width.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='c32width.c' object='libgnu_a-c32width.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-c32width.obj `if test -f 'c32width.c'; then $(CYGPATH_W) 'c32width.c'; else $(CYGPATH_W) '$(srcdir)/c32width.c'; fi` + libgnu_a-canonicalize.o: canonicalize.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-canonicalize.o -MD -MP -MF $(DEPDIR)/libgnu_a-canonicalize.Tpo -c -o libgnu_a-canonicalize.o `test -f 'canonicalize.c' || echo '$(srcdir)/'`canonicalize.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-canonicalize.Tpo $(DEPDIR)/libgnu_a-canonicalize.Po @@ -4856,6 +5407,20 @@ libgnu_a-iswblank.obj: iswblank.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-iswblank.obj `if test -f 'iswblank.c'; then $(CYGPATH_W) 'iswblank.c'; else $(CYGPATH_W) '$(srcdir)/iswblank.c'; fi` +libgnu_a-iswctype.o: iswctype.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-iswctype.o -MD -MP -MF $(DEPDIR)/libgnu_a-iswctype.Tpo -c -o libgnu_a-iswctype.o `test -f 'iswctype.c' || echo '$(srcdir)/'`iswctype.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-iswctype.Tpo $(DEPDIR)/libgnu_a-iswctype.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iswctype.c' object='libgnu_a-iswctype.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-iswctype.o `test -f 'iswctype.c' || echo '$(srcdir)/'`iswctype.c + +libgnu_a-iswctype.obj: iswctype.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-iswctype.obj -MD -MP -MF $(DEPDIR)/libgnu_a-iswctype.Tpo -c -o libgnu_a-iswctype.obj `if test -f 'iswctype.c'; then $(CYGPATH_W) 'iswctype.c'; else $(CYGPATH_W) '$(srcdir)/iswctype.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-iswctype.Tpo $(DEPDIR)/libgnu_a-iswctype.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iswctype.c' object='libgnu_a-iswctype.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-iswctype.obj `if test -f 'iswctype.c'; then $(CYGPATH_W) 'iswctype.c'; else $(CYGPATH_W) '$(srcdir)/iswctype.c'; fi` + libgnu_a-iswdigit.o: iswdigit.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-iswdigit.o -MD -MP -MF $(DEPDIR)/libgnu_a-iswdigit.Tpo -c -o libgnu_a-iswdigit.o `test -f 'iswdigit.c' || echo '$(srcdir)/'`iswdigit.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-iswdigit.Tpo $(DEPDIR)/libgnu_a-iswdigit.Po @@ -4870,6 +5435,20 @@ libgnu_a-iswdigit.obj: iswdigit.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-iswdigit.obj `if test -f 'iswdigit.c'; then $(CYGPATH_W) 'iswdigit.c'; else $(CYGPATH_W) '$(srcdir)/iswdigit.c'; fi` +libgnu_a-iswpunct.o: iswpunct.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-iswpunct.o -MD -MP -MF $(DEPDIR)/libgnu_a-iswpunct.Tpo -c -o libgnu_a-iswpunct.o `test -f 'iswpunct.c' || echo '$(srcdir)/'`iswpunct.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-iswpunct.Tpo $(DEPDIR)/libgnu_a-iswpunct.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iswpunct.c' object='libgnu_a-iswpunct.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-iswpunct.o `test -f 'iswpunct.c' || echo '$(srcdir)/'`iswpunct.c + +libgnu_a-iswpunct.obj: iswpunct.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-iswpunct.obj -MD -MP -MF $(DEPDIR)/libgnu_a-iswpunct.Tpo -c -o libgnu_a-iswpunct.obj `if test -f 'iswpunct.c'; then $(CYGPATH_W) 'iswpunct.c'; else $(CYGPATH_W) '$(srcdir)/iswpunct.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-iswpunct.Tpo $(DEPDIR)/libgnu_a-iswpunct.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iswpunct.c' object='libgnu_a-iswpunct.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-iswpunct.obj `if test -f 'iswpunct.c'; then $(CYGPATH_W) 'iswpunct.c'; else $(CYGPATH_W) '$(srcdir)/iswpunct.c'; fi` + libgnu_a-iswxdigit.o: iswxdigit.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-iswxdigit.o -MD -MP -MF $(DEPDIR)/libgnu_a-iswxdigit.Tpo -c -o libgnu_a-iswxdigit.o `test -f 'iswxdigit.c' || echo '$(srcdir)/'`iswxdigit.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-iswxdigit.Tpo $(DEPDIR)/libgnu_a-iswxdigit.Po @@ -5024,6 +5603,20 @@ libgnu_a-mbiter.obj: mbiter.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mbiter.obj `if test -f 'mbiter.c'; then $(CYGPATH_W) 'mbiter.c'; else $(CYGPATH_W) '$(srcdir)/mbiter.c'; fi` +libgnu_a-mbrtoc32.o: mbrtoc32.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mbrtoc32.o -MD -MP -MF $(DEPDIR)/libgnu_a-mbrtoc32.Tpo -c -o libgnu_a-mbrtoc32.o `test -f 'mbrtoc32.c' || echo '$(srcdir)/'`mbrtoc32.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mbrtoc32.Tpo $(DEPDIR)/libgnu_a-mbrtoc32.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbrtoc32.c' object='libgnu_a-mbrtoc32.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mbrtoc32.o `test -f 'mbrtoc32.c' || echo '$(srcdir)/'`mbrtoc32.c + +libgnu_a-mbrtoc32.obj: mbrtoc32.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mbrtoc32.obj -MD -MP -MF $(DEPDIR)/libgnu_a-mbrtoc32.Tpo -c -o libgnu_a-mbrtoc32.obj `if test -f 'mbrtoc32.c'; then $(CYGPATH_W) 'mbrtoc32.c'; else $(CYGPATH_W) '$(srcdir)/mbrtoc32.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mbrtoc32.Tpo $(DEPDIR)/libgnu_a-mbrtoc32.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbrtoc32.c' object='libgnu_a-mbrtoc32.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mbrtoc32.obj `if test -f 'mbrtoc32.c'; then $(CYGPATH_W) 'mbrtoc32.c'; else $(CYGPATH_W) '$(srcdir)/mbrtoc32.c'; fi` + libgnu_a-mbrtowc.o: mbrtowc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mbrtowc.o -MD -MP -MF $(DEPDIR)/libgnu_a-mbrtowc.Tpo -c -o libgnu_a-mbrtowc.o `test -f 'mbrtowc.c' || echo '$(srcdir)/'`mbrtowc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mbrtowc.Tpo $(DEPDIR)/libgnu_a-mbrtowc.Po @@ -5052,6 +5645,20 @@ libgnu_a-mbsinit.obj: mbsinit.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mbsinit.obj `if test -f 'mbsinit.c'; then $(CYGPATH_W) 'mbsinit.c'; else $(CYGPATH_W) '$(srcdir)/mbsinit.c'; fi` +libgnu_a-mbsrtoc32s.o: mbsrtoc32s.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mbsrtoc32s.o -MD -MP -MF $(DEPDIR)/libgnu_a-mbsrtoc32s.Tpo -c -o libgnu_a-mbsrtoc32s.o `test -f 'mbsrtoc32s.c' || echo '$(srcdir)/'`mbsrtoc32s.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mbsrtoc32s.Tpo $(DEPDIR)/libgnu_a-mbsrtoc32s.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbsrtoc32s.c' object='libgnu_a-mbsrtoc32s.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mbsrtoc32s.o `test -f 'mbsrtoc32s.c' || echo '$(srcdir)/'`mbsrtoc32s.c + +libgnu_a-mbsrtoc32s.obj: mbsrtoc32s.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mbsrtoc32s.obj -MD -MP -MF $(DEPDIR)/libgnu_a-mbsrtoc32s.Tpo -c -o libgnu_a-mbsrtoc32s.obj `if test -f 'mbsrtoc32s.c'; then $(CYGPATH_W) 'mbsrtoc32s.c'; else $(CYGPATH_W) '$(srcdir)/mbsrtoc32s.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mbsrtoc32s.Tpo $(DEPDIR)/libgnu_a-mbsrtoc32s.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbsrtoc32s.c' object='libgnu_a-mbsrtoc32s.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mbsrtoc32s.obj `if test -f 'mbsrtoc32s.c'; then $(CYGPATH_W) 'mbsrtoc32s.c'; else $(CYGPATH_W) '$(srcdir)/mbsrtoc32s.c'; fi` + libgnu_a-mbsrtowcs.o: mbsrtowcs.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mbsrtowcs.o -MD -MP -MF $(DEPDIR)/libgnu_a-mbsrtowcs.Tpo -c -o libgnu_a-mbsrtowcs.o `test -f 'mbsrtowcs.c' || echo '$(srcdir)/'`mbsrtowcs.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mbsrtowcs.Tpo $(DEPDIR)/libgnu_a-mbsrtowcs.Po @@ -5066,6 +5673,20 @@ libgnu_a-mbsrtowcs.obj: mbsrtowcs.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mbsrtowcs.obj `if test -f 'mbsrtowcs.c'; then $(CYGPATH_W) 'mbsrtowcs.c'; else $(CYGPATH_W) '$(srcdir)/mbsrtowcs.c'; fi` +libgnu_a-mbszero.o: mbszero.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mbszero.o -MD -MP -MF $(DEPDIR)/libgnu_a-mbszero.Tpo -c -o libgnu_a-mbszero.o `test -f 'mbszero.c' || echo '$(srcdir)/'`mbszero.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mbszero.Tpo $(DEPDIR)/libgnu_a-mbszero.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbszero.c' object='libgnu_a-mbszero.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mbszero.o `test -f 'mbszero.c' || echo '$(srcdir)/'`mbszero.c + +libgnu_a-mbszero.obj: mbszero.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mbszero.obj -MD -MP -MF $(DEPDIR)/libgnu_a-mbszero.Tpo -c -o libgnu_a-mbszero.obj `if test -f 'mbszero.c'; then $(CYGPATH_W) 'mbszero.c'; else $(CYGPATH_W) '$(srcdir)/mbszero.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mbszero.Tpo $(DEPDIR)/libgnu_a-mbszero.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbszero.c' object='libgnu_a-mbszero.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mbszero.obj `if test -f 'mbszero.c'; then $(CYGPATH_W) 'mbszero.c'; else $(CYGPATH_W) '$(srcdir)/mbszero.c'; fi` + libgnu_a-mbtowc.o: mbtowc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mbtowc.o -MD -MP -MF $(DEPDIR)/libgnu_a-mbtowc.Tpo -c -o libgnu_a-mbtowc.o `test -f 'mbtowc.c' || echo '$(srcdir)/'`mbtowc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mbtowc.Tpo $(DEPDIR)/libgnu_a-mbtowc.Po @@ -5710,6 +6331,20 @@ libgnu_a-rmdir.obj: rmdir.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-rmdir.obj `if test -f 'rmdir.c'; then $(CYGPATH_W) 'rmdir.c'; else $(CYGPATH_W) '$(srcdir)/rmdir.c'; fi` +libgnu_a-same-inode.o: same-inode.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-same-inode.o -MD -MP -MF $(DEPDIR)/libgnu_a-same-inode.Tpo -c -o libgnu_a-same-inode.o `test -f 'same-inode.c' || echo '$(srcdir)/'`same-inode.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-same-inode.Tpo $(DEPDIR)/libgnu_a-same-inode.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='same-inode.c' object='libgnu_a-same-inode.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-same-inode.o `test -f 'same-inode.c' || echo '$(srcdir)/'`same-inode.c + +libgnu_a-same-inode.obj: same-inode.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-same-inode.obj -MD -MP -MF $(DEPDIR)/libgnu_a-same-inode.Tpo -c -o libgnu_a-same-inode.obj `if test -f 'same-inode.c'; then $(CYGPATH_W) 'same-inode.c'; else $(CYGPATH_W) '$(srcdir)/same-inode.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-same-inode.Tpo $(DEPDIR)/libgnu_a-same-inode.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='same-inode.c' object='libgnu_a-same-inode.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-same-inode.obj `if test -f 'same-inode.c'; then $(CYGPATH_W) 'same-inode.c'; else $(CYGPATH_W) '$(srcdir)/same-inode.c'; fi` + libgnu_a-save-cwd.o: save-cwd.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-save-cwd.o -MD -MP -MF $(DEPDIR)/libgnu_a-save-cwd.Tpo -c -o libgnu_a-save-cwd.o `test -f 'save-cwd.c' || echo '$(srcdir)/'`save-cwd.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-save-cwd.Tpo $(DEPDIR)/libgnu_a-save-cwd.Po @@ -5794,6 +6429,20 @@ libgnu_a-setlocale-lock.obj: setlocale-lock.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-setlocale-lock.obj `if test -f 'setlocale-lock.c'; then $(CYGPATH_W) 'setlocale-lock.c'; else $(CYGPATH_W) '$(srcdir)/setlocale-lock.c'; fi` +libgnu_a-setlocale_null-unlocked.o: setlocale_null-unlocked.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-setlocale_null-unlocked.o -MD -MP -MF $(DEPDIR)/libgnu_a-setlocale_null-unlocked.Tpo -c -o libgnu_a-setlocale_null-unlocked.o `test -f 'setlocale_null-unlocked.c' || echo '$(srcdir)/'`setlocale_null-unlocked.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-setlocale_null-unlocked.Tpo $(DEPDIR)/libgnu_a-setlocale_null-unlocked.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='setlocale_null-unlocked.c' object='libgnu_a-setlocale_null-unlocked.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-setlocale_null-unlocked.o `test -f 'setlocale_null-unlocked.c' || echo '$(srcdir)/'`setlocale_null-unlocked.c + +libgnu_a-setlocale_null-unlocked.obj: setlocale_null-unlocked.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-setlocale_null-unlocked.obj -MD -MP -MF $(DEPDIR)/libgnu_a-setlocale_null-unlocked.Tpo -c -o libgnu_a-setlocale_null-unlocked.obj `if test -f 'setlocale_null-unlocked.c'; then $(CYGPATH_W) 'setlocale_null-unlocked.c'; else $(CYGPATH_W) '$(srcdir)/setlocale_null-unlocked.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-setlocale_null-unlocked.Tpo $(DEPDIR)/libgnu_a-setlocale_null-unlocked.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='setlocale_null-unlocked.c' object='libgnu_a-setlocale_null-unlocked.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-setlocale_null-unlocked.obj `if test -f 'setlocale_null-unlocked.c'; then $(CYGPATH_W) 'setlocale_null-unlocked.c'; else $(CYGPATH_W) '$(srcdir)/setlocale_null-unlocked.c'; fi` + libgnu_a-setsockopt.o: setsockopt.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-setsockopt.o -MD -MP -MF $(DEPDIR)/libgnu_a-setsockopt.Tpo -c -o libgnu_a-setsockopt.o `test -f 'setsockopt.c' || echo '$(srcdir)/'`setsockopt.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-setsockopt.Tpo $(DEPDIR)/libgnu_a-setsockopt.Po @@ -6424,6 +7073,174 @@ unictype/libgnu_a-combiningclass.obj: unictype/combiningclass.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-combiningclass.obj `if test -f 'unictype/combiningclass.c'; then $(CYGPATH_W) 'unictype/combiningclass.c'; else $(CYGPATH_W) '$(srcdir)/unictype/combiningclass.c'; fi` +unictype/libgnu_a-ctype_alnum.o: unictype/ctype_alnum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_alnum.o -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_alnum.Tpo -c -o unictype/libgnu_a-ctype_alnum.o `test -f 'unictype/ctype_alnum.c' || echo '$(srcdir)/'`unictype/ctype_alnum.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_alnum.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_alnum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_alnum.c' object='unictype/libgnu_a-ctype_alnum.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_alnum.o `test -f 'unictype/ctype_alnum.c' || echo '$(srcdir)/'`unictype/ctype_alnum.c + +unictype/libgnu_a-ctype_alnum.obj: unictype/ctype_alnum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_alnum.obj -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_alnum.Tpo -c -o unictype/libgnu_a-ctype_alnum.obj `if test -f 'unictype/ctype_alnum.c'; then $(CYGPATH_W) 'unictype/ctype_alnum.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_alnum.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_alnum.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_alnum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_alnum.c' object='unictype/libgnu_a-ctype_alnum.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_alnum.obj `if test -f 'unictype/ctype_alnum.c'; then $(CYGPATH_W) 'unictype/ctype_alnum.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_alnum.c'; fi` + +unictype/libgnu_a-ctype_alpha.o: unictype/ctype_alpha.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_alpha.o -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_alpha.Tpo -c -o unictype/libgnu_a-ctype_alpha.o `test -f 'unictype/ctype_alpha.c' || echo '$(srcdir)/'`unictype/ctype_alpha.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_alpha.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_alpha.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_alpha.c' object='unictype/libgnu_a-ctype_alpha.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_alpha.o `test -f 'unictype/ctype_alpha.c' || echo '$(srcdir)/'`unictype/ctype_alpha.c + +unictype/libgnu_a-ctype_alpha.obj: unictype/ctype_alpha.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_alpha.obj -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_alpha.Tpo -c -o unictype/libgnu_a-ctype_alpha.obj `if test -f 'unictype/ctype_alpha.c'; then $(CYGPATH_W) 'unictype/ctype_alpha.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_alpha.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_alpha.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_alpha.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_alpha.c' object='unictype/libgnu_a-ctype_alpha.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_alpha.obj `if test -f 'unictype/ctype_alpha.c'; then $(CYGPATH_W) 'unictype/ctype_alpha.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_alpha.c'; fi` + +unictype/libgnu_a-ctype_blank.o: unictype/ctype_blank.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_blank.o -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_blank.Tpo -c -o unictype/libgnu_a-ctype_blank.o `test -f 'unictype/ctype_blank.c' || echo '$(srcdir)/'`unictype/ctype_blank.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_blank.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_blank.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_blank.c' object='unictype/libgnu_a-ctype_blank.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_blank.o `test -f 'unictype/ctype_blank.c' || echo '$(srcdir)/'`unictype/ctype_blank.c + +unictype/libgnu_a-ctype_blank.obj: unictype/ctype_blank.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_blank.obj -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_blank.Tpo -c -o unictype/libgnu_a-ctype_blank.obj `if test -f 'unictype/ctype_blank.c'; then $(CYGPATH_W) 'unictype/ctype_blank.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_blank.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_blank.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_blank.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_blank.c' object='unictype/libgnu_a-ctype_blank.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_blank.obj `if test -f 'unictype/ctype_blank.c'; then $(CYGPATH_W) 'unictype/ctype_blank.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_blank.c'; fi` + +unictype/libgnu_a-ctype_cntrl.o: unictype/ctype_cntrl.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_cntrl.o -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_cntrl.Tpo -c -o unictype/libgnu_a-ctype_cntrl.o `test -f 'unictype/ctype_cntrl.c' || echo '$(srcdir)/'`unictype/ctype_cntrl.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_cntrl.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_cntrl.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_cntrl.c' object='unictype/libgnu_a-ctype_cntrl.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_cntrl.o `test -f 'unictype/ctype_cntrl.c' || echo '$(srcdir)/'`unictype/ctype_cntrl.c + +unictype/libgnu_a-ctype_cntrl.obj: unictype/ctype_cntrl.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_cntrl.obj -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_cntrl.Tpo -c -o unictype/libgnu_a-ctype_cntrl.obj `if test -f 'unictype/ctype_cntrl.c'; then $(CYGPATH_W) 'unictype/ctype_cntrl.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_cntrl.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_cntrl.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_cntrl.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_cntrl.c' object='unictype/libgnu_a-ctype_cntrl.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_cntrl.obj `if test -f 'unictype/ctype_cntrl.c'; then $(CYGPATH_W) 'unictype/ctype_cntrl.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_cntrl.c'; fi` + +unictype/libgnu_a-ctype_digit.o: unictype/ctype_digit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_digit.o -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_digit.Tpo -c -o unictype/libgnu_a-ctype_digit.o `test -f 'unictype/ctype_digit.c' || echo '$(srcdir)/'`unictype/ctype_digit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_digit.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_digit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_digit.c' object='unictype/libgnu_a-ctype_digit.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_digit.o `test -f 'unictype/ctype_digit.c' || echo '$(srcdir)/'`unictype/ctype_digit.c + +unictype/libgnu_a-ctype_digit.obj: unictype/ctype_digit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_digit.obj -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_digit.Tpo -c -o unictype/libgnu_a-ctype_digit.obj `if test -f 'unictype/ctype_digit.c'; then $(CYGPATH_W) 'unictype/ctype_digit.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_digit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_digit.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_digit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_digit.c' object='unictype/libgnu_a-ctype_digit.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_digit.obj `if test -f 'unictype/ctype_digit.c'; then $(CYGPATH_W) 'unictype/ctype_digit.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_digit.c'; fi` + +unictype/libgnu_a-ctype_graph.o: unictype/ctype_graph.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_graph.o -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_graph.Tpo -c -o unictype/libgnu_a-ctype_graph.o `test -f 'unictype/ctype_graph.c' || echo '$(srcdir)/'`unictype/ctype_graph.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_graph.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_graph.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_graph.c' object='unictype/libgnu_a-ctype_graph.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_graph.o `test -f 'unictype/ctype_graph.c' || echo '$(srcdir)/'`unictype/ctype_graph.c + +unictype/libgnu_a-ctype_graph.obj: unictype/ctype_graph.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_graph.obj -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_graph.Tpo -c -o unictype/libgnu_a-ctype_graph.obj `if test -f 'unictype/ctype_graph.c'; then $(CYGPATH_W) 'unictype/ctype_graph.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_graph.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_graph.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_graph.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_graph.c' object='unictype/libgnu_a-ctype_graph.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_graph.obj `if test -f 'unictype/ctype_graph.c'; then $(CYGPATH_W) 'unictype/ctype_graph.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_graph.c'; fi` + +unictype/libgnu_a-ctype_lower.o: unictype/ctype_lower.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_lower.o -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_lower.Tpo -c -o unictype/libgnu_a-ctype_lower.o `test -f 'unictype/ctype_lower.c' || echo '$(srcdir)/'`unictype/ctype_lower.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_lower.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_lower.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_lower.c' object='unictype/libgnu_a-ctype_lower.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_lower.o `test -f 'unictype/ctype_lower.c' || echo '$(srcdir)/'`unictype/ctype_lower.c + +unictype/libgnu_a-ctype_lower.obj: unictype/ctype_lower.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_lower.obj -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_lower.Tpo -c -o unictype/libgnu_a-ctype_lower.obj `if test -f 'unictype/ctype_lower.c'; then $(CYGPATH_W) 'unictype/ctype_lower.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_lower.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_lower.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_lower.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_lower.c' object='unictype/libgnu_a-ctype_lower.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_lower.obj `if test -f 'unictype/ctype_lower.c'; then $(CYGPATH_W) 'unictype/ctype_lower.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_lower.c'; fi` + +unictype/libgnu_a-ctype_print.o: unictype/ctype_print.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_print.o -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_print.Tpo -c -o unictype/libgnu_a-ctype_print.o `test -f 'unictype/ctype_print.c' || echo '$(srcdir)/'`unictype/ctype_print.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_print.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_print.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_print.c' object='unictype/libgnu_a-ctype_print.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_print.o `test -f 'unictype/ctype_print.c' || echo '$(srcdir)/'`unictype/ctype_print.c + +unictype/libgnu_a-ctype_print.obj: unictype/ctype_print.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_print.obj -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_print.Tpo -c -o unictype/libgnu_a-ctype_print.obj `if test -f 'unictype/ctype_print.c'; then $(CYGPATH_W) 'unictype/ctype_print.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_print.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_print.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_print.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_print.c' object='unictype/libgnu_a-ctype_print.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_print.obj `if test -f 'unictype/ctype_print.c'; then $(CYGPATH_W) 'unictype/ctype_print.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_print.c'; fi` + +unictype/libgnu_a-ctype_punct.o: unictype/ctype_punct.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_punct.o -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_punct.Tpo -c -o unictype/libgnu_a-ctype_punct.o `test -f 'unictype/ctype_punct.c' || echo '$(srcdir)/'`unictype/ctype_punct.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_punct.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_punct.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_punct.c' object='unictype/libgnu_a-ctype_punct.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_punct.o `test -f 'unictype/ctype_punct.c' || echo '$(srcdir)/'`unictype/ctype_punct.c + +unictype/libgnu_a-ctype_punct.obj: unictype/ctype_punct.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_punct.obj -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_punct.Tpo -c -o unictype/libgnu_a-ctype_punct.obj `if test -f 'unictype/ctype_punct.c'; then $(CYGPATH_W) 'unictype/ctype_punct.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_punct.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_punct.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_punct.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_punct.c' object='unictype/libgnu_a-ctype_punct.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_punct.obj `if test -f 'unictype/ctype_punct.c'; then $(CYGPATH_W) 'unictype/ctype_punct.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_punct.c'; fi` + +unictype/libgnu_a-ctype_space.o: unictype/ctype_space.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_space.o -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_space.Tpo -c -o unictype/libgnu_a-ctype_space.o `test -f 'unictype/ctype_space.c' || echo '$(srcdir)/'`unictype/ctype_space.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_space.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_space.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_space.c' object='unictype/libgnu_a-ctype_space.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_space.o `test -f 'unictype/ctype_space.c' || echo '$(srcdir)/'`unictype/ctype_space.c + +unictype/libgnu_a-ctype_space.obj: unictype/ctype_space.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_space.obj -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_space.Tpo -c -o unictype/libgnu_a-ctype_space.obj `if test -f 'unictype/ctype_space.c'; then $(CYGPATH_W) 'unictype/ctype_space.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_space.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_space.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_space.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_space.c' object='unictype/libgnu_a-ctype_space.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_space.obj `if test -f 'unictype/ctype_space.c'; then $(CYGPATH_W) 'unictype/ctype_space.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_space.c'; fi` + +unictype/libgnu_a-ctype_upper.o: unictype/ctype_upper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_upper.o -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_upper.Tpo -c -o unictype/libgnu_a-ctype_upper.o `test -f 'unictype/ctype_upper.c' || echo '$(srcdir)/'`unictype/ctype_upper.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_upper.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_upper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_upper.c' object='unictype/libgnu_a-ctype_upper.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_upper.o `test -f 'unictype/ctype_upper.c' || echo '$(srcdir)/'`unictype/ctype_upper.c + +unictype/libgnu_a-ctype_upper.obj: unictype/ctype_upper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_upper.obj -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_upper.Tpo -c -o unictype/libgnu_a-ctype_upper.obj `if test -f 'unictype/ctype_upper.c'; then $(CYGPATH_W) 'unictype/ctype_upper.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_upper.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_upper.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_upper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_upper.c' object='unictype/libgnu_a-ctype_upper.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_upper.obj `if test -f 'unictype/ctype_upper.c'; then $(CYGPATH_W) 'unictype/ctype_upper.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_upper.c'; fi` + +unictype/libgnu_a-ctype_xdigit.o: unictype/ctype_xdigit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_xdigit.o -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_xdigit.Tpo -c -o unictype/libgnu_a-ctype_xdigit.o `test -f 'unictype/ctype_xdigit.c' || echo '$(srcdir)/'`unictype/ctype_xdigit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_xdigit.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_xdigit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_xdigit.c' object='unictype/libgnu_a-ctype_xdigit.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_xdigit.o `test -f 'unictype/ctype_xdigit.c' || echo '$(srcdir)/'`unictype/ctype_xdigit.c + +unictype/libgnu_a-ctype_xdigit.obj: unictype/ctype_xdigit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-ctype_xdigit.obj -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-ctype_xdigit.Tpo -c -o unictype/libgnu_a-ctype_xdigit.obj `if test -f 'unictype/ctype_xdigit.c'; then $(CYGPATH_W) 'unictype/ctype_xdigit.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_xdigit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-ctype_xdigit.Tpo unictype/$(DEPDIR)/libgnu_a-ctype_xdigit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unictype/ctype_xdigit.c' object='unictype/libgnu_a-ctype_xdigit.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unictype/libgnu_a-ctype_xdigit.obj `if test -f 'unictype/ctype_xdigit.c'; then $(CYGPATH_W) 'unictype/ctype_xdigit.c'; else $(CYGPATH_W) '$(srcdir)/unictype/ctype_xdigit.c'; fi` + unictype/libgnu_a-pr_soft_dotted.o: unictype/pr_soft_dotted.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unictype/libgnu_a-pr_soft_dotted.o -MD -MP -MF unictype/$(DEPDIR)/libgnu_a-pr_soft_dotted.Tpo -c -o unictype/libgnu_a-pr_soft_dotted.o `test -f 'unictype/pr_soft_dotted.c' || echo '$(srcdir)/'`unictype/pr_soft_dotted.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unictype/$(DEPDIR)/libgnu_a-pr_soft_dotted.Tpo unictype/$(DEPDIR)/libgnu_a-pr_soft_dotted.Po @@ -6522,6 +7339,76 @@ libgnu_a-pipe-safer.obj: pipe-safer.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-pipe-safer.obj `if test -f 'pipe-safer.c'; then $(CYGPATH_W) 'pipe-safer.c'; else $(CYGPATH_W) '$(srcdir)/pipe-safer.c'; fi` +unistr/libgnu_a-u32-chr.o: unistr/u32-chr.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unistr/libgnu_a-u32-chr.o -MD -MP -MF unistr/$(DEPDIR)/libgnu_a-u32-chr.Tpo -c -o unistr/libgnu_a-u32-chr.o `test -f 'unistr/u32-chr.c' || echo '$(srcdir)/'`unistr/u32-chr.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unistr/$(DEPDIR)/libgnu_a-u32-chr.Tpo unistr/$(DEPDIR)/libgnu_a-u32-chr.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u32-chr.c' object='unistr/libgnu_a-u32-chr.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unistr/libgnu_a-u32-chr.o `test -f 'unistr/u32-chr.c' || echo '$(srcdir)/'`unistr/u32-chr.c + +unistr/libgnu_a-u32-chr.obj: unistr/u32-chr.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unistr/libgnu_a-u32-chr.obj -MD -MP -MF unistr/$(DEPDIR)/libgnu_a-u32-chr.Tpo -c -o unistr/libgnu_a-u32-chr.obj `if test -f 'unistr/u32-chr.c'; then $(CYGPATH_W) 'unistr/u32-chr.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u32-chr.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unistr/$(DEPDIR)/libgnu_a-u32-chr.Tpo unistr/$(DEPDIR)/libgnu_a-u32-chr.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u32-chr.c' object='unistr/libgnu_a-u32-chr.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unistr/libgnu_a-u32-chr.obj `if test -f 'unistr/u32-chr.c'; then $(CYGPATH_W) 'unistr/u32-chr.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u32-chr.c'; fi` + +unistr/libgnu_a-u32-cpy.o: unistr/u32-cpy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unistr/libgnu_a-u32-cpy.o -MD -MP -MF unistr/$(DEPDIR)/libgnu_a-u32-cpy.Tpo -c -o unistr/libgnu_a-u32-cpy.o `test -f 'unistr/u32-cpy.c' || echo '$(srcdir)/'`unistr/u32-cpy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unistr/$(DEPDIR)/libgnu_a-u32-cpy.Tpo unistr/$(DEPDIR)/libgnu_a-u32-cpy.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u32-cpy.c' object='unistr/libgnu_a-u32-cpy.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unistr/libgnu_a-u32-cpy.o `test -f 'unistr/u32-cpy.c' || echo '$(srcdir)/'`unistr/u32-cpy.c + +unistr/libgnu_a-u32-cpy.obj: unistr/u32-cpy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unistr/libgnu_a-u32-cpy.obj -MD -MP -MF unistr/$(DEPDIR)/libgnu_a-u32-cpy.Tpo -c -o unistr/libgnu_a-u32-cpy.obj `if test -f 'unistr/u32-cpy.c'; then $(CYGPATH_W) 'unistr/u32-cpy.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u32-cpy.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unistr/$(DEPDIR)/libgnu_a-u32-cpy.Tpo unistr/$(DEPDIR)/libgnu_a-u32-cpy.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u32-cpy.c' object='unistr/libgnu_a-u32-cpy.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unistr/libgnu_a-u32-cpy.obj `if test -f 'unistr/u32-cpy.c'; then $(CYGPATH_W) 'unistr/u32-cpy.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u32-cpy.c'; fi` + +unistr/libgnu_a-u32-pcpy.o: unistr/u32-pcpy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unistr/libgnu_a-u32-pcpy.o -MD -MP -MF unistr/$(DEPDIR)/libgnu_a-u32-pcpy.Tpo -c -o unistr/libgnu_a-u32-pcpy.o `test -f 'unistr/u32-pcpy.c' || echo '$(srcdir)/'`unistr/u32-pcpy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unistr/$(DEPDIR)/libgnu_a-u32-pcpy.Tpo unistr/$(DEPDIR)/libgnu_a-u32-pcpy.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u32-pcpy.c' object='unistr/libgnu_a-u32-pcpy.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unistr/libgnu_a-u32-pcpy.o `test -f 'unistr/u32-pcpy.c' || echo '$(srcdir)/'`unistr/u32-pcpy.c + +unistr/libgnu_a-u32-pcpy.obj: unistr/u32-pcpy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unistr/libgnu_a-u32-pcpy.obj -MD -MP -MF unistr/$(DEPDIR)/libgnu_a-u32-pcpy.Tpo -c -o unistr/libgnu_a-u32-pcpy.obj `if test -f 'unistr/u32-pcpy.c'; then $(CYGPATH_W) 'unistr/u32-pcpy.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u32-pcpy.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unistr/$(DEPDIR)/libgnu_a-u32-pcpy.Tpo unistr/$(DEPDIR)/libgnu_a-u32-pcpy.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u32-pcpy.c' object='unistr/libgnu_a-u32-pcpy.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unistr/libgnu_a-u32-pcpy.obj `if test -f 'unistr/u32-pcpy.c'; then $(CYGPATH_W) 'unistr/u32-pcpy.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u32-pcpy.c'; fi` + +unistr/libgnu_a-u32-strcat.o: unistr/u32-strcat.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unistr/libgnu_a-u32-strcat.o -MD -MP -MF unistr/$(DEPDIR)/libgnu_a-u32-strcat.Tpo -c -o unistr/libgnu_a-u32-strcat.o `test -f 'unistr/u32-strcat.c' || echo '$(srcdir)/'`unistr/u32-strcat.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unistr/$(DEPDIR)/libgnu_a-u32-strcat.Tpo unistr/$(DEPDIR)/libgnu_a-u32-strcat.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u32-strcat.c' object='unistr/libgnu_a-u32-strcat.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unistr/libgnu_a-u32-strcat.o `test -f 'unistr/u32-strcat.c' || echo '$(srcdir)/'`unistr/u32-strcat.c + +unistr/libgnu_a-u32-strcat.obj: unistr/u32-strcat.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unistr/libgnu_a-u32-strcat.obj -MD -MP -MF unistr/$(DEPDIR)/libgnu_a-u32-strcat.Tpo -c -o unistr/libgnu_a-u32-strcat.obj `if test -f 'unistr/u32-strcat.c'; then $(CYGPATH_W) 'unistr/u32-strcat.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u32-strcat.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unistr/$(DEPDIR)/libgnu_a-u32-strcat.Tpo unistr/$(DEPDIR)/libgnu_a-u32-strcat.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u32-strcat.c' object='unistr/libgnu_a-u32-strcat.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unistr/libgnu_a-u32-strcat.obj `if test -f 'unistr/u32-strcat.c'; then $(CYGPATH_W) 'unistr/u32-strcat.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u32-strcat.c'; fi` + +unistr/libgnu_a-u32-strlen.o: unistr/u32-strlen.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unistr/libgnu_a-u32-strlen.o -MD -MP -MF unistr/$(DEPDIR)/libgnu_a-u32-strlen.Tpo -c -o unistr/libgnu_a-u32-strlen.o `test -f 'unistr/u32-strlen.c' || echo '$(srcdir)/'`unistr/u32-strlen.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unistr/$(DEPDIR)/libgnu_a-u32-strlen.Tpo unistr/$(DEPDIR)/libgnu_a-u32-strlen.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u32-strlen.c' object='unistr/libgnu_a-u32-strlen.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unistr/libgnu_a-u32-strlen.o `test -f 'unistr/u32-strlen.c' || echo '$(srcdir)/'`unistr/u32-strlen.c + +unistr/libgnu_a-u32-strlen.obj: unistr/u32-strlen.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unistr/libgnu_a-u32-strlen.obj -MD -MP -MF unistr/$(DEPDIR)/libgnu_a-u32-strlen.Tpo -c -o unistr/libgnu_a-u32-strlen.obj `if test -f 'unistr/u32-strlen.c'; then $(CYGPATH_W) 'unistr/u32-strlen.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u32-strlen.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unistr/$(DEPDIR)/libgnu_a-u32-strlen.Tpo unistr/$(DEPDIR)/libgnu_a-u32-strlen.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u32-strlen.c' object='unistr/libgnu_a-u32-strlen.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o unistr/libgnu_a-u32-strlen.obj `if test -f 'unistr/u32-strlen.c'; then $(CYGPATH_W) 'unistr/u32-strlen.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u32-strlen.c'; fi` + unistr/libgnu_a-u8-cpy.o: unistr/u8-cpy.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT unistr/libgnu_a-u8-cpy.o -MD -MP -MF unistr/$(DEPDIR)/libgnu_a-u8-cpy.Tpo -c -o unistr/libgnu_a-u8-cpy.o `test -f 'unistr/u8-cpy.c' || echo '$(srcdir)/'`unistr/u8-cpy.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unistr/$(DEPDIR)/libgnu_a-u8-cpy.Tpo unistr/$(DEPDIR)/libgnu_a-u8-cpy.Po @@ -6704,6 +7591,20 @@ libgnu_a-wcrtomb.obj: wcrtomb.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-wcrtomb.obj `if test -f 'wcrtomb.c'; then $(CYGPATH_W) 'wcrtomb.c'; else $(CYGPATH_W) '$(srcdir)/wcrtomb.c'; fi` +libgnu_a-wctype.o: wctype.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-wctype.o -MD -MP -MF $(DEPDIR)/libgnu_a-wctype.Tpo -c -o libgnu_a-wctype.o `test -f 'wctype.c' || echo '$(srcdir)/'`wctype.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-wctype.Tpo $(DEPDIR)/libgnu_a-wctype.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wctype.c' object='libgnu_a-wctype.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-wctype.o `test -f 'wctype.c' || echo '$(srcdir)/'`wctype.c + +libgnu_a-wctype.obj: wctype.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-wctype.obj -MD -MP -MF $(DEPDIR)/libgnu_a-wctype.Tpo -c -o libgnu_a-wctype.obj `if test -f 'wctype.c'; then $(CYGPATH_W) 'wctype.c'; else $(CYGPATH_W) '$(srcdir)/wctype.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-wctype.Tpo $(DEPDIR)/libgnu_a-wctype.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wctype.c' object='libgnu_a-wctype.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-wctype.obj `if test -f 'wctype.c'; then $(CYGPATH_W) 'wctype.c'; else $(CYGPATH_W) '$(srcdir)/wctype.c'; fi` + libgnu_a-wctype-h.o: wctype-h.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-wctype-h.o -MD -MP -MF $(DEPDIR)/libgnu_a-wctype-h.Tpo -c -o libgnu_a-wctype-h.o `test -f 'wctype-h.c' || echo '$(srcdir)/'`wctype-h.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-wctype-h.Tpo $(DEPDIR)/libgnu_a-wctype-h.Po @@ -7082,6 +7983,20 @@ libgnu_a-mbtowc-lock.obj: mbtowc-lock.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mbtowc-lock.obj `if test -f 'mbtowc-lock.c'; then $(CYGPATH_W) 'mbtowc-lock.c'; else $(CYGPATH_W) '$(srcdir)/mbtowc-lock.c'; fi` +libgnu_a-mbsrtoc32s-state.o: mbsrtoc32s-state.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mbsrtoc32s-state.o -MD -MP -MF $(DEPDIR)/libgnu_a-mbsrtoc32s-state.Tpo -c -o libgnu_a-mbsrtoc32s-state.o `test -f 'mbsrtoc32s-state.c' || echo '$(srcdir)/'`mbsrtoc32s-state.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mbsrtoc32s-state.Tpo $(DEPDIR)/libgnu_a-mbsrtoc32s-state.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbsrtoc32s-state.c' object='libgnu_a-mbsrtoc32s-state.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mbsrtoc32s-state.o `test -f 'mbsrtoc32s-state.c' || echo '$(srcdir)/'`mbsrtoc32s-state.c + +libgnu_a-mbsrtoc32s-state.obj: mbsrtoc32s-state.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mbsrtoc32s-state.obj -MD -MP -MF $(DEPDIR)/libgnu_a-mbsrtoc32s-state.Tpo -c -o libgnu_a-mbsrtoc32s-state.obj `if test -f 'mbsrtoc32s-state.c'; then $(CYGPATH_W) 'mbsrtoc32s-state.c'; else $(CYGPATH_W) '$(srcdir)/mbsrtoc32s-state.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mbsrtoc32s-state.Tpo $(DEPDIR)/libgnu_a-mbsrtoc32s-state.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbsrtoc32s-state.c' object='libgnu_a-mbsrtoc32s-state.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mbsrtoc32s-state.obj `if test -f 'mbsrtoc32s-state.c'; then $(CYGPATH_W) 'mbsrtoc32s-state.c'; else $(CYGPATH_W) '$(srcdir)/mbsrtoc32s-state.c'; fi` + libgnu_a-mbsrtowcs-state.o: mbsrtowcs-state.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mbsrtowcs-state.o -MD -MP -MF $(DEPDIR)/libgnu_a-mbsrtowcs-state.Tpo -c -o libgnu_a-mbsrtowcs-state.o `test -f 'mbsrtowcs-state.c' || echo '$(srcdir)/'`mbsrtowcs-state.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mbsrtowcs-state.Tpo $(DEPDIR)/libgnu_a-mbsrtowcs-state.Po @@ -7451,11 +8366,28 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libgnu_a-binary-io.Po -rm -f ./$(DEPDIR)/libgnu_a-bind.Po -rm -f ./$(DEPDIR)/libgnu_a-bitrotate.Po + -rm -f ./$(DEPDIR)/libgnu_a-btoc32.Po -rm -f ./$(DEPDIR)/libgnu_a-btowc.Po -rm -f ./$(DEPDIR)/libgnu_a-c-ctype.Po -rm -f ./$(DEPDIR)/libgnu_a-c-strcasecmp.Po -rm -f ./$(DEPDIR)/libgnu_a-c-strcasestr.Po -rm -f ./$(DEPDIR)/libgnu_a-c-strncasecmp.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32_apply_type_test.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32_get_type_test.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isalnum.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isalpha.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isblank.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32iscntrl.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isdigit.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isgraph.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32islower.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isprint.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32ispunct.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isspace.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isupper.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isxdigit.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32tolower.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32width.Po -rm -f ./$(DEPDIR)/libgnu_a-calloc.Po -rm -f ./$(DEPDIR)/libgnu_a-canonicalize-lgpl.Po -rm -f ./$(DEPDIR)/libgnu_a-canonicalize.Po @@ -7527,7 +8459,9 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libgnu_a-ioctl.Po -rm -f ./$(DEPDIR)/libgnu_a-isblank.Po -rm -f ./$(DEPDIR)/libgnu_a-iswblank.Po + -rm -f ./$(DEPDIR)/libgnu_a-iswctype.Po -rm -f ./$(DEPDIR)/libgnu_a-iswdigit.Po + -rm -f ./$(DEPDIR)/libgnu_a-iswpunct.Po -rm -f ./$(DEPDIR)/libgnu_a-iswxdigit.Po -rm -f ./$(DEPDIR)/libgnu_a-itold.Po -rm -f ./$(DEPDIR)/libgnu_a-lc-charset-dispatch.Po @@ -7541,10 +8475,14 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libgnu_a-malloca.Po -rm -f ./$(DEPDIR)/libgnu_a-mbchar.Po -rm -f ./$(DEPDIR)/libgnu_a-mbiter.Po + -rm -f ./$(DEPDIR)/libgnu_a-mbrtoc32.Po -rm -f ./$(DEPDIR)/libgnu_a-mbrtowc.Po -rm -f ./$(DEPDIR)/libgnu_a-mbsinit.Po + -rm -f ./$(DEPDIR)/libgnu_a-mbsrtoc32s-state.Po + -rm -f ./$(DEPDIR)/libgnu_a-mbsrtoc32s.Po -rm -f ./$(DEPDIR)/libgnu_a-mbsrtowcs-state.Po -rm -f ./$(DEPDIR)/libgnu_a-mbsrtowcs.Po + -rm -f ./$(DEPDIR)/libgnu_a-mbszero.Po -rm -f ./$(DEPDIR)/libgnu_a-mbtowc-lock.Po -rm -f ./$(DEPDIR)/libgnu_a-mbtowc.Po -rm -f ./$(DEPDIR)/libgnu_a-md2-stream.Po @@ -7594,11 +8532,13 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libgnu_a-rename.Po -rm -f ./$(DEPDIR)/libgnu_a-rewinddir.Po -rm -f ./$(DEPDIR)/libgnu_a-rmdir.Po + -rm -f ./$(DEPDIR)/libgnu_a-same-inode.Po -rm -f ./$(DEPDIR)/libgnu_a-save-cwd.Po -rm -f ./$(DEPDIR)/libgnu_a-secure_getenv.Po -rm -f ./$(DEPDIR)/libgnu_a-select.Po -rm -f ./$(DEPDIR)/libgnu_a-send.Po -rm -f ./$(DEPDIR)/libgnu_a-setlocale-lock.Po + -rm -f ./$(DEPDIR)/libgnu_a-setlocale_null-unlocked.Po -rm -f ./$(DEPDIR)/libgnu_a-setlocale_null.Po -rm -f ./$(DEPDIR)/libgnu_a-setsockopt.Po -rm -f ./$(DEPDIR)/libgnu_a-sha1-stream.Po @@ -7669,6 +8609,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libgnu_a-waitpid.Po -rm -f ./$(DEPDIR)/libgnu_a-wcrtomb.Po -rm -f ./$(DEPDIR)/libgnu_a-wctype-h.Po + -rm -f ./$(DEPDIR)/libgnu_a-wctype.Po -rm -f ./$(DEPDIR)/libgnu_a-wcwidth.Po -rm -f ./$(DEPDIR)/libgnu_a-windows-mutex.Po -rm -f ./$(DEPDIR)/libgnu_a-windows-once.Po @@ -7703,9 +8644,26 @@ distclean: distclean-am -rm -f unicase/$(DEPDIR)/libgnu_a-u8-casemap.Po -rm -f unicase/$(DEPDIR)/libgnu_a-u8-tolower.Po -rm -f unictype/$(DEPDIR)/libgnu_a-combiningclass.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_alnum.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_alpha.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_blank.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_cntrl.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_digit.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_graph.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_lower.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_print.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_punct.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_space.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_upper.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_xdigit.Po -rm -f unictype/$(DEPDIR)/libgnu_a-pr_soft_dotted.Po -rm -f uninorm/$(DEPDIR)/libgnu_a-decompose-internal.Po -rm -f uninorm/$(DEPDIR)/libgnu_a-u8-normalize.Po + -rm -f unistr/$(DEPDIR)/libgnu_a-u32-chr.Po + -rm -f unistr/$(DEPDIR)/libgnu_a-u32-cpy.Po + -rm -f unistr/$(DEPDIR)/libgnu_a-u32-pcpy.Po + -rm -f unistr/$(DEPDIR)/libgnu_a-u32-strcat.Po + -rm -f unistr/$(DEPDIR)/libgnu_a-u32-strlen.Po -rm -f unistr/$(DEPDIR)/libgnu_a-u8-cpy.Po -rm -f unistr/$(DEPDIR)/libgnu_a-u8-mbtouc-unsafe-aux.Po -rm -f unistr/$(DEPDIR)/libgnu_a-u8-mbtouc-unsafe.Po @@ -7772,11 +8730,28 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libgnu_a-binary-io.Po -rm -f ./$(DEPDIR)/libgnu_a-bind.Po -rm -f ./$(DEPDIR)/libgnu_a-bitrotate.Po + -rm -f ./$(DEPDIR)/libgnu_a-btoc32.Po -rm -f ./$(DEPDIR)/libgnu_a-btowc.Po -rm -f ./$(DEPDIR)/libgnu_a-c-ctype.Po -rm -f ./$(DEPDIR)/libgnu_a-c-strcasecmp.Po -rm -f ./$(DEPDIR)/libgnu_a-c-strcasestr.Po -rm -f ./$(DEPDIR)/libgnu_a-c-strncasecmp.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32_apply_type_test.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32_get_type_test.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isalnum.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isalpha.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isblank.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32iscntrl.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isdigit.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isgraph.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32islower.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isprint.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32ispunct.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isspace.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isupper.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32isxdigit.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32tolower.Po + -rm -f ./$(DEPDIR)/libgnu_a-c32width.Po -rm -f ./$(DEPDIR)/libgnu_a-calloc.Po -rm -f ./$(DEPDIR)/libgnu_a-canonicalize-lgpl.Po -rm -f ./$(DEPDIR)/libgnu_a-canonicalize.Po @@ -7848,7 +8823,9 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libgnu_a-ioctl.Po -rm -f ./$(DEPDIR)/libgnu_a-isblank.Po -rm -f ./$(DEPDIR)/libgnu_a-iswblank.Po + -rm -f ./$(DEPDIR)/libgnu_a-iswctype.Po -rm -f ./$(DEPDIR)/libgnu_a-iswdigit.Po + -rm -f ./$(DEPDIR)/libgnu_a-iswpunct.Po -rm -f ./$(DEPDIR)/libgnu_a-iswxdigit.Po -rm -f ./$(DEPDIR)/libgnu_a-itold.Po -rm -f ./$(DEPDIR)/libgnu_a-lc-charset-dispatch.Po @@ -7862,10 +8839,14 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libgnu_a-malloca.Po -rm -f ./$(DEPDIR)/libgnu_a-mbchar.Po -rm -f ./$(DEPDIR)/libgnu_a-mbiter.Po + -rm -f ./$(DEPDIR)/libgnu_a-mbrtoc32.Po -rm -f ./$(DEPDIR)/libgnu_a-mbrtowc.Po -rm -f ./$(DEPDIR)/libgnu_a-mbsinit.Po + -rm -f ./$(DEPDIR)/libgnu_a-mbsrtoc32s-state.Po + -rm -f ./$(DEPDIR)/libgnu_a-mbsrtoc32s.Po -rm -f ./$(DEPDIR)/libgnu_a-mbsrtowcs-state.Po -rm -f ./$(DEPDIR)/libgnu_a-mbsrtowcs.Po + -rm -f ./$(DEPDIR)/libgnu_a-mbszero.Po -rm -f ./$(DEPDIR)/libgnu_a-mbtowc-lock.Po -rm -f ./$(DEPDIR)/libgnu_a-mbtowc.Po -rm -f ./$(DEPDIR)/libgnu_a-md2-stream.Po @@ -7915,11 +8896,13 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libgnu_a-rename.Po -rm -f ./$(DEPDIR)/libgnu_a-rewinddir.Po -rm -f ./$(DEPDIR)/libgnu_a-rmdir.Po + -rm -f ./$(DEPDIR)/libgnu_a-same-inode.Po -rm -f ./$(DEPDIR)/libgnu_a-save-cwd.Po -rm -f ./$(DEPDIR)/libgnu_a-secure_getenv.Po -rm -f ./$(DEPDIR)/libgnu_a-select.Po -rm -f ./$(DEPDIR)/libgnu_a-send.Po -rm -f ./$(DEPDIR)/libgnu_a-setlocale-lock.Po + -rm -f ./$(DEPDIR)/libgnu_a-setlocale_null-unlocked.Po -rm -f ./$(DEPDIR)/libgnu_a-setlocale_null.Po -rm -f ./$(DEPDIR)/libgnu_a-setsockopt.Po -rm -f ./$(DEPDIR)/libgnu_a-sha1-stream.Po @@ -7990,6 +8973,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libgnu_a-waitpid.Po -rm -f ./$(DEPDIR)/libgnu_a-wcrtomb.Po -rm -f ./$(DEPDIR)/libgnu_a-wctype-h.Po + -rm -f ./$(DEPDIR)/libgnu_a-wctype.Po -rm -f ./$(DEPDIR)/libgnu_a-wcwidth.Po -rm -f ./$(DEPDIR)/libgnu_a-windows-mutex.Po -rm -f ./$(DEPDIR)/libgnu_a-windows-once.Po @@ -8024,9 +9008,26 @@ maintainer-clean: maintainer-clean-am -rm -f unicase/$(DEPDIR)/libgnu_a-u8-casemap.Po -rm -f unicase/$(DEPDIR)/libgnu_a-u8-tolower.Po -rm -f unictype/$(DEPDIR)/libgnu_a-combiningclass.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_alnum.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_alpha.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_blank.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_cntrl.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_digit.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_graph.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_lower.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_print.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_punct.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_space.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_upper.Po + -rm -f unictype/$(DEPDIR)/libgnu_a-ctype_xdigit.Po -rm -f unictype/$(DEPDIR)/libgnu_a-pr_soft_dotted.Po -rm -f uninorm/$(DEPDIR)/libgnu_a-decompose-internal.Po -rm -f uninorm/$(DEPDIR)/libgnu_a-u8-normalize.Po + -rm -f unistr/$(DEPDIR)/libgnu_a-u32-chr.Po + -rm -f unistr/$(DEPDIR)/libgnu_a-u32-cpy.Po + -rm -f unistr/$(DEPDIR)/libgnu_a-u32-pcpy.Po + -rm -f unistr/$(DEPDIR)/libgnu_a-u32-strcat.Po + -rm -f unistr/$(DEPDIR)/libgnu_a-u32-strlen.Po -rm -f unistr/$(DEPDIR)/libgnu_a-u8-cpy.Po -rm -f unistr/$(DEPDIR)/libgnu_a-u8-mbtouc-unsafe-aux.Po -rm -f unistr/$(DEPDIR)/libgnu_a-u8-mbtouc-unsafe.Po @@ -8210,24 +9211,20 @@ dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H @GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status @GL_GENERATE_ERRNO_H_FALSE@ rm -f $@ -# We need the following in order to create <error.h> when the system -# doesn't have one that works. -@GL_GENERATE_ERROR_H_TRUE@error.h: error.in.h $(top_builddir)/config.status $(CXXDEFS_H) -@GL_GENERATE_ERROR_H_TRUE@ $(gl_V_at)$(SED_HEADER_STDOUT) \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''HAVE_ERROR_H''@|$(HAVE_ERROR_H)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''NEXT_ERROR_H''@|$(NEXT_ERROR_H)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''HAVE_ERROR''@|$(HAVE_ERROR)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''HAVE_ERROR_AT_LINE''@|$(HAVE_ERROR_AT_LINE)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''REPLACE_ERROR''@|$(REPLACE_ERROR)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''REPLACE_ERROR_AT_LINE''@|$(REPLACE_ERROR_AT_LINE)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -@GL_GENERATE_ERROR_H_TRUE@ $(srcdir)/error.in.h > $@-t -@GL_GENERATE_ERROR_H_TRUE@ $(AM_V_at)mv $@-t $@ -@GL_GENERATE_ERROR_H_FALSE@error.h: $(top_builddir)/config.status -@GL_GENERATE_ERROR_H_FALSE@ rm -f $@ +# We need the following in order to override <error.h>. +error.h: error.in.h $(top_builddir)/config.status $(CXXDEFS_H) + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''HAVE_ERROR_H''@|$(HAVE_ERROR_H)|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''NEXT_ERROR_H''@|$(NEXT_ERROR_H)|g' \ + -e 's|@''HAVE_ERROR''@|$(HAVE_ERROR)|g' \ + -e 's|@''HAVE_ERROR_AT_LINE''@|$(HAVE_ERROR_AT_LINE)|g' \ + -e 's|@''REPLACE_ERROR''@|$(REPLACE_ERROR)|g' \ + -e 's|@''REPLACE_ERROR_AT_LINE''@|$(REPLACE_ERROR_AT_LINE)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + $(srcdir)/error.in.h > $@-t + $(AM_V_at)mv $@-t $@ # We need the following in order to create <fcntl.h> when the system # doesn't have one that works with the given compiler. @@ -8454,7 +9451,7 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_SETLOCALE''@/$(GL_GNULIB_SETLOCALE)/g' \ -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GL_GNULIB_SETLOCALE_NULL)/g' \ -e 's/@''GNULIB_DUPLOCALE''@/$(GL_GNULIB_DUPLOCALE)/g' \ - -e 's/@''GNULIB_LOCALENAME''@/$(GL_GNULIB_LOCALENAME)/g' \ + -e 's/@''GNULIB_LOCALENAME_UNSAFE''@/$(GL_GNULIB_LOCALENAME_UNSAFE)/g' \ -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \ -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \ -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \ @@ -8744,8 +9741,9 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_MDA_GETW''@/$(GL_GNULIB_MDA_GETW)/g' \ -e 's/@''GNULIB_MDA_PUTW''@/$(GL_GNULIB_MDA_PUTW)/g' \ -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GL_GNULIB_MDA_TEMPNAM)/g' \ - < $(srcdir)/stdio.in.h | \ - sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ + < $(srcdir)/stdio.in.h > $@-t1 + $(AM_V_at)sed \ + -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ @@ -8764,6 +9762,8 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \ -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \ -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \ + < $@-t1 > $@-t2 + $(AM_V_at)sed \ -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \ -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \ @@ -8801,8 +9801,9 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + < $@-t2 > $@-t3 + $(AM_V_at)rm -f $@-t1 $@-t2 + $(AM_V_at)mv $@-t3 $@ # We need the following in order to create <stdlib.h> when the system # doesn't have one that works with the given compiler. @@ -8840,6 +9841,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_PTSNAME_R''@/$(GL_GNULIB_PTSNAME_R)/g' \ -e 's/@''GNULIB_PUTENV''@/$(GL_GNULIB_PUTENV)/g' \ -e 's/@''GNULIB_QSORT_R''@/$(GL_GNULIB_QSORT_R)/g' \ + -e 's/@''GNULIB_RAND''@/$(GL_GNULIB_RAND)/g' \ -e 's/@''GNULIB_RANDOM''@/$(GL_GNULIB_RANDOM)/g' \ -e 's/@''GNULIB_RANDOM_R''@/$(GL_GNULIB_RANDOM_R)/g' \ -e 's/@''GNULIB_REALLOC_GNU''@/$(GL_GNULIB_REALLOC_GNU)/g' \ @@ -8850,6 +9852,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \ -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \ -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \ + -e 's/@''GNULIB_STRTOF''@/$(GL_GNULIB_STRTOF)/g' \ -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \ -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \ -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \ @@ -8864,8 +9867,9 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_MDA_GCVT''@/$(GL_GNULIB_MDA_GCVT)/g' \ -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_GNULIB_MDA_MKTEMP)/g' \ -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_GNULIB_MDA_PUTENV)/g' \ - < $(srcdir)/stdlib.in.h | \ - sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ + < $(srcdir)/stdlib.in.h > $@-t1 + $(AM_V_at)sed \ + -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \ -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ @@ -8901,6 +9905,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_SETSTATE''@|$(HAVE_SETSTATE)|g' \ -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ + -e 's|@''HAVE_STRTOF''@|$(HAVE_STRTOF)|g' \ -e 's|@''HAVE_STRTOL''@|$(HAVE_STRTOL)|g' \ -e 's|@''HAVE_STRTOLD''@|$(HAVE_STRTOLD)|g' \ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ @@ -8910,6 +9915,8 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ + < $@-t1 > $@-t2 + $(AM_V_at)sed \ -e 's|@''REPLACE__EXIT''@|$(REPLACE__EXIT)|g' \ -e 's|@''REPLACE_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \ -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|$(REPLACE_CALLOC_FOR_CALLOC_GNU)|g' \ @@ -8934,6 +9941,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \ + -e 's|@''REPLACE_RAND''@|$(REPLACE_RAND)|g' \ -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \ -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ -e 's|@''REPLACE_REALLOC_FOR_REALLOC_GNU''@|$(REPLACE_REALLOC_FOR_REALLOC_GNU)|g' \ @@ -8943,6 +9951,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \ -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ + -e 's|@''REPLACE_STRTOF''@|$(REPLACE_STRTOF)|g' \ -e 's|@''REPLACE_STRTOL''@|$(REPLACE_STRTOL)|g' \ -e 's|@''REPLACE_STRTOLD''@|$(REPLACE_STRTOLD)|g' \ -e 's|@''REPLACE_STRTOLL''@|$(REPLACE_STRTOLL)|g' \ @@ -8954,8 +9963,9 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e '/definition of _Noreturn/r $(_NORETURN_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + < $@-t2 > $@-t3 + $(AM_V_at)rm -f $@-t1 $@-t2 + $(AM_V_at)mv $@-t3 $@ # We need the following in order to create <string.h> when the system # doesn't have one that works with the given compiler. @@ -9011,8 +10021,9 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_GNULIB_MDA_MEMCCPY)/g' \ -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_GNULIB_MDA_STRDUP)/g' \ -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ - < $(srcdir)/string.in.h | \ - sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ + < $(srcdir)/string.in.h > $@-t1 + $(AM_V_at)sed \ + -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ @@ -9041,6 +10052,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \ + -e 's|@''REPLACE_MEMSET_EXPLICIT''@|$(REPLACE_MEMSET_EXPLICIT)|g' \ -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \ -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ @@ -9056,12 +10068,14 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \ -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ + -e 's|@''REPLACE_STRVERSCMP''@|$(REPLACE_STRVERSCMP)|g' \ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + < $@-t1 > $@-t2 + $(AM_V_at)rm -f $@-t1 + $(AM_V_at)mv $@-t2 $@ # We need the following in order to create <strings.h> when the system # doesn't have one that works with the given compiler. @@ -9372,6 +10386,7 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''REPLACE_TIME''@|$(REPLACE_TIME)|g' \ -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ -e 's|@''REPLACE_TIMESPEC_GET''@|$(REPLACE_TIMESPEC_GET)|g' \ + -e 's|@''REPLACE_TIMESPEC_GETRES''@|$(REPLACE_TIMESPEC_GETRES)|g' \ -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ @@ -9384,6 +10399,77 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( $(srcdir)/time.in.h > $@-t $(AM_V_at)mv $@-t $@ +uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's/@''HAVE_UCHAR_H''@/$(HAVE_UCHAR_H)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_UCHAR_H''@|$(NEXT_UCHAR_H)|g' \ + -e 's|@''CXX_HAS_CHAR8_TYPE''@|$(CXX_HAS_CHAR8_TYPE)|g' \ + -e 's|@''CXX_HAS_UCHAR_TYPES''@|$(CXX_HAS_UCHAR_TYPES)|g' \ + -e 's|@''SMALL_WCHAR_T''@|$(SMALL_WCHAR_T)|g' \ + -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR8_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR8_T)|g' \ + -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR16_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR16_T)|g' \ + -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR32_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR32_T)|g' \ + -e 's/@''GNULIB_BTOC32''@/$(GL_GNULIB_BTOC32)/g' \ + -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \ + -e 's/@''GNULIB_C32ISALNUM''@/$(GL_GNULIB_C32ISALNUM)/g' \ + -e 's/@''GNULIB_C32ISALPHA''@/$(GL_GNULIB_C32ISALPHA)/g' \ + -e 's/@''GNULIB_C32ISBLANK''@/$(GL_GNULIB_C32ISBLANK)/g' \ + -e 's/@''GNULIB_C32ISCNTRL''@/$(GL_GNULIB_C32ISCNTRL)/g' \ + -e 's/@''GNULIB_C32ISDIGIT''@/$(GL_GNULIB_C32ISDIGIT)/g' \ + -e 's/@''GNULIB_C32ISGRAPH''@/$(GL_GNULIB_C32ISGRAPH)/g' \ + -e 's/@''GNULIB_C32ISLOWER''@/$(GL_GNULIB_C32ISLOWER)/g' \ + -e 's/@''GNULIB_C32ISPRINT''@/$(GL_GNULIB_C32ISPRINT)/g' \ + -e 's/@''GNULIB_C32ISPUNCT''@/$(GL_GNULIB_C32ISPUNCT)/g' \ + -e 's/@''GNULIB_C32ISSPACE''@/$(GL_GNULIB_C32ISSPACE)/g' \ + -e 's/@''GNULIB_C32ISUPPER''@/$(GL_GNULIB_C32ISUPPER)/g' \ + -e 's/@''GNULIB_C32ISXDIGIT''@/$(GL_GNULIB_C32ISXDIGIT)/g' \ + -e 's/@''GNULIB_C32TOLOWER''@/$(GL_GNULIB_C32TOLOWER)/g' \ + -e 's/@''GNULIB_C32TOUPPER''@/$(GL_GNULIB_C32TOUPPER)/g' \ + -e 's/@''GNULIB_C32WIDTH''@/$(GL_GNULIB_C32WIDTH)/g' \ + -e 's/@''GNULIB_C32RTOMB''@/$(GL_GNULIB_C32RTOMB)/g' \ + -e 's/@''GNULIB_C32SNRTOMBS''@/$(GL_GNULIB_C32SNRTOMBS)/g' \ + -e 's/@''GNULIB_C32SRTOMBS''@/$(GL_GNULIB_C32SRTOMBS)/g' \ + -e 's/@''GNULIB_C32STOMBS''@/$(GL_GNULIB_C32STOMBS)/g' \ + -e 's/@''GNULIB_C32SWIDTH''@/$(GL_GNULIB_C32SWIDTH)/g' \ + -e 's/@''GNULIB_C32TOB''@/$(GL_GNULIB_C32TOB)/g' \ + -e 's/@''GNULIB_C32_APPLY_MAPPING''@/$(GL_GNULIB_C32_APPLY_MAPPING)/g' \ + -e 's/@''GNULIB_C32_APPLY_TYPE_TEST''@/$(GL_GNULIB_C32_APPLY_TYPE_TEST)/g' \ + -e 's/@''GNULIB_C32_GET_MAPPING''@/$(GL_GNULIB_C32_GET_MAPPING)/g' \ + -e 's/@''GNULIB_C32_GET_TYPE_TEST''@/$(GL_GNULIB_C32_GET_TYPE_TEST)/g' \ + -e 's/@''GNULIB_ISWCTYPE''@/$(GL_GNULIB_ISWCTYPE)/g' \ + -e 's/@''GNULIB_ISWDIGIT''@/$(GL_GNULIB_ISWDIGIT)/g' \ + -e 's/@''GNULIB_ISWXDIGIT''@/$(GL_GNULIB_ISWXDIGIT)/g' \ + -e 's/@''GNULIB_MBRTOC16''@/$(GL_GNULIB_MBRTOC16)/g' \ + -e 's/@''GNULIB_MBRTOC32''@/$(GL_GNULIB_MBRTOC32)/g' \ + -e 's/@''GNULIB_MBSNRTOC32S''@/$(GL_GNULIB_MBSNRTOC32S)/g' \ + -e 's/@''GNULIB_MBSNRTOWCS''@/$(GL_GNULIB_MBSNRTOWCS)/g' \ + -e 's/@''GNULIB_MBSRTOC32S''@/$(GL_GNULIB_MBSRTOC32S)/g' \ + -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \ + -e 's/@''GNULIB_MBSTOC32S''@/$(GL_GNULIB_MBSTOC32S)/g' \ + -e 's/@''GNULIB_TOWCTRANS''@/$(GL_GNULIB_TOWCTRANS)/g' \ + -e 's/@''GNULIB_WCSNRTOMBS''@/$(GL_GNULIB_WCSNRTOMBS)/g' \ + -e 's/@''GNULIB_WCSRTOMBS''@/$(GL_GNULIB_WCSRTOMBS)/g' \ + -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \ + -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \ + -e 's/@''GNULIB_WCTRANS''@/$(GL_GNULIB_WCTRANS)/g' \ + -e 's/@''GNULIB_WCTYPE''@/$(GL_GNULIB_WCTYPE)/g' \ + -e 's/@''GNULIB_WCWIDTH''@/$(GL_GNULIB_WCWIDTH)/g' \ + -e 's|@''HAVE_C32RTOMB''@|$(HAVE_C32RTOMB)|g' \ + -e 's|@''HAVE_MBRTOC16''@|$(HAVE_MBRTOC16)|g' \ + -e 's|@''HAVE_MBRTOC32''@|$(HAVE_MBRTOC32)|g' \ + -e 's|@''REPLACE_C32RTOMB''@|$(REPLACE_C32RTOMB)|g' \ + -e 's|@''REPLACE_MBRTOC16''@|$(REPLACE_MBRTOC16)|g' \ + -e 's|@''REPLACE_MBRTOC32''@|$(REPLACE_MBRTOC32)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + $(srcdir)/uchar.in.h > $@-t + $(AM_V_at)mv $@-t $@ + unicase.h: unicase.in.h $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|$(HAVE_UNISTRING_WOE32DLL_H)|g' \ @@ -9446,6 +10532,8 @@ unictype.h: unictype.in.h -e 's/@''GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE)/g' \ + < $(srcdir)/unictype.in.h > $@-t1 + $(AM_V_at)sed \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE)/g' \ @@ -9470,13 +10558,16 @@ unictype.h: unictype.in.h -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE)/g' \ - < $(srcdir)/unictype.in.h | \ - sed -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE)/g' \ + < $@-t1 > $@-t2 + $(AM_V_at)sed \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE)/g' \ @@ -9501,11 +10592,14 @@ unictype.h: unictype.in.h -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE)/g' \ + < $@-t2 > $@-t3 + $(AM_V_at)sed \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE)/g' \ @@ -9519,6 +10613,7 @@ unictype.h: unictype.in.h -e 's/@''GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE)/g' \ @@ -9540,8 +10635,9 @@ unictype.h: unictype.in.h -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE)/g' \ - > $@-t - $(AM_V_at)mv $@-t $@ + < $@-t3 > $@-t4 + $(AM_V_at)rm -f $@-t1 $@-t2 $@-t3 + $(AM_V_at)mv $@-t4 $@ uninorm.h: uninorm.in.h $(gl_V_at)$(SED_HEADER_STDOUT) \ @@ -9587,6 +10683,8 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_FDATASYNC''@/$(GL_GNULIB_FDATASYNC)/g' \ -e 's/@''GNULIB_FSYNC''@/$(GL_GNULIB_FSYNC)/g' \ -e 's/@''GNULIB_FTRUNCATE''@/$(GL_GNULIB_FTRUNCATE)/g' \ + < $(srcdir)/unistd.in.h > $@-t1 + $(AM_V_at)sed \ -e 's/@''GNULIB_GETCWD''@/$(GL_GNULIB_GETCWD)/g' \ -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_GNULIB_GETDOMAINNAME)/g' \ -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_GNULIB_GETDTABLESIZE)/g' \ @@ -9648,8 +10746,9 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_MDA_SWAB''@/$(GL_GNULIB_MDA_SWAB)/g' \ -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_GNULIB_MDA_UNLINK)/g' \ -e 's/@''GNULIB_MDA_WRITE''@/$(GL_GNULIB_MDA_WRITE)/g' \ - < $(srcdir)/unistd.in.h | \ - sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ + < $@-t1 > $@-t2 + $(AM_V_at)sed \ + -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ @@ -9696,8 +10795,9 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ - | \ - sed -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \ + < $@-t2 > $@-t3 + $(AM_V_at)sed \ + -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \ @@ -9712,6 +10812,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_EXECVP''@|$(REPLACE_EXECVP)|g' \ -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \ -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \ + -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -e 's|@''REPLACE_FDATASYNC''@|$(REPLACE_FDATASYNC)|g' \ -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ @@ -9752,8 +10853,9 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + < $@-t3 > $@-t4 + $(AM_V_at)rm -f $@-t1 $@-t2 $@-t3 + $(AM_V_at)mv $@-t4 $@ unistr.h: unistr.in.h $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unistr.in.h @@ -9803,6 +10905,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \ -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \ -e 's/@''GNULIB_MBSINIT''@/$(GL_GNULIB_MBSINIT)/g' \ + -e 's/@''GNULIB_MBSZERO''@/$(GL_GNULIB_MBSZERO)/g' \ -e 's/@''GNULIB_MBRTOWC''@/$(GL_GNULIB_MBRTOWC)/g' \ -e 's/@''GNULIB_MBRLEN''@/$(GL_GNULIB_MBRLEN)/g' \ -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \ @@ -9841,10 +10944,12 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_WCSTOK''@/$(GL_GNULIB_WCSTOK)/g' \ -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \ -e 's/@''GNULIB_WCSFTIME''@/$(GL_GNULIB_WCSFTIME)/g' \ + -e 's/@''GNULIB_WGETCWD''@/$(GL_GNULIB_WGETCWD)/g' \ -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_GNULIB_MDA_WCSDUP)/g' \ -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ - < $(srcdir)/wchar.in.h | \ - sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ + < $(srcdir)/wchar.in.h > $@-t1 + $(AM_V_at)sed \ + -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \ @@ -9887,8 +10992,9 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ -e 's|@''HAVE_DECL_WCSDUP''@|$(HAVE_DECL_WCSDUP)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ - | \ - sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ + < $@-t1 > $@-t2 + $(AM_V_at)sed \ + -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ @@ -9912,12 +11018,13 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + < $@-t2 > $@-t3 + $(AM_V_at)rm -f $@-t1 $@-t2 + $(AM_V_at)mv $@-t3 $@ # We need the following in order to create <wctype.h> when the system # doesn't have one that works with the given compiler. -wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) +wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|GL|g' \ -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \ @@ -9929,6 +11036,7 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ -e 's/@''GNULIB_ISWBLANK''@/$(GL_GNULIB_ISWBLANK)/g' \ -e 's/@''GNULIB_ISWDIGIT''@/$(GL_GNULIB_ISWDIGIT)/g' \ + -e 's/@''GNULIB_ISWPUNCT''@/$(GL_GNULIB_ISWPUNCT)/g' \ -e 's/@''GNULIB_ISWXDIGIT''@/$(GL_GNULIB_ISWXDIGIT)/g' \ -e 's/@''GNULIB_WCTYPE''@/$(GL_GNULIB_WCTYPE)/g' \ -e 's/@''GNULIB_ISWCTYPE''@/$(GL_GNULIB_ISWCTYPE)/g' \ @@ -9941,10 +11049,14 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ -e 's/@''REPLACE_ISWDIGIT''@/$(REPLACE_ISWDIGIT)/g' \ + -e 's/@''REPLACE_ISWPUNCT''@/$(REPLACE_ISWPUNCT)/g' \ -e 's/@''REPLACE_ISWXDIGIT''@/$(REPLACE_ISWXDIGIT)/g' \ -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \ + -e 's/@''REPLACE_WCTRANS''@/$(REPLACE_WCTRANS)/g' \ + -e 's/@''REPLACE_WCTYPE''@/$(REPLACE_WCTYPE)/g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ $(srcdir)/wctype.in.h > $@-t $(AM_V_at)mv $@-t $@ diff --git a/lib/_Noreturn.h b/lib/_Noreturn.h index 6ecea98..7326bd4 100644 --- a/lib/_Noreturn.h +++ b/lib/_Noreturn.h @@ -1,5 +1,5 @@ /* A C macro for declaring that a function does not return. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published diff --git a/lib/accept.c b/lib/accept.c index 2641ced..18ce80c 100644 --- a/lib/accept.c +++ b/lib/accept.c @@ -1,6 +1,6 @@ /* accept.c --- wrappers for Windows accept function - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/access.c b/lib/access.c index e2c12b1..c3bdbff 100644 --- a/lib/access.c +++ b/lib/access.c @@ -1,5 +1,5 @@ /* Test the access rights of a file. - Copyright (C) 2019-2023 Free Software Foundation, Inc. + Copyright (C) 2019-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -19,13 +19,53 @@ /* Specification. */ #include <unistd.h> +#include <errno.h> #include <fcntl.h> -#include <io.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> + +#if defined _WIN32 && !defined __CYGWIN__ +# include <io.h> +#endif int access (const char *file, int mode) +#undef access { + int ret; + +#if defined _WIN32 && !defined __CYGWIN__ if ((mode & X_OK) != 0) mode = (mode & ~X_OK) | R_OK; - return _access (file, mode); + ret = _access (file, mode); +#else + ret = access (file, mode); +#endif + +#if (defined _WIN32 && !defined __CYGWIN__) || ACCESS_TRAILING_SLASH_BUG +# if defined _WIN32 && !defined __CYGWIN__ + if (ret == 0 || errno == EINVAL) +# else + if (ret == 0) +# endif + { + size_t file_len = strlen (file); + if (file_len > 0 && file[file_len - 1] == '/') + { + struct stat st; + if (stat (file, &st) == 0) + { + if (! S_ISDIR (st.st_mode)) + { + errno = ENOTDIR; + return -1; + } + } + else + return (mode == F_OK && errno == EOVERFLOW ? 0 : -1); + } + } +#endif + return ret; } diff --git a/lib/af_alg.c b/lib/af_alg.c index 9f022ce..6fd08c2 100644 --- a/lib/af_alg.c +++ b/lib/af_alg.c @@ -1,5 +1,5 @@ /* af_alg.c - Compute message digests from file streams and buffers. - Copyright (C) 2018-2023 Free Software Foundation, Inc. + Copyright (C) 2018-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/af_alg.h b/lib/af_alg.h index e8ffb3f..ed933e1 100644 --- a/lib/af_alg.h +++ b/lib/af_alg.h @@ -1,5 +1,5 @@ /* af_alg.h - Compute message digests from file streams and buffers. - Copyright (C) 2018-2023 Free Software Foundation, Inc. + Copyright (C) 2018-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/alloca.in.h b/lib/alloca.in.h index a1bb3d7..6aa47df 100644 --- a/lib/alloca.in.h +++ b/lib/alloca.in.h @@ -1,6 +1,6 @@ /* Memory allocation on the stack. - Copyright (C) 1995, 1999, 2001-2004, 2006-2023 Free Software Foundation, + Copyright (C) 1995, 1999, 2001-2004, 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/arg-nonnull.h b/lib/arg-nonnull.h index 9498ae1..46c711c 100644 --- a/lib/arg-nonnull.h +++ b/lib/arg-nonnull.h @@ -1,5 +1,5 @@ /* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h index 12876b5..523a448 100644 --- a/lib/arpa_inet.in.h +++ b/lib/arpa_inet.in.h @@ -1,6 +1,6 @@ /* A GNU-like <arpa/inet.h>. - Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/array-mergesort.h b/lib/array-mergesort.h index 1ef6ef6..43be96f 100644 --- a/lib/array-mergesort.h +++ b/lib/array-mergesort.h @@ -1,5 +1,5 @@ /* Stable-sorting of an array using mergesort. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software: you can redistribute it and/or modify diff --git a/lib/asnprintf.c b/lib/asnprintf.c index f4861bf..a6c09bc 100644 --- a/lib/asnprintf.c +++ b/lib/asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/asprintf.c b/lib/asprintf.c index ba58e06..b0c3347 100644 --- a/lib/asprintf.c +++ b/lib/asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2023 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/assert.in.h b/lib/assert.in.h index b0ab99c..6e4995e 100644 --- a/lib/assert.in.h +++ b/lib/assert.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <assert.h> - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/assure.h b/lib/assure.h index e31076d..d650ca1 100644 --- a/lib/assure.h +++ b/lib/assure.h @@ -1,6 +1,6 @@ /* Run-time assert-like macros. - Copyright (C) 2014-2023 Free Software Foundation, Inc. + Copyright (C) 2014-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/at-func.c b/lib/at-func.c index 13e3fb3..56b313f 100644 --- a/lib/at-func.c +++ b/lib/at-func.c @@ -1,5 +1,5 @@ /* Define at-style functions like fstatat, unlinkat, fchownat, etc. - Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/attribute.h b/lib/attribute.h index 9464fde..710341b 100644 --- a/lib/attribute.h +++ b/lib/attribute.h @@ -1,6 +1,6 @@ /* ATTRIBUTE_* macros for using attributes in GCC and similar compilers - Copyright 2020-2023 Free Software Foundation, Inc. + Copyright 2020-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -182,6 +182,8 @@ /* The function does not throw exceptions. */ /* Applies to: functions. */ +/* After a function's parameter list, this attribute must come first, before + other attributes. */ #define ATTRIBUTE_NOTHROW _GL_ATTRIBUTE_NOTHROW /* Do not inline the function. */ diff --git a/lib/base32.c b/lib/base32.c index 50f9d42..270c505 100644 --- a/lib/base32.c +++ b/lib/base32.c @@ -1,5 +1,5 @@ /* base32.c -- Encode binary data using printable characters. - Copyright (C) 1999-2001, 2004-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2004-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -40,6 +40,7 @@ #include <config.h> /* Get prototype. */ +#define BASE32_INLINE _GL_EXTERN_INLINE #include "base32.h" /* Get imalloc. */ @@ -47,9 +48,6 @@ #include <intprops.h> -/* Get UCHAR_MAX. */ -#include <limits.h> - #include <string.h> /* Convert 'char' to 'unsigned char' without casting. */ @@ -205,7 +203,7 @@ base32_encode_alloc (const char *in, idx_t inlen, char **out) : (_) == '7' ? 31 \ : -1) -static const signed char b32[0x100] = { +signed char const base32_to_int[256] = { B32 (0), B32 (1), B32 (2), B32 (3), B32 (4), B32 (5), B32 (6), B32 (7), B32 (8), B32 (9), B32 (10), B32 (11), @@ -272,28 +270,6 @@ static const signed char b32[0x100] = { B32 (252), B32 (253), B32 (254), B32 (255) }; -#if UCHAR_MAX == 255 -# define uchar_in_range(c) true -#else -# define uchar_in_range(c) ((c) <= 255) -#endif - -/* Return true if CH is a character from the Base32 alphabet, and - false otherwise. Note that '=' is padding and not considered to be - part of the alphabet. */ -bool -isbase32 (char ch) -{ - return uchar_in_range (to_uchar (ch)) && 0 <= b32[to_uchar (ch)]; -} - -/* Initialize decode-context buffer, CTX. */ -void -base32_decode_ctx_init (struct base32_decode_context *ctx) -{ - ctx->i = 0; -} - /* If CTX->i is 0 or 8, there are eight or more bytes in [*IN..IN_END), and none of those eight is a newline, then return *IN. Otherwise, copy up to 4 - CTX->i non-newline bytes from that range into CTX->buf, starting at @@ -368,8 +344,8 @@ decode_8 (char const *restrict in, idx_t inlen, if (*outleft) { - *out++ = ((b32[to_uchar (in[0])] << 3) - | (b32[to_uchar (in[1])] >> 2)); + *out++ = ((base32_to_int[to_uchar (in[0])] << 3) + | (base32_to_int[to_uchar (in[1])] >> 2)); --*outleft; } @@ -378,6 +354,10 @@ decode_8 (char const *restrict in, idx_t inlen, if (in[3] != '=' || in[4] != '=' || in[5] != '=' || in[6] != '=' || in[7] != '=') return_false; + + /* Reject non-canonical encodings. */ + if (base32_to_int[to_uchar (in[1])] & 0x03) + return_false; } else { @@ -386,9 +366,9 @@ decode_8 (char const *restrict in, idx_t inlen, if (*outleft) { - *out++ = ((b32[to_uchar (in[1])] << 6) - | (b32[to_uchar (in[2])] << 1) - | (b32[to_uchar (in[3])] >> 4)); + *out++ = ((base32_to_int[to_uchar (in[1])] << 6) + | (base32_to_int[to_uchar (in[2])] << 1) + | (base32_to_int[to_uchar (in[3])] >> 4)); --*outleft; } @@ -396,6 +376,10 @@ decode_8 (char const *restrict in, idx_t inlen, { if (in[5] != '=' || in[6] != '=' || in[7] != '=') return_false; + + /* Reject non-canonical encodings. */ + if (base32_to_int[to_uchar (in[3])] & 0x0f) + return_false; } else { @@ -404,8 +388,8 @@ decode_8 (char const *restrict in, idx_t inlen, if (*outleft) { - *out++ = ((b32[to_uchar (in[3])] << 4) - | (b32[to_uchar (in[4])] >> 1)); + *out++ = ((base32_to_int[to_uchar (in[3])] << 4) + | (base32_to_int[to_uchar (in[4])] >> 1)); --*outleft; } @@ -413,6 +397,10 @@ decode_8 (char const *restrict in, idx_t inlen, { if (in[6] != '=' || in[7] != '=') return_false; + + /* Reject non-canonical encodings. */ + if (base32_to_int[to_uchar (in[4])] & 0x01) + return_false; } else { @@ -421,9 +409,9 @@ decode_8 (char const *restrict in, idx_t inlen, if (*outleft) { - *out++ = ((b32[to_uchar (in[4])] << 7) - | (b32[to_uchar (in[5])] << 2) - | (b32[to_uchar (in[6])] >> 3)); + *out++ = ((base32_to_int[to_uchar (in[4])] << 7) + | (base32_to_int[to_uchar (in[5])] << 2) + | (base32_to_int[to_uchar (in[6])] >> 3)); --*outleft; } @@ -434,11 +422,17 @@ decode_8 (char const *restrict in, idx_t inlen, if (*outleft) { - *out++ = ((b32[to_uchar (in[6])] << 5) - | (b32[to_uchar (in[7])])); + *out++ = ((base32_to_int[to_uchar (in[6])] << 5) + | (base32_to_int[to_uchar (in[7])])); --*outleft; } } + else + { + /* Reject non-canonical encodings. */ + if (base32_to_int[to_uchar (in[6])] & 0x07) + return_false; + } } } } diff --git a/lib/base32.h b/lib/base32.h index 2e784d9..eadbeae 100644 --- a/lib/base32.h +++ b/lib/base32.h @@ -1,5 +1,5 @@ /* base32.h -- Encode binary data using printable characters. - Copyright (C) 2004-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2004-2006, 2009-2024 Free Software Foundation, Inc. Adapted from Simon Josefsson's base64 code by Gijs van Tulder. This file is free software: you can redistribute it and/or modify @@ -16,19 +16,33 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef BASE32_H -# define BASE32_H +#define BASE32_H -/* This file uses _GL_ATTRIBUTE_CONST. */ +/* This file uses _GL_INLINE_HEADER_BEGIN. */ #if !_GL_CONFIG_H_INCLUDED #error "Please include config.h first." #endif -/* Get idx_t. */ -# include <idx.h> +/* Get idx_t. */ +#include <idx.h> + +/* Pacify GCC in isubase32. */ +#if defined __GNUC__ && 4 < __GNUC__ + (3 <= __GNUC_MINOR__) +# pragma GCC diagnostic ignored "-Wtype-limits" +#endif + +_GL_INLINE_HEADER_BEGIN +#ifndef BASE32_INLINE +# define BASE32_INLINE _GL_INLINE +#endif + +#ifdef __cplusplus +extern "C" { +#endif /* This uses that the expression (n+(k-1))/k means the smallest integer >= n/k, i.e., the ceiling of n/k. */ -# define BASE32_LENGTH(inlen) ((((inlen) + 4) / 5) * 8) +#define BASE32_LENGTH(inlen) ((((inlen) + 4) / 5) * 8) struct base32_decode_context { @@ -36,14 +50,31 @@ struct base32_decode_context char buf[8]; }; -extern bool isbase32 (char ch) _GL_ATTRIBUTE_CONST; +extern signed char const base32_to_int[256]; + +BASE32_INLINE bool +isubase32 (unsigned char ch) +{ + return ch < sizeof base32_to_int && 0 <= base32_to_int[ch]; +} + +BASE32_INLINE bool +isbase32 (char ch) +{ + return isubase32 (ch); +} extern void base32_encode (const char *restrict in, idx_t inlen, char *restrict out, idx_t outlen); extern idx_t base32_encode_alloc (const char *in, idx_t inlen, char **out); -extern void base32_decode_ctx_init (struct base32_decode_context *ctx); +/* Initialize decode-context buffer, CTX. */ +BASE32_INLINE void +base32_decode_ctx_init (struct base32_decode_context *ctx) +{ + ctx->i = 0; +} extern bool base32_decode_ctx (struct base32_decode_context *ctx, const char *restrict in, idx_t inlen, @@ -59,4 +90,10 @@ extern bool base32_decode_alloc_ctx (struct base32_decode_context *ctx, #define base32_decode_alloc(in, inlen, out, outlen) \ base32_decode_alloc_ctx (NULL, in, inlen, out, outlen) +#ifdef __cplusplus +} +#endif + +_GL_INLINE_HEADER_END + #endif /* BASE32_H */ diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c index 6de60aa..256f846 100644 --- a/lib/basename-lgpl.c +++ b/lib/basename-lgpl.c @@ -1,6 +1,6 @@ /* basename.c -- return the last element in a file name - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2023 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/basename-lgpl.h b/lib/basename-lgpl.h index c1982fa..2a56be9 100644 --- a/lib/basename-lgpl.h +++ b/lib/basename-lgpl.h @@ -1,6 +1,6 @@ /* Extract the last component (base name) of a file name. - Copyright (C) 1998, 2001, 2003-2006, 2009-2023 Free Software Foundation, + Copyright (C) 1998, 2001, 2003-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/basename.c b/lib/basename.c index 21fab1e..c5a6bdc 100644 --- a/lib/basename.c +++ b/lib/basename.c @@ -1,6 +1,6 @@ /* basename.c -- return the last element in a file name - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2023 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/binary-io.c b/lib/binary-io.c index 28a9e6e..40f01d6 100644 --- a/lib/binary-io.c +++ b/lib/binary-io.c @@ -1,5 +1,5 @@ /* Binary mode I/O. - Copyright 2017-2023 Free Software Foundation, Inc. + Copyright 2017-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/binary-io.h b/lib/binary-io.h index 855d6f8..0cc5c11 100644 --- a/lib/binary-io.h +++ b/lib/binary-io.h @@ -1,5 +1,5 @@ /* Binary mode I/O. - Copyright (C) 2001, 2003, 2005, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -1,6 +1,6 @@ /* bind.c --- wrappers for Windows bind function - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/bitrotate.c b/lib/bitrotate.c index 180ab15..bbf94d8 100644 --- a/lib/bitrotate.c +++ b/lib/bitrotate.c @@ -1,6 +1,6 @@ /* Rotate bits in integers. - Copyright (C) 2012-2023 Free Software Foundation, Inc. + Copyright (C) 2012-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/bitrotate.h b/lib/bitrotate.h index 6fb7b49..91744cc 100644 --- a/lib/bitrotate.h +++ b/lib/bitrotate.h @@ -1,5 +1,5 @@ /* bitrotate.h - Rotate bits in integers - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/btoc32.c b/lib/btoc32.c new file mode 100644 index 0000000..4f22305 --- /dev/null +++ b/lib/btoc32.c @@ -0,0 +1,68 @@ +/* Convert unibyte character to 32-bit wide character. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2020. */ + +#include <config.h> + +#define IN_BTOC32 +/* Specification. */ +#include <uchar.h> + +#include <stdio.h> +#include <string.h> +#include <wchar.h> + +#if GL_CHAR32_T_IS_UNICODE +# include "lc-charset-unicode.h" +#endif + +#if _GL_WCHAR_T_IS_UCS4 +_GL_EXTERN_INLINE +#endif +wint_t +btoc32 (int c) +{ +#if HAVE_WORKING_MBRTOC32 && !_GL_WCHAR_T_IS_UCS4 + /* The char32_t encoding of a multibyte character may be different than its + wchar_t encoding. */ + if (c != EOF) + { + mbstate_t state; + char s[1]; + char32_t wc; + + mbszero (&state); + s[0] = (unsigned char) c; + if (mbrtoc32 (&wc, s, 1, &state) <= 1) + return wc; + } + return WEOF; +#else + /* In all known locale encodings, unibyte characters correspond only to + characters in the BMP. */ + wint_t wc = btowc (c); +# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION + if (wc != WEOF && wc != 0) + { + wc = locale_encoding_to_unicode (wc); + if (wc == 0) + return WEOF; + } +# endif + return wc; +#endif +} diff --git a/lib/btowc.c b/lib/btowc.c index 4defbdd..8bf21aa 100644 --- a/lib/btowc.c +++ b/lib/btowc.c @@ -1,5 +1,5 @@ /* Convert unibyte character to wide character. - Copyright (C) 2008, 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify @@ -35,7 +35,7 @@ btowc (int c) buf[0] = c; #if HAVE_MBRTOWC mbstate_t state; - memset (&state, 0, sizeof (mbstate_t)); + mbszero (&state); size_t ret = mbrtowc (&wc, buf, 1, &state); if (!(ret == (size_t)(-1) || ret == (size_t)(-2))) #else diff --git a/lib/byteswap.in.h b/lib/byteswap.in.h index e61be27..8e49efa 100644 --- a/lib/byteswap.in.h +++ b/lib/byteswap.in.h @@ -1,5 +1,5 @@ /* byteswap.h - Byte swapping - Copyright (C) 2005, 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2024 Free Software Foundation, Inc. Written by Oskar Liljeblad <oskar@osk.mine.nu>, 2005. This file is free software: you can redistribute it and/or modify diff --git a/lib/c++defs.h b/lib/c++defs.h index 458c014..eb66967 100644 --- a/lib/c++defs.h +++ b/lib/c++defs.h @@ -1,5 +1,5 @@ /* C++ compatible function declaration macros. - Copyright (C) 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2010-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published diff --git a/lib/c-ctype.c b/lib/c-ctype.c index a4343f4..d3f1b12 100644 --- a/lib/c-ctype.c +++ b/lib/c-ctype.c @@ -1,6 +1,6 @@ /* Character handling in C locale. - Copyright (C) 2003-2023 Free Software Foundation, Inc. + Copyright (C) 2003-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/c-ctype.h b/lib/c-ctype.h index cb0f4f3..b582de4 100644 --- a/lib/c-ctype.h +++ b/lib/c-ctype.h @@ -5,7 +5,7 @@ <ctype.h> functions' behaviour depends on the current locale set via setlocale. - Copyright (C) 2000-2003, 2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/c-strcase.h b/lib/c-strcase.h index 5dfa96c..b75e8dd 100644 --- a/lib/c-strcase.h +++ b/lib/c-strcase.h @@ -1,5 +1,5 @@ /* Case-insensitive string comparison functions in C locale. - Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2023 Free Software + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c index 8a958dc..1fa575a 100644 --- a/lib/c-strcasecmp.c +++ b/lib/c-strcasecmp.c @@ -1,5 +1,5 @@ /* c-strcasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/c-strcaseeq.h b/lib/c-strcaseeq.h index 1d0759a..26e05c9 100644 --- a/lib/c-strcaseeq.h +++ b/lib/c-strcaseeq.h @@ -1,5 +1,5 @@ /* Optimized case-insensitive string comparison in C locale. - Copyright (C) 2001-2002, 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/c-strcasestr.c b/lib/c-strcasestr.c index 46fd4cd..e5648bf 100644 --- a/lib/c-strcasestr.c +++ b/lib/c-strcasestr.c @@ -1,5 +1,5 @@ /* c-strcasestr.c -- case insensitive substring search in C locale - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2005. This file is free software: you can redistribute it and/or modify diff --git a/lib/c-strcasestr.h b/lib/c-strcasestr.h index f62ab1f..7f3ef1d 100644 --- a/lib/c-strcasestr.h +++ b/lib/c-strcasestr.h @@ -1,5 +1,5 @@ /* Case-insensitive searching in a string in C locale. - Copyright (C) 2005, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c index 4ca8c5f..4c8b0b6 100644 --- a/lib/c-strncasecmp.c +++ b/lib/c-strncasecmp.c @@ -1,5 +1,5 @@ /* c-strncasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/c32_apply_type_test.c b/lib/c32_apply_type_test.c new file mode 100644 index 0000000..4d3ee90 --- /dev/null +++ b/lib/c32_apply_type_test.c @@ -0,0 +1,39 @@ +/* Apply a 32-bit wide character property test. + Copyright (C) 2011-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2023. */ + +#include <config.h> + +#define IN_C32_APPLY_TYPE_TEST +/* Specification. */ +#include <uchar.h> + +#include <string.h> +#include <wctype.h> + +#if _GL_WCHAR_T_IS_UCS4 +_GL_EXTERN_INLINE +#endif +int +c32_apply_type_test (wint_t wc, c32_type_test_t property) +{ +#if _GL_WCHAR_T_IS_UCS4 + return iswctype (wc, property); +#else + return property (wc); +#endif +} diff --git a/lib/c32_get_type_test.c b/lib/c32_get_type_test.c new file mode 100644 index 0000000..90bee39 --- /dev/null +++ b/lib/c32_get_type_test.c @@ -0,0 +1,113 @@ +/* Get descriptor for a 32-bit wide character property. + Copyright (C) 2011-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2023. */ + +#include <config.h> + +#define IN_C32_GET_TYPE_TEST +/* Specification. */ +#include <uchar.h> + +#include <string.h> +#include <wctype.h> + +#if _GL_WCHAR_T_IS_UCS4 +_GL_EXTERN_INLINE +#endif +c32_type_test_t +c32_get_type_test (const char *name) +{ +#if _GL_WCHAR_T_IS_UCS4 + return wctype (name); +#else + switch (name[0]) + { + case 'a': + switch (name[1]) + { + case 'l': + switch (name[2]) + { + case 'n': + if (strcmp (name + 3, "um") == 0) + return c32isalnum; + break; + case 'p': + if (strcmp (name + 3, "ha") == 0) + return c32isalpha; + break; + default: + break; + } + break; + default: + break; + } + break; + case 'b': + if (strcmp (name + 1, "lank") == 0) + return c32isblank; + break; + case 'c': + if (strcmp (name + 1, "ntrl") == 0) + return c32iscntrl; + break; + case 'd': + if (strcmp (name + 1, "igit") == 0) + return c32isdigit; + break; + case 'g': + if (strcmp (name + 1, "raph") == 0) + return c32isgraph; + break; + case 'l': + if (strcmp (name + 1, "ower") == 0) + return c32islower; + break; + case 'p': + switch (name[1]) + { + case 'r': + if (strcmp (name + 2, "int") == 0) + return c32isprint; + break; + case 'u': + if (strcmp (name + 2, "nct") == 0) + return c32ispunct; + break; + default: + break; + } + break; + case 's': + if (strcmp (name + 1, "pace") == 0) + return c32isspace; + break; + case 'u': + if (strcmp (name + 1, "pper") == 0) + return c32isupper; + break; + case 'x': + if (strcmp (name + 1, "digit") == 0) + return c32isxdigit; + break; + default: + break; + } + return (c32_type_test_t) 0; +#endif +} diff --git a/lib/c32is-impl.h b/lib/c32is-impl.h new file mode 100644 index 0000000..084b3a0 --- /dev/null +++ b/lib/c32is-impl.h @@ -0,0 +1,105 @@ +/* Test whether a 32-bit wide character belongs to a specific character class. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2020. */ + +#include <wchar.h> +#include <wctype.h> + +#ifdef __CYGWIN__ +# include <cygwin/version.h> +#endif + +#if GNULIB_defined_mbstate_t +# include "localcharset.h" +# include "streq.h" +#endif + +#if GL_CHAR32_T_IS_UNICODE +# include "lc-charset-unicode.h" +#endif + +#include "unictype.h" + +#if _GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t +_GL_EXTERN_INLINE +#endif +int +FUNC (wint_t wc) +{ + /* The char32_t encoding of a multibyte character is defined by the way + mbrtoc32() is defined. */ + +#if GNULIB_defined_mbstate_t /* AIX, IRIX */ + /* mbrtoc32() is defined on top of mbtowc() for the non-UTF-8 locales + and directly for the UTF-8 locales. */ + if (wc != WEOF) + { + const char *encoding = locale_charset (); + if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0)) + return UCS_FUNC (wc); + else + return WCHAR_FUNC (wc); + } + else + return 0; + +#elif HAVE_WORKING_MBRTOC32 /* glibc, Android */ + /* mbrtoc32() is essentially defined by the system libc. */ + +# if _GL_WCHAR_T_IS_UCS4 + /* The char32_t encoding of a multibyte character is known to be the same as + the wchar_t encoding. */ + return WCHAR_FUNC (wc); +# else + /* The char32_t encoding of a multibyte character is known to be UCS-4, + different from the wchar_t encoding. */ + if (wc != WEOF) + return UCS_FUNC (wc); + else + return 0; +# endif + +#elif _GL_SMALL_WCHAR_T /* Cygwin, mingw, MSVC */ + /* The wchar_t encoding is UTF-16. + The char32_t encoding is UCS-4. */ + +# if defined __CYGWIN__ && CYGWIN_VERSION_DLL_MAJOR >= 1007 + /* As an extension to POSIX, the iswalnum() function of Cygwin >= 1.7 + supports also wc arguments outside the Unicode BMP, that is, outside + the 'wchar_t' range. See + <https://lists.gnu.org/archive/html/bug-gnulib/2011-02/msg00019.html> + = <https://cygwin.com/ml/cygwin/2011-02/msg00044.html>. */ + return WCHAR_FUNC (wc); +# else + if (wc == WEOF || wc == (wchar_t) wc) + /* wc is in the range for the isw* functions. */ + return WCHAR_FUNC (wc); + else + return UCS_FUNC (wc); +# endif + +#else /* macOS, FreeBSD, NetBSD, OpenBSD, HP-UX, Solaris, Minix, Android */ + /* char32_t and wchar_t are equivalent. */ + static_assert (sizeof (char32_t) == sizeof (wchar_t)); + +# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION + return UCS_FUNC (wc); +# else + return WCHAR_FUNC (wc); +# endif +#endif +} diff --git a/lib/c32isalnum.c b/lib/c32isalnum.c new file mode 100644 index 0000000..6335af6 --- /dev/null +++ b/lib/c32isalnum.c @@ -0,0 +1,26 @@ +/* Test 32-bit wide character for being alphanumeric. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32ISALNUM +/* Specification. */ +#include <uchar.h> + +#define FUNC c32isalnum +#define WCHAR_FUNC iswalnum +#define UCS_FUNC uc_is_alnum +#include "c32is-impl.h" diff --git a/lib/c32isalpha.c b/lib/c32isalpha.c new file mode 100644 index 0000000..ea43be5 --- /dev/null +++ b/lib/c32isalpha.c @@ -0,0 +1,26 @@ +/* Test 32-bit wide character for being alphabetic. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32ISALPHA +/* Specification. */ +#include <uchar.h> + +#define FUNC c32isalpha +#define WCHAR_FUNC iswalpha +#define UCS_FUNC uc_is_alpha +#include "c32is-impl.h" diff --git a/lib/c32isblank.c b/lib/c32isblank.c new file mode 100644 index 0000000..ee06d3d --- /dev/null +++ b/lib/c32isblank.c @@ -0,0 +1,26 @@ +/* Test 32-bit wide character for being blank. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32ISBLANK +/* Specification. */ +#include <uchar.h> + +#define FUNC c32isblank +#define WCHAR_FUNC iswblank +#define UCS_FUNC uc_is_blank +#include "c32is-impl.h" diff --git a/lib/c32iscntrl.c b/lib/c32iscntrl.c new file mode 100644 index 0000000..1f50527 --- /dev/null +++ b/lib/c32iscntrl.c @@ -0,0 +1,26 @@ +/* Test 32-bit wide character for being a control character. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32ISCNTRL +/* Specification. */ +#include <uchar.h> + +#define FUNC c32iscntrl +#define WCHAR_FUNC iswcntrl +#define UCS_FUNC uc_is_cntrl +#include "c32is-impl.h" diff --git a/lib/c32isdigit.c b/lib/c32isdigit.c new file mode 100644 index 0000000..4cb99c2 --- /dev/null +++ b/lib/c32isdigit.c @@ -0,0 +1,26 @@ +/* Test 32-bit wide character for being a digit. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32ISDIGIT +/* Specification. */ +#include <uchar.h> + +#define FUNC c32isdigit +#define WCHAR_FUNC iswdigit +#define UCS_FUNC uc_is_digit +#include "c32is-impl.h" diff --git a/lib/c32isgraph.c b/lib/c32isgraph.c new file mode 100644 index 0000000..407d6d1 --- /dev/null +++ b/lib/c32isgraph.c @@ -0,0 +1,26 @@ +/* Test 32-bit wide character for being graphic. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32ISGRAPH +/* Specification. */ +#include <uchar.h> + +#define FUNC c32isgraph +#define WCHAR_FUNC iswgraph +#define UCS_FUNC uc_is_graph +#include "c32is-impl.h" diff --git a/lib/c32islower.c b/lib/c32islower.c new file mode 100644 index 0000000..f2bfda7 --- /dev/null +++ b/lib/c32islower.c @@ -0,0 +1,26 @@ +/* Test 32-bit wide character for being lowercase. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32ISLOWER +/* Specification. */ +#include <uchar.h> + +#define FUNC c32islower +#define WCHAR_FUNC iswlower +#define UCS_FUNC uc_is_lower +#include "c32is-impl.h" diff --git a/lib/c32isprint.c b/lib/c32isprint.c new file mode 100644 index 0000000..fd8d7a6 --- /dev/null +++ b/lib/c32isprint.c @@ -0,0 +1,26 @@ +/* Test 32-bit wide character for being printable. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32ISPRINT +/* Specification. */ +#include <uchar.h> + +#define FUNC c32isprint +#define WCHAR_FUNC iswprint +#define UCS_FUNC uc_is_print +#include "c32is-impl.h" diff --git a/lib/c32ispunct.c b/lib/c32ispunct.c new file mode 100644 index 0000000..03d6469 --- /dev/null +++ b/lib/c32ispunct.c @@ -0,0 +1,26 @@ +/* Test 32-bit wide character for being a punctuation or symbol character. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32ISPUNCT +/* Specification. */ +#include <uchar.h> + +#define FUNC c32ispunct +#define WCHAR_FUNC iswpunct +#define UCS_FUNC uc_is_punct +#include "c32is-impl.h" diff --git a/lib/c32isspace.c b/lib/c32isspace.c new file mode 100644 index 0000000..1449fc4 --- /dev/null +++ b/lib/c32isspace.c @@ -0,0 +1,26 @@ +/* Test 32-bit wide character for being white-space. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32ISSPACE +/* Specification. */ +#include <uchar.h> + +#define FUNC c32isspace +#define WCHAR_FUNC iswspace +#define UCS_FUNC uc_is_space +#include "c32is-impl.h" diff --git a/lib/c32isupper.c b/lib/c32isupper.c new file mode 100644 index 0000000..4b21860 --- /dev/null +++ b/lib/c32isupper.c @@ -0,0 +1,26 @@ +/* Test 32-bit wide character for being uppercase. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32ISUPPER +/* Specification. */ +#include <uchar.h> + +#define FUNC c32isupper +#define WCHAR_FUNC iswupper +#define UCS_FUNC uc_is_upper +#include "c32is-impl.h" diff --git a/lib/c32isxdigit.c b/lib/c32isxdigit.c new file mode 100644 index 0000000..133d010 --- /dev/null +++ b/lib/c32isxdigit.c @@ -0,0 +1,26 @@ +/* Test 32-bit wide character for being a hexadecimal digit. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32ISXDIGIT +/* Specification. */ +#include <uchar.h> + +#define FUNC c32isxdigit +#define WCHAR_FUNC iswxdigit +#define UCS_FUNC uc_is_xdigit +#include "c32is-impl.h" diff --git a/lib/c32to-impl.h b/lib/c32to-impl.h new file mode 100644 index 0000000..e94fa7d --- /dev/null +++ b/lib/c32to-impl.h @@ -0,0 +1,92 @@ +/* Case mapping of a 32-bit wide character. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2023. */ + +#include <wchar.h> +#include <wctype.h> + +#if GNULIB_defined_mbstate_t +# include "localcharset.h" +# include "streq.h" +#endif + +#if GL_CHAR32_T_IS_UNICODE +# include "lc-charset-unicode.h" +#endif + +#include "unicase.h" + +#if _GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t +_GL_EXTERN_INLINE +#endif +wint_t +FUNC (wint_t wc) +{ + /* The char32_t encoding of a multibyte character is defined by the way + mbrtoc32() is defined. */ + +#if GNULIB_defined_mbstate_t /* AIX, IRIX */ + /* mbrtoc32() is defined on top of mbtowc() for the non-UTF-8 locales + and directly for the UTF-8 locales. */ + if (wc != WEOF) + { + const char *encoding = locale_charset (); + if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0)) + return UCS_FUNC (wc); + else + return WCHAR_FUNC (wc); + } + else + return wc; + +#elif HAVE_WORKING_MBRTOC32 /* glibc, Android */ + /* mbrtoc32() is essentially defined by the system libc. */ + +# if _GL_WCHAR_T_IS_UCS4 + /* The char32_t encoding of a multibyte character is known to be the same as + the wchar_t encoding. */ + return WCHAR_FUNC (wc); +# else + /* The char32_t encoding of a multibyte character is known to be UCS-4, + different from the wchar_t encoding. */ + if (wc != WEOF) + return UCS_FUNC (wc); + else + return wc; +# endif + +#elif _GL_SMALL_WCHAR_T /* Cygwin, mingw, MSVC */ + /* The wchar_t encoding is UTF-16. + The char32_t encoding is UCS-4. */ + + if (wc == WEOF || wc == (wchar_t) wc) + /* wc is in the range for the tow* functions. */ + return WCHAR_FUNC (wc); + else + return UCS_FUNC (wc); + +#else /* macOS, FreeBSD, NetBSD, OpenBSD, HP-UX, Solaris, Minix, Android */ + /* char32_t and wchar_t are equivalent. */ + static_assert (sizeof (char32_t) == sizeof (wchar_t)); + +# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION + return UCS_FUNC (wc); +# else + return WCHAR_FUNC (wc); +# endif +#endif +} diff --git a/lib/c32tolower.c b/lib/c32tolower.c new file mode 100644 index 0000000..52b149b --- /dev/null +++ b/lib/c32tolower.c @@ -0,0 +1,26 @@ +/* Map a 32-bit wide character to lowercase. + Copyright (C) 2023-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32TOLOWER +/* Specification. */ +#include <uchar.h> + +#define FUNC c32tolower +#define WCHAR_FUNC towlower +#define UCS_FUNC uc_tolower +#include "c32to-impl.h" diff --git a/lib/c32width.c b/lib/c32width.c new file mode 100644 index 0000000..7edf008 --- /dev/null +++ b/lib/c32width.c @@ -0,0 +1,102 @@ +/* Determine the number of screen columns needed for a 32-bit wide character. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2023. */ + +#include <config.h> + +#define IN_C32WIDTH +/* Specification. */ +#include <uchar.h> + +#include <wchar.h> + +#ifdef __CYGWIN__ +# include <cygwin/version.h> +#endif + +#if GNULIB_defined_mbstate_t +# include "streq.h" +#endif + +#include "localcharset.h" + +#if GL_CHAR32_T_IS_UNICODE +# include "lc-charset-unicode.h" +#endif + +#include "uniwidth.h" + +#if _GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t +_GL_EXTERN_INLINE +#endif +int +c32width (char32_t wc) +{ + /* The char32_t encoding of a multibyte character is defined by the way + mbrtoc32() is defined. */ + +#if GNULIB_defined_mbstate_t /* AIX, IRIX */ + /* mbrtoc32() is defined on top of mbtowc() for the non-UTF-8 locales + and directly for the UTF-8 locales. */ + const char *encoding = locale_charset (); + if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0)) + return uc_width (wc, encoding); + else + return wcwidth (wc); + +#elif HAVE_WORKING_MBRTOC32 /* glibc, Android */ + /* mbrtoc32() is essentially defined by the system libc. */ + +# if _GL_WCHAR_T_IS_UCS4 + /* The char32_t encoding of a multibyte character is known to be the same as + the wchar_t encoding. */ + return wcwidth (wc); +# else + /* The char32_t encoding of a multibyte character is known to be UCS-4, + different from the wchar_t encoding. */ + return uc_width (wc, locale_charset ()); +# endif + +#elif _GL_SMALL_WCHAR_T /* Cygwin, mingw, MSVC */ + /* The wchar_t encoding is UTF-16. + The char32_t encoding is UCS-4. */ + +# if defined __CYGWIN__ && CYGWIN_VERSION_DLL_MAJOR >= 1007 && 0 + /* As an extension to POSIX, the wcwidth() function of Cygwin >= 1.7 + supports also wc arguments outside the Unicode BMP, that is, outside + the 'wchar_t' range. See + <https://www.cygwin.com/cgit/newlib-cygwin/commit/?id=098a75dc51caa98f369d98a9809d773bc45329aa>. + But the resulting values for these characters are not of good quality. */ + return wcwidth (wc); +# else + if (wc == (wchar_t) wc) + /* wc is in the range for the wcwidth function. */ + return wcwidth (wc); + else + return uc_width (wc, locale_charset ()); +# endif + +#else /* macOS, FreeBSD, NetBSD, OpenBSD, HP-UX, Solaris, Minix, Android */ + /* char32_t and wchar_t are equivalent. */ + static_assert (sizeof (char32_t) == sizeof (wchar_t)); + +# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION + return uc_width (wc, locale_charset ()); +# endif + return wcwidth (wc); +#endif +} diff --git a/lib/calloc.c b/lib/calloc.c index 08843ac..81dfd3e 100644 --- a/lib/calloc.c +++ b/lib/calloc.c @@ -1,6 +1,6 @@ /* calloc() function that is glibc compatible. This wrapper function is required at least on Tru64 UNIX 5.1 and mingw. - Copyright (C) 2004-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2004-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c index e701297..efd79ce 100644 --- a/lib/canonicalize-lgpl.c +++ b/lib/canonicalize-lgpl.c @@ -1,5 +1,5 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2023 Free Software Foundation, Inc. + Copyright (C) 1996-2024 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/lib/canonicalize.c b/lib/canonicalize.c index 010190d..52e9b3b 100644 --- a/lib/canonicalize.c +++ b/lib/canonicalize.c @@ -1,5 +1,5 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2023 Free Software Foundation, Inc. + Copyright (C) 1996-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -34,13 +34,6 @@ #include "hash-triple.h" #include "xalloc.h" -/* Suppress bogus GCC -Wmaybe-uninitialized warnings. */ -#if defined GCC_LINT || defined lint -# define IF_LINT(Code) Code -#else -# define IF_LINT(Code) /* empty */ -#endif - #ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT # define DOUBLE_SLASH_IS_DISTINCT_ROOT false #endif @@ -51,6 +44,11 @@ # define SLASHES "/" #endif +/* Avoid false GCC warning "'end_idx' may be used uninitialized". */ +#if __GNUC__ + (__GNUC_MINOR__ >= 7) > 4 +# pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif + /* Return true if FILE's existence can be shown, false (setting errno) otherwise. Follow symbolic links. */ static bool @@ -369,7 +367,7 @@ canonicalize_filename_mode_stk (const char *name, canonicalize_mode_t can_mode, buf[n] = '\0'; char *extra_buf = bufs->extra.data; - idx_t end_idx IF_LINT (= 0); + idx_t end_idx; if (end_in_extra_buffer) end_idx = end - extra_buf; size_t len = strlen (end); diff --git a/lib/canonicalize.h b/lib/canonicalize.h index ea09c66..fed0148 100644 --- a/lib/canonicalize.h +++ b/lib/canonicalize.h @@ -1,5 +1,5 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/cdefs.h b/lib/cdefs.h index 412f036..d38382a 100644 --- a/lib/cdefs.h +++ b/lib/cdefs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2023 Free Software Foundation, Inc. +/* Copyright (C) 1992-2024 Free Software Foundation, Inc. Copyright The GNU Toolchain Authors. This file is part of the GNU C Library. @@ -42,8 +42,8 @@ #if (defined __has_attribute \ && (!defined __clang_minor__ \ || (defined __apple_build_version__ \ - ? 6000000 <= __apple_build_version__ \ - : 3 < __clang_major__ + (5 <= __clang_minor__)))) + ? 7000000 <= __apple_build_version__ \ + : 5 <= __clang_major__))) # define __glibc_has_attribute(attr) __has_attribute (attr) #else # define __glibc_has_attribute(attr) 0 diff --git a/lib/chdir-long.c b/lib/chdir-long.c index 8a25538..6160025 100644 --- a/lib/chdir-long.c +++ b/lib/chdir-long.c @@ -1,5 +1,5 @@ /* provide a chdir function that tries not to fail due to ENAMETOOLONG - Copyright (C) 2004-2023 Free Software Foundation, Inc. + Copyright (C) 2004-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -209,7 +209,7 @@ chdir_long (char *dir) #if TEST_CHDIR # include "closeout.h" -# include "error.h" +# include <error.h> int main (int argc, char *argv[]) diff --git a/lib/chdir-long.h b/lib/chdir-long.h index 6f81fad..2f24fa0 100644 --- a/lib/chdir-long.h +++ b/lib/chdir-long.h @@ -1,5 +1,5 @@ /* provide a chdir function that tries not to fail due to ENAMETOOLONG - Copyright (C) 2004-2005, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2004-2005, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/cloexec.c b/lib/cloexec.c index e4cecbd..cdb0d74 100644 --- a/lib/cloexec.c +++ b/lib/cloexec.c @@ -1,6 +1,6 @@ /* cloexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 1991, 2004-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1991, 2004-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/cloexec.h b/lib/cloexec.h index 057fd66..f52e5f2 100644 --- a/lib/cloexec.h +++ b/lib/cloexec.h @@ -1,6 +1,6 @@ /* cloexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 2004, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/close.c b/lib/close.c index 3c1b09e..830fd82 100644 --- a/lib/close.c +++ b/lib/close.c @@ -1,5 +1,5 @@ /* close replacement. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/closedir.c b/lib/closedir.c index 3777e9f..24b6bda 100644 --- a/lib/closedir.c +++ b/lib/closedir.c @@ -1,5 +1,5 @@ /* Stop reading the entries of a directory. - Copyright (C) 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -40,7 +40,7 @@ int closedir (DIR *dirp) #undef closedir { -#if GNULIB_defined_DIR || REPLACE_FCHDIR || defined __KLIBC__ +#if GNULIB_defined_DIR || REPLACE_FCHDIR int fd = dirfd (dirp); #endif int retval; @@ -55,10 +55,6 @@ closedir (DIR *dirp) retval = closedir (dirp); # endif -# ifdef __KLIBC__ - if (!retval) - _gl_unregister_dirp_fd (fd); -# endif #else if (dirp->current != INVALID_HANDLE_VALUE) diff --git a/lib/concat-filename.c b/lib/concat-filename.c index 62842a6..b46ff1b 100644 --- a/lib/concat-filename.c +++ b/lib/concat-filename.c @@ -1,5 +1,5 @@ /* Construct a full filename from a directory and a relative filename. - Copyright (C) 2001-2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/concat-filename.h b/lib/concat-filename.h index 490aa96..328b0e2 100644 --- a/lib/concat-filename.h +++ b/lib/concat-filename.h @@ -1,5 +1,5 @@ /* Construct a full filename from a directory and a relative filename. - Copyright (C) 2001-2004, 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/connect.c b/lib/connect.c index 1ac4a74..421849c 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -1,6 +1,6 @@ /* connect.c --- wrappers for Windows connect function - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/ctype.in.h b/lib/ctype.in.h index ec43126..61bcbf1 100644 --- a/lib/ctype.in.h +++ b/lib/ctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 <ctype.h>, for platforms on which it is incomplete. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/dirent-private.h b/lib/dirent-private.h index 012b683..335fbc3 100644 --- a/lib/dirent-private.h +++ b/lib/dirent-private.h @@ -1,5 +1,5 @@ /* Private details of the DIR type. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/dirent.in.h b/lib/dirent.in.h index d409a03..f05b880 100644 --- a/lib/dirent.in.h +++ b/lib/dirent.in.h @@ -1,5 +1,5 @@ /* A GNU-like <dirent.h>. - Copyright (C) 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -237,12 +237,6 @@ _GL_WARN_ON_USE (rewinddir, "rewinddir is not portable - " _GL_FUNCDECL_RPL (dirfd, int, (DIR *) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (dirfd, int, (DIR *)); -# ifdef __KLIBC__ -/* Gnulib internal hooks needed to maintain the dirfd metadata. */ -_GL_EXTERN_C int _gl_register_dirp_fd (int fd, DIR *dirp) - _GL_ARG_NONNULL ((2)); -_GL_EXTERN_C void _gl_unregister_dirp_fd (int fd); -# endif # else # if defined __cplusplus && defined GNULIB_NAMESPACE && defined dirfd /* dirfd is defined as a macro and not as a function. diff --git a/lib/dirfd.c b/lib/dirfd.c index 75b2163..afcf382 100644 --- a/lib/dirfd.c +++ b/lib/dirfd.c @@ -1,6 +1,6 @@ /* dirfd.c -- return the file descriptor associated with an open DIR* - Copyright (C) 2001, 2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -26,59 +26,6 @@ # include "dirent-private.h" #endif -#ifdef __KLIBC__ -# include <stdlib.h> -# include <io.h> - -static struct dirp_fd_list -{ - DIR *dirp; - int fd; - struct dirp_fd_list *next; -} *dirp_fd_start = NULL; - -/* Register fd associated with dirp to dirp_fd_list. */ -int -_gl_register_dirp_fd (int fd, DIR *dirp) -{ - struct dirp_fd_list *new_dirp_fd = malloc (sizeof *new_dirp_fd); - if (!new_dirp_fd) - return -1; - - new_dirp_fd->dirp = dirp; - new_dirp_fd->fd = fd; - new_dirp_fd->next = dirp_fd_start; - - dirp_fd_start = new_dirp_fd; - - return 0; -} - -/* Unregister fd from dirp_fd_list with closing it */ -void -_gl_unregister_dirp_fd (int fd) -{ - struct dirp_fd_list *dirp_fd; - struct dirp_fd_list *dirp_fd_prev; - - for (dirp_fd_prev = NULL, dirp_fd = dirp_fd_start; dirp_fd; - dirp_fd_prev = dirp_fd, dirp_fd = dirp_fd->next) - { - if (dirp_fd->fd == fd) - { - if (dirp_fd_prev) - dirp_fd_prev->next = dirp_fd->next; - else /* dirp_fd == dirp_fd_start */ - dirp_fd_start = dirp_fd_start->next; - - close (fd); - free (dirp_fd); - break; - } - } -} -#endif - int dirfd (DIR *dir_p) { @@ -90,19 +37,7 @@ dirfd (DIR *dir_p) #else int fd = DIR_TO_FD (dir_p); if (fd == -1) -# ifndef __KLIBC__ errno = ENOTSUP; -# else - { - struct dirp_fd_list *dirp_fd; - - for (dirp_fd = dirp_fd_start; dirp_fd; dirp_fd = dirp_fd->next) - if (dirp_fd->dirp == dir_p) - return dirp_fd->fd; - - errno = EINVAL; - } -# endif return fd; #endif diff --git a/lib/dirname-lgpl.c b/lib/dirname-lgpl.c index e9454af..8333c0e 100644 --- a/lib/dirname-lgpl.c +++ b/lib/dirname-lgpl.c @@ -1,6 +1,6 @@ /* dirname.c -- return all but the last element in a file name - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2023 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/dirname.c b/lib/dirname.c index e72f713..393ec1b 100644 --- a/lib/dirname.c +++ b/lib/dirname.c @@ -1,6 +1,6 @@ /* dirname.c -- return all but the last element in a file name - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2023 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/dirname.h b/lib/dirname.h index 0344f1c..33935ba 100644 --- a/lib/dirname.h +++ b/lib/dirname.h @@ -1,6 +1,6 @@ /* Take file names apart into directory and base names. - Copyright (C) 1998, 2001, 2003-2006, 2009-2023 Free Software Foundation, + Copyright (C) 1998, 2001, 2003-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/dup-safer-flag.c b/lib/dup-safer-flag.c index be1762b..ec2e311 100644 --- a/lib/dup-safer-flag.c +++ b/lib/dup-safer-flag.c @@ -1,7 +1,7 @@ /* Duplicate a file descriptor result, avoiding clobbering STD{IN,OUT,ERR}_FILENO, with specific flags. - Copyright (C) 2001, 2004-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2004-2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/dup-safer.c b/lib/dup-safer.c index bb86a2e..b0df227 100644 --- a/lib/dup-safer.c +++ b/lib/dup-safer.c @@ -1,6 +1,6 @@ /* Invoke dup, but avoid some glitches. - Copyright (C) 2001, 2004-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2004-2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,6 +1,6 @@ /* Duplicate an open file descriptor. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -1,6 +1,6 @@ /* Duplicate an open file descriptor to a specified file descriptor. - Copyright (C) 1999, 2004-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1999, 2004-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/dynarray.h b/lib/dynarray.h index 9155910..8940e81 100644 --- a/lib/dynarray.h +++ b/lib/dynarray.h @@ -1,5 +1,5 @@ /* Type-safe arrays which grow dynamically. - Copyright 2021-2023 Free Software Foundation, Inc. + Copyright 2021-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/eloop-threshold.h b/lib/eloop-threshold.h index d9b154e..84d19b4 100644 --- a/lib/eloop-threshold.h +++ b/lib/eloop-threshold.h @@ -1,5 +1,5 @@ /* Threshold at which to diagnose ELOOP. Generic version. - Copyright (C) 2012-2023 Free Software Foundation, Inc. + Copyright (C) 2012-2024 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/lib/errno.in.h b/lib/errno.in.h index 3dda9c2..aa658e6 100644 --- a/lib/errno.in.h +++ b/lib/errno.in.h @@ -1,6 +1,6 @@ /* A POSIX-like <errno.h>. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/error.c b/lib/error.c index ef43728..c53dfeb 100644 --- a/lib/error.c +++ b/lib/error.c @@ -1,5 +1,5 @@ /* Error handler for noninteractive utilities - Copyright (C) 1990-1998, 2000-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2007, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify @@ -19,9 +19,10 @@ #if !_LIBC # include <config.h> +# define _GL_NO_INLINE_ERROR #endif -#include "error.h" +#include <error.h> #include <stdarg.h> #include <stdio.h> diff --git a/lib/error.in.h b/lib/error.in.h index 9a520f1..51f8caf 100644 --- a/lib/error.in.h +++ b/lib/error.in.h @@ -1,5 +1,5 @@ /* Declarations for error-reporting functions. - Copyright (C) 1995-1997, 2003, 2006, 2008-2023 Free Software Foundation, + Copyright (C) 1995-1997, 2003, 2006, 2008-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -18,9 +18,9 @@ #ifndef _@GUARD_PREFIX@_ERROR_H -#if __GNUC__ >= 3 -@PRAGMA_SYSTEM_HEADER@ -#endif +/* No @PRAGMA_SYSTEM_HEADER@ here, because it would prevent + -Wimplicit-fallthrough warnings for missing FALLTHROUGH after error(...) + or error_at_line(...) invocations. */ /* The include_next requires a split double-inclusion guard. */ #if @HAVE_ERROR_H@ @@ -30,11 +30,15 @@ #ifndef _@GUARD_PREFIX@_ERROR_H #define _@GUARD_PREFIX@_ERROR_H -/* This file uses _GL_ATTRIBUTE_FORMAT. */ +/* This file uses _GL_ATTRIBUTE_ALWAYS_INLINE, _GL_ATTRIBUTE_FORMAT, + _GL_ATTRIBUTE_MAYBE_UNUSED. */ #if !_GL_CONFIG_H_INCLUDED #error "Please include config.h first." #endif +/* Get 'unreachable'. */ +#include <stddef.h> + /* Get _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM. */ #include <stdio.h> @@ -46,6 +50,35 @@ # define _GL_ATTRIBUTE_SPEC_PRINTF_ERROR _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM #endif +/* Helper macro for supporting the compiler's control flow analysis better. + It evaluates its arguments only once. + Test case: Compile copy-file.c with "gcc -Wimplicit-fallthrough". */ +#if defined __GNUC__ || defined __clang__ +/* Use 'unreachable' to tell the compiler when the function call does not + return. */ +# define __gl_error_call1(function, status, ...) \ + ((function) (status, __VA_ARGS__), \ + (status) != 0 ? unreachable () : (void) 0) +/* If STATUS is a not a constant, the function call may or may not return; + therefore -Wimplicit-fallthrough will produce a warning. Use a compound + statement in order to evaluate STATUS only once. + If STATUS is a constant, we don't use a compound statement, because that + would trigger a -Wimplicit-fallthrough warning even when STATUS is != 0, + when not optimizing. This causes STATUS to be evaluated twice, but + that's OK since it does not have side effects. */ +# define __gl_error_call(function, status, ...) \ + (__builtin_constant_p (status) \ + ? __gl_error_call1 (function, status, __VA_ARGS__) \ + : __extension__ \ + ({ \ + int const __errstatus = status; \ + __gl_error_call1 (function, __errstatus, __VA_ARGS__); \ + })) +#else +# define __gl_error_call(function, status, ...) \ + (function) (status, __VA_ARGS__) +#endif + #ifdef __cplusplus extern "C" { #endif @@ -63,6 +96,11 @@ _GL_FUNCDECL_RPL (error, void, _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4))); _GL_CXXALIAS_RPL (error, void, (int __status, int __errnum, const char *__format, ...)); +# ifndef _GL_NO_INLINE_ERROR +# undef error +# define error(status, ...) \ + __gl_error_call (rpl_error, status, __VA_ARGS__) +# endif #else # if ! @HAVE_ERROR@ _GL_FUNCDECL_SYS (error, void, @@ -71,6 +109,30 @@ _GL_FUNCDECL_SYS (error, void, # endif _GL_CXXALIAS_SYS (error, void, (int __status, int __errnum, const char *__format, ...)); +# ifndef _GL_NO_INLINE_ERROR +# ifdef error +/* Only gcc ≥ 4.7 has __builtin_va_arg_pack. */ +# if _GL_GNUC_PREREQ (4, 7) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wattributes" +_GL_ATTRIBUTE_MAYBE_UNUSED +static void +_GL_ATTRIBUTE_ALWAYS_INLINE +_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4)) +_gl_inline_error (int __status, int __errnum, const char *__format, ...) +{ + return error (__status, __errnum, __format, __builtin_va_arg_pack ()); +} +# pragma GCC diagnostic pop +# undef error +# define error(status, ...) \ + __gl_error_call (_gl_inline_error, status, __VA_ARGS__) +# endif +# else +# define error(status, ...) \ + __gl_error_call (error, status, __VA_ARGS__) +# endif +# endif #endif #if __GLIBC__ >= 2 _GL_CXXALIASWARN (error); @@ -90,6 +152,11 @@ _GL_FUNCDECL_RPL (error_at_line, void, _GL_CXXALIAS_RPL (error_at_line, void, (int __status, int __errnum, const char *__filename, unsigned int __lineno, const char *__format, ...)); +# ifndef _GL_NO_INLINE_ERROR +# undef error_at_line +# define error_at_line(status, ...) \ + __gl_error_call (rpl_error_at_line, status, __VA_ARGS__) +# endif #else # if ! @HAVE_ERROR_AT_LINE@ _GL_FUNCDECL_SYS (error_at_line, void, @@ -100,6 +167,32 @@ _GL_FUNCDECL_SYS (error_at_line, void, _GL_CXXALIAS_SYS (error_at_line, void, (int __status, int __errnum, const char *__filename, unsigned int __lineno, const char *__format, ...)); +# ifndef _GL_NO_INLINE_ERROR +# ifdef error_at_line +/* Only gcc ≥ 4.7 has __builtin_va_arg_pack. */ +# if _GL_GNUC_PREREQ (4, 7) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wattributes" +_GL_ATTRIBUTE_MAYBE_UNUSED +static void +_GL_ATTRIBUTE_ALWAYS_INLINE +_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 5, 6)) +_gl_inline_error_at_line (int __status, int __errnum, const char *__filename, + unsigned int __lineno, const char *__format, ...) +{ + return error_at_line (__status, __errnum, __filename, __lineno, __format, + __builtin_va_arg_pack ()); +} +# pragma GCC diagnostic pop +# undef error_at_line +# define error_at_line(status, ...) \ + __gl_error_call (_gl_inline_error_at_line, status, __VA_ARGS__) +# endif +# else +# define error_at_line(status, ...) \ + __gl_error_call (error_at_line, status, __VA_ARGS__) +# endif +# endif #endif _GL_CXXALIASWARN (error_at_line); diff --git a/lib/exitfail.c b/lib/exitfail.c index d67a130..8a5962e 100644 --- a/lib/exitfail.c +++ b/lib/exitfail.c @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002-2003, 2005-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/exitfail.h b/lib/exitfail.h index 85a6af6..20ac506 100644 --- a/lib/exitfail.h +++ b/lib/exitfail.h @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c index 90d5a9b..ea92574 100644 --- a/lib/fatal-signal.c +++ b/lib/fatal-signal.c @@ -1,5 +1,5 @@ /* Emergency actions in case of a fatal signal. - Copyright (C) 2003-2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 2006-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This file is free software: you can redistribute it and/or modify diff --git a/lib/fatal-signal.h b/lib/fatal-signal.h index fed4f4b..a51d15f 100644 --- a/lib/fatal-signal.h +++ b/lib/fatal-signal.h @@ -1,5 +1,5 @@ /* Emergency actions in case of a fatal signal. - Copyright (C) 2003-2004, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This file is free software: you can redistribute it and/or modify diff --git a/lib/fchdir.c b/lib/fchdir.c index 880b137..5ac2f09 100644 --- a/lib/fchdir.c +++ b/lib/fchdir.c @@ -1,5 +1,5 @@ /* fchdir replacement. - Copyright (C) 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fcntl.c b/lib/fcntl.c index e220800..7cd3a0f 100644 --- a/lib/fcntl.c +++ b/lib/fcntl.c @@ -1,6 +1,6 @@ /* Provide file descriptor control. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index d0bb85f..eea3b95 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -1,6 +1,6 @@ /* Like <fcntl.h>, but with non-working flags defined to 0. - Copyright (C) 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fd-hook.c b/lib/fd-hook.c index 3626115..75bbe49 100644 --- a/lib/fd-hook.c +++ b/lib/fd-hook.c @@ -1,5 +1,5 @@ /* Hook for making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software: you can redistribute it and/or modify diff --git a/lib/fd-hook.h b/lib/fd-hook.h index 6bf3c24..2150460 100644 --- a/lib/fd-hook.h +++ b/lib/fd-hook.h @@ -1,5 +1,5 @@ /* Hook for making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fd-safer-flag.c b/lib/fd-safer-flag.c index 9aef271..4cd1b14 100644 --- a/lib/fd-safer-flag.c +++ b/lib/fd-safer-flag.c @@ -1,7 +1,7 @@ /* Adjust a file descriptor result so that it avoids clobbering STD{IN,OUT,ERR}_FILENO, with specific flags. - Copyright (C) 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/fd-safer.c b/lib/fd-safer.c index 9c40a5a..8d62433 100644 --- a/lib/fd-safer.c +++ b/lib/fd-safer.c @@ -1,6 +1,6 @@ /* Return a safer copy of a file descriptor. - Copyright (C) 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/fdopendir.c b/lib/fdopendir.c index 0f43d6f..bdbb2ea 100644 --- a/lib/fdopendir.c +++ b/lib/fdopendir.c @@ -1,5 +1,5 @@ /* provide a replacement fdopendir function - Copyright (C) 2004-2023 Free Software Foundation, Inc. + Copyright (C) 2004-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,42 +44,6 @@ fdopendir (int fd) return dirp; } -# elif defined __KLIBC__ - -# include <InnoTekLIBC/backend.h> - -DIR * -fdopendir (int fd) -{ - char path[_MAX_PATH]; - DIR *dirp; - - /* Get a path from fd */ - if (__libc_Back_ioFHToPath (fd, path, sizeof (path))) - return NULL; - - dirp = opendir (path); - if (!dirp) - return NULL; - - /* Unregister fd registered by opendir() */ - _gl_unregister_dirp_fd (dirfd (dirp)); - - /* Register our fd */ - if (_gl_register_dirp_fd (fd, dirp)) - { - int saved_errno = errno; - - closedir (dirp); - - errno = saved_errno; - - dirp = NULL; - } - - return dirp; -} - # else /* We are not in control of the file descriptor of a DIR, and therefore have to play tricks with file descriptors before and after a call to opendir(). */ diff --git a/lib/fflush.c b/lib/fflush.c index f3689b3..36cc14d 100644 --- a/lib/fflush.c +++ b/lib/fflush.c @@ -1,5 +1,5 @@ /* fflush.c -- allow flushing input streams - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/file-set.c b/lib/file-set.c index 44cf643..956c092 100644 --- a/lib/file-set.c +++ b/lib/file-set.c @@ -1,5 +1,5 @@ /* Specialized functions to manipulate a set of files. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/file-set.h b/lib/file-set.h index c2508b0..17e89ca 100644 --- a/lib/file-set.h +++ b/lib/file-set.h @@ -1,5 +1,5 @@ /* Very specialized set-of-files code. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/filename.h b/lib/filename.h index a2400a9..4f0f0fb 100644 --- a/lib/filename.h +++ b/lib/filename.h @@ -1,5 +1,5 @@ /* Basic filename support macros. - Copyright (C) 2001-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2024 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/lib/filenamecat-lgpl.c b/lib/filenamecat-lgpl.c index 6d7ed84..dc6d346 100644 --- a/lib/filenamecat-lgpl.c +++ b/lib/filenamecat-lgpl.c @@ -1,6 +1,6 @@ /* Concatenate two arbitrary file names. - Copyright (C) 1996-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/filenamecat.h b/lib/filenamecat.h index 29a4daa..8c8cf44 100644 --- a/lib/filenamecat.h +++ b/lib/filenamecat.h @@ -1,6 +1,6 @@ /* Concatenate two arbitrary file names. - Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2023 Free Software + Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/findprog-in.c b/lib/findprog-in.c index c0768c2..5c71c30 100644 --- a/lib/findprog-in.c +++ b/lib/findprog-in.c @@ -1,5 +1,5 @@ /* Locating a program in a given path. - Copyright (C) 2001-2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2024 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001, 2019. This file is free software: you can redistribute it and/or modify diff --git a/lib/findprog.h b/lib/findprog.h index 6223394..ebc3b0f 100644 --- a/lib/findprog.h +++ b/lib/findprog.h @@ -1,5 +1,5 @@ /* Locating a program in PATH. - Copyright (C) 2001-2003, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This file is free software: you can redistribute it and/or modify diff --git a/lib/flexmember.h b/lib/flexmember.h index 8c5915e..6ef66a3 100644 --- a/lib/flexmember.h +++ b/lib/flexmember.h @@ -1,6 +1,6 @@ /* Sizes of structs with flexible array members. - Copyright 2016-2023 Free Software Foundation, Inc. + Copyright 2016-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -43,7 +43,7 @@ followed by N bytes of other data. The result is suitable as an argument to malloc. For example: - struct s { int n; char d[FLEXIBLE_ARRAY_MEMBER]; }; + struct s { int a; char d[FLEXIBLE_ARRAY_MEMBER]; }; struct s *p = malloc (FLEXSIZEOF (struct s, d, n * sizeof (char))); FLEXSIZEOF (TYPE, MEMBER, N) is not simply (sizeof (TYPE) + N), @@ -63,3 +63,14 @@ #define FLEXSIZEOF(type, member, n) \ ((offsetof (type, member) + FLEXALIGNOF (type) - 1 + (n)) \ & ~ (FLEXALIGNOF (type) - 1)) + +/* Yield a properly aligned upper bound on the size of a struct of + type TYPE with a flexible array member named MEMBER that has N + elements. The result is suitable as an argument to malloc. + For example: + + struct s { int a; double d[FLEXIBLE_ARRAY_MEMBER]; }; + struct s *p = malloc (FLEXNSIZEOF (struct s, d, n)); + */ +#define FLEXNSIZEOF(type, member, n) \ + FLEXSIZEOF (type, member, (n) * sizeof (((type *) 0)->member[0])) diff --git a/lib/float+.h b/lib/float+.h index e7531e4..104f477 100644 --- a/lib/float+.h +++ b/lib/float+.h @@ -1,5 +1,5 @@ /* Supplemental information about the floating-point formats. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2007. This file is free software: you can redistribute it and/or modify diff --git a/lib/float.c b/lib/float.c index f81ff33..a9ea40b 100644 --- a/lib/float.c +++ b/lib/float.c @@ -1,5 +1,5 @@ /* Auxiliary definitions for <float.h>. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This file is free software: you can redistribute it and/or modify diff --git a/lib/float.in.h b/lib/float.in.h index bf2c502..73e8d40 100644 --- a/lib/float.in.h +++ b/lib/float.in.h @@ -1,6 +1,6 @@ /* A correct <float.h>. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/flock.c b/lib/flock.c index 85433e7..53525cf 100644 --- a/lib/flock.c +++ b/lib/flock.c @@ -6,7 +6,7 @@ Written by Richard W.M. Jones <rjones.at.redhat.com> - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/lib/fnmatch.c b/lib/fnmatch.c index 32cfb48..832b5a1 100644 --- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2023 Free Software Foundation, Inc. +/* Copyright (C) 1991-2024 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 @@ -35,9 +35,40 @@ #if defined _LIBC || HAVE_ALLOCA # include <alloca.h> #endif -#include <wchar.h> -#include <wctype.h> #include <stddef.h> +#include <uchar.h> +#if defined _LIBC || !_GL_SMALL_WCHAR_T +/* It's OK to use wchar_t, since it's wide enough. */ +# include <wchar.h> +# include <wctype.h> +# define WCHAR_T wchar_t +# define WINT_T wint_t +# define BTOWC btowc +# define MBSRTOWCS mbsrtowcs +# define WCSLEN wcslen +# define WCSCAT wcscat +# define WMEMPCPY wmempcpy +# define WMEMCHR wmemchr +# define TOWLOWER towlower +# define WCTYPE_T wctype_t +# define WCTYPE wctype +# define ISWCTYPE iswctype +#else +/* wchar_t is too small, use char32_t instead. */ +# include "unistr.h" +# define WCHAR_T char32_t +# define WINT_T char32_t +# define BTOWC btoc32 +# define MBSRTOWCS mbsrtoc32s +# define WCSLEN u32_strlen +# define WCSCAT u32_strcat +# define WMEMPCPY u32_pcpy +# define WMEMCHR(S, C, N) u32_chr (S, N, C) +# define TOWLOWER c32tolower +# define WCTYPE_T c32_type_test_t +# define WCTYPE c32_get_type_test +# define ISWCTYPE c32_apply_type_test +#endif /* We need some of the locale data (the collation sequence information) but there is no interface to get this information in general. Therefore @@ -111,7 +142,7 @@ typedef ptrdiff_t idx_t; # define CHAR_CLASS_MAX_LENGTH 256 #endif -#define IS_CHAR_CLASS(string) wctype (string) +#define IS_CHAR_CLASS(string) WCTYPE (string) /* Avoid depending on library functions or files whose names are inconsistent. */ @@ -129,7 +160,7 @@ static int posixly_correct; #define END end_pattern #define STRUCT fnmatch_struct #define L_(CS) CS -#define BTOWC(C) btowc (C) +#define UCHAR_TO_WCHAR(C) BTOWC (C) #define STRLEN(S) strlen (S) #define STRCAT(D, S) strcat (D, S) #define MEMPCPY(D, S, N) mempcpy (D, S, N) @@ -142,19 +173,19 @@ static int posixly_correct; #include "fnmatch_loop.c" -#define FOLD(c) ((flags & FNM_CASEFOLD) ? towlower (c) : (c)) -#define CHAR wchar_t -#define UCHAR wint_t -#define INT wint_t +#define FOLD(c) ((flags & FNM_CASEFOLD) ? TOWLOWER (c) : (c)) +#define CHAR WCHAR_T +#define UCHAR WINT_T +#define INT WINT_T #define FCT internal_fnwmatch #define EXT ext_wmatch #define END end_wpattern #define L_(CS) L##CS -#define BTOWC(C) (C) -#define STRLEN(S) wcslen (S) -#define STRCAT(D, S) wcscat (D, S) -#define MEMPCPY(D, S, N) wmempcpy (D, S, N) -#define MEMCHR(S, C, N) wmemchr (S, C, N) +#define UCHAR_TO_WCHAR(C) (C) +#define STRLEN(S) WCSLEN (S) +#define STRCAT(D, S) WCSCAT (D, S) +#define MEMPCPY(D, S, N) WMEMPCPY (D, S, N) +#define MEMCHR(S, C, N) WMEMCHR (S, C, N) #define WIDE_CHAR_VERSION 1 #ifdef _LIBC /* Change the name the header defines so it doesn't conflict with @@ -172,8 +203,8 @@ static int posixly_correct; for a member of the portable character set is the same code point as its single-byte encoding, we can use a simplified method to convert the string to a multibyte character string. */ -static wctype_t -is_char_class (const wchar_t *wcs) +static WCTYPE_T +is_char_class (const WCHAR_T *wcs) { char s[CHAR_CLASS_MAX_LENGTH + 1]; char *cp = s; @@ -184,7 +215,7 @@ is_char_class (const wchar_t *wcs) #ifdef _LIBC if (*wcs < 0x20 || *wcs > 0x7e || *wcs == 0x24 || *wcs == 0x40 || *wcs == 0x60) - return (wctype_t) 0; + return (WCTYPE_T) 0; #else switch (*wcs) { @@ -210,13 +241,13 @@ is_char_class (const wchar_t *wcs) case L'z': case L'{': case L'|': case L'}': case L'~': break; default: - return (wctype_t) 0; + return (WCTYPE_T) 0; } #endif /* Avoid overrunning the buffer. */ if (cp == s + CHAR_CLASS_MAX_LENGTH) - return (wctype_t) 0; + return (WCTYPE_T) 0; *cp++ = (char) *wcs++; } @@ -224,7 +255,7 @@ is_char_class (const wchar_t *wcs) *cp = '\0'; - return wctype (s); + return WCTYPE (s); } #define IS_CHAR_CLASS(string) is_char_class (string) @@ -239,10 +270,10 @@ fnmatch (const char *pattern, const char *string, int flags) mbstate_t ps; size_t n; const char *p; - wchar_t *wpattern_malloc = NULL; - wchar_t *wpattern; - wchar_t *wstring_malloc = NULL; - wchar_t *wstring; + WCHAR_T *wpattern_malloc = NULL; + WCHAR_T *wpattern; + WCHAR_T *wstring_malloc = NULL; + WCHAR_T *wstring; size_t alloca_used = 0; /* Convert the strings into wide characters. */ @@ -251,9 +282,9 @@ fnmatch (const char *pattern, const char *string, int flags) n = strnlen (pattern, 1024); if (__glibc_likely (n < 1024)) { - wpattern = (wchar_t *) alloca_account ((n + 1) * sizeof (wchar_t), + wpattern = (WCHAR_T *) alloca_account ((n + 1) * sizeof (WCHAR_T), alloca_used); - n = mbsrtowcs (wpattern, &p, n + 1, &ps); + n = MBSRTOWCS (wpattern, &p, n + 1, &ps); if (__glibc_unlikely (n == (size_t) -1)) /* Something wrong. XXX Do we have to set 'errno' to something which mbsrtows hasn't @@ -268,23 +299,23 @@ fnmatch (const char *pattern, const char *string, int flags) else { prepare_wpattern: - n = mbsrtowcs (NULL, &pattern, 0, &ps); + n = MBSRTOWCS (NULL, &pattern, 0, &ps); if (__glibc_unlikely (n == (size_t) -1)) /* Something wrong. XXX Do we have to set 'errno' to something which mbsrtows hasn't already done? */ return -1; - if (__glibc_unlikely (n >= (size_t) -1 / sizeof (wchar_t))) + if (__glibc_unlikely (n >= (size_t) -1 / sizeof (WCHAR_T))) { __set_errno (ENOMEM); return -2; } wpattern_malloc = wpattern - = (wchar_t *) malloc ((n + 1) * sizeof (wchar_t)); + = (WCHAR_T *) malloc ((n + 1) * sizeof (WCHAR_T)); assert (mbsinit (&ps)); if (wpattern == NULL) return -2; - (void) mbsrtowcs (wpattern, &pattern, n + 1, &ps); + (void) MBSRTOWCS (wpattern, &pattern, n + 1, &ps); } assert (mbsinit (&ps)); @@ -292,9 +323,9 @@ fnmatch (const char *pattern, const char *string, int flags) p = string; if (__glibc_likely (n < 1024)) { - wstring = (wchar_t *) alloca_account ((n + 1) * sizeof (wchar_t), + wstring = (WCHAR_T *) alloca_account ((n + 1) * sizeof (WCHAR_T), alloca_used); - n = mbsrtowcs (wstring, &p, n + 1, &ps); + n = MBSRTOWCS (wstring, &p, n + 1, &ps); if (__glibc_unlikely (n == (size_t) -1)) { /* Something wrong. @@ -313,13 +344,13 @@ fnmatch (const char *pattern, const char *string, int flags) else { prepare_wstring: - n = mbsrtowcs (NULL, &string, 0, &ps); + n = MBSRTOWCS (NULL, &string, 0, &ps); if (__glibc_unlikely (n == (size_t) -1)) /* Something wrong. XXX Do we have to set 'errno' to something which mbsrtows hasn't already done? */ goto free_return; - if (__glibc_unlikely (n >= (size_t) -1 / sizeof (wchar_t))) + if (__glibc_unlikely (n >= (size_t) -1 / sizeof (WCHAR_T))) { free (wpattern_malloc); __set_errno (ENOMEM); @@ -327,14 +358,14 @@ fnmatch (const char *pattern, const char *string, int flags) } wstring_malloc = wstring - = (wchar_t *) malloc ((n + 1) * sizeof (wchar_t)); + = (WCHAR_T *) malloc ((n + 1) * sizeof (WCHAR_T)); if (wstring == NULL) { free (wpattern_malloc); return -2; } assert (mbsinit (&ps)); - (void) mbsrtowcs (wstring, &string, n + 1, &ps); + (void) MBSRTOWCS (wstring, &string, n + 1, &ps); } int res = internal_fnwmatch (wpattern, wstring, wstring + n, diff --git a/lib/fnmatch.in.h b/lib/fnmatch.in.h index 144143b..974bbff 100644 --- a/lib/fnmatch.in.h +++ b/lib/fnmatch.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <fnmatch.h>. - Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2023 Free + Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -84,6 +84,7 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define fnmatch rpl_fnmatch # endif +# define GNULIB_defined_fnmatch_function 1 _GL_FUNCDECL_RPL (fnmatch, int, (const char *pattern, const char *name, int flags) _GL_ARG_NONNULL ((1, 2))); @@ -91,6 +92,7 @@ _GL_CXXALIAS_RPL (fnmatch, int, (const char *pattern, const char *name, int flags)); # else # if !@HAVE_FNMATCH@ +# define GNULIB_defined_fnmatch_function 1 _GL_FUNCDECL_SYS (fnmatch, int, (const char *pattern, const char *name, int flags) _GL_ARG_NONNULL ((1, 2))); diff --git a/lib/fnmatch_loop.c b/lib/fnmatch_loop.c index 68a3b7a..4e6e086 100644 --- a/lib/fnmatch_loop.c +++ b/lib/fnmatch_loop.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2023 Free Software Foundation, Inc. +/* Copyright (C) 1991-2024 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 @@ -270,7 +270,7 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, /* Leave room for the null. */ CHAR str[CHAR_CLASS_MAX_LENGTH + 1]; size_t c1 = 0; - wctype_t wt; + WCTYPE_T wt; const CHAR *startp = p; for (;;) @@ -310,7 +310,7 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, if (_ISCTYPE ((UCHAR) *n, wt)) goto matched; #else - if (iswctype (BTOWC ((UCHAR) *n), wt)) + if (ISWCTYPE (UCHAR_TO_WCHAR ((UCHAR) *n), wt)) goto matched; #endif c = *p++; @@ -1206,6 +1206,6 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end, #undef STRLEN #undef STRCAT #undef L_ -#undef BTOWC +#undef UCHAR_TO_WCHAR #undef WIDE_CHAR_VERSION #undef FINDIDX diff --git a/lib/fopen.c b/lib/fopen.c index e1e4cdb..d3b57a9 100644 --- a/lib/fopen.c +++ b/lib/fopen.c @@ -1,5 +1,5 @@ /* Open a stream to a file. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -33,9 +33,13 @@ orig_fopen (const char *filename, const char *mode) } /* Specification. */ +#ifdef __osf__ /* Write "stdio.h" here, not <stdio.h>, otherwise OSF/1 5.1 DTK cc eliminates this include because of the preliminary #include <stdio.h> above. */ -#include "stdio.h" +# include "stdio.h" +#else +# include <stdio.h> +#endif #include <errno.h> #include <fcntl.h> diff --git a/lib/fpurge.c b/lib/fpurge.c index 0dcb2b7..52a3dce 100644 --- a/lib/fpurge.c +++ b/lib/fpurge.c @@ -1,5 +1,5 @@ /* Flushing buffers of a FILE stream. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/freading.c b/lib/freading.c index b9377cb..c80d9aa 100644 --- a/lib/freading.c +++ b/lib/freading.c @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/freading.h b/lib/freading.h index 0fe4810..943354f 100644 --- a/lib/freading.h +++ b/lib/freading.h @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -1,6 +1,6 @@ /* Make free() preserve errno. - Copyright (C) 2003, 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2003, 2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fseek.c b/lib/fseek.c index 9764375..cebc174 100644 --- a/lib/fseek.c +++ b/lib/fseek.c @@ -1,5 +1,5 @@ /* An fseek() function that, together with fflush(), is POSIX compliant. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fseeko.c b/lib/fseeko.c index 89a7087..2c3b053 100644 --- a/lib/fseeko.c +++ b/lib/fseeko.c @@ -1,5 +1,5 @@ /* An fseeko() function that, together with fflush(), is POSIX compliant. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fstat.c b/lib/fstat.c index 6a23500..205d5aa 100644 --- a/lib/fstat.c +++ b/lib/fstat.c @@ -1,5 +1,5 @@ /* fstat() replacement. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fstatat.c b/lib/fstatat.c index 372965e..470ef33 100644 --- a/lib/fstatat.c +++ b/lib/fstatat.c @@ -1,6 +1,6 @@ /* Work around an fstatat bug on Solaris 9. - Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/ftell.c b/lib/ftell.c index ce2bd54..21cab43 100644 --- a/lib/ftell.c +++ b/lib/ftell.c @@ -1,5 +1,5 @@ /* An ftell() function that works around platform bugs. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/ftello.c b/lib/ftello.c index 14184e5..64119aa 100644 --- a/lib/ftello.c +++ b/lib/ftello.c @@ -1,5 +1,5 @@ /* An ftello() function that works around platform bugs. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/futimens.c b/lib/futimens.c index 5bb3049..defae93 100644 --- a/lib/futimens.c +++ b/lib/futimens.c @@ -1,5 +1,5 @@ /* Set the access and modification time of an open fd. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c index 3436c07..37092e2 100644 --- a/lib/gai_strerror.c +++ b/lib/gai_strerror.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2023 Free Software +/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Philip Blundell <pjb27@cam.ac.uk>, 1997. diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c index 6586ee5..bf5d61f 100644 --- a/lib/getaddrinfo.c +++ b/lib/getaddrinfo.c @@ -1,5 +1,5 @@ /* Get address information (partial implementation). - Copyright (C) 1997, 2001-2002, 2004-2023 Free Software Foundation, Inc. + Copyright (C) 1997, 2001-2002, 2004-2024 Free Software Foundation, Inc. Contributed by Simon Josefsson <simon@josefsson.org>. This file is free software: you can redistribute it and/or modify diff --git a/lib/getcwd-lgpl.c b/lib/getcwd-lgpl.c index 8a5bde9..67ed287 100644 --- a/lib/getcwd-lgpl.c +++ b/lib/getcwd-lgpl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2023 Free Software Foundation, Inc. +/* Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is part of gnulib. This file is free software: you can redistribute it and/or modify @@ -45,12 +45,12 @@ typedef int dummy; char * rpl_getcwd (char *buf, size_t size) { - char *ptr; char *result; /* Handle single size operations. */ if (buf) { + /* Check SIZE argument. */ if (!size) { errno = EINVAL; @@ -79,7 +79,7 @@ rpl_getcwd (char *buf, size_t size) { char tmp[4032]; size = sizeof tmp; - ptr = getcwd (tmp, size); + char *ptr = getcwd (tmp, size); if (ptr) { result = strdup (ptr); @@ -95,7 +95,7 @@ rpl_getcwd (char *buf, size_t size) do { size <<= 1; - ptr = realloc (buf, size); + char *ptr = realloc (buf, size); if (ptr == NULL) { free (buf); diff --git a/lib/getcwd.c b/lib/getcwd.c index 0530630..214950a 100644 --- a/lib/getcwd.c +++ b/lib/getcwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2023 Free Software Foundation, Inc. +/* Copyright (C) 1991-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify @@ -114,13 +114,21 @@ FIXME - if the kernel ever adds support for multi-thread safety for avoiding standard fds, then we should use opendir_safer and openat_safer. */ -#ifdef GNULIB_defined_opendir +#ifdef GNULIB_defined_DIR +# undef DIR # undef opendir -#endif -#ifdef GNULIB_defined_closedir # undef closedir +# undef readdir +# undef rewinddir +#else +# ifdef GNULIB_defined_opendir +# undef opendir +# endif +# ifdef GNULIB_defined_closedir +# undef closedir +# endif #endif - + #if defined _WIN32 && !defined __CYGWIN__ # if HAVE_MSVC_INVALID_PARAMETER_HANDLER static char * diff --git a/lib/getdelim.c b/lib/getdelim.c index 79ec3dd..58063b1 100644 --- a/lib/getdelim.c +++ b/lib/getdelim.c @@ -1,5 +1,5 @@ /* getdelim.c --- Implementation of replacement getdelim function. - Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2023 Free Software + Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify @@ -30,10 +30,6 @@ #include <stdlib.h> #include <errno.h> -#ifndef SSIZE_MAX -# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) -#endif - #if USE_UNLOCKED_IO # include "unlocked-io.h" # define getc_maybe_unlocked(fp) getc(fp) diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c index ac2d175..762c100 100644 --- a/lib/getdtablesize.c +++ b/lib/getdtablesize.c @@ -1,5 +1,5 @@ /* getdtablesize() function: Return maximum possible file descriptor value + 1. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify diff --git a/lib/getgroups.c b/lib/getgroups.c index 93829d3..9f4908e 100644 --- a/lib/getgroups.c +++ b/lib/getgroups.c @@ -1,6 +1,6 @@ /* provide consistent interface to getgroups for systems that don't allow N==0 - Copyright (C) 1996, 1999, 2003, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 1996, 1999, 2003, 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/getline.c b/lib/getline.c index 85f16ab..2d03b64 100644 --- a/lib/getline.c +++ b/lib/getline.c @@ -1,5 +1,5 @@ /* getline.c --- Implementation of replacement getline function. - Copyright (C) 2005-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/getopt-cdefs.in.h b/lib/getopt-cdefs.in.h index e76c78c..a1d304d 100644 --- a/lib/getopt-cdefs.in.h +++ b/lib/getopt-cdefs.in.h @@ -1,5 +1,5 @@ /* getopt-on-non-glibc compatibility macros. - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2024 Free Software Foundation, Inc. This file is part of gnulib. Unlike most of the getopt implementation, it is NOT shared with the GNU C Library. @@ -57,7 +57,11 @@ #ifndef __THROW # if defined __cplusplus && (__GNUC_PREREQ (2,8) || __clang_major__ >= 4) -# define __THROW throw () +# if __cplusplus >= 201103L +# define __THROW noexcept (true) +# else +# define __THROW throw () +# endif # else # define __THROW # endif diff --git a/lib/getopt-core.h b/lib/getopt-core.h index c5dd493..12d09a2 100644 --- a/lib/getopt-core.h +++ b/lib/getopt-core.h @@ -1,5 +1,5 @@ /* Declarations for getopt (basic, portable features only). - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2024 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. diff --git a/lib/getopt-ext.h b/lib/getopt-ext.h index d37c293..e4b499d 100644 --- a/lib/getopt-ext.h +++ b/lib/getopt-ext.h @@ -1,5 +1,5 @@ /* Declarations for getopt (GNU extensions). - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2024 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h index 095e393..78b7816 100644 --- a/lib/getopt-pfx-core.h +++ b/lib/getopt-pfx-core.h @@ -1,5 +1,5 @@ /* getopt (basic, portable features) gnulib wrapper header. - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2024 Free Software Foundation, Inc. This file is part of gnulib. Unlike most of the getopt implementation, it is NOT shared with the GNU C Library. diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h index 8578d72..f001c11 100644 --- a/lib/getopt-pfx-ext.h +++ b/lib/getopt-pfx-ext.h @@ -1,5 +1,5 @@ /* getopt (GNU extensions) gnulib wrapper header. - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2024 Free Software Foundation, Inc. This file is part of gnulib. Unlike most of the getopt implementation, it is NOT shared with the GNU C Library. diff --git a/lib/getopt.c b/lib/getopt.c index 1e2441c..f66f119 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -1,5 +1,5 @@ /* Getopt for GNU. - Copyright (C) 1987-2023 Free Software Foundation, Inc. + Copyright (C) 1987-2024 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. @@ -21,7 +21,7 @@ # include <config.h> #endif -#include "getopt.h" +#include <getopt.h> #include <stdio.h> #include <stdlib.h> @@ -223,8 +223,9 @@ process_long_option (int argc, char **argv, const char *optstring, { /* Didn't find an exact match, so look for abbreviations. */ unsigned char *ambig_set = NULL; - int ambig_malloced = 0; - int ambig_fallback = 0; + /* Use simpler fallback diagnostic if ambig_set == &ambig_fallback. */ + unsigned char ambig_fallback; + void *ambig_malloced = NULL; int indfound = -1; for (p = longopts, option_index = 0; p->name; p++, option_index++) @@ -242,39 +243,42 @@ process_long_option (int argc, char **argv, const char *optstring, || pfound->val != p->val) { /* Second or later nonexact match found. */ - if (!ambig_fallback) + if (ambig_set != &ambig_fallback) { if (!print_errors) /* Don't waste effort tracking the ambig set if we're not going to print it anyway. */ - ambig_fallback = 1; + ambig_set = &ambig_fallback; else if (!ambig_set) { if (__libc_use_alloca (n_options)) ambig_set = alloca (n_options); - else if ((ambig_set = malloc (n_options)) == NULL) - /* Fall back to simpler error message. */ - ambig_fallback = 1; else - ambig_malloced = 1; + { + ambig_malloced = malloc (n_options); + /* Fall back to simpler diagnostic if + memory allocation fails. */ + ambig_set = (ambig_malloced ? ambig_malloced + : &ambig_fallback); + } - if (ambig_set) + if (ambig_set != &ambig_fallback) { memset (ambig_set, 0, n_options); ambig_set[indfound] = 1; } } - if (ambig_set) + if (ambig_set && ambig_set != &ambig_fallback) ambig_set[option_index] = 1; } } } - if (ambig_set || ambig_fallback) + if (ambig_set) { if (print_errors) { - if (ambig_fallback) + if (ambig_set == &ambig_fallback) fprintf (stderr, _("%s: option '%s%s' is ambiguous\n"), argv[0], prefix, d->__nextchar); else @@ -296,8 +300,7 @@ process_long_option (int argc, char **argv, const char *optstring, funlockfile (stderr); } } - if (ambig_malloced) - free (ambig_set); + free (ambig_malloced); d->__nextchar += strlen (d->__nextchar); d->optind++; d->optopt = 0; diff --git a/lib/getopt.in.h b/lib/getopt.in.h index 0867d36..c2411a7 100644 --- a/lib/getopt.in.h +++ b/lib/getopt.in.h @@ -1,5 +1,5 @@ /* Declarations for getopt. - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2024 Free Software Foundation, Inc. This file is part of gnulib. Unlike most of the getopt implementation, it is NOT shared with the GNU C Library, which supplies a different version of diff --git a/lib/getopt1.c b/lib/getopt1.c index 49323aa..c42d29f 100644 --- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -1,5 +1,5 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987-2023 Free Software Foundation, Inc. + Copyright (C) 1987-2024 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. @@ -21,7 +21,7 @@ # include <config.h> #endif -#include "getopt.h" +#include <getopt.h> #include "getopt_int.h" int diff --git a/lib/getopt_int.h b/lib/getopt_int.h index 4d9e24b..c00c0b6 100644 --- a/lib/getopt_int.h +++ b/lib/getopt_int.h @@ -1,5 +1,5 @@ /* Internal declarations for getopt. - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2024 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. diff --git a/lib/getpass.c b/lib/getpass.c index 576ab0a..5104e89 100644 --- a/lib/getpass.c +++ b/lib/getpass.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2001, 2003-2007, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 1992-2001, 2003-2007, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/getpass.h b/lib/getpass.h index f0ddef7..b897e3b 100644 --- a/lib/getpass.h +++ b/lib/getpass.h @@ -1,6 +1,6 @@ /* Read a password from /dec/tty. - Copyright (C) 2004-2023 Free Software Foundation, Inc. + Copyright (C) 2004-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/getpeername.c b/lib/getpeername.c index 70ffc0b..f4da618 100644 --- a/lib/getpeername.c +++ b/lib/getpeername.c @@ -1,6 +1,6 @@ /* getpeername.c --- wrappers for Windows getpeername function - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/getprogname.c b/lib/getprogname.c index 279d79f..392a9a2 100644 --- a/lib/getprogname.c +++ b/lib/getprogname.c @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2016-2023 Free Software Foundation, Inc. + Copyright (C) 2016-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -212,7 +212,19 @@ getprogname (void) { char *s = strdup (last_component (buf.ps_pathptr)); if (s) - p = s; + { +# if defined __XPLINK__ && __CHARSET_LIB == 1 + /* The compiler option -qascii is in use. + https://makingdeveloperslivesbetter.wordpress.com/2022/01/07/is-z-os-ascii-or-ebcdic-yes/ + https://www.ibm.com/docs/en/zos/2.5.0?topic=features-macros-related-compiler-option-settings + So, convert the result from EBCDIC to ASCII. + https://www.ibm.com/docs/en/zos/2.5.0?topic=functions-e2a-s-convert-string-from-ebcdic-ascii */ + if (__e2a_s (s) == (size_t)-1) + free (s); + else +# endif + p = s; + } break; } } diff --git a/lib/getprogname.h b/lib/getprogname.h index 13314f2..bee1c1a 100644 --- a/lib/getprogname.h +++ b/lib/getprogname.h @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2016-2023 Free Software Foundation, Inc. + Copyright (C) 2016-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/lib/getrandom.c b/lib/getrandom.c index 19bb342..44283cf 100644 --- a/lib/getrandom.c +++ b/lib/getrandom.c @@ -1,6 +1,6 @@ /* Obtain a series of random bytes. - Copyright 2020-2023 Free Software Foundation, Inc. + Copyright 2020-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/getsockname.c b/lib/getsockname.c index 263b912..1a5e975 100644 --- a/lib/getsockname.c +++ b/lib/getsockname.c @@ -1,6 +1,6 @@ /* getsockname.c --- wrappers for Windows getsockname function - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/gettext.h b/lib/gettext.h index d0462c4..39d5ae4 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU <libintl.h>. - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2023 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/gettime.c b/lib/gettime.c index f86cc4e..38d3685 100644 --- a/lib/gettime.c +++ b/lib/gettime.c @@ -1,6 +1,6 @@ /* gettime -- get the system clock - Copyright (C) 2002, 2004-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2004-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -35,8 +35,8 @@ gettime (struct timespec *ts) #else struct timeval tv; gettimeofday (&tv, NULL); - ts->tv_sec = tv.tv_sec; - ts->tv_nsec = tv.tv_usec * 1000; + *ts = (struct timespec) { .tv_sec = tv.tv_sec, + .tv_nsec = tv.tv_usec * 1000 }; #endif } diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c index d896ec1..8dd26f7 100644 --- a/lib/gettimeofday.c +++ b/lib/gettimeofday.c @@ -1,6 +1,6 @@ /* Provide gettimeofday for systems that don't have it or for which it's broken. - Copyright (C) 2001-2003, 2005-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -113,8 +113,10 @@ gettimeofday (struct timeval *restrict tv, void *restrict tz) ULONGLONG since_1970 = since_1601 - (ULONGLONG) 134774 * (ULONGLONG) 86400 * (ULONGLONG) 10000000; ULONGLONG microseconds_since_1970 = since_1970 / (ULONGLONG) 10; - tv->tv_sec = microseconds_since_1970 / (ULONGLONG) 1000000; - tv->tv_usec = microseconds_since_1970 % (ULONGLONG) 1000000; + *tv = (struct timeval) { + .tv_sec = microseconds_since_1970 / (ULONGLONG) 1000000, + .tv_usec = microseconds_since_1970 % (ULONGLONG) 1000000 + }; return 0; @@ -127,10 +129,7 @@ gettimeofday (struct timeval *restrict tv, void *restrict tz) struct timeval otv; int result = gettimeofday (&otv, (struct timezone *) tz); if (result == 0) - { - tv->tv_sec = otv.tv_sec; - tv->tv_usec = otv.tv_usec; - } + *tv = otv; # else int result = gettimeofday (tv, (struct timezone *) tz); # endif @@ -143,8 +142,7 @@ gettimeofday (struct timeval *restrict tv, void *restrict tz) # error "Only 1-second nominal clock resolution found. Is that intended?" \ "If so, compile with the -DOK_TO_USE_1S_CLOCK option." # endif - tv->tv_sec = time (NULL); - tv->tv_usec = 0; + *tv = (struct timeval) { .tv_sec = time (NULL), .tv_usec = 0 }; return 0; diff --git a/lib/gl_openssl.h b/lib/gl_openssl.h index 159a837..0686473 100644 --- a/lib/gl_openssl.h +++ b/lib/gl_openssl.h @@ -1,6 +1,6 @@ /* Wrap openssl crypto hash routines in gnulib interface. -*- coding: utf-8 -*- - Copyright (C) 2013-2023 Free Software Foundation, Inc. + Copyright (C) 2013-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/glthread/lock.c b/lib/glthread/lock.c index 82fb755..6661ad6 100644 --- a/lib/glthread/lock.c +++ b/lib/glthread/lock.c @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/glthread/lock.h b/lib/glthread/lock.h index 805cd1c..2d5cb32 100644 --- a/lib/glthread/lock.h +++ b/lib/glthread/lock.h @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/glthread/threadlib.c b/lib/glthread/threadlib.c index 5ecf827..7a77676 100644 --- a/lib/glthread/threadlib.c +++ b/lib/glthread/threadlib.c @@ -1,5 +1,5 @@ /* Multithreading primitives. - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/gnulib.mk b/lib/gnulib.mk index 6dd7226..141937c 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk @@ -1,6 +1,6 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! ## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2023 Free Software Foundation, Inc. +# Copyright (C) 2002-2024 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -52,6 +52,7 @@ # crypto/sha256 \ # crypto/sha512 \ # dirname \ +# do-release-commit-and-tag \ # fcntl \ # flock \ # fnmatch-gnu \ @@ -347,6 +348,12 @@ libgnu_a_SOURCES += bitrotate.h bitrotate.c ## end gnulib module bitrotate +## begin gnulib module btoc32 + +libgnu_a_SOURCES += btoc32.c + +## end gnulib module btoc32 + ## begin gnulib module btowc if GL_COND_OBJ_BTOWC @@ -402,6 +409,128 @@ EXTRA_DIST += str-two-way.h ## end gnulib module c-strcasestr +## begin gnulib module c32_apply_type_test + +libgnu_a_SOURCES += c32_apply_type_test.c + +## end gnulib module c32_apply_type_test + +## begin gnulib module c32_get_type_test + +libgnu_a_SOURCES += c32_get_type_test.c + +## end gnulib module c32_get_type_test + +## begin gnulib module c32isalnum + +libgnu_a_SOURCES += c32isalnum.c + +EXTRA_DIST += c32is-impl.h + +## end gnulib module c32isalnum + +## begin gnulib module c32isalpha + +libgnu_a_SOURCES += c32isalpha.c + +EXTRA_DIST += c32is-impl.h + +## end gnulib module c32isalpha + +## begin gnulib module c32isblank + +libgnu_a_SOURCES += c32isblank.c + +EXTRA_DIST += c32is-impl.h + +## end gnulib module c32isblank + +## begin gnulib module c32iscntrl + +libgnu_a_SOURCES += c32iscntrl.c + +EXTRA_DIST += c32is-impl.h + +## end gnulib module c32iscntrl + +## begin gnulib module c32isdigit + +libgnu_a_SOURCES += c32isdigit.c + +EXTRA_DIST += c32is-impl.h + +## end gnulib module c32isdigit + +## begin gnulib module c32isgraph + +libgnu_a_SOURCES += c32isgraph.c + +EXTRA_DIST += c32is-impl.h + +## end gnulib module c32isgraph + +## begin gnulib module c32islower + +libgnu_a_SOURCES += c32islower.c + +EXTRA_DIST += c32is-impl.h + +## end gnulib module c32islower + +## begin gnulib module c32isprint + +libgnu_a_SOURCES += c32isprint.c + +EXTRA_DIST += c32is-impl.h + +## end gnulib module c32isprint + +## begin gnulib module c32ispunct + +libgnu_a_SOURCES += c32ispunct.c + +EXTRA_DIST += c32is-impl.h + +## end gnulib module c32ispunct + +## begin gnulib module c32isspace + +libgnu_a_SOURCES += c32isspace.c + +EXTRA_DIST += c32is-impl.h + +## end gnulib module c32isspace + +## begin gnulib module c32isupper + +libgnu_a_SOURCES += c32isupper.c + +EXTRA_DIST += c32is-impl.h + +## end gnulib module c32isupper + +## begin gnulib module c32isxdigit + +libgnu_a_SOURCES += c32isxdigit.c + +EXTRA_DIST += c32is-impl.h + +## end gnulib module c32isxdigit + +## begin gnulib module c32tolower + +libgnu_a_SOURCES += c32tolower.c + +EXTRA_DIST += c32to-impl.h + +## end gnulib module c32tolower + +## begin gnulib module c32width + +libgnu_a_SOURCES += c32width.c + +## end gnulib module c32width + ## begin gnulib module calloc-gnu @@ -684,6 +813,13 @@ EXTRA_DIST += dirname.h ## end gnulib module dirname-lgpl +## begin gnulib module do-release-commit-and-tag + + +EXTRA_DIST += $(top_srcdir)/build-aux/do-release-commit-and-tag + +## end gnulib module do-release-commit-and-tag + ## begin gnulib module dup if GL_COND_OBJ_DUP @@ -749,17 +885,14 @@ endif ## begin gnulib module error-h -BUILT_SOURCES += $(ERROR_H) +BUILT_SOURCES += error.h -# We need the following in order to create <error.h> when the system -# doesn't have one that works. -if GL_GENERATE_ERROR_H +# We need the following in order to override <error.h>. error.h: error.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|GL|g' \ -e 's|@''HAVE_ERROR_H''@|$(HAVE_ERROR_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_ERROR_H''@|$(NEXT_ERROR_H)|g' \ -e 's|@''HAVE_ERROR''@|$(HAVE_ERROR)|g' \ -e 's|@''HAVE_ERROR_AT_LINE''@|$(HAVE_ERROR_AT_LINE)|g' \ @@ -768,10 +901,6 @@ error.h: error.in.h $(top_builddir)/config.status $(CXXDEFS_H) -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ $(srcdir)/error.in.h > $@-t $(AM_V_at)mv $@-t $@ -else -error.h: $(top_builddir)/config.status - rm -f $@ -endif MOSTLYCLEANFILES += error.h error.h-t EXTRA_DIST += error.in.h @@ -1134,6 +1263,7 @@ SED_HEADER_STDOUT = sed -e 1h -e '1$(SED_HEADER_NOEDIT)' -e 1G SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) -n -e 'w $@-t' # Use $(gl_V_at) instead of $(AM_V_GEN) or $(AM_V_at) on a line that +# is its recipe's first line if and only if @NMD@ lines are absent. gl_V_at = $(AM_V_GEN) ## end gnulib module gen-header @@ -1601,6 +1731,16 @@ endif ## end gnulib module iswblank +## begin gnulib module iswctype + +if GL_COND_OBJ_ISWCTYPE +libgnu_a_SOURCES += iswctype.c +endif + +EXTRA_DIST += iswctype-impl.h + +## end gnulib module iswctype + ## begin gnulib module iswdigit if GL_COND_OBJ_ISWDIGIT @@ -1609,6 +1749,14 @@ endif ## end gnulib module iswdigit +## begin gnulib module iswpunct + +if GL_COND_OBJ_ISWPUNCT +libgnu_a_SOURCES += iswpunct.c +endif + +## end gnulib module iswpunct + ## begin gnulib module iswxdigit if GL_COND_OBJ_ISWXDIGIT @@ -1732,7 +1880,7 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_SETLOCALE''@/$(GL_GNULIB_SETLOCALE)/g' \ -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GL_GNULIB_SETLOCALE_NULL)/g' \ -e 's/@''GNULIB_DUPLOCALE''@/$(GL_GNULIB_DUPLOCALE)/g' \ - -e 's/@''GNULIB_LOCALENAME''@/$(GL_GNULIB_LOCALENAME)/g' \ + -e 's/@''GNULIB_LOCALENAME_UNSAFE''@/$(GL_GNULIB_LOCALENAME_UNSAFE)/g' \ -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \ -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \ -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \ @@ -1831,6 +1979,18 @@ libgnu_a_SOURCES += mbiter.h mbiter.c ## end gnulib module mbiter +## begin gnulib module mbrtoc32 + +if GL_COND_OBJ_MBRTOC32 +libgnu_a_SOURCES += mbrtoc32.c +endif + +EXTRA_DIST += lc-charset-dispatch.c lc-charset-dispatch.h mbrtowc-impl-utf8.h mbrtowc-impl.h mbtowc-lock.c mbtowc-lock.h windows-initguard.h + +EXTRA_libgnu_a_SOURCES += lc-charset-dispatch.c mbtowc-lock.c + +## end gnulib module mbrtoc32 + ## begin gnulib module mbrtowc if GL_COND_OBJ_MBRTOWC @@ -1851,6 +2011,16 @@ endif ## end gnulib module mbsinit +## begin gnulib module mbsrtoc32s + +libgnu_a_SOURCES += mbsrtoc32s.c + +EXTRA_DIST += mbsrtoc32s-state.c mbsrtowcs-impl.h + +EXTRA_libgnu_a_SOURCES += mbsrtoc32s-state.c + +## end gnulib module mbsrtoc32s + ## begin gnulib module mbsrtowcs if GL_COND_OBJ_MBSRTOWCS @@ -1863,6 +2033,12 @@ EXTRA_libgnu_a_SOURCES += mbsrtowcs-state.c ## end gnulib module mbsrtowcs +## begin gnulib module mbszero + +libgnu_a_SOURCES += mbszero.c + +## end gnulib module mbszero + ## begin gnulib module mbtowc if GL_COND_OBJ_MBTOWC @@ -2383,8 +2559,7 @@ endif ## begin gnulib module same-inode - -EXTRA_DIST += same-inode.h +libgnu_a_SOURCES += same-inode.h same-inode.c ## end gnulib module same-inode @@ -2462,6 +2637,14 @@ EXTRA_DIST += setlocale_null.h windows-initguard.h ## end gnulib module setlocale-null +## begin gnulib module setlocale-null-unlocked + +libgnu_a_SOURCES += setlocale_null-unlocked.c + +EXTRA_DIST += setlocale_null.h + +## end gnulib module setlocale-null-unlocked + ## begin gnulib module setsockopt if GL_COND_OBJ_SETSOCKOPT @@ -2882,8 +3065,9 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_MDA_GETW''@/$(GL_GNULIB_MDA_GETW)/g' \ -e 's/@''GNULIB_MDA_PUTW''@/$(GL_GNULIB_MDA_PUTW)/g' \ -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GL_GNULIB_MDA_TEMPNAM)/g' \ - < $(srcdir)/stdio.in.h | \ - sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ + < $(srcdir)/stdio.in.h > $@-t1 + $(AM_V_at)sed \ + -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ @@ -2902,6 +3086,8 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \ -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \ -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \ + < $@-t1 > $@-t2 + $(AM_V_at)sed \ -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \ -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \ @@ -2939,9 +3125,10 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += stdio.h stdio.h-t + < $@-t2 > $@-t3 + $(AM_V_at)rm -f $@-t1 $@-t2 + $(AM_V_at)mv $@-t3 $@ +MOSTLYCLEANFILES += stdio.h stdio.h-t1 stdio.h-t2 stdio.h-t3 if GL_COND_OBJ_STDIO_READ libgnu_a_SOURCES += stdio-read.c @@ -2994,6 +3181,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_PTSNAME_R''@/$(GL_GNULIB_PTSNAME_R)/g' \ -e 's/@''GNULIB_PUTENV''@/$(GL_GNULIB_PUTENV)/g' \ -e 's/@''GNULIB_QSORT_R''@/$(GL_GNULIB_QSORT_R)/g' \ + -e 's/@''GNULIB_RAND''@/$(GL_GNULIB_RAND)/g' \ -e 's/@''GNULIB_RANDOM''@/$(GL_GNULIB_RANDOM)/g' \ -e 's/@''GNULIB_RANDOM_R''@/$(GL_GNULIB_RANDOM_R)/g' \ -e 's/@''GNULIB_REALLOC_GNU''@/$(GL_GNULIB_REALLOC_GNU)/g' \ @@ -3004,6 +3192,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \ -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \ -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \ + -e 's/@''GNULIB_STRTOF''@/$(GL_GNULIB_STRTOF)/g' \ -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \ -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \ -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \ @@ -3018,8 +3207,9 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_MDA_GCVT''@/$(GL_GNULIB_MDA_GCVT)/g' \ -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_GNULIB_MDA_MKTEMP)/g' \ -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_GNULIB_MDA_PUTENV)/g' \ - < $(srcdir)/stdlib.in.h | \ - sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ + < $(srcdir)/stdlib.in.h > $@-t1 + $(AM_V_at)sed \ + -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \ -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ @@ -3055,6 +3245,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_SETSTATE''@|$(HAVE_SETSTATE)|g' \ -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ + -e 's|@''HAVE_STRTOF''@|$(HAVE_STRTOF)|g' \ -e 's|@''HAVE_STRTOL''@|$(HAVE_STRTOL)|g' \ -e 's|@''HAVE_STRTOLD''@|$(HAVE_STRTOLD)|g' \ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ @@ -3064,6 +3255,8 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ + < $@-t1 > $@-t2 + $(AM_V_at)sed \ -e 's|@''REPLACE__EXIT''@|$(REPLACE__EXIT)|g' \ -e 's|@''REPLACE_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \ -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|$(REPLACE_CALLOC_FOR_CALLOC_GNU)|g' \ @@ -3088,6 +3281,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \ + -e 's|@''REPLACE_RAND''@|$(REPLACE_RAND)|g' \ -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \ -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ -e 's|@''REPLACE_REALLOC_FOR_REALLOC_GNU''@|$(REPLACE_REALLOC_FOR_REALLOC_GNU)|g' \ @@ -3097,6 +3291,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \ -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ + -e 's|@''REPLACE_STRTOF''@|$(REPLACE_STRTOF)|g' \ -e 's|@''REPLACE_STRTOL''@|$(REPLACE_STRTOL)|g' \ -e 's|@''REPLACE_STRTOLD''@|$(REPLACE_STRTOLD)|g' \ -e 's|@''REPLACE_STRTOLL''@|$(REPLACE_STRTOLL)|g' \ @@ -3108,9 +3303,10 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e '/definition of _Noreturn/r $(_NORETURN_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += stdlib.h stdlib.h-t + < $@-t2 > $@-t3 + $(AM_V_at)rm -f $@-t1 $@-t2 + $(AM_V_at)mv $@-t3 $@ +MOSTLYCLEANFILES += stdlib.h stdlib.h-t1 stdlib.h-t2 stdlib.h-t3 EXTRA_DIST += stdlib.in.h @@ -3245,8 +3441,9 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_GNULIB_MDA_MEMCCPY)/g' \ -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_GNULIB_MDA_STRDUP)/g' \ -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ - < $(srcdir)/string.in.h | \ - sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ + < $(srcdir)/string.in.h > $@-t1 + $(AM_V_at)sed \ + -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ @@ -3275,6 +3472,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \ + -e 's|@''REPLACE_MEMSET_EXPLICIT''@|$(REPLACE_MEMSET_EXPLICIT)|g' \ -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \ -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ @@ -3290,13 +3488,15 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \ -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ + -e 's|@''REPLACE_STRVERSCMP''@|$(REPLACE_STRVERSCMP)|g' \ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += string.h string.h-t + < $@-t1 > $@-t2 + $(AM_V_at)rm -f $@-t1 + $(AM_V_at)mv $@-t2 $@ +MOSTLYCLEANFILES += string.h string.h-t1 string.h-t2 EXTRA_DIST += string.in.h @@ -3818,6 +4018,7 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''REPLACE_TIME''@|$(REPLACE_TIME)|g' \ -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ -e 's|@''REPLACE_TIMESPEC_GET''@|$(REPLACE_TIMESPEC_GET)|g' \ + -e 's|@''REPLACE_TIMESPEC_GETRES''@|$(REPLACE_TIMESPEC_GETRES)|g' \ -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ @@ -3875,6 +4076,86 @@ EXTRA_DIST += u64.h ## end gnulib module u64 +## begin gnulib module uchar + +BUILT_SOURCES += uchar.h + +uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's/@''HAVE_UCHAR_H''@/$(HAVE_UCHAR_H)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_UCHAR_H''@|$(NEXT_UCHAR_H)|g' \ + -e 's|@''CXX_HAS_CHAR8_TYPE''@|$(CXX_HAS_CHAR8_TYPE)|g' \ + -e 's|@''CXX_HAS_UCHAR_TYPES''@|$(CXX_HAS_UCHAR_TYPES)|g' \ + -e 's|@''SMALL_WCHAR_T''@|$(SMALL_WCHAR_T)|g' \ + -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR8_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR8_T)|g' \ + -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR16_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR16_T)|g' \ + -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR32_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR32_T)|g' \ + -e 's/@''GNULIB_BTOC32''@/$(GL_GNULIB_BTOC32)/g' \ + -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \ + -e 's/@''GNULIB_C32ISALNUM''@/$(GL_GNULIB_C32ISALNUM)/g' \ + -e 's/@''GNULIB_C32ISALPHA''@/$(GL_GNULIB_C32ISALPHA)/g' \ + -e 's/@''GNULIB_C32ISBLANK''@/$(GL_GNULIB_C32ISBLANK)/g' \ + -e 's/@''GNULIB_C32ISCNTRL''@/$(GL_GNULIB_C32ISCNTRL)/g' \ + -e 's/@''GNULIB_C32ISDIGIT''@/$(GL_GNULIB_C32ISDIGIT)/g' \ + -e 's/@''GNULIB_C32ISGRAPH''@/$(GL_GNULIB_C32ISGRAPH)/g' \ + -e 's/@''GNULIB_C32ISLOWER''@/$(GL_GNULIB_C32ISLOWER)/g' \ + -e 's/@''GNULIB_C32ISPRINT''@/$(GL_GNULIB_C32ISPRINT)/g' \ + -e 's/@''GNULIB_C32ISPUNCT''@/$(GL_GNULIB_C32ISPUNCT)/g' \ + -e 's/@''GNULIB_C32ISSPACE''@/$(GL_GNULIB_C32ISSPACE)/g' \ + -e 's/@''GNULIB_C32ISUPPER''@/$(GL_GNULIB_C32ISUPPER)/g' \ + -e 's/@''GNULIB_C32ISXDIGIT''@/$(GL_GNULIB_C32ISXDIGIT)/g' \ + -e 's/@''GNULIB_C32TOLOWER''@/$(GL_GNULIB_C32TOLOWER)/g' \ + -e 's/@''GNULIB_C32TOUPPER''@/$(GL_GNULIB_C32TOUPPER)/g' \ + -e 's/@''GNULIB_C32WIDTH''@/$(GL_GNULIB_C32WIDTH)/g' \ + -e 's/@''GNULIB_C32RTOMB''@/$(GL_GNULIB_C32RTOMB)/g' \ + -e 's/@''GNULIB_C32SNRTOMBS''@/$(GL_GNULIB_C32SNRTOMBS)/g' \ + -e 's/@''GNULIB_C32SRTOMBS''@/$(GL_GNULIB_C32SRTOMBS)/g' \ + -e 's/@''GNULIB_C32STOMBS''@/$(GL_GNULIB_C32STOMBS)/g' \ + -e 's/@''GNULIB_C32SWIDTH''@/$(GL_GNULIB_C32SWIDTH)/g' \ + -e 's/@''GNULIB_C32TOB''@/$(GL_GNULIB_C32TOB)/g' \ + -e 's/@''GNULIB_C32_APPLY_MAPPING''@/$(GL_GNULIB_C32_APPLY_MAPPING)/g' \ + -e 's/@''GNULIB_C32_APPLY_TYPE_TEST''@/$(GL_GNULIB_C32_APPLY_TYPE_TEST)/g' \ + -e 's/@''GNULIB_C32_GET_MAPPING''@/$(GL_GNULIB_C32_GET_MAPPING)/g' \ + -e 's/@''GNULIB_C32_GET_TYPE_TEST''@/$(GL_GNULIB_C32_GET_TYPE_TEST)/g' \ + -e 's/@''GNULIB_ISWCTYPE''@/$(GL_GNULIB_ISWCTYPE)/g' \ + -e 's/@''GNULIB_ISWDIGIT''@/$(GL_GNULIB_ISWDIGIT)/g' \ + -e 's/@''GNULIB_ISWXDIGIT''@/$(GL_GNULIB_ISWXDIGIT)/g' \ + -e 's/@''GNULIB_MBRTOC16''@/$(GL_GNULIB_MBRTOC16)/g' \ + -e 's/@''GNULIB_MBRTOC32''@/$(GL_GNULIB_MBRTOC32)/g' \ + -e 's/@''GNULIB_MBSNRTOC32S''@/$(GL_GNULIB_MBSNRTOC32S)/g' \ + -e 's/@''GNULIB_MBSNRTOWCS''@/$(GL_GNULIB_MBSNRTOWCS)/g' \ + -e 's/@''GNULIB_MBSRTOC32S''@/$(GL_GNULIB_MBSRTOC32S)/g' \ + -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \ + -e 's/@''GNULIB_MBSTOC32S''@/$(GL_GNULIB_MBSTOC32S)/g' \ + -e 's/@''GNULIB_TOWCTRANS''@/$(GL_GNULIB_TOWCTRANS)/g' \ + -e 's/@''GNULIB_WCSNRTOMBS''@/$(GL_GNULIB_WCSNRTOMBS)/g' \ + -e 's/@''GNULIB_WCSRTOMBS''@/$(GL_GNULIB_WCSRTOMBS)/g' \ + -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \ + -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \ + -e 's/@''GNULIB_WCTRANS''@/$(GL_GNULIB_WCTRANS)/g' \ + -e 's/@''GNULIB_WCTYPE''@/$(GL_GNULIB_WCTYPE)/g' \ + -e 's/@''GNULIB_WCWIDTH''@/$(GL_GNULIB_WCWIDTH)/g' \ + -e 's|@''HAVE_C32RTOMB''@|$(HAVE_C32RTOMB)|g' \ + -e 's|@''HAVE_MBRTOC16''@|$(HAVE_MBRTOC16)|g' \ + -e 's|@''HAVE_MBRTOC32''@|$(HAVE_MBRTOC32)|g' \ + -e 's|@''REPLACE_C32RTOMB''@|$(REPLACE_C32RTOMB)|g' \ + -e 's|@''REPLACE_MBRTOC16''@|$(REPLACE_MBRTOC16)|g' \ + -e 's|@''REPLACE_MBRTOC32''@|$(REPLACE_MBRTOC32)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + $(srcdir)/uchar.in.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += uchar.h uchar.h-t + +EXTRA_DIST += uchar.in.h + +## end gnulib module uchar + ## begin gnulib module unicase/base BUILT_SOURCES += $(LIBUNISTRING_UNICASE_H) @@ -4022,6 +4303,8 @@ unictype.h: unictype.in.h -e 's/@''GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE)/g' \ + < $(srcdir)/unictype.in.h > $@-t1 + $(AM_V_at)sed \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE)/g' \ @@ -4046,13 +4329,16 @@ unictype.h: unictype.in.h -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE)/g' \ - < $(srcdir)/unictype.in.h | \ - sed -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE)/g' \ + < $@-t1 > $@-t2 + $(AM_V_at)sed \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE)/g' \ @@ -4077,11 +4363,14 @@ unictype.h: unictype.in.h -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE)/g' \ + < $@-t2 > $@-t3 + $(AM_V_at)sed \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE)/g' \ @@ -4095,6 +4384,7 @@ unictype.h: unictype.in.h -e 's/@''GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE)/g' \ @@ -4116,9 +4406,10 @@ unictype.h: unictype.in.h -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE)/g' \ -e 's/@''GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE)/g' \ - > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += unictype.h unictype.h-t + < $@-t3 > $@-t4 + $(AM_V_at)rm -f $@-t1 $@-t2 $@-t3 + $(AM_V_at)mv $@-t4 $@ +MOSTLYCLEANFILES += unictype.h unictype.h-t1 unictype.h-t2 unictype.h-t3 unictype.h-t4 EXTRA_DIST += unictype.in.h @@ -4134,6 +4425,126 @@ EXTRA_DIST += unictype/combiningclass.h ## end gnulib module unictype/combining-class +## begin gnulib module unictype/ctype-alnum + +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM +libgnu_a_SOURCES += unictype/ctype_alnum.c +endif + +EXTRA_DIST += unictype/bitmap.h unictype/ctype_alnum.h + +## end gnulib module unictype/ctype-alnum + +## begin gnulib module unictype/ctype-alpha + +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA +libgnu_a_SOURCES += unictype/ctype_alpha.c +endif + +EXTRA_DIST += unictype/bitmap.h unictype/ctype_alpha.h + +## end gnulib module unictype/ctype-alpha + +## begin gnulib module unictype/ctype-blank + +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK +libgnu_a_SOURCES += unictype/ctype_blank.c +endif + +EXTRA_DIST += unictype/bitmap.h unictype/ctype_blank.h + +## end gnulib module unictype/ctype-blank + +## begin gnulib module unictype/ctype-cntrl + +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL +libgnu_a_SOURCES += unictype/ctype_cntrl.c +endif + +EXTRA_DIST += unictype/bitmap.h unictype/ctype_cntrl.h + +## end gnulib module unictype/ctype-cntrl + +## begin gnulib module unictype/ctype-digit + +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT +libgnu_a_SOURCES += unictype/ctype_digit.c +endif + +EXTRA_DIST += unictype/bitmap.h unictype/ctype_digit.h + +## end gnulib module unictype/ctype-digit + +## begin gnulib module unictype/ctype-graph + +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH +libgnu_a_SOURCES += unictype/ctype_graph.c +endif + +EXTRA_DIST += unictype/bitmap.h unictype/ctype_graph.h + +## end gnulib module unictype/ctype-graph + +## begin gnulib module unictype/ctype-lower + +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER +libgnu_a_SOURCES += unictype/ctype_lower.c +endif + +EXTRA_DIST += unictype/bitmap.h unictype/ctype_lower.h + +## end gnulib module unictype/ctype-lower + +## begin gnulib module unictype/ctype-print + +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT +libgnu_a_SOURCES += unictype/ctype_print.c +endif + +EXTRA_DIST += unictype/bitmap.h unictype/ctype_print.h + +## end gnulib module unictype/ctype-print + +## begin gnulib module unictype/ctype-punct + +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT +libgnu_a_SOURCES += unictype/ctype_punct.c +endif + +EXTRA_DIST += unictype/bitmap.h unictype/ctype_punct.h + +## end gnulib module unictype/ctype-punct + +## begin gnulib module unictype/ctype-space + +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE +libgnu_a_SOURCES += unictype/ctype_space.c +endif + +EXTRA_DIST += unictype/bitmap.h unictype/ctype_space.h + +## end gnulib module unictype/ctype-space + +## begin gnulib module unictype/ctype-upper + +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER +libgnu_a_SOURCES += unictype/ctype_upper.c +endif + +EXTRA_DIST += unictype/bitmap.h unictype/ctype_upper.h + +## end gnulib module unictype/ctype-upper + +## begin gnulib module unictype/ctype-xdigit + +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT +libgnu_a_SOURCES += unictype/ctype_xdigit.c +endif + +EXTRA_DIST += unictype/bitmap.h unictype/ctype_xdigit.h + +## end gnulib module unictype/ctype-xdigit + ## begin gnulib module unictype/property-soft-dotted if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SOFT_DOTTED @@ -4220,6 +4631,8 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_FDATASYNC''@/$(GL_GNULIB_FDATASYNC)/g' \ -e 's/@''GNULIB_FSYNC''@/$(GL_GNULIB_FSYNC)/g' \ -e 's/@''GNULIB_FTRUNCATE''@/$(GL_GNULIB_FTRUNCATE)/g' \ + < $(srcdir)/unistd.in.h > $@-t1 + $(AM_V_at)sed \ -e 's/@''GNULIB_GETCWD''@/$(GL_GNULIB_GETCWD)/g' \ -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_GNULIB_GETDOMAINNAME)/g' \ -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_GNULIB_GETDTABLESIZE)/g' \ @@ -4281,8 +4694,9 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_MDA_SWAB''@/$(GL_GNULIB_MDA_SWAB)/g' \ -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_GNULIB_MDA_UNLINK)/g' \ -e 's/@''GNULIB_MDA_WRITE''@/$(GL_GNULIB_MDA_WRITE)/g' \ - < $(srcdir)/unistd.in.h | \ - sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ + < $@-t1 > $@-t2 + $(AM_V_at)sed \ + -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ @@ -4329,8 +4743,9 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ - | \ - sed -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \ + < $@-t2 > $@-t3 + $(AM_V_at)sed \ + -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \ @@ -4345,6 +4760,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_EXECVP''@|$(REPLACE_EXECVP)|g' \ -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \ -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \ + -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -e 's|@''REPLACE_FDATASYNC''@|$(REPLACE_FDATASYNC)|g' \ -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ @@ -4385,9 +4801,10 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += unistd.h unistd.h-t + < $@-t3 > $@-t4 + $(AM_V_at)rm -f $@-t1 $@-t2 $@-t3 + $(AM_V_at)mv $@-t4 $@ +MOSTLYCLEANFILES += unistd.h unistd.h-t1 unistd.h-t2 unistd.h-t3 unistd.h-t4 EXTRA_DIST += unistd.in.h @@ -4414,6 +4831,54 @@ EXTRA_DIST += unistr.in.h ## end gnulib module unistr/base +## begin gnulib module unistr/u32-chr + +if LIBUNISTRING_COMPILE_UNISTR_U32_CHR +libgnu_a_SOURCES += unistr/u32-chr.c +endif + +## end gnulib module unistr/u32-chr + +## begin gnulib module unistr/u32-cpy + +if LIBUNISTRING_COMPILE_UNISTR_U32_CPY +libgnu_a_SOURCES += unistr/u32-cpy.c +endif + +EXTRA_DIST += unistr/u-cpy.h + +## end gnulib module unistr/u32-cpy + +## begin gnulib module unistr/u32-pcpy + +if LIBUNISTRING_COMPILE_UNISTR_U32_PCPY +libgnu_a_SOURCES += unistr/u32-pcpy.c +endif + +EXTRA_DIST += unistr/u-pcpy.h + +## end gnulib module unistr/u32-pcpy + +## begin gnulib module unistr/u32-strcat + +if LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT +libgnu_a_SOURCES += unistr/u32-strcat.c +endif + +EXTRA_DIST += unistr/u-strcat.h + +## end gnulib module unistr/u32-strcat + +## begin gnulib module unistr/u32-strlen + +if LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN +libgnu_a_SOURCES += unistr/u32-strlen.c +endif + +EXTRA_DIST += unistr/u-strlen.h + +## end gnulib module unistr/u32-strlen + ## begin gnulib module unistr/u8-cpy if LIBUNISTRING_COMPILE_UNISTR_U8_CPY @@ -4633,6 +5098,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \ -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \ -e 's/@''GNULIB_MBSINIT''@/$(GL_GNULIB_MBSINIT)/g' \ + -e 's/@''GNULIB_MBSZERO''@/$(GL_GNULIB_MBSZERO)/g' \ -e 's/@''GNULIB_MBRTOWC''@/$(GL_GNULIB_MBRTOWC)/g' \ -e 's/@''GNULIB_MBRLEN''@/$(GL_GNULIB_MBRLEN)/g' \ -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \ @@ -4671,10 +5137,12 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_WCSTOK''@/$(GL_GNULIB_WCSTOK)/g' \ -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \ -e 's/@''GNULIB_WCSFTIME''@/$(GL_GNULIB_WCSFTIME)/g' \ + -e 's/@''GNULIB_WGETCWD''@/$(GL_GNULIB_WGETCWD)/g' \ -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_GNULIB_MDA_WCSDUP)/g' \ -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ - < $(srcdir)/wchar.in.h | \ - sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ + < $(srcdir)/wchar.in.h > $@-t1 + $(AM_V_at)sed \ + -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \ @@ -4717,8 +5185,9 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ -e 's|@''HAVE_DECL_WCSDUP''@|$(HAVE_DECL_WCSDUP)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ - | \ - sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ + < $@-t1 > $@-t2 + $(AM_V_at)sed \ + -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ @@ -4742,9 +5211,10 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += wchar.h wchar.h-t + < $@-t2 > $@-t3 + $(AM_V_at)rm -f $@-t1 $@-t2 + $(AM_V_at)mv $@-t3 $@ +MOSTLYCLEANFILES += wchar.h wchar.h-t1 wchar.h-t2 wchar.h-t3 EXTRA_DIST += wchar.in.h @@ -4758,6 +5228,16 @@ endif ## end gnulib module wcrtomb +## begin gnulib module wctype + +if GL_COND_OBJ_WCTYPE +libgnu_a_SOURCES += wctype.c +endif + +EXTRA_DIST += wctype-impl.h + +## end gnulib module wctype + ## begin gnulib module wctype-h BUILT_SOURCES += wctype.h @@ -4765,7 +5245,7 @@ libgnu_a_SOURCES += wctype-h.c # We need the following in order to create <wctype.h> when the system # doesn't have one that works with the given compiler. -wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) +wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|GL|g' \ -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \ @@ -4777,6 +5257,7 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ -e 's/@''GNULIB_ISWBLANK''@/$(GL_GNULIB_ISWBLANK)/g' \ -e 's/@''GNULIB_ISWDIGIT''@/$(GL_GNULIB_ISWDIGIT)/g' \ + -e 's/@''GNULIB_ISWPUNCT''@/$(GL_GNULIB_ISWPUNCT)/g' \ -e 's/@''GNULIB_ISWXDIGIT''@/$(GL_GNULIB_ISWXDIGIT)/g' \ -e 's/@''GNULIB_WCTYPE''@/$(GL_GNULIB_WCTYPE)/g' \ -e 's/@''GNULIB_ISWCTYPE''@/$(GL_GNULIB_ISWCTYPE)/g' \ @@ -4789,10 +5270,14 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ -e 's/@''REPLACE_ISWDIGIT''@/$(REPLACE_ISWDIGIT)/g' \ + -e 's/@''REPLACE_ISWPUNCT''@/$(REPLACE_ISWPUNCT)/g' \ -e 's/@''REPLACE_ISWXDIGIT''@/$(REPLACE_ISWXDIGIT)/g' \ -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \ + -e 's/@''REPLACE_WCTRANS''@/$(REPLACE_WCTRANS)/g' \ + -e 's/@''REPLACE_WCTYPE''@/$(REPLACE_WCTYPE)/g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ $(srcdir)/wctype.in.h > $@-t $(AM_V_at)mv $@-t $@ diff --git a/lib/group-member.c b/lib/group-member.c index 96a09f9..43b4983 100644 --- a/lib/group-member.c +++ b/lib/group-member.c @@ -1,6 +1,6 @@ /* group-member.c -- determine whether group id is in calling user's group list - Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2023 Free Software + Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/hard-locale.c b/lib/hard-locale.c index c01fce5..653c580 100644 --- a/lib/hard-locale.c +++ b/lib/hard-locale.c @@ -1,6 +1,6 @@ /* hard-locale.c -- Determine whether a locale is hard. - Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2023 Free Software + Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/hard-locale.h b/lib/hard-locale.h index 5123d71..21c5c54 100644 --- a/lib/hard-locale.h +++ b/lib/hard-locale.h @@ -1,6 +1,6 @@ /* Determine whether a locale is hard. - Copyright (C) 1999, 2003-2004, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1999, 2003-2004, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/hash-pjw.c b/lib/hash-pjw.c index 74afac7..d8517ea 100644 --- a/lib/hash-pjw.c +++ b/lib/hash-pjw.c @@ -1,6 +1,6 @@ /* hash-pjw.c -- compute a hash value from a NUL-terminated string. - Copyright (C) 2001, 2003, 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/hash-pjw.h b/lib/hash-pjw.h index 69af02f..7c60d16 100644 --- a/lib/hash-pjw.h +++ b/lib/hash-pjw.h @@ -1,5 +1,5 @@ /* hash-pjw.h -- declaration for a simple hash function - Copyright (C) 2001, 2003, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/hash-triple-simple.c b/lib/hash-triple-simple.c index b0fd31d..ef1b4dc 100644 --- a/lib/hash-triple-simple.c +++ b/lib/hash-triple-simple.c @@ -1,5 +1,5 @@ /* Hash functions for file-related triples: name, device, inode. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -46,7 +46,7 @@ triple_compare_ino_str (void const *x, void const *y) { struct F_triple const *a = x; struct F_triple const *b = y; - return (SAME_INODE (*a, *b) && STREQ (a->name, b->name)) ? true : false; + return PSAME_INODE (a, b) && STREQ (a->name, b->name); } /* Free an F_triple. */ diff --git a/lib/hash-triple.h b/lib/hash-triple.h index f2cf38b..9135e73 100644 --- a/lib/hash-triple.h +++ b/lib/hash-triple.h @@ -1,5 +1,5 @@ /* Hash functions for file-related (name, device, inode) triples. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,6 +1,6 @@ /* hash - hashing table processing. - Copyright (C) 1998-2004, 2006-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1998-2004, 2006-2007, 2009-2024 Free Software Foundation, Inc. Written by Jim Meyering, 1992. @@ -29,6 +29,7 @@ #include "bitrotate.h" #include "xalloc-oversized.h" +#include <errno.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> @@ -499,13 +500,17 @@ compute_bucket_size (size_t candidate, const Hash_tuning *tuning) { float new_candidate = candidate / tuning->growth_threshold; if ((float) SIZE_MAX <= new_candidate) - return 0; + goto nomem; candidate = new_candidate; } candidate = next_prime (candidate); if (xalloc_oversized (candidate, sizeof (struct hash_entry *))) - return 0; + goto nomem; return candidate; + + nomem: + errno = ENOMEM; + return 0; } Hash_table * @@ -534,6 +539,7 @@ hash_initialize (size_t candidate, const Hash_tuning *tuning, if the user provides invalid tuning options, we silently revert to using the defaults, and ignore further request to change the tuning options. */ + errno = EINVAL; goto fail; } @@ -607,6 +613,7 @@ hash_free (Hash_table *table) struct hash_entry *bucket; struct hash_entry *cursor; struct hash_entry *next; + int err = errno; /* Call the user data_freer function. */ if (table->data_freer && table->n_entries) @@ -649,6 +656,8 @@ hash_free (Hash_table *table) /* Free the remainder of the hash table structure. */ free (table->bucket); free (table); + + errno = err; } /* Insertion and deletion. */ @@ -762,8 +771,8 @@ hash_find_entry (Hash_table *table, const void *entry, /* Internal helper, to move entries from SRC to DST. Both tables must share the same free entry list. If SAFE, only move overflow entries, saving bucket heads for later, so that no allocations will - occur. Return false if the free entry list is exhausted and an - allocation fails. */ + occur. Return false (setting errno) if the free entry list is + exhausted and an allocation fails. */ static bool transfer_entries (Hash_table *dst, Hash_table *src, bool safe) @@ -910,12 +919,14 @@ hash_rehash (Hash_table *table, size_t candidate) passes. Two passes give worse cache performance and takes longer, but at this point, we're already out of memory, so slow and safe is better than failure. */ + int err = errno; table->free_entry_list = new_table->free_entry_list; if (! (transfer_entries (table, new_table, true) && transfer_entries (table, new_table, false))) abort (); /* table->n_entries already holds its value. */ free (new_table->bucket); + errno = err; return false; } @@ -962,7 +973,10 @@ hash_insert_if_absent (Hash_table *table, void const *entry, * tuning->growth_threshold)); if ((float) SIZE_MAX <= candidate) - return -1; + { + errno = ENOMEM; + return -1; + } /* If the rehash fails, arrange to return NULL. */ if (!hash_rehash (table, candidate)) @@ -1,5 +1,5 @@ /* hash - hashing table processing. - Copyright (C) 1998-1999, 2001, 2003, 2009-2023 Free Software Foundation, + Copyright (C) 1998-1999, 2001, 2003, 2009-2024 Free Software Foundation, Inc. Written by Jim Meyering <meyering@ascend.com>, 1998. @@ -148,7 +148,7 @@ typedef void (*Hash_data_freer) (void *entry); /* Reclaim all storage associated with a hash table. If a data_freer function has been supplied by the user when the hash table was created, this function applies it to the data of each entry before freeing that - entry. */ + entry. This function preserves errno, like 'free'. */ extern void hash_free (Hash_table *table); /* Allocate and return a new hash table, or NULL upon failure. The initial @@ -183,7 +183,9 @@ extern void hash_free (Hash_table *table); You should specify this function only if you want these functions to free all of your 'data' data. This is typically the case when your data is simply an auxiliary struct that you have malloc'd to aggregate several - values. */ + values. + + Set errno on failure; otherwise errno is unspecified. */ _GL_ATTRIBUTE_NODISCARD extern Hash_table *hash_initialize (size_t candidate, const Hash_tuning *tuning, @@ -192,7 +194,7 @@ extern Hash_table *hash_initialize (size_t candidate, Hash_data_freer data_freer) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (hash_free, 1); -/* Same as hash_initialize, but invokes xalloc_die on memory exhaustion. */ +/* Like hash_initialize, but invokes xalloc_die instead of returning NULL. */ /* This function is defined by module 'xhash'. */ _GL_ATTRIBUTE_NODISCARD extern Hash_table *hash_xinitialize (size_t candidate, @@ -204,7 +206,7 @@ extern Hash_table *hash_xinitialize (size_t candidate, _GL_ATTRIBUTE_RETURNS_NONNULL; /* Make all buckets empty, placing any chained entries on the free list. - Apply the user-specified function data_freer (if any) to the datas of any + Apply the user-specified function data_freer (if any) to the data of any affected entries. */ extern void hash_clear (Hash_table *table); @@ -218,25 +220,26 @@ extern void hash_clear (Hash_table *table); the table may receive at least CANDIDATE different user entries, including those already in the table, before any other growth of the hash table size occurs. If TUNING->IS_N_BUCKETS is true, then CANDIDATE specifies the - exact number of buckets desired. Return true iff the rehash succeeded. */ + exact number of buckets desired. Return true iff the rehash succeeded, + false (setting errno) otherwise. */ _GL_ATTRIBUTE_NODISCARD extern bool hash_rehash (Hash_table *table, size_t candidate); /* If ENTRY matches an entry already in the hash table, return the pointer to the entry from the table. Otherwise, insert ENTRY and return ENTRY. - Return NULL if the storage required for insertion cannot be allocated. - This implementation does not support duplicate entries or insertion of - NULL. */ + Return NULL (setting errno) if the storage required for insertion + cannot be allocated. This implementation does not support + duplicate entries or insertion of NULL. */ _GL_ATTRIBUTE_NODISCARD extern void *hash_insert (Hash_table *table, const void *entry); -/* Same as hash_insert, but invokes xalloc_die on memory exhaustion. */ +/* Same as hash_insert, but invokes xalloc_die instead of returning NULL. */ /* This function is defined by module 'xhash'. */ extern void *hash_xinsert (Hash_table *table, const void *entry); /* Insert ENTRY into hash TABLE if there is not already a matching entry. - Return -1 upon memory allocation failure. + Return -1 (setting errno) upon memory allocation failure. Return 1 if insertion succeeded. Return 0 if there is already a matching entry in the table, and in that case, if MATCHED_ENT is non-NULL, set *MATCHED_ENT diff --git a/lib/ialloc.c b/lib/ialloc.c index cd44d8c..8564a15 100644 --- a/lib/ialloc.c +++ b/lib/ialloc.c @@ -1,6 +1,6 @@ /* malloc with idx_t rather than size_t - Copyright 2021-2023 Free Software Foundation, Inc. + Copyright 2021-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/ialloc.h b/lib/ialloc.h index 22f57a4..2aa94ae 100644 --- a/lib/ialloc.h +++ b/lib/ialloc.h @@ -1,6 +1,6 @@ /* ialloc.h -- malloc with idx_t rather than size_t - Copyright 2021-2023 Free Software Foundation, Inc. + Copyright 2021-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -29,6 +29,9 @@ #include <errno.h> #include <stdint.h> #include <stdlib.h> +#if defined __CHERI_PURE_CAPABILITY__ +# include <cheri.h> +#endif _GL_INLINE_HEADER_BEGIN #ifndef IALLOC_INLINE @@ -65,9 +68,19 @@ IALLOC_INLINE void * irealloc (void *p, idx_t s) { - /* Work around GNU realloc glitch by treating a zero size as if it - were 1, so that returning NULL is equivalent to failing. */ - return s <= SIZE_MAX ? realloc (p, s | !s) : _gl_alloc_nomem (); + if (s <= SIZE_MAX) + { + /* Work around GNU realloc glitch by treating a zero size as if it + were 1, so that returning NULL is equivalent to failing. */ + p = realloc (p, s | !s); +#if defined __CHERI_PURE_CAPABILITY__ + if (p != NULL) + p = cheri_bounds_set (p, s); +#endif + return p; + } + else + return _gl_alloc_nomem (); } /* icalloc (num, size) is like calloc (num, size). @@ -99,13 +112,23 @@ icalloc (idx_t n, idx_t s) IALLOC_INLINE void * ireallocarray (void *p, idx_t n, idx_t s) { - /* Work around GNU reallocarray glitch by treating a zero size as if - it were 1, so that returning NULL is equivalent to failing. */ - if (n == 0 || s == 0) - n = s = 1; - return (n <= SIZE_MAX && s <= SIZE_MAX - ? reallocarray (p, n, s) - : _gl_alloc_nomem ()); + if (n <= SIZE_MAX && s <= SIZE_MAX) + { + /* Work around GNU reallocarray glitch by treating a zero size as if + it were 1, so that returning NULL is equivalent to failing. */ + size_t nx = n; + size_t sx = s; + if (n == 0 || s == 0) + nx = sx = 1; + p = reallocarray (p, nx, sx); +#if defined __CHERI_PURE_CAPABILITY__ + if (p != NULL && (n == 0 || s == 0)) + p = cheri_bounds_set (p, 0); +#endif + return p; + } + else + return _gl_alloc_nomem (); } #ifdef __cplusplus diff --git a/lib/iconv.in.h b/lib/iconv.in.h index 56de44c..9e41e41 100644 --- a/lib/iconv.in.h +++ b/lib/iconv.in.h @@ -1,6 +1,6 @@ /* A GNU-like <iconv.h>. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -1,5 +1,5 @@ /* A type for indices and sizes. - Copyright (C) 2020-2023 Free Software Foundation, Inc. + Copyright (C) 2020-2024 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/lib/inet_ntop.c b/lib/inet_ntop.c index 9e2d412..0a4ba20 100644 --- a/lib/inet_ntop.c +++ b/lib/inet_ntop.c @@ -1,6 +1,6 @@ /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form - Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/intprops-internal.h b/lib/intprops-internal.h index 0467a9c..c8a87d2 100644 --- a/lib/intprops-internal.h +++ b/lib/intprops-internal.h @@ -1,6 +1,6 @@ /* intprops-internal.h -- properties of integer types not visible to users - Copyright (C) 2001-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published @@ -20,6 +20,11 @@ #include <limits.h> +/* Pacify GCC 13.2 in some calls to _GL_EXPR_SIGNED. */ +#if defined __GNUC__ && 4 < __GNUC__ + (3 <= __GNUC_MINOR__) +# pragma GCC diagnostic ignored "-Wtype-limits" +#endif + /* Return a value with the common real type of E and V and the value of V. Do not evaluate E. */ #define _GL_INT_CONVERT(e, v) ((1 ? 0 : (e)) + (v)) diff --git a/lib/intprops.h b/lib/intprops.h index 44b5e60..43734f3 100644 --- a/lib/intprops.h +++ b/lib/intprops.h @@ -1,6 +1,6 @@ /* intprops.h -- properties of integer types - Copyright (C) 2001-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index 2264387..b9ab8a4 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2023 Free Software Foundation, Inc. +/* Copyright (C) 2006-2024 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Derek Price. This file is part of gnulib. diff --git a/lib/ioctl.c b/lib/ioctl.c index 65cce13..3ee63fd 100644 --- a/lib/ioctl.c +++ b/lib/ioctl.c @@ -1,6 +1,6 @@ /* ioctl.c --- wrappers for Windows ioctl function - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/isblank.c b/lib/isblank.c index 8aad6af..d16450a 100644 --- a/lib/isblank.c +++ b/lib/isblank.c @@ -1,6 +1,6 @@ /* Test whether a character is a blank. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/iswblank.c b/lib/iswblank.c index 5540f1f..f699850 100644 --- a/lib/iswblank.c +++ b/lib/iswblank.c @@ -1,5 +1,5 @@ /* Test wide character for being blank. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/iswctype-impl.h b/lib/iswctype-impl.h new file mode 100644 index 0000000..999f220 --- /dev/null +++ b/lib/iswctype-impl.h @@ -0,0 +1,22 @@ +/* Test whether a wide character has a given property. + Copyright (C) 2011-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2011. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +int +iswctype (wint_t wc, wctype_t desc) +{ + return ((int (*) (wint_t)) desc) (wc); +} diff --git a/lib/iswctype.c b/lib/iswctype.c new file mode 100644 index 0000000..f4e6f01 --- /dev/null +++ b/lib/iswctype.c @@ -0,0 +1,36 @@ +/* Test whether a wide character has a given property. + Copyright (C) 2011-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2011. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include <wctype.h> + +#if GNULIB_defined_wint_t && !GNULIB_defined_wctype_t + +int +iswctype (wint_t wc, wctype_t desc) +# undef iswctype +{ + return ((wchar_t) wc == wc ? iswctype ((wchar_t) wc, desc) : 0); +} + +#else + +# include "iswctype-impl.h" + +#endif diff --git a/lib/iswdigit.c b/lib/iswdigit.c index 94db274..57363ab 100644 --- a/lib/iswdigit.c +++ b/lib/iswdigit.c @@ -1,5 +1,5 @@ /* Test wide character for being a digit. - Copyright (C) 2020-2023 Free Software Foundation, Inc. + Copyright (C) 2020-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/iswpunct.c b/lib/iswpunct.c new file mode 100644 index 0000000..c7cb28b --- /dev/null +++ b/lib/iswpunct.c @@ -0,0 +1,33 @@ +/* Test wide character for being a punctuation or symbol character. + Copyright (C) 2023-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include <wctype.h> + +#include <ctype.h> + +int +iswpunct (wint_t wc) +#undef iswpunct +{ +#if defined __ANDROID__ + if ((unsigned int) wc < 128) + return ispunct ((unsigned int) wc); +#endif + return iswpunct (wc); +} diff --git a/lib/iswxdigit.c b/lib/iswxdigit.c index 7ec4566..d32e3b0 100644 --- a/lib/iswxdigit.c +++ b/lib/iswxdigit.c @@ -1,5 +1,5 @@ /* Test wide character for being a hexadecimal digit. - Copyright (C) 2020-2023 Free Software Foundation, Inc. + Copyright (C) 2020-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/itold.c b/lib/itold.c index 0ef4464..e6fbcff 100644 --- a/lib/itold.c +++ b/lib/itold.c @@ -1,5 +1,5 @@ /* Replacement for 'int' to 'long double' conversion routine. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This file is free software: you can redistribute it and/or modify diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h index 4cf712e..febbd25 100644 --- a/lib/langinfo.in.h +++ b/lib/langinfo.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <langinfo.h>. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/lc-charset-dispatch.c b/lib/lc-charset-dispatch.c index cd74466..e2f8b2f 100644 --- a/lib/lc-charset-dispatch.c +++ b/lib/lc-charset-dispatch.c @@ -1,5 +1,5 @@ /* Dispatching based on the current locale's character encoding. - Copyright (C) 2018-2023 Free Software Foundation, Inc. + Copyright (C) 2018-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/lc-charset-dispatch.h b/lib/lc-charset-dispatch.h index c82b6a6..4c1cf5f 100644 --- a/lib/lc-charset-dispatch.h +++ b/lib/lc-charset-dispatch.h @@ -1,5 +1,5 @@ /* Dispatching based on the current locale's character encoding. - Copyright (C) 2018-2023 Free Software Foundation, Inc. + Copyright (C) 2018-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/libc-config.h b/lib/libc-config.h index 5f5ad01..7011460 100644 --- a/lib/libc-config.h +++ b/lib/libc-config.h @@ -1,6 +1,6 @@ /* System definitions for code taken from the GNU C Library - Copyright 2017-2023 Free Software Foundation, Inc. + Copyright 2017-2024 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/lib/libunistring.valgrind b/lib/libunistring.valgrind index c2c5820..c4d6a5c 100644 --- a/lib/libunistring.valgrind +++ b/lib/libunistring.valgrind @@ -1,6 +1,6 @@ # Suppress valgrind messages in an installed libunistring. -# Copyright (C) 2010-2023 Free Software Foundation, Inc. +# Copyright (C) 2010-2024 Free Software Foundation, Inc. # # This file is free software. # It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". diff --git a/lib/limits.in.h b/lib/limits.in.h index 45d46fd..c65eb4c 100644 --- a/lib/limits.in.h +++ b/lib/limits.in.h @@ -1,6 +1,6 @@ /* A GNU-like <limits.h>. - Copyright 2016-2023 Free Software Foundation, Inc. + Copyright 2016-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -130,7 +130,19 @@ # define BOOL_WIDTH 1 # define BOOL_MAX 1 # elif ! defined BOOL_MAX -# define BOOL_MAX ((((1U << (BOOL_WIDTH - 1)) - 1) << 1) + 1) +# define BOOL_MAX 1 +# endif +#endif + +/* Macro specified by POSIX. */ + +/* The maximum ssize_t value. Although it might not be of ssize_t type + as it should be, it's too much trouble to fix this minor detail. */ +#ifndef SSIZE_MAX +# ifdef _WIN64 +# define SSIZE_MAX LLONG_MAX +# else +# define SSIZE_MAX LONG_MAX # endif #endif @@ -1,6 +1,6 @@ /* Emulate link on platforms that lack it, namely native Windows platforms. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/listen.c b/lib/listen.c index 85600fa..785b131 100644 --- a/lib/listen.c +++ b/lib/listen.c @@ -1,6 +1,6 @@ /* listen.c --- wrappers for Windows listen function - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/localcharset.c b/lib/localcharset.c index 7ed9c95..93c4baa 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -1,6 +1,6 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -1054,7 +1054,7 @@ locale_charset (void) } } if (0) - done_table_lookup: ; + done_table_lookup: {} else # endif { diff --git a/lib/localcharset.h b/lib/localcharset.h index 29ee8dc..4721402 100644 --- a/lib/localcharset.h +++ b/lib/localcharset.h @@ -1,5 +1,5 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2003, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU CHARSET Library. This file is free software: you can redistribute it and/or modify @@ -104,10 +104,8 @@ extern const char * locale_charset (void); GBK glibc aix osf solaris freebsd darwin cygwin windows dos GB18030 glibc hpux solaris freebsd netbsd darwin SHIFT_JIS Y hpux osf solaris freebsd netbsd darwin - JOHAB glibc solaris windows + JOHAB solaris windows TIS-620 glibc aix hpux osf solaris cygwin zos - VISCII Y glibc - TCVN5712-1 glibc ARMSCII-8 glibc freebsd netbsd darwin GEORGIAN-PS glibc cygwin PT154 glibc netbsd cygwin diff --git a/lib/locale.in.h b/lib/locale.in.h index 41a93c1..1b11a41 100644 --- a/lib/locale.in.h +++ b/lib/locale.in.h @@ -1,5 +1,5 @@ /* A POSIX <locale.h>. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -216,7 +216,7 @@ _GL_WARN_ON_USE (setlocale, "setlocale works differently on native Windows - " # include "setlocale_null.h" #endif -#if /*@GNULIB_NEWLOCALE@ ||*/ (@GNULIB_LOCALENAME@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_NEWLOCALE@) +#if /*@GNULIB_NEWLOCALE@ ||*/ (@GNULIB_LOCALENAME_UNSAFE@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_NEWLOCALE@) # if @REPLACE_NEWLOCALE@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef newlocale @@ -249,7 +249,7 @@ _GL_WARN_ON_USE (newlocale, "newlocale is not portable"); # endif #endif -#if @GNULIB_DUPLOCALE@ || (@GNULIB_LOCALENAME@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_DUPLOCALE@) +#if @GNULIB_DUPLOCALE@ || (@GNULIB_LOCALENAME_UNSAFE@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_DUPLOCALE@) # if @HAVE_DUPLOCALE@ /* locale_t may be undefined if !@HAVE_DUPLOCALE@. */ # if @REPLACE_DUPLOCALE@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -279,7 +279,7 @@ _GL_WARN_ON_USE (duplocale, "duplocale is buggy on some glibc systems - " # endif #endif -#if /*@GNULIB_FREELOCALE@ ||*/ (@GNULIB_LOCALENAME@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_FREELOCALE@) +#if /*@GNULIB_FREELOCALE@ ||*/ (@GNULIB_LOCALENAME_UNSAFE@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_FREELOCALE@) # if @REPLACE_FREELOCALE@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef freelocale diff --git a/lib/localeconv.c b/lib/localeconv.c index c1a34ba..10fc7b7 100644 --- a/lib/localeconv.c +++ b/lib/localeconv.c @@ -1,5 +1,5 @@ /* Query locale dependent information for formatting numbers. - Copyright (C) 2012-2023 Free Software Foundation, Inc. + Copyright (C) 2012-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/lseek.c b/lib/lseek.c index 7919b03..61bd9fc 100644 --- a/lib/lseek.c +++ b/lib/lseek.c @@ -1,5 +1,5 @@ /* An lseek() function that detects pipes. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/lstat.c b/lib/lstat.c index 00a4ce2..7c09957 100644 --- a/lib/lstat.c +++ b/lib/lstat.c @@ -1,6 +1,6 @@ /* Work around a bug of lstat on some systems - Copyright (C) 1997-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 1997-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/malloc.c b/lib/malloc.c index 3ade35c..2a7867a 100644 --- a/lib/malloc.c +++ b/lib/malloc.c @@ -1,6 +1,6 @@ /* malloc() function that is glibc compatible. - Copyright (C) 1997-1998, 2006-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2006-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/malloc/dynarray-skeleton.c b/lib/malloc/dynarray-skeleton.c index 580c278..a95241a 100644 --- a/lib/malloc/dynarray-skeleton.c +++ b/lib/malloc/dynarray-skeleton.c @@ -1,5 +1,5 @@ /* Type-safe arrays which grow dynamically. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2024 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/lib/malloc/dynarray.h b/lib/malloc/dynarray.h index a9a3b08..3163e27 100644 --- a/lib/malloc/dynarray.h +++ b/lib/malloc/dynarray.h @@ -1,5 +1,5 @@ /* Type-safe arrays which grow dynamically. Shared definitions. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2024 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/lib/malloc/dynarray_at_failure.c b/lib/malloc/dynarray_at_failure.c index ebc9310..95e34e7 100644 --- a/lib/malloc/dynarray_at_failure.c +++ b/lib/malloc/dynarray_at_failure.c @@ -1,5 +1,5 @@ /* Report an dynamic array index out of bounds condition. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2024 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/lib/malloc/dynarray_emplace_enlarge.c b/lib/malloc/dynarray_emplace_enlarge.c index 65aabb1..7bdba15 100644 --- a/lib/malloc/dynarray_emplace_enlarge.c +++ b/lib/malloc/dynarray_emplace_enlarge.c @@ -1,5 +1,5 @@ /* Increase the size of a dynamic array in preparation of an emplace operation. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2024 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/lib/malloc/dynarray_finalize.c b/lib/malloc/dynarray_finalize.c index 673595a..52764f7 100644 --- a/lib/malloc/dynarray_finalize.c +++ b/lib/malloc/dynarray_finalize.c @@ -1,5 +1,5 @@ /* Copy the dynamically-allocated area to an explicitly-sized heap allocation. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2024 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/lib/malloc/dynarray_resize.c b/lib/malloc/dynarray_resize.c index 014f98c..7323f8e 100644 --- a/lib/malloc/dynarray_resize.c +++ b/lib/malloc/dynarray_resize.c @@ -1,5 +1,5 @@ /* Increase the size of a dynamic array. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2024 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/lib/malloc/dynarray_resize_clear.c b/lib/malloc/dynarray_resize_clear.c index bb23c52..aa17f74 100644 --- a/lib/malloc/dynarray_resize_clear.c +++ b/lib/malloc/dynarray_resize_clear.c @@ -1,5 +1,5 @@ /* Increase the size of a dynamic array and clear the new part. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2024 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/lib/malloc/scratch_buffer.h b/lib/malloc/scratch_buffer.h index 33fd2b2..b94f872 100644 --- a/lib/malloc/scratch_buffer.h +++ b/lib/malloc/scratch_buffer.h @@ -1,5 +1,5 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2015-2023 Free Software Foundation, Inc. + Copyright (C) 2015-2024 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/lib/malloc/scratch_buffer_grow.c b/lib/malloc/scratch_buffer_grow.c index a5e8f2f..c082757 100644 --- a/lib/malloc/scratch_buffer_grow.c +++ b/lib/malloc/scratch_buffer_grow.c @@ -1,5 +1,5 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2015-2023 Free Software Foundation, Inc. + Copyright (C) 2015-2024 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/lib/malloc/scratch_buffer_grow_preserve.c b/lib/malloc/scratch_buffer_grow_preserve.c index c0b5d87..6891db8 100644 --- a/lib/malloc/scratch_buffer_grow_preserve.c +++ b/lib/malloc/scratch_buffer_grow_preserve.c @@ -1,5 +1,5 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2015-2023 Free Software Foundation, Inc. + Copyright (C) 2015-2024 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/lib/malloc/scratch_buffer_set_array_size.c b/lib/malloc/scratch_buffer_set_array_size.c index 24c3935..0582bef 100644 --- a/lib/malloc/scratch_buffer_set_array_size.c +++ b/lib/malloc/scratch_buffer_set_array_size.c @@ -1,5 +1,5 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2015-2023 Free Software Foundation, Inc. + Copyright (C) 2015-2024 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/lib/malloca.c b/lib/malloca.c index f055b1e..e75c72d 100644 --- a/lib/malloca.c +++ b/lib/malloca.c @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003, 2006-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003, 2018. This file is free software: you can redistribute it and/or modify @@ -22,6 +22,9 @@ #include "malloca.h" #include <stdckdint.h> +#if defined __CHERI_PURE_CAPABILITY__ +# include <cheri.h> +#endif #include "idx.h" @@ -36,10 +39,15 @@ allocation. - NULL comes from a failed heap allocation. */ +#if defined __CHERI_PURE_CAPABILITY__ +/* Type for holding the original malloc() result. */ +typedef uintptr_t small_t; +#else /* Type for holding very small pointer differences. */ typedef unsigned char small_t; /* Verify that it is wide enough. */ static_assert (2 * sa_alignment_max - 1 <= (small_t) -1); +#endif void * mmalloca (size_t n) @@ -56,20 +64,28 @@ mmalloca (size_t n) if (mem != NULL) { - uintptr_t umem = (uintptr_t)mem, umemplus; + uintptr_t umem = (uintptr_t) mem; /* The ckd_add avoids signed integer overflow on theoretical platforms where UINTPTR_MAX <= INT_MAX. */ + uintptr_t umemplus; ckd_add (&umemplus, umem, sizeof (small_t) + sa_alignment_max - 1); - idx_t offset = ((umemplus & ~alignment2_mask) + idx_t offset = (umemplus - umemplus % (2 * sa_alignment_max) + sa_alignment_max - umem); - void *vp = mem + offset; - small_t *p = vp; + void *p = mem + offset; /* Here p >= mem + sizeof (small_t), and p <= mem + sizeof (small_t) + 2 * sa_alignment_max - 1 hence p + n <= mem + nplus. So, the memory range [p, p+n) lies in the allocated memory range [mem, mem + nplus). */ - p[-1] = offset; + small_t *sp = p; +# if defined __CHERI_PURE_CAPABILITY__ + sp[-1] = umem; + p = (char *) cheri_bounds_set ((char *) p - sizeof (small_t), + sizeof (small_t) + n) + + sizeof (small_t); +# else + sp[-1] = offset; +# endif /* p ≡ sa_alignment_max mod 2*sa_alignment_max. */ return p; } @@ -90,15 +106,22 @@ void freea (void *p) { /* Check argument. */ - if ((uintptr_t) p & (sa_alignment_max - 1)) + uintptr_t u = (uintptr_t) p; + if (u & (sa_alignment_max - 1)) { /* p was not the result of a malloca() call. Invalid argument. */ abort (); } /* Determine whether p was a non-NULL pointer returned by mmalloca(). */ - if ((uintptr_t) p & sa_alignment_max) + if (u & sa_alignment_max) { - void *mem = (char *) p - ((small_t *) p)[-1]; + char *cp = p; + small_t *sp = p; +# if defined __CHERI_PURE_CAPABILITY__ + void *mem = sp[-1]; +# else + void *mem = cp - sp[-1]; +# endif free (mem); } } diff --git a/lib/malloca.h b/lib/malloca.h index f68ddfe..c520842 100644 --- a/lib/malloca.h +++ b/lib/malloca.h @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This file is free software: you can redistribute it and/or modify @@ -28,6 +28,9 @@ #include <stddef.h> #include <stdlib.h> #include <stdint.h> +#if defined __CHERI_PURE_CAPABILITY__ +# include <cheri.h> +#endif #include "xalloc-oversized.h" @@ -68,12 +71,24 @@ extern void freea (void *p); memory allocated on the stack, that must be freed using freea() before the function returns. Upon failure, it returns NULL. */ #if HAVE_ALLOCA -# define malloca(N) \ - ((N) < 4032 - (2 * sa_alignment_max - 1) \ - ? (void *) (((uintptr_t) (char *) alloca ((N) + 2 * sa_alignment_max - 1) \ - + (2 * sa_alignment_max - 1)) \ - & ~(uintptr_t)(2 * sa_alignment_max - 1)) \ - : mmalloca (N)) +# if defined __CHERI_PURE_CAPABILITY__ +# define malloca(N) \ + ((N) < 4032 - (2 * sa_alignment_max - 1) \ + ? cheri_bounds_set ((void *) (((uintptr_t) \ + (char *) \ + alloca ((N) + 2 * sa_alignment_max - 1) \ + + (2 * sa_alignment_max - 1)) \ + & ~(uintptr_t)(2 * sa_alignment_max - 1)), \ + (N)) \ + : mmalloca (N)) +# else +# define malloca(N) \ + ((N) < 4032 - (2 * sa_alignment_max - 1) \ + ? (void *) (((uintptr_t) (char *) alloca ((N) + 2 * sa_alignment_max - 1) \ + + (2 * sa_alignment_max - 1)) \ + & ~(uintptr_t)(2 * sa_alignment_max - 1)) \ + : mmalloca (N)) +# endif #else # define malloca(N) \ mmalloca (N) diff --git a/lib/mbchar.c b/lib/mbchar.c index 7d5f72c..d94b7c3 100644 --- a/lib/mbchar.c +++ b/lib/mbchar.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -21,17 +21,3 @@ #include <limits.h> #include "mbchar.h" - -#if IS_BASIC_ASCII - -/* Bit table of characters in the ISO C "basic character set". */ -const unsigned int is_basic_table [UCHAR_MAX / 32 + 1] = -{ - 0x00001a00, /* '\t' '\v' '\f' */ - 0xffffffef, /* ' '...'#' '%'...'?' */ - 0xfffffffe, /* 'A'...'Z' '[' '\\' ']' '^' '_' */ - 0x7ffffffe /* 'a'...'z' '{' '|' '}' '~' */ - /* The remaining bits are 0. */ -}; - -#endif /* IS_BASIC_ASCII */ diff --git a/lib/mbchar.h b/lib/mbchar.h index a2ff1d8..c06ef11 100644 --- a/lib/mbchar.h +++ b/lib/mbchar.h @@ -1,5 +1,5 @@ /* Multibyte character data type. - Copyright (C) 2001, 2005-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2005-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -17,10 +17,10 @@ /* Written by Bruno Haible <bruno@clisp.org>. */ /* A multibyte character is a short subsequence of a char* string, - representing a single wide character. + representing a single 32-bit wide character. - We use multibyte characters instead of wide characters because of - the following goals: + We use multibyte characters instead of 32-bit wide characters because + of the following goals: 1) correct multibyte handling, i.e. operate according to the LC_CTYPE locale, 2) ease of maintenance, i.e. the maintainer needs not know all details @@ -28,8 +28,7 @@ 3) don't fail grossly if the input is not in the encoding set by the locale, because often different encodings are in use in the same countries (ISO-8859-1/UTF-8, EUC-JP/Shift_JIS, ...), - 4) fast in the case of ASCII characters, - 5) portability, i.e. don't make unportable assumptions about wchar_t. + 4) fast in the case of ASCII characters. Multibyte characters are only accessed through the mb* macros. @@ -108,6 +107,7 @@ mb_setascii (&mbc, sc) assigns the standard ASCII character sc to mbc. + (Only available if the 'mbfile' module is in use.) mb_copy (&destmbc, &srcmbc) copies srcmbc to destmbc. @@ -150,23 +150,26 @@ #endif #include <string.h> -#include <wchar.h> -#include <wctype.h> +#include <uchar.h> _GL_INLINE_HEADER_BEGIN #ifndef MBCHAR_INLINE # define MBCHAR_INLINE _GL_INLINE #endif -#define MBCHAR_BUF_SIZE 24 +/* The longest multibyte characters, nowadays, are 4 bytes long. + Regardless of the values of MB_CUR_MAX and MB_LEN_MAX. */ +#define MBCHAR_BUF_SIZE 4 struct mbchar { const char *ptr; /* pointer to current character */ size_t bytes; /* number of bytes of current character, > 0 */ - bool wc_valid; /* true if wc is a valid wide character */ - wchar_t wc; /* if wc_valid: the current character */ + bool wc_valid; /* true if wc is a valid 32-bit wide character */ + char32_t wc; /* if wc_valid: the current character */ +#if defined GNULIB_MBFILE char buf[MBCHAR_BUF_SIZE]; /* room for the bytes, used for file input only */ +#endif }; /* EOF (not a real character) is represented with bytes = 0 and @@ -184,7 +187,7 @@ typedef struct mbchar mbchar_t; #define mb_cmp(mbc1, mbc2) \ ((mbc1).wc_valid \ ? ((mbc2).wc_valid \ - ? (int) (mbc1).wc - (int) (mbc2).wc \ + ? _GL_CMP ((mbc1).wc, (mbc2).wc) \ : -1) \ : ((mbc2).wc_valid \ ? 1 \ @@ -196,7 +199,7 @@ typedef struct mbchar mbchar_t; #define mb_casecmp(mbc1, mbc2) \ ((mbc1).wc_valid \ ? ((mbc2).wc_valid \ - ? (int) towlower ((mbc1).wc) - (int) towlower ((mbc2).wc) \ + ? _GL_CMP (c32tolower ((mbc1).wc), c32tolower ((mbc2).wc)) \ : -1) \ : ((mbc2).wc_valid \ ? 1 \ @@ -212,25 +215,25 @@ typedef struct mbchar mbchar_t; && memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) == 0) #define mb_caseequal(mbc1, mbc2) \ ((mbc1).wc_valid && (mbc2).wc_valid \ - ? towlower ((mbc1).wc) == towlower ((mbc2).wc) \ + ? c32tolower ((mbc1).wc) == c32tolower ((mbc2).wc) \ : (mbc1).bytes == (mbc2).bytes \ && memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) == 0) /* <ctype.h>, <wctype.h> classification. */ #define mb_isascii(mbc) \ ((mbc).wc_valid && (mbc).wc >= 0 && (mbc).wc <= 127) -#define mb_isalnum(mbc) ((mbc).wc_valid && iswalnum ((mbc).wc)) -#define mb_isalpha(mbc) ((mbc).wc_valid && iswalpha ((mbc).wc)) -#define mb_isblank(mbc) ((mbc).wc_valid && iswblank ((mbc).wc)) -#define mb_iscntrl(mbc) ((mbc).wc_valid && iswcntrl ((mbc).wc)) -#define mb_isdigit(mbc) ((mbc).wc_valid && iswdigit ((mbc).wc)) -#define mb_isgraph(mbc) ((mbc).wc_valid && iswgraph ((mbc).wc)) -#define mb_islower(mbc) ((mbc).wc_valid && iswlower ((mbc).wc)) -#define mb_isprint(mbc) ((mbc).wc_valid && iswprint ((mbc).wc)) -#define mb_ispunct(mbc) ((mbc).wc_valid && iswpunct ((mbc).wc)) -#define mb_isspace(mbc) ((mbc).wc_valid && iswspace ((mbc).wc)) -#define mb_isupper(mbc) ((mbc).wc_valid && iswupper ((mbc).wc)) -#define mb_isxdigit(mbc) ((mbc).wc_valid && iswxdigit ((mbc).wc)) +#define mb_isalnum(mbc) ((mbc).wc_valid && c32isalnum ((mbc).wc)) +#define mb_isalpha(mbc) ((mbc).wc_valid && c32isalpha ((mbc).wc)) +#define mb_isblank(mbc) ((mbc).wc_valid && c32isblank ((mbc).wc)) +#define mb_iscntrl(mbc) ((mbc).wc_valid && c32iscntrl ((mbc).wc)) +#define mb_isdigit(mbc) ((mbc).wc_valid && c32isdigit ((mbc).wc)) +#define mb_isgraph(mbc) ((mbc).wc_valid && c32isgraph ((mbc).wc)) +#define mb_islower(mbc) ((mbc).wc_valid && c32islower ((mbc).wc)) +#define mb_isprint(mbc) ((mbc).wc_valid && c32isprint ((mbc).wc)) +#define mb_ispunct(mbc) ((mbc).wc_valid && c32ispunct ((mbc).wc)) +#define mb_isspace(mbc) ((mbc).wc_valid && c32isspace ((mbc).wc)) +#define mb_isupper(mbc) ((mbc).wc_valid && c32isupper ((mbc).wc)) +#define mb_isxdigit(mbc) ((mbc).wc_valid && c32isxdigit ((mbc).wc)) /* Extra <wchar.h> function. */ @@ -238,12 +241,12 @@ typedef struct mbchar mbchar_t; #define MB_UNPRINTABLE_WIDTH 1 MBCHAR_INLINE int -mb_width_aux (wint_t wc) +mb_width_aux (char32_t wc) { - int w = wcwidth (wc); + int w = c32width (wc); /* For unprintable characters, arbitrarily return 0 for control characters and MB_UNPRINTABLE_WIDTH otherwise. */ - return (w >= 0 ? w : iswcntrl (wc) ? 0 : MB_UNPRINTABLE_WIDTH); + return (w >= 0 ? w : c32iscntrl (wc) ? 0 : MB_UNPRINTABLE_WIDTH); } #define mb_width(mbc) \ @@ -252,21 +255,25 @@ mb_width_aux (wint_t wc) /* Output. */ #define mb_putc(mbc, stream) fwrite ((mbc).ptr, 1, (mbc).bytes, (stream)) +#if defined GNULIB_MBFILE /* Assignment. */ -#define mb_setascii(mbc, sc) \ - ((mbc)->ptr = (mbc)->buf, (mbc)->bytes = 1, (mbc)->wc_valid = 1, \ - (mbc)->wc = (mbc)->buf[0] = (sc)) +# define mb_setascii(mbc, sc) \ + ((mbc)->ptr = (mbc)->buf, (mbc)->bytes = 1, (mbc)->wc_valid = 1, \ + (mbc)->wc = (mbc)->buf[0] = (sc)) +#endif /* Copying a character. */ MBCHAR_INLINE void mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc) { +#if defined GNULIB_MBFILE if (old_mbc->ptr == &old_mbc->buf[0]) { memcpy (&new_mbc->buf[0], &old_mbc->buf[0], old_mbc->bytes); new_mbc->ptr = &new_mbc->buf[0]; } else +#endif new_mbc->ptr = old_mbc->ptr; new_mbc->bytes = old_mbc->bytes; if ((new_mbc->wc_valid = old_mbc->wc_valid)) @@ -274,44 +281,54 @@ mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc) } -/* is_basic(c) tests whether the single-byte character c is in the - ISO C "basic character set". +/* is_basic(c) tests whether the single-byte character c is + - in the ISO C "basic character set" or is one of '@', '$', and '`' + which ISO C 23 § 5.2.1.1.(1) guarantees to be single-byte and in + practice are safe to treat as basic in the execution character set, + or + - in the POSIX "portable character set", which + <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap06.html> + equally guarantees to be single-byte. This is a convenience function, and is in this file only to share code - between mbiter_multi.h and mbfile_multi.h. */ + between mbiter.h, mbuiter.h, and mbfile.h. */ #if (' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ - && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ - && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ - && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ - && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ - && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ - && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ - && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ - && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ - && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ - && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ - && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ - && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ - && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ - && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ - && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ - && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ - && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ - && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ - && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ - && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ - && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126) + && ('$' == 36) && ('%' == 37) && ('&' == 38) && ('\'' == 39) \ + && ('(' == 40) && (')' == 41) && ('*' == 42) && ('+' == 43) \ + && (',' == 44) && ('-' == 45) && ('.' == 46) && ('/' == 47) \ + && ('0' == 48) && ('1' == 49) && ('2' == 50) && ('3' == 51) \ + && ('4' == 52) && ('5' == 53) && ('6' == 54) && ('7' == 55) \ + && ('8' == 56) && ('9' == 57) && (':' == 58) && (';' == 59) \ + && ('<' == 60) && ('=' == 61) && ('>' == 62) && ('?' == 63) \ + && ('@' == 64) && ('A' == 65) && ('B' == 66) && ('C' == 67) \ + && ('D' == 68) && ('E' == 69) && ('F' == 70) && ('G' == 71) \ + && ('H' == 72) && ('I' == 73) && ('J' == 74) && ('K' == 75) \ + && ('L' == 76) && ('M' == 77) && ('N' == 78) && ('O' == 79) \ + && ('P' == 80) && ('Q' == 81) && ('R' == 82) && ('S' == 83) \ + && ('T' == 84) && ('U' == 85) && ('V' == 86) && ('W' == 87) \ + && ('X' == 88) && ('Y' == 89) && ('Z' == 90) && ('[' == 91) \ + && ('\\' == 92) && (']' == 93) && ('^' == 94) && ('_' == 95) \ + && ('`' == 96) && ('a' == 97) && ('b' == 98) && ('c' == 99) \ + && ('d' == 100) && ('e' == 101) && ('f' == 102) && ('g' == 103) \ + && ('h' == 104) && ('i' == 105) && ('j' == 106) && ('k' == 107) \ + && ('l' == 108) && ('m' == 109) && ('n' == 110) && ('o' == 111) \ + && ('p' == 112) && ('q' == 113) && ('r' == 114) && ('s' == 115) \ + && ('t' == 116) && ('u' == 117) && ('v' == 118) && ('w' == 119) \ + && ('x' == 120) && ('y' == 121) && ('z' == 122) && ('{' == 123) \ + && ('|' == 124) && ('}' == 125) && ('~' == 126) /* The character set is ISO-646, not EBCDIC. */ # define IS_BASIC_ASCII 1 -extern const unsigned int is_basic_table[]; - -MBCHAR_INLINE bool -is_basic (char c) -{ - return (is_basic_table [(unsigned char) c >> 5] >> ((unsigned char) c & 31)) - & 1; -} +/* All locale encodings (see localcharset.h) map the characters 0x00..0x7F + to U+0000..U+007F, like ASCII, except for + CP864 different mapping of '%' + SHIFT_JIS different mappings of 0x5C, 0x7E + JOHAB different mapping of 0x5C + However, these characters in the range 0x20..0x7E are in the ISO C + "basic character set" and in the POSIX "portable character set", which + ISO C and POSIX guarantee to be single-byte. Thus, locales with these + encodings are not POSIX compliant. And they are most likely not in use + any more (as of 2023). */ +# define is_basic(c) ((unsigned char) (c) < 0x80) #else @@ -320,21 +337,23 @@ is_basic (char c) { switch (c) { - case '\t': case '\v': case '\f': - case ' ': case '!': case '"': case '#': case '%': + case '\0': + case '\007': case '\010': + case '\t': case '\n': case '\v': case '\f': case '\r': + case ' ': case '!': case '"': case '#': case '$': case '%': case '&': case '\'': case '(': case ')': case '*': case '+': case ',': case '-': case '.': case '/': case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case ':': case ';': case '<': case '=': case '>': - case '?': + case '?': case '@': case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G': case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z': - case '[': case '\\': case ']': case '^': case '_': + case '[': case '\\': case ']': case '^': case '_': case '`': case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g': case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n': case 'o': diff --git a/lib/mbiter.c b/lib/mbiter.c index 530181a..bf525b1 100644 --- a/lib/mbiter.c +++ b/lib/mbiter.c @@ -1,6 +1,6 @@ /* Iterating through multibyte strings: macros for multi-byte encodings. - Copyright (C) 2012-2023 Free Software Foundation, Inc. + Copyright (C) 2012-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/mbiter.h b/lib/mbiter.h index 7b41870..cb7950d 100644 --- a/lib/mbiter.h +++ b/lib/mbiter.h @@ -1,5 +1,5 @@ /* Iterating through multibyte strings: macros for multi-byte encodings. - Copyright (C) 2001, 2005, 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -82,7 +82,8 @@ #ifndef _MBITER_H #define _MBITER_H 1 -/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE. */ +/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, + _GL_ATTRIBUTE_ALWAYS_INLINE. */ #if !_GL_CONFIG_H_INCLUDED #error "Please include config.h first." #endif @@ -90,27 +91,35 @@ #include <assert.h> #include <stddef.h> #include <string.h> +#include <uchar.h> #include <wchar.h> #include "mbchar.h" _GL_INLINE_HEADER_BEGIN #ifndef MBITER_INLINE -# define MBITER_INLINE _GL_INLINE +# define MBITER_INLINE _GL_INLINE _GL_ATTRIBUTE_ALWAYS_INLINE #endif struct mbiter_multi { const char *limit; /* pointer to end of string */ + #if !GNULIB_MBRTOC32_REGULAR bool in_shift; /* true if next byte may not be interpreted as ASCII */ + /* If GNULIB_MBRTOC32_REGULAR, it is always false, + so optimize it away. */ + #endif mbstate_t state; /* if in_shift: current shift state */ + /* If GNULIB_MBRTOC32_REGULAR, it is in an initial state + before and after every mbiter_multi_next invocation. + */ bool next_done; /* true if mbi_avail has already filled the following */ struct mbchar cur; /* the current character: - const char *cur.ptr pointer to current character + const char *cur.ptr pointer to current character The following are only valid after mbi_avail. - size_t cur.bytes number of bytes of current character - bool cur.wc_valid true if wc is a valid wide character - wchar_t cur.wc if wc_valid: the current character + size_t cur.bytes number of bytes of current character + bool cur.wc_valid true if wc is a valid 32-bit wide character + char32_t cur.wc if wc_valid: the current character */ }; @@ -119,14 +128,19 @@ mbiter_multi_next (struct mbiter_multi *iter) { if (iter->next_done) return; + #if !GNULIB_MBRTOC32_REGULAR if (iter->in_shift) goto with_shift; + #endif /* Handle most ASCII characters quickly, without calling mbrtowc(). */ if (is_basic (*iter->cur.ptr)) { - /* These characters are part of the basic character set. ISO C 99 - guarantees that their wide character code is identical to their - char code. */ + /* These characters are part of the POSIX portable character set. + For most of them, namely those in the ISO C basic character set, + ISO C 99 guarantees that their wide character code is identical to + their char code. For the few other ones, this is the case as well, + in all locale encodings that are in use. The 32-bit wide character + code is the same as well. */ iter->cur.bytes = 1; iter->cur.wc = *iter->cur.ptr; iter->cur.wc_valid = true; @@ -134,25 +148,34 @@ mbiter_multi_next (struct mbiter_multi *iter) else { assert (mbsinit (&iter->state)); + #if !GNULIB_MBRTOC32_REGULAR iter->in_shift = true; with_shift: - iter->cur.bytes = mbrtowc (&iter->cur.wc, iter->cur.ptr, - iter->limit - iter->cur.ptr, &iter->state); + #endif + iter->cur.bytes = mbrtoc32 (&iter->cur.wc, iter->cur.ptr, + iter->limit - iter->cur.ptr, &iter->state); if (iter->cur.bytes == (size_t) -1) { /* An invalid multibyte sequence was encountered. */ iter->cur.bytes = 1; iter->cur.wc_valid = false; - /* Whether to set iter->in_shift = false and reset iter->state - or not is not very important; the string is bogus anyway. */ + /* Allow the next invocation to continue from a sane state. */ + #if !GNULIB_MBRTOC32_REGULAR + iter->in_shift = false; + #endif + mbszero (&iter->state); } else if (iter->cur.bytes == (size_t) -2) { /* An incomplete multibyte character at the end. */ iter->cur.bytes = iter->limit - iter->cur.ptr; iter->cur.wc_valid = false; - /* Whether to set iter->in_shift = false and reset iter->state - or not is not important; the string end is reached anyway. */ + #if !GNULIB_MBRTOC32_REGULAR + /* Cause the next mbi_avail invocation to return false. */ + iter->in_shift = false; + #endif + /* Whether to reset iter->state or not is not important; the + string end is reached anyway. */ } else { @@ -163,12 +186,20 @@ mbiter_multi_next (struct mbiter_multi *iter) assert (*iter->cur.ptr == '\0'); assert (iter->cur.wc == 0); } + #if !GNULIB_MBRTOC32_REGULAR + else if (iter->cur.bytes == (size_t) -3) + /* The previous multibyte sequence produced an additional 32-bit + wide character. */ + iter->cur.bytes = 0; + #endif iter->cur.wc_valid = true; - /* When in the initial state, we can go back treating ASCII + /* When in an initial state, we can go back treating ASCII characters more quickly. */ + #if !GNULIB_MBRTOC32_REGULAR if (mbsinit (&iter->state)) iter->in_shift = false; + #endif } } iter->next_done = true; @@ -185,22 +216,40 @@ MBITER_INLINE void mbiter_multi_copy (struct mbiter_multi *new_iter, const struct mbiter_multi *old_iter) { new_iter->limit = old_iter->limit; + #if !GNULIB_MBRTOC32_REGULAR if ((new_iter->in_shift = old_iter->in_shift)) memcpy (&new_iter->state, &old_iter->state, sizeof (mbstate_t)); else - memset (&new_iter->state, 0, sizeof (mbstate_t)); + #endif + mbszero (&new_iter->state); new_iter->next_done = old_iter->next_done; mb_copy (&new_iter->cur, &old_iter->cur); } /* Iteration macros. */ typedef struct mbiter_multi mbi_iterator_t; +#if !GNULIB_MBRTOC32_REGULAR #define mbi_init(iter, startptr, length) \ ((iter).cur.ptr = (startptr), (iter).limit = (iter).cur.ptr + (length), \ - (iter).in_shift = false, memset (&(iter).state, '\0', sizeof (mbstate_t)), \ + (iter).in_shift = false, mbszero (&(iter).state), \ (iter).next_done = false) +#else +/* Optimized: no in_shift. */ +#define mbi_init(iter, startptr, length) \ + ((iter).cur.ptr = (startptr), (iter).limit = (iter).cur.ptr + (length), \ + mbszero (&(iter).state), \ + (iter).next_done = false) +#endif +#if !GNULIB_MBRTOC32_REGULAR +#define mbi_avail(iter) \ + (((iter).cur.ptr < (iter).limit || (iter).in_shift) \ + && (mbiter_multi_next (&(iter)), true)) +#else +/* Optimized: no in_shift. */ #define mbi_avail(iter) \ - ((iter).cur.ptr < (iter).limit && (mbiter_multi_next (&(iter)), true)) + ((iter).cur.ptr < (iter).limit \ + && (mbiter_multi_next (&(iter)), true)) +#endif #define mbi_advance(iter) \ ((iter).cur.ptr += (iter).cur.bytes, (iter).next_done = false) diff --git a/lib/mbrtoc32.c b/lib/mbrtoc32.c new file mode 100644 index 0000000..56e4a86 --- /dev/null +++ b/lib/mbrtoc32.c @@ -0,0 +1,288 @@ +/* Convert multibyte character to 32-bit wide character. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2020. */ + +#include <config.h> + +/* Specification. */ +#include <uchar.h> + +#include "attribute.h" + +#include <errno.h> +#include <stdlib.h> + +#if GL_CHAR32_T_IS_UNICODE +# include "lc-charset-unicode.h" +#endif + +#if GNULIB_defined_mbstate_t /* AIX, IRIX */ +/* Implement mbrtoc32() on top of mbtowc() for the non-UTF-8 locales + and directly for the UTF-8 locales. */ + +/* Note: On AIX (64-bit) we can implement mbrtoc32 in two equivalent ways: + - in a way that parallels the override of mbrtowc; this is the code branch + here; + - in a way that invokes the overridden mbrtowc; this would be the #else + branch below. + They are equivalent. */ + +# if AVOID_ANY_THREADS + +/* The option '--disable-threads' explicitly requests no locking. */ + +# elif defined _WIN32 && !defined __CYGWIN__ + +# define WIN32_LEAN_AND_MEAN /* avoid including junk */ +# include <windows.h> + +# elif HAVE_PTHREAD_API + +# include <pthread.h> +# if HAVE_THREADS_H && HAVE_WEAK_SYMBOLS +# include <threads.h> +# pragma weak thrd_exit +# define c11_threads_in_use() (thrd_exit != NULL) +# else +# define c11_threads_in_use() 0 +# endif + +# elif HAVE_THREADS_H + +# include <threads.h> + +# endif + +# include "lc-charset-dispatch.h" +# include "mbtowc-lock.h" + +static_assert (sizeof (mbstate_t) >= 4); +static char internal_state[4]; + +size_t +mbrtoc32 (char32_t *pwc, const char *s, size_t n, mbstate_t *ps) +{ +# define FITS_IN_CHAR_TYPE(wc) 1 +# include "mbrtowc-impl.h" +} + +#else /* glibc, macOS, FreeBSD, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, mingw, MSVC, Minix, Android */ + +/* Implement mbrtoc32() based on the original mbrtoc32() or on mbrtowc(). */ + +# include <wchar.h> + +# include "localcharset.h" +# include "streq.h" + +# if MBRTOC32_IN_C_LOCALE_MAYBE_EILSEQ +# include "hard-locale.h" +# include <locale.h> +# endif + +static mbstate_t internal_state; + +size_t +mbrtoc32 (char32_t *pwc, const char *s, size_t n, mbstate_t *ps) +# undef mbrtoc32 +{ + /* It's simpler to handle the case s == NULL upfront, than to worry about + this case later, before every test of pwc and n. */ + if (s == NULL) + { + pwc = NULL; + s = ""; + n = 1; + } + +# if MBRTOC32_EMPTY_INPUT_BUG || _GL_SMALL_WCHAR_T + if (n == 0) + return (size_t) -2; +# endif + + if (ps == NULL) + ps = &internal_state; + +# if HAVE_WORKING_MBRTOC32 + /* mbrtoc32() may produce different values for wc than mbrtowc(). Therefore + use mbrtoc32(). */ + +# if defined _WIN32 && !defined __CYGWIN__ + char32_t wc; + size_t ret = mbrtoc32 (&wc, s, n, ps); + if (ret < (size_t) -2 && pwc != NULL) + *pwc = wc; +# else + size_t ret = mbrtoc32 (pwc, s, n, ps); +# endif + +# if GNULIB_MBRTOC32_REGULAR + /* Verify that mbrtoc32 is regular. */ + if (ret < (size_t) -3 && ! mbsinit (ps)) + /* This occurs on glibc 2.36. */ + mbszero (ps); + if (ret == (size_t) -3) + abort (); +# endif + +# if MBRTOC32_IN_C_LOCALE_MAYBE_EILSEQ + if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE)) + { + if (pwc != NULL) + *pwc = (unsigned char) *s; + return 1; + } +# endif + + return ret; + +# elif _GL_SMALL_WCHAR_T + + /* Special-case all encodings that may produce wide character values + > WCHAR_MAX. */ + const char *encoding = locale_charset (); + if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0)) + { + /* Special-case the UTF-8 encoding. Assume that the wide-character + encoding in a UTF-8 locale is UCS-2 or, equivalently, UTF-16. */ + /* Here n > 0. */ + char *pstate = (char *)ps; + size_t nstate = pstate[0]; + char buf[4]; + const char *p; + size_t m; + int res; + + switch (nstate) + { + case 0: + p = s; + m = n; + break; + case 3: + buf[2] = pstate[3]; + FALLTHROUGH; + case 2: + buf[1] = pstate[2]; + FALLTHROUGH; + case 1: + buf[0] = pstate[1]; + p = buf; + m = nstate; + buf[m++] = s[0]; + if (n >= 2 && m < 4) + { + buf[m++] = s[1]; + if (n >= 3 && m < 4) + buf[m++] = s[2]; + } + break; + default: + errno = EINVAL; + return (size_t)(-1); + } + + /* Here m > 0. */ + + { +# define FITS_IN_CHAR_TYPE(wc) 1 +# include "mbrtowc-impl-utf8.h" + } + + success: + if (nstate >= (res > 0 ? res : 1)) + abort (); + res -= nstate; + /* Set *ps to an initial state. */ +# if defined _WIN32 && !defined __CYGWIN__ + /* Native Windows. */ + /* MSVC defines 'mbstate_t' as an 8-byte struct; the first 4 bytes matter. + On mingw, 'mbstate_t' is sometimes defined as 'int', sometimes defined + as an 8-byte struct, of which the first 4 bytes matter. */ + *(unsigned int *)pstate = 0; +# elif defined __CYGWIN__ + /* Cygwin defines 'mbstate_t' as an 8-byte struct; the first 4 bytes + matter. */ + ps->__count = 0; +# else + pstate[0] = 0; +# endif + return res; + + incomplete: + { + size_t k = nstate; + /* Here 0 <= k < m < 4. */ + pstate[++k] = s[0]; + if (k < m) + { + pstate[++k] = s[1]; + if (k < m) + pstate[++k] = s[2]; + } + if (k != m) + abort (); + } + pstate[0] = m; + return (size_t)(-2); + + invalid: + errno = EILSEQ; + /* The conversion state is undefined, says POSIX. */ + return (size_t)(-1); + } + else + { + wchar_t wc; + size_t ret = mbrtowc (&wc, s, n, ps); + if (ret < (size_t) -2 && pwc != NULL) + *pwc = wc; + return ret; + } + +# else + + /* char32_t and wchar_t are equivalent. Use mbrtowc(). */ + wchar_t wc; + size_t ret = mbrtowc (&wc, s, n, ps); + +# if GNULIB_MBRTOC32_REGULAR + /* Ensure that mbrtoc32 is regular. */ + if (ret < (size_t) -2 && ! mbsinit (ps)) + /* This occurs on glibc 2.12. */ + mbszero (ps); +# endif + +# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION + if (ret < (size_t) -2 && wc != 0) + { + wc = locale_encoding_to_unicode (wc); + if (wc == 0) + { + ret = (size_t) -1; + errno = EILSEQ; + } + } +# endif + if (ret < (size_t) -2 && pwc != NULL) + *pwc = wc; + return ret; + +# endif +} + +#endif diff --git a/lib/mbrtowc-impl-utf8.h b/lib/mbrtowc-impl-utf8.h index 4fdd65d..3a3ba13 100644 --- a/lib/mbrtowc-impl-utf8.h +++ b/lib/mbrtowc-impl-utf8.h @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2023 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/mbrtowc-impl.h b/lib/mbrtowc-impl.h index e9c04ed..963631c 100644 --- a/lib/mbrtowc-impl.h +++ b/lib/mbrtowc-impl.h @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2023 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c index c1a689a..8a1646d 100644 --- a/lib/mbrtowc.c +++ b/lib/mbrtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2023 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify @@ -28,7 +28,11 @@ # include <stdint.h> # include <stdlib.h> -# if defined _WIN32 && !defined __CYGWIN__ +# if AVOID_ANY_THREADS + +/* The option '--disable-threads' explicitly requests no locking. */ + +# elif defined _WIN32 && !defined __CYGWIN__ # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include <windows.h> diff --git a/lib/mbsinit.c b/lib/mbsinit.c index 6e60079..d1b8475 100644 --- a/lib/mbsinit.c +++ b/lib/mbsinit.c @@ -1,5 +1,5 @@ /* Test for initial conversion state. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify @@ -36,7 +36,7 @@ buffered bytes (in the range 0..3), followed by up to 3 buffered bytes. See mbrtowc.c. - In wc -> mb direction, mbstate_t contains no information. In other - words, it is always in the initial state. */ + words, it is always in an initial state. */ static_assert (sizeof (mbstate_t) >= 4); diff --git a/lib/mbsrtoc32s-state.c b/lib/mbsrtoc32s-state.c new file mode 100644 index 0000000..4f6eeaa --- /dev/null +++ b/lib/mbsrtoc32s-state.c @@ -0,0 +1,37 @@ +/* Convert string to 32-bit wide string. + Copyright (C) 2008-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2020. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#include <wchar.h> + +/* Internal state used by the functions mbsrtoc32s() and mbsnrtoc32s(). */ +mbstate_t _gl_mbsrtoc32s_state +/* The state must initially be in an "initial state"; so, zero-initialize it. + On most systems, putting it into BSS is sufficient. Not so on Mac OS X 10.3, + see <https://lists.gnu.org/r/bug-gnulib/2009-01/msg00329.html>. + When it needs an initializer, use 0 or {0} as initializer? 0 only works + when mbstate_t is a scalar type (such as when gnulib defines it, or on + AIX, IRIX, mingw). {0} works as an initializer in all cases: for a struct + or union type, but also for a scalar type (ISO C 99, 6.7.8.(11)). */ +#if defined __ELF__ + /* On ELF systems, variables in BSS behave well. */ +#else + /* Use braces, to be on the safe side. */ + = { 0 } +#endif + ; diff --git a/lib/mbsrtoc32s.c b/lib/mbsrtoc32s.c new file mode 100644 index 0000000..896dc51 --- /dev/null +++ b/lib/mbsrtoc32s.c @@ -0,0 +1,65 @@ +/* Convert string to 32-bit wide string. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2020. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_MBSRTOC32S +/* Specification. */ +#include <uchar.h> + +#include <wchar.h> + +#if (HAVE_WORKING_MBRTOC32 && !_GL_WCHAR_T_IS_UCS4) || (GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION) || _GL_SMALL_WCHAR_T +/* The char32_t encoding of a multibyte character may be different than its + wchar_t encoding, or char32_t is wider than wchar_t. */ + +# include <errno.h> +# include <limits.h> +# include <stdlib.h> + +# include "strnlen1.h" + +extern mbstate_t _gl_mbsrtoc32s_state; + +# define FUNC mbsrtoc32s +# define DCHAR_T char32_t +# define INTERNAL_STATE _gl_mbsrtoc32s_state +# define MBRTOWC mbrtoc32 +# if GNULIB_MBRTOC32_REGULAR + /* If the 'mbrtoc32-regular' module is in use, we don't need to handle + a (size_t)(-3) return value from mbrtoc32. */ +# define USES_C32 0 +# else +# define USES_C32 1 +# endif +# include "mbsrtowcs-impl.h" + +#else +/* char32_t and wchar_t are equivalent. */ + +static_assert (sizeof (char32_t) == sizeof (wchar_t)); + +# if _GL_WCHAR_T_IS_UCS4 +_GL_EXTERN_INLINE +# endif +size_t +mbsrtoc32s (char32_t *dest, const char **srcp, size_t len, mbstate_t *ps) +{ + return mbsrtowcs ((wchar_t *) dest, srcp, len, ps); +} + +#endif diff --git a/lib/mbsrtowcs-impl.h b/lib/mbsrtowcs-impl.h index bcf729d..9043fb8 100644 --- a/lib/mbsrtowcs-impl.h +++ b/lib/mbsrtowcs-impl.h @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify @@ -61,7 +61,8 @@ FUNC (DCHAR_T *dest, const char **srcp, size_t len, mbstate_t *ps) /* Here mbsinit (ps). */ break; } - src += ret; + if (!(USES_C32 && ret == (size_t)(-3))) + src += ret; } *srcp = src; diff --git a/lib/mbsrtowcs-state.c b/lib/mbsrtowcs-state.c index 0949a37..cbb8753 100644 --- a/lib/mbsrtowcs-state.c +++ b/lib/mbsrtowcs-state.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify @@ -21,7 +21,7 @@ /* Internal state used by the functions mbsrtowcs() and mbsnrtowcs(). */ mbstate_t _gl_mbsrtowcs_state -/* The state must initially be in the "initial state"; so, zero-initialize it. +/* The state must initially be in an "initial state"; so, zero-initialize it. On most systems, putting it into BSS is sufficient. Not so on Mac OS X 10.3, see <https://lists.gnu.org/r/bug-gnulib/2009-01/msg00329.html>. When it needs an initializer, use 0 or {0} as initializer? 0 only works diff --git a/lib/mbsrtowcs.c b/lib/mbsrtowcs.c index c20fc41..c77179f 100644 --- a/lib/mbsrtowcs.c +++ b/lib/mbsrtowcs.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify @@ -33,4 +33,5 @@ extern mbstate_t _gl_mbsrtowcs_state; #define DCHAR_T wchar_t #define INTERNAL_STATE _gl_mbsrtowcs_state #define MBRTOWC mbrtowc +#define USES_C32 0 #include "mbsrtowcs-impl.h" diff --git a/lib/mbszero.c b/lib/mbszero.c new file mode 100644 index 0000000..25af284 --- /dev/null +++ b/lib/mbszero.c @@ -0,0 +1,23 @@ +/* Put an mbstate_t into an initial conversion state. + Copyright (C) 2023-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2023. */ + +#include <config.h> + +#define IN_MBSZERO +/* Specification and implementation. */ +#include <wchar.h> diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h index 39b977b..92efb4a 100644 --- a/lib/mbtowc-impl.h +++ b/lib/mbtowc-impl.h @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This file is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ mbtowc (wchar_t *pwc, const char *s, size_t n) wchar_t wc; size_t result; - memset (&state, 0, sizeof (mbstate_t)); + mbszero (&state); result = mbrtowc (&wc, s, n, &state); if (result == (size_t)-1 || result == (size_t)-2) { diff --git a/lib/mbtowc-lock.c b/lib/mbtowc-lock.c index 6ca6e10..9001c5a 100644 --- a/lib/mbtowc-lock.c +++ b/lib/mbtowc-lock.c @@ -1,5 +1,5 @@ /* Return the internal lock used by mbrtowc and mbrtoc32. - Copyright (C) 2019-2023 Free Software Foundation, Inc. + Copyright (C) 2019-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -18,9 +18,10 @@ #include <config.h> +/* The option '--disable-threads' explicitly requests no locking. */ /* When it is known that the gl_get_mbtowc_lock function is defined by a dependency library, it should not be defined here. */ -#if OMIT_MBTOWC_LOCK +#if AVOID_ANY_THREADS || OMIT_MBTOWC_LOCK /* This declaration is solely to ensure that after preprocessing this file is never empty. */ @@ -37,14 +38,14 @@ typedef int dummy; /* Macro for exporting a symbol (function, not variable) defined in this file, when compiled into a shared library. */ -# ifndef DLL_EXPORTED +# ifndef SHLIB_EXPORTED # if HAVE_VISIBILITY /* Override the effect of the compiler option '-fvisibility=hidden'. */ -# define DLL_EXPORTED __attribute__((__visibility__("default"))) +# define SHLIB_EXPORTED __attribute__((__visibility__("default"))) # elif defined _WIN32 || defined __CYGWIN__ -# define DLL_EXPORTED __declspec(dllexport) +# define SHLIB_EXPORTED __declspec(dllexport) # else -# define DLL_EXPORTED +# define SHLIB_EXPORTED # endif # endif @@ -59,7 +60,7 @@ typedef int dummy; because the latter is not guaranteed to be a stable ABI in the future. */ /* Make sure the function gets exported from DLLs. */ -DLL_EXPORTED CRITICAL_SECTION *gl_get_mbtowc_lock (void); +SHLIB_EXPORTED CRITICAL_SECTION *gl_get_mbtowc_lock (void); static glwthread_initguard_t guard = GLWTHREAD_INITGUARD_INIT; static CRITICAL_SECTION lock; @@ -96,7 +97,7 @@ gl_get_mbtowc_lock (void) static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; /* Make sure the function gets exported from shared libraries. */ -DLL_EXPORTED pthread_mutex_t *gl_get_mbtowc_lock (void); +SHLIB_EXPORTED pthread_mutex_t *gl_get_mbtowc_lock (void); /* Returns the internal lock used by mbrtowc and mbrtoc32. */ pthread_mutex_t * @@ -123,7 +124,7 @@ atomic_init (void) } /* Make sure the function gets exported from shared libraries. */ -DLL_EXPORTED mtx_t *gl_get_mbtowc_lock (void); +SHLIB_EXPORTED mtx_t *gl_get_mbtowc_lock (void); /* Returns the internal lock used by mbrtowc and mbrtoc32. */ mtx_t * diff --git a/lib/mbtowc-lock.h b/lib/mbtowc-lock.h index 2dc22ac..10f7dc7 100644 --- a/lib/mbtowc-lock.h +++ b/lib/mbtowc-lock.h @@ -1,5 +1,5 @@ /* Use the internal lock used by mbrtowc and mbrtoc32. - Copyright (C) 2019-2023 Free Software Foundation, Inc. + Copyright (C) 2019-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -21,7 +21,7 @@ static inline int mbtowc_unlocked (wchar_t *pwc, const char *p, size_t m) { - /* Put the hidden internal state of mbtowc into its initial state. + /* Put the hidden internal state of mbtowc into an initial state. This is needed at least with glibc, uClibc, and MSVC CRT. See <https://sourceware.org/bugzilla/show_bug.cgi?id=9674>. */ mbtowc (NULL, NULL, 0); @@ -32,7 +32,7 @@ mbtowc_unlocked (wchar_t *pwc, const char *p, size_t m) /* Prohibit renaming this symbol. */ #undef gl_get_mbtowc_lock -#if GNULIB_MBRTOWC_SINGLE_THREAD +#if AVOID_ANY_THREADS || GNULIB_MBRTOWC_SINGLE_THREAD /* All uses of this function are in a single thread. No locking needed. */ diff --git a/lib/mbtowc.c b/lib/mbtowc.c index 8d9b06d..31a2d63 100644 --- a/lib/mbtowc.c +++ b/lib/mbtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This file is free software: you can redistribute it and/or modify diff --git a/lib/md2-stream.c b/lib/md2-stream.c index c311892..1637c79 100644 --- a/lib/md2-stream.c +++ b/lib/md2-stream.c @@ -1,6 +1,6 @@ /* Functions to compute MD2 message digest of files or memory blocks. according to the definition of MD2 in RFC 1319 from April 1992. - Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-2023 Free Software + Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify @@ -1,6 +1,6 @@ /* Functions to compute MD2 message digest of files or memory blocks. according to the definition of MD2 in RFC 1319 from April 1992. - Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-2023 Free Software + Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify @@ -1,6 +1,6 @@ /* Declarations of functions and data types used for MD2 sum library functions. - Copyright (C) 2000-2001, 2003, 2005, 2008-2023 Free Software Foundation, + Copyright (C) 2000-2001, 2003, 2005, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/md4-stream.c b/lib/md4-stream.c index 16694f8..65af7f9 100644 --- a/lib/md4-stream.c +++ b/lib/md4-stream.c @@ -1,6 +1,6 @@ /* Functions to compute MD4 message digest of files or memory blocks. according to the definition of MD4 in RFC 1320 from April 1992. - Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-2023 Free Software + Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify @@ -1,6 +1,6 @@ /* Functions to compute MD4 message digest of files or memory blocks. according to the definition of MD4 in RFC 1320 from April 1992. - Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-2023 Free Software + Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify @@ -1,6 +1,6 @@ /* Declarations of functions and data types used for MD4 sum library functions. - Copyright (C) 2000-2001, 2003, 2005, 2008-2023 Free Software Foundation, + Copyright (C) 2000-2001, 2003, 2005, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/md5-stream.c b/lib/md5-stream.c index ba76792..c82f181 100644 --- a/lib/md5-stream.c +++ b/lib/md5-stream.c @@ -1,6 +1,6 @@ /* Functions to compute MD5 message digest of files or memory blocks. according to the definition of MD5 in RFC 1321 from April 1992. - Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2023 Free Software + Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -1,6 +1,6 @@ /* Functions to compute MD5 message digest of files or memory blocks. according to the definition of MD5 in RFC 1321 from April 1992. - Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2023 Free Software + Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -1,6 +1,6 @@ /* Declaration of functions and data types used for MD5 sum computing library functions. - Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2023 Free Software + Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -32,7 +32,21 @@ # ifndef OPENSSL_API_COMPAT # define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API. */ # endif -# include <openssl/md5.h> +/* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL. */ +# include <openssl/opensslv.h> +# if OPENSSL_VERSION_MAJOR >= 3 +# include <openssl/configuration.h> +# if (OPENSSL_CONFIGURED_API \ + < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \ + ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \ + + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \ + + ((OPENSSL_API_COMPAT >> 12) & 0xFF))) +# undef HAVE_OPENSSL_MD5 +# endif +# endif +# if HAVE_OPENSSL_MD5 +# include <openssl/md5.h> +# endif # endif #define MD5_DIGEST_SIZE 16 @@ -49,7 +63,11 @@ #ifndef __THROW # if defined __cplusplus && (__GNUC_PREREQ (2,8) || __clang_major__ >= 4) -# define __THROW throw () +# if __cplusplus >= 201103L +# define __THROW noexcept (true) +# else +# define __THROW throw () +# endif # else # define __THROW # endif diff --git a/lib/memchr.c b/lib/memchr.c index 8e95579..67687a8 100644 --- a/lib/memchr.c +++ b/lib/memchr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2023 +/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2024 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), diff --git a/lib/memchr.valgrind b/lib/memchr.valgrind index 97690f2..0295d7e 100644 --- a/lib/memchr.valgrind +++ b/lib/memchr.valgrind @@ -1,6 +1,6 @@ # Suppress a valgrind message about use of uninitialized memory in memchr(). -# Copyright (C) 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2009-2024 Free Software Foundation, Inc. # # This file is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as diff --git a/lib/mempcpy.c b/lib/mempcpy.c index 24a3135..6388677 100644 --- a/lib/mempcpy.c +++ b/lib/mempcpy.c @@ -1,5 +1,5 @@ /* Copy memory area and return pointer after last written byte. - Copyright (C) 2003, 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2003, 2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/memrchr.c b/lib/memrchr.c index c5b1fe8..3df1f47 100644 --- a/lib/memrchr.c +++ b/lib/memrchr.c @@ -1,6 +1,6 @@ /* memrchr -- find the last occurrence of a byte in a memory block - Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2023 Free Software + Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2024 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), diff --git a/lib/minmax.h b/lib/minmax.h index 0ac4019..f3df58b 100644 --- a/lib/minmax.h +++ b/lib/minmax.h @@ -1,5 +1,5 @@ /* MIN, MAX macros. - Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2023 Free Software + Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/mkdir.c b/lib/mkdir.c index f94aba1..21d7767 100644 --- a/lib/mkdir.c +++ b/lib/mkdir.c @@ -1,7 +1,7 @@ /* On some systems, mkdir ("foo/", 0700) fails because of the trailing slash. On those systems, this wrapper removes the trailing slash. - Copyright (C) 2001, 2003, 2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/mkostemp.c b/lib/mkostemp.c index 5cd5b3a..d826627 100644 --- a/lib/mkostemp.c +++ b/lib/mkostemp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2023 Free Software +/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2024 Free Software Foundation, Inc. This file is derived from the one in the GNU C Library. diff --git a/lib/mkstemp.c b/lib/mkstemp.c index 77aadbb..724638d 100644 --- a/lib/mkstemp.c +++ b/lib/mkstemp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2023 Free Software +/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2024 Free Software Foundation, Inc. This file is derived from the one in the GNU C Library. diff --git a/lib/mktime-internal.h b/lib/mktime-internal.h index 709c36b..0693aaf 100644 --- a/lib/mktime-internal.h +++ b/lib/mktime-internal.h @@ -1,5 +1,5 @@ /* Internals of mktime and related functions - Copyright 2016-2023 Free Software Foundation, Inc. + Copyright 2016-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert <eggert@cs.ucla.edu>. diff --git a/lib/mktime.c b/lib/mktime.c index 8e80bcd..c704f41 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -1,5 +1,5 @@ /* Convert a 'struct tm' to a time_t value. - Copyright (C) 1993-2023 Free Software Foundation, Inc. + Copyright (C) 1993-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert <eggert@twinsun.com>. diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c index c5149a8..da3fc86 100644 --- a/lib/msvc-inval.c +++ b/lib/msvc-inval.c @@ -1,5 +1,5 @@ /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/msvc-inval.h b/lib/msvc-inval.h index c16d880..7aee6e5 100644 --- a/lib/msvc-inval.h +++ b/lib/msvc-inval.h @@ -1,5 +1,5 @@ /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/msvc-nothrow.c b/lib/msvc-nothrow.c index f729fe6..06b35a6 100644 --- a/lib/msvc-nothrow.c +++ b/lib/msvc-nothrow.c @@ -1,6 +1,6 @@ /* Wrappers that don't throw invalid parameter notifications with MSVC runtime libraries. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/msvc-nothrow.h b/lib/msvc-nothrow.h index 0dd229f..dc6dd35 100644 --- a/lib/msvc-nothrow.h +++ b/lib/msvc-nothrow.h @@ -1,6 +1,6 @@ /* Wrappers that don't throw invalid parameter notifications with MSVC runtime libraries. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/nanosleep.c b/lib/nanosleep.c index 3f295f4..c6a76ec 100644 --- a/lib/nanosleep.c +++ b/lib/nanosleep.c @@ -1,6 +1,6 @@ /* Provide a replacement for the POSIX nanosleep function. - Copyright (C) 1999-2000, 2002, 2004-2023 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002, 2004-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -60,8 +60,7 @@ nanosleep (const struct timespec *requested_delay, static_assert (TYPE_MAXIMUM (time_t) / 24 / 24 / 60 / 60); const time_t limit = 24 * 24 * 60 * 60; time_t seconds = requested_delay->tv_sec; - struct timespec intermediate; - intermediate.tv_nsec = requested_delay->tv_nsec; + struct timespec intermediate = *requested_delay; while (limit < seconds) { diff --git a/lib/netdb.in.h b/lib/netdb.in.h index 81c65e7..43409b2 100644 --- a/lib/netdb.in.h +++ b/lib/netdb.in.h @@ -1,5 +1,5 @@ /* Provide a netdb.h header file for systems lacking it (read: MinGW). - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. Written by Simon Josefsson. This file is free software: you can redistribute it and/or modify diff --git a/lib/netinet_in.in.h b/lib/netinet_in.in.h index f88923a..4e9f6f2 100644 --- a/lib/netinet_in.in.h +++ b/lib/netinet_in.in.h @@ -1,5 +1,5 @@ /* Substitute for <netinet/in.h>. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/nl_langinfo-lock.c b/lib/nl_langinfo-lock.c index e5cdcd3..5a248ed 100644 --- a/lib/nl_langinfo-lock.c +++ b/lib/nl_langinfo-lock.c @@ -1,5 +1,5 @@ /* Return the internal lock used by nl_langinfo. - Copyright (C) 2019-2023 Free Software Foundation, Inc. + Copyright (C) 2019-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -18,9 +18,10 @@ #include <config.h> +/* The option '--disable-threads' explicitly requests no locking. */ /* When it is known that the gl_get_nl_langinfo_lock function is defined by a dependency library, it should not be defined here. */ -#if OMIT_NL_LANGINFO_LOCK +#if AVOID_ANY_THREADS || OMIT_NL_LANGINFO_LOCK /* This declaration is solely to ensure that after preprocessing this file is never empty. */ @@ -37,14 +38,14 @@ typedef int dummy; /* Macro for exporting a symbol (function, not variable) defined in this file, when compiled into a shared library. */ -# ifndef DLL_EXPORTED +# ifndef SHLIB_EXPORTED # if HAVE_VISIBILITY /* Override the effect of the compiler option '-fvisibility=hidden'. */ -# define DLL_EXPORTED __attribute__((__visibility__("default"))) +# define SHLIB_EXPORTED __attribute__((__visibility__("default"))) # elif defined _WIN32 || defined __CYGWIN__ -# define DLL_EXPORTED __declspec(dllexport) +# define SHLIB_EXPORTED __declspec(dllexport) # else -# define DLL_EXPORTED +# define SHLIB_EXPORTED # endif # endif @@ -59,7 +60,7 @@ typedef int dummy; because the latter is not guaranteed to be a stable ABI in the future. */ /* Make sure the function gets exported from DLLs. */ -DLL_EXPORTED CRITICAL_SECTION *gl_get_nl_langinfo_lock (void); +SHLIB_EXPORTED CRITICAL_SECTION *gl_get_nl_langinfo_lock (void); static glwthread_initguard_t guard = GLWTHREAD_INITGUARD_INIT; static CRITICAL_SECTION lock; @@ -96,7 +97,7 @@ gl_get_nl_langinfo_lock (void) static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; /* Make sure the function gets exported from shared libraries. */ -DLL_EXPORTED pthread_mutex_t *gl_get_nl_langinfo_lock (void); +SHLIB_EXPORTED pthread_mutex_t *gl_get_nl_langinfo_lock (void); /* Returns the internal lock used by nl_langinfo. */ pthread_mutex_t * @@ -123,7 +124,7 @@ atomic_init (void) } /* Make sure the function gets exported from shared libraries. */ -DLL_EXPORTED mtx_t *gl_get_nl_langinfo_lock (void); +SHLIB_EXPORTED mtx_t *gl_get_nl_langinfo_lock (void); /* Returns the internal lock used by nl_langinfo. */ mtx_t * diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c index f872c6d..64ff93b 100644 --- a/lib/nl_langinfo.c +++ b/lib/nl_langinfo.c @@ -1,6 +1,6 @@ /* nl_langinfo() replacement: query locale dependent information. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -30,7 +30,12 @@ #endif #if REPLACE_NL_LANGINFO && !NL_LANGINFO_MTSAFE -# if defined _WIN32 && !defined __CYGWIN__ + +# if AVOID_ANY_THREADS + +/* The option '--disable-threads' explicitly requests no locking. */ + +# elif defined _WIN32 && !defined __CYGWIN__ # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include <windows.h> @@ -51,6 +56,7 @@ # include <threads.h> # endif + #endif /* nl_langinfo() must be multithread-safe. To achieve this without using @@ -186,7 +192,12 @@ nl_langinfo_unlocked (nl_item item) /* Prohibit renaming this symbol. */ # undef gl_get_nl_langinfo_lock -# if defined _WIN32 && !defined __CYGWIN__ +# if AVOID_ANY_THREADS + +/* The option '--disable-threads' explicitly requests no locking. */ +# define nl_langinfo_with_lock nl_langinfo_unlocked + +# elif defined _WIN32 && !defined __CYGWIN__ extern __declspec(dllimport) CRITICAL_SECTION *gl_get_nl_langinfo_lock (void); @@ -451,7 +462,7 @@ nl_langinfo (nl_item item) { static char const months[][sizeof "September"] = { "January", "February", "March", "April", "May", "June", "July", - "September", "October", "November", "December" + "August", "September", "October", "November", "December" }; case MON_1: case MON_2: @@ -515,7 +526,7 @@ nl_langinfo (nl_item item) static char result[12][30]; static char const abmonths[][sizeof "Jan"] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", - "Sep", "Oct", "Nov", "Dec" + "Aug", "Sep", "Oct", "Nov", "Dec" }; tmm.tm_mon = item - ABMON_1; if (!strftime (buf, sizeof result[0], "%b", &tmm)) @@ -1,5 +1,5 @@ /* Open a descriptor to a file. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -38,9 +38,13 @@ orig_open (const char *filename, int flags, mode_t mode) } /* Specification. */ +#ifdef __osf__ /* Write "fcntl.h" here, not <fcntl.h>, otherwise OSF/1 5.1 DTK cc eliminates this include because of the preliminary #include <fcntl.h> above. */ -#include "fcntl.h" +# include "fcntl.h" +#else +# include <fcntl.h> +#endif #include "cloexec.h" diff --git a/lib/openat-die.c b/lib/openat-die.c index df3dbc9..959c77d 100644 --- a/lib/openat-die.c +++ b/lib/openat-die.c @@ -1,6 +1,6 @@ /* Report a save- or restore-cwd failure in our openat replacement and then exit. - Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ #include <stdlib.h> #ifndef GNULIB_LIBPOSIX -# include "error.h" +# include <error.h> #endif #include "exitfail.h" diff --git a/lib/openat-priv.h b/lib/openat-priv.h index 1d31c4e..7fd4beb 100644 --- a/lib/openat-priv.h +++ b/lib/openat-priv.h @@ -1,6 +1,6 @@ /* Internals for openat-like functions. - Copyright (C) 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/openat-proc.c b/lib/openat-proc.c index 88f70be..7ccb734 100644 --- a/lib/openat-proc.c +++ b/lib/openat-proc.c @@ -1,6 +1,6 @@ /* Create /proc/self/fd-related names for subfiles of open directories. - Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/openat.c b/lib/openat.c index f28b10e..65cfc5e 100644 --- a/lib/openat.c +++ b/lib/openat.c @@ -1,5 +1,5 @@ /* provide a replacement openat function - Copyright (C) 2004-2023 Free Software Foundation, Inc. + Copyright (C) 2004-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,9 +35,13 @@ orig_openat (int fd, char const *filename, int flags, mode_t mode) } #endif +#ifdef __osf__ /* Write "fcntl.h" here, not <fcntl.h>, otherwise OSF/1 5.1 DTK cc eliminates this include because of the preliminary #include <fcntl.h> above. */ -#include "fcntl.h" +# include "fcntl.h" +#else +# include <fcntl.h> +#endif #include "openat.h" diff --git a/lib/openat.h b/lib/openat.h index 97f066d..dc34092 100644 --- a/lib/openat.h +++ b/lib/openat.h @@ -1,5 +1,5 @@ /* provide a replacement openat function - Copyright (C) 2004-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2004-2006, 2008-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/opendir.c b/lib/opendir.c index ceb0e28..df76807 100644 --- a/lib/opendir.c +++ b/lib/opendir.c @@ -1,5 +1,5 @@ /* Start reading the entries of a directory. - Copyright (C) 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -44,11 +44,6 @@ # include <unistd.h> #endif -#ifdef __KLIBC__ -# include <io.h> -# include <fcntl.h> -#endif - #if defined _WIN32 && ! defined __CYGWIN__ /* Don't assume that UNICODE is not defined. */ # undef WIN32_FIND_DATA @@ -93,23 +88,6 @@ opendir (const char *dir_name) return NULL; # endif -# ifdef __KLIBC__ - { - int fd = open (dir_name, O_RDONLY); - if (fd == -1 || _gl_register_dirp_fd (fd, dirp)) - { - int saved_errno = errno; - - close (fd); - closedir (dirp); - - errno = saved_errno; - - return NULL; - } - } -# endif - #else char dir_name_mask[MAX_PATH + 1 + 1 + 1]; diff --git a/lib/os2-spawn.c b/lib/os2-spawn.c index c47f33a..05bcd1e 100644 --- a/lib/os2-spawn.c +++ b/lib/os2-spawn.c @@ -1,5 +1,5 @@ /* Auxiliary functions for the creation of subprocesses. OS/2 kLIBC API. - Copyright (C) 2001, 2003-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software: you can redistribute it and/or modify @@ -29,7 +29,7 @@ #include <errno.h> #include "cloexec.h" -#include "error.h" +#include <error.h> #include "gettext.h" #define _(str) gettext (str) diff --git a/lib/os2-spawn.h b/lib/os2-spawn.h index ebfaf11..c8b8e33 100644 --- a/lib/os2-spawn.h +++ b/lib/os2-spawn.h @@ -1,5 +1,5 @@ /* Auxiliary functions for the creation of subprocesses. OS/2 kLIBC API. - Copyright (C) 2001, 2003-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software: you can redistribute it and/or modify diff --git a/lib/pathmax.h b/lib/pathmax.h index 6930283..d6512c6 100644 --- a/lib/pathmax.h +++ b/lib/pathmax.h @@ -1,5 +1,5 @@ /* Define PATH_MAX somehow. Requires sys/types.h. - Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2023 Free Software + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/pipe-safer.c b/lib/pipe-safer.c index 750d097..3f2143e 100644 --- a/lib/pipe-safer.c +++ b/lib/pipe-safer.c @@ -1,5 +1,5 @@ /* Invoke pipe, but avoid some glitches. - Copyright (C) 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* Create a pipe. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/pipe2-safer.c b/lib/pipe2-safer.c index 0a5336d..1d1b94c 100644 --- a/lib/pipe2-safer.c +++ b/lib/pipe2-safer.c @@ -1,5 +1,5 @@ /* Invoke pipe2, but avoid some glitches. - Copyright (C) 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/pipe2.c b/lib/pipe2.c index 8f06575..7b476df 100644 --- a/lib/pipe2.c +++ b/lib/pipe2.c @@ -1,5 +1,5 @@ /* Create a pipe, with specific opening flags. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/printf-args.c b/lib/printf-args.c index b2b21ae..eb0d2cd 100644 --- a/lib/printf-args.c +++ b/lib/printf-args.c @@ -1,5 +1,5 @@ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2023 Free Software + Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/printf-args.h b/lib/printf-args.h index 1101610..9b80bb3 100644 --- a/lib/printf-args.h +++ b/lib/printf-args.h @@ -1,5 +1,5 @@ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2023 Free Software + Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/printf-parse.c b/lib/printf-parse.c index d3f2c3c..a33e27a 100644 --- a/lib/printf-parse.c +++ b/lib/printf-parse.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999-2000, 2002-2003, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2003, 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -555,9 +555,10 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) unsigned_type = TYPE_ULONGINT; pointer_type = TYPE_COUNT_LONGINT_POINTER; } - cp++; + cp += 3; } #endif + (void) pointer_type; /* Read the conversion character. */ c = *cp++; @@ -616,9 +617,11 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) case 'p': type = TYPE_POINTER; break; +#if NEED_PRINTF_WITH_N_DIRECTIVE case 'n': type = pointer_type; break; +#endif #if ENABLE_UNISTDIO /* The unistdio extensions. */ case 'U': diff --git a/lib/printf-parse.h b/lib/printf-parse.h index 45febac..949b875 100644 --- a/lib/printf-parse.h +++ b/lib/printf-parse.h @@ -1,5 +1,5 @@ /* Parse printf format string. - Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2023 Free Software + Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/pselect.c b/lib/pselect.c index 52d3837..54732e5 100644 --- a/lib/pselect.c +++ b/lib/pselect.c @@ -1,6 +1,6 @@ /* pselect - synchronous I/O multiplexing - Copyright 2011-2023 Free Software Foundation, Inc. + Copyright 2011-2024 Free Software Foundation, Inc. This file is part of gnulib. @@ -59,8 +59,10 @@ pselect (int nfds, fd_set *restrict rfds, return -1; } - tv.tv_sec = timeout->tv_sec; - tv.tv_usec = (timeout->tv_nsec + 999) / 1000; + tv = (struct timeval) { + .tv_sec = timeout->tv_sec, + .tv_usec = (timeout->tv_nsec + 999) / 1000 + }; tvp = &tv; } else diff --git a/lib/pthread_sigmask.c b/lib/pthread_sigmask.c index 1281075..3b6e6e4 100644 --- a/lib/pthread_sigmask.c +++ b/lib/pthread_sigmask.c @@ -1,5 +1,5 @@ /* POSIX compatible signal blocking for threads. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/quote.h b/lib/quote.h index 9ec5747..2a1c581 100644 --- a/lib/quote.h +++ b/lib/quote.h @@ -1,6 +1,6 @@ /* quote.h - prototypes for quote.c - Copyright (C) 1998-2001, 2003, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1998-2001, 2003, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/quotearg.c b/lib/quotearg.c index 975bd61..847101e 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -1,6 +1,6 @@ /* quotearg.c - quote arguments for output - Copyright (C) 1998-2002, 2004-2023 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,8 +41,8 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> +#include <uchar.h> #include <wchar.h> -#include <wctype.h> #include "gettext.h" #define _(msgid) gettext (msgid) @@ -531,12 +531,9 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, case '<': case '=': /* sometimes special in 0th or (with "set -k") later args */ case '>': case '[': - case '^': /* special in old /bin/sh, e.g. SunOS 4.1.4 */ + case '^': /* special in old /bin/sh, e.g., Solaris 10 */ case '`': case '|': - /* A shell special character. In theory, '$' and '`' could - be the first bytes of multibyte characters, which means - we should check them with mbrtowc, but in practice this - doesn't happen so it's not worth worrying about. */ + /* A shell special character. */ if (quoting_style == shell_always_quoting_style && elide_outer_quotes) goto force_outer_quoting_style; @@ -611,18 +608,18 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, else { mbstate_t mbstate; - memset (&mbstate, 0, sizeof mbstate); + mbszero (&mbstate); m = 0; printable = true; if (argsize == SIZE_MAX) argsize = strlen (arg); - do + for (;;) { - wchar_t w; - size_t bytes = mbrtowc (&w, &arg[i + m], - argsize - (i + m), &mbstate); + char32_t w; + size_t bytes = mbrtoc32 (&w, &arg[i + m], + argsize - (i + m), &mbstate); if (bytes == 0) break; else if (bytes == (size_t) -1) @@ -639,6 +636,10 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, } else { + #if !GNULIB_MBRTOC32_REGULAR + if (bytes == (size_t) -3) + bytes = 0; + #endif /* Work around a bug with older shells that "see" a '\' that is really the 2nd byte of a multibyte character. In practice the problem is limited to ASCII @@ -659,12 +660,15 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, } } - if (! iswprint (w)) + if (! c32isprint (w)) printable = false; m += bytes; } + #if !GNULIB_MBRTOC32_REGULAR + if (mbsinit (&mbstate)) + #endif + break; } - while (! mbsinit (&mbstate)); } c_and_shell_quote_compat = printable; diff --git a/lib/quotearg.h b/lib/quotearg.h index baab586..4e9099f 100644 --- a/lib/quotearg.h +++ b/lib/quotearg.h @@ -1,6 +1,6 @@ /* quotearg.h - quote arguments for output - Copyright (C) 1998-2002, 2004, 2006, 2008-2023 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -155,11 +155,11 @@ enum quoting_style LC_MESSAGES=C quotearg_buffer: - "`simple'", "`\\0 \\t\\n\\'\"\\033??/\\\\'", "`a:b'" + "'simple'", "'\\0 \\t\\n\\'\"\\033??/\\\\'", "'a:b'" quotearg: - "`simple'", "`\\0 \\t\\n\\'\"\\033??/\\\\'", "`a:b'" + "'simple'", "'\\0 \\t\\n\\'\"\\033??/\\\\'", "'a:b'" quotearg_colon: - "`simple'", "`\\0 \\t\\n\\'\"\\033??/\\\\'", "`a\\:b'" + "'simple'", "'\\0 \\t\\n\\'\"\\033??/\\\\'", "'a\\:b'" LC_MESSAGES=pt_PT.utf8 quotearg_buffer: diff --git a/lib/raise.c b/lib/raise.c index 506e20b..891f355 100644 --- a/lib/raise.c +++ b/lib/raise.c @@ -1,6 +1,6 @@ /* Provide a non-threads replacement for the POSIX raise function. - Copyright (C) 2002-2003, 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/rawmemchr.c b/lib/rawmemchr.c index 45c6cd3..013e7f8 100644 --- a/lib/rawmemchr.c +++ b/lib/rawmemchr.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ /* Specification. */ #include <string.h> -/* A function definition is only needed if HAVE_RAWMEMCHR is not defined. */ +/* A function definition is needed only if HAVE_RAWMEMCHR is not defined. */ #if !HAVE_RAWMEMCHR # include <limits.h> @@ -30,19 +30,30 @@ void * rawmemchr (const void *s, int c_in) { - /* Change this typedef to experiment with performance. */ +# ifdef __CHERI_PURE_CAPABILITY__ + /* Most architectures let you read an aligned word, + even if the unsigned char array at S ends in the middle of the word. + However CHERI does not, so call memchr + with the underlying object's remaining length. + This cannot return NULL if S points to a C_IN-terminated array. + Use builtins rather than including <cheri.h> which is less stable. */ + return memchr (s, c_in, (__builtin_cheri_length_get (s) + - __builtin_cheri_offset_get (s))); +# else + + /* You can change this typedef to experiment with performance. */ typedef uintptr_t longword; - /* If you change the "uintptr_t", you should change UINTPTR_WIDTH to match. - This verifies that the type does not have padding bits. */ - static_assert (UINTPTR_WIDTH == UCHAR_WIDTH * sizeof (longword)); + /* Verify that the longword type lacks padding bits. */ + static_assert (UINTPTR_WIDTH == UCHAR_WIDTH * sizeof (uintptr_t)); const unsigned char *char_ptr; unsigned char c = c_in; /* Handle the first few bytes by reading one byte at a time. - Do this until CHAR_PTR is aligned on a longword boundary. */ + Do this until CHAR_PTR is aligned on a natural longword boundary, + as using alignof (longword) might be slower. */ for (char_ptr = (const unsigned char *) s; - (uintptr_t) char_ptr % alignof (longword) != 0; + (uintptr_t) char_ptr % sizeof (longword) != 0; ++char_ptr) if (*char_ptr == c) return (void *) char_ptr; @@ -118,6 +129,7 @@ rawmemchr (const void *s, int c_in) while (*char_ptr != c) char_ptr++; return (void *) char_ptr; +# endif } #endif diff --git a/lib/rawmemchr.valgrind b/lib/rawmemchr.valgrind index f3e4cb0..bb201f7 100644 --- a/lib/rawmemchr.valgrind +++ b/lib/rawmemchr.valgrind @@ -1,6 +1,6 @@ # Suppress a valgrind message about use of uninitialized memory in rawmemchr(). -# Copyright (C) 2008-2023 Free Software Foundation, Inc. +# Copyright (C) 2008-2024 Free Software Foundation, Inc. # # This file is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as diff --git a/lib/readdir.c b/lib/readdir.c index 04dbba2..fab1964 100644 --- a/lib/readdir.c +++ b/lib/readdir.c @@ -1,5 +1,5 @@ /* Read the next entry of a directory. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/readlink.c b/lib/readlink.c index 14bbb7f..a5369fa 100644 --- a/lib/readlink.c +++ b/lib/readlink.c @@ -1,5 +1,5 @@ /* Read the contents of a symbolic link. - Copyright (C) 2003-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/realloc.c b/lib/realloc.c index 1063eb0..0573139 100644 --- a/lib/realloc.c +++ b/lib/realloc.c @@ -1,6 +1,6 @@ /* realloc() function that is glibc compatible. - Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2023 Free Software + Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/reallocarray.c b/lib/reallocarray.c index 8c99250..09711a0 100644 --- a/lib/reallocarray.c +++ b/lib/reallocarray.c @@ -1,6 +1,6 @@ /* reallocarray function that is glibc compatible. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -1,6 +1,6 @@ /* recv.c --- wrappers for Windows recv function - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/regcomp.c b/lib/regcomp.c index 8947839..696cf81 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2023 Free Software Foundation, Inc. + Copyright (C) 2002-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -905,7 +905,7 @@ init_word_char (re_dfa_t *dfa) bitset_word_t bits3 = 0x07fffffe; if (BITSET_WORD_BITS == 64) { - /* Pacify gcc -Woverflow on 32-bit platformns. */ + /* Pacify gcc -Woverflow on 32-bit platforms. */ dfa->word_char[0] = bits1 << 31 << 1 | bits0; dfa->word_char[1] = bits3 << 31 << 1 | bits2; i = 2; diff --git a/lib/regex.c b/lib/regex.c index 3beb0de..4b1a6ed 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2023 Free Software Foundation, Inc. + Copyright (C) 2002-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -26,10 +26,6 @@ # pragma GCC diagnostic ignored "-Wsuggest-attribute=pure" # pragma GCC diagnostic ignored "-Wvla" # endif -# if __GNUC_PREREQ (4, 3) -# pragma GCC diagnostic ignored "-Wold-style-definition" -# pragma GCC diagnostic ignored "-Wtype-limits" -# endif #endif /* Make sure no one compiles this code with a C++ compiler. */ diff --git a/lib/regex.h b/lib/regex.h index 9ef0252..ccf40ce 100644 --- a/lib/regex.h +++ b/lib/regex.h @@ -1,6 +1,6 @@ /* Definitions for data structures and routines for the regular expression library. - Copyright (C) 1985, 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1985, 1989-2024 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/lib/regex_internal.c b/lib/regex_internal.c index 998a19b..8cd096e 100644 --- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2023 Free Software Foundation, Inc. + Copyright (C) 2002-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/regex_internal.h b/lib/regex_internal.h index 0270091..6165cb1 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2023 Free Software Foundation, Inc. + Copyright (C) 2002-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -151,9 +151,6 @@ as some non-GCC platforms lack them, an issue when this code is used in Gnulib. */ -#ifndef SSIZE_MAX -# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) -#endif #ifndef ULONG_WIDTH # define ULONG_WIDTH REGEX_UINTEGER_WIDTH (ULONG_MAX) /* The number of usable bits in an unsigned integer type with maximum diff --git a/lib/regexec.c b/lib/regexec.c index f05f38a..9f065df 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2023 Free Software Foundation, Inc. + Copyright (C) 2002-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/rename.c b/lib/rename.c index 4722f13..b6c93db 100644 --- a/lib/rename.c +++ b/lib/rename.c @@ -1,6 +1,6 @@ /* Work around rename bugs in some systems. - Copyright (C) 2001-2003, 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -351,7 +351,7 @@ rpl_rename (char const *src, char const *dst) return -1; } # if RENAME_HARD_LINK_BUG - if (SAME_INODE (src_st, dst_st)) + if (psame_inode (&src_st, &dst_st)) return 0; # endif /* RENAME_HARD_LINK_BUG */ dst_exists = true; @@ -360,7 +360,7 @@ rpl_rename (char const *src, char const *dst) # if (RENAME_TRAILING_SLASH_SOURCE_BUG || RENAME_DEST_EXISTS_BUG \ || RENAME_HARD_LINK_BUG) /* If the only bug was that a trailing slash was allowed on a - non-existing file destination, as in Solaris 10, then we've + nonexistent file destination, as in Solaris 10, then we've already covered that situation. But if there is any problem with a trailing slash on an existing source or destination, as in Solaris 9, or if a directory can overwrite a symlink, as on diff --git a/lib/rewinddir.c b/lib/rewinddir.c index f200cc5..82ebc7f 100644 --- a/lib/rewinddir.c +++ b/lib/rewinddir.c @@ -1,5 +1,5 @@ /* Restart reading the entries of a directory from the beginning. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/rmdir.c b/lib/rmdir.c index bd1d819..04e4316 100644 --- a/lib/rmdir.c +++ b/lib/rmdir.c @@ -1,6 +1,6 @@ /* Work around rmdir bugs. - Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2023 Free Software + Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/same-inode.c b/lib/same-inode.c new file mode 100644 index 0000000..08c66a2 --- /dev/null +++ b/lib/same-inode.c @@ -0,0 +1,3 @@ +#include <config.h> +#define SAME_INODE_INLINE _GL_EXTERN_INLINE +#include "same-inode.h" diff --git a/lib/same-inode.h b/lib/same-inode.h index 10964f0..62dd088 100644 --- a/lib/same-inode.h +++ b/lib/same-inode.h @@ -1,6 +1,6 @@ /* Determine whether two stat buffers are known to refer to the same file. - Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -16,32 +16,70 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef SAME_INODE_H -# define SAME_INODE_H 1 - -# include <sys/types.h> - -# if defined __VMS && __CRTL_VER < 80200000 -# define SAME_INODE(a, b) \ - ((a).st_ino[0] == (b).st_ino[0] \ - && (a).st_ino[1] == (b).st_ino[1] \ - && (a).st_ino[2] == (b).st_ino[2] \ - && (a).st_dev == (b).st_dev) -# elif defined _WIN32 && ! defined __CYGWIN__ - /* Native Windows. */ -# if _GL_WINDOWS_STAT_INODES - /* stat() and fstat() set st_dev and st_ino to 0 if information about - the inode is not available. */ -# define SAME_INODE(a, b) \ - (!((a).st_ino == 0 && (a).st_dev == 0) \ - && (a).st_ino == (b).st_ino && (a).st_dev == (b).st_dev) +#define SAME_INODE_H 1 + +/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE. */ +#if !_GL_CONFIG_H_INCLUDED + #error "Please include config.h first." +#endif + +#include <sys/stat.h> + +_GL_INLINE_HEADER_BEGIN +#ifndef SAME_INODE_INLINE +# define SAME_INODE_INLINE _GL_INLINE +#endif + +/* True if A and B point to structs with st_dev and st_ino members + that are known to represent the same file. + + Use | and ^ to shorten generated code, and to lessen the + probability of screwups if st_ino is an array. */ + +#if defined __VMS && __CRTL_VER < 80200000 +# define PSAME_INODE(a, b) (! (((a)->st_dev ^ (b)->st_dev) \ + | ((a)->st_ino[0] ^ (b)->st_ino[0]) \ + | ((a)->st_ino[1] ^ (b)->st_ino[1]) \ + | ((a)->st_ino[2] ^ (b)->st_ino[2]))) +#elif defined _WIN32 && ! defined __CYGWIN__ + /* Native Windows. */ +# if _GL_WINDOWS_STAT_INODES + /* stat() and fstat() set st_dev and st_ino to 0 if information about + the inode is not available. */ +# if _GL_WINDOWS_STAT_INODES == 2 +# define PSAME_INODE(a, b) \ + (! (! ((a)->st_dev | (a)->st_ino._gl_ino[0] | (a)->st_ino._gl_ino[1]) \ + | ((a)->st_dev ^ (b)->st_dev) \ + | ((a)->st_ino._gl_ino[0] ^ (b)->st_ino._gl_ino[0]) \ + | ((a)->st_ino._gl_ino[1] ^ (b)->st_ino._gl_ino[1]))) # else - /* stat() and fstat() set st_ino to 0 always. */ -# define SAME_INODE(a, b) 0 +# define PSAME_INODE(a, b) (! (! ((a)->st_dev | (a)->st_ino) \ + | ((a)->st_dev ^ (b)->st_dev) \ + | ((a)->st_ino ^ (b)->st_ino))) # endif # else -# define SAME_INODE(a, b) \ - ((a).st_ino == (b).st_ino \ - && (a).st_dev == (b).st_dev) + /* stat() and fstat() set st_ino to 0 always. */ +# define PSAME_INODE(a, b) 0 # endif +#else + /* POSIX. */ +# define PSAME_INODE(a, b) (! (((a)->st_dev ^ (b)->st_dev) \ + | ((a)->st_ino ^ (b)->st_ino))) +#endif + +/* True if struct objects A and B are known to represent the same file. */ + +#define SAME_INODE(a, b) PSAME_INODE (&(a), &(b)) + +/* True if *A and *B represent the same file. Unlike PSAME_INODE, + args are evaluated once and must point to struct stat. */ + +SAME_INODE_INLINE bool +psame_inode (struct stat const *a, struct stat const *b) +{ + return PSAME_INODE (a, b); +} + +_GL_INLINE_HEADER_END #endif diff --git a/lib/save-cwd.c b/lib/save-cwd.c index 3806084..47f888c 100644 --- a/lib/save-cwd.c +++ b/lib/save-cwd.c @@ -1,6 +1,6 @@ /* save-cwd.c -- Save and restore current working directory. - Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2023 Free Software + Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/save-cwd.h b/lib/save-cwd.h index d089b0e..692e4b9 100644 --- a/lib/save-cwd.h +++ b/lib/save-cwd.h @@ -1,6 +1,6 @@ /* Save and restore current working directory. - Copyright (C) 1995, 1997-1998, 2003, 2009-2023 Free Software Foundation, + Copyright (C) 1995, 1997-1998, 2003, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/sched.in.h b/lib/sched.in.h index 21aab51..838fb12 100644 --- a/lib/sched.in.h +++ b/lib/sched.in.h @@ -1,5 +1,5 @@ /* A GNU-like <sched.h>. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/scratch_buffer.h b/lib/scratch_buffer.h index 4cf60d2..4f28203 100644 --- a/lib/scratch_buffer.h +++ b/lib/scratch_buffer.h @@ -1,5 +1,5 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/secure_getenv.c b/lib/secure_getenv.c index a0bc0cf..1ee98bf 100644 --- a/lib/secure_getenv.c +++ b/lib/secure_getenv.c @@ -1,6 +1,6 @@ /* Look up an environment variable, returning NULL in insecure situations. - Copyright 2013-2023 Free Software Foundation, Inc. + Copyright 2013-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/select.c b/lib/select.c index 6b6ca41..5f7a5d0 100644 --- a/lib/select.c +++ b/lib/select.c @@ -1,7 +1,7 @@ /* Emulation for select(2) Contributed by Paolo Bonzini. - Copyright 2008-2023 Free Software Foundation, Inc. + Copyright 2008-2024 Free Software Foundation, Inc. This file is part of gnulib. @@ -1,6 +1,6 @@ /* send.c --- wrappers for Windows send function - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/setlocale-lock.c b/lib/setlocale-lock.c index b70ba09..192489c 100644 --- a/lib/setlocale-lock.c +++ b/lib/setlocale-lock.c @@ -1,5 +1,5 @@ /* Return the internal lock used by setlocale_null_r. - Copyright (C) 2019-2023 Free Software Foundation, Inc. + Copyright (C) 2019-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -18,9 +18,10 @@ #include <config.h> +/* The option '--disable-threads' explicitly requests no locking. */ /* When it is known that the gl_get_setlocale_null_lock function is defined by a dependency library, it should not be defined here. */ -#if OMIT_SETLOCALE_LOCK +#if AVOID_ANY_THREADS || OMIT_SETLOCALE_LOCK /* This declaration is solely to ensure that after preprocessing this file is never empty. */ @@ -37,14 +38,14 @@ typedef int dummy; /* Macro for exporting a symbol (function, not variable) defined in this file, when compiled into a shared library. */ -# ifndef DLL_EXPORTED +# ifndef SHLIB_EXPORTED # if HAVE_VISIBILITY /* Override the effect of the compiler option '-fvisibility=hidden'. */ -# define DLL_EXPORTED __attribute__((__visibility__("default"))) +# define SHLIB_EXPORTED __attribute__((__visibility__("default"))) # elif defined _WIN32 || defined __CYGWIN__ -# define DLL_EXPORTED __declspec(dllexport) +# define SHLIB_EXPORTED __declspec(dllexport) # else -# define DLL_EXPORTED +# define SHLIB_EXPORTED # endif # endif @@ -59,7 +60,7 @@ typedef int dummy; because the latter is not guaranteed to be a stable ABI in the future. */ /* Make sure the function gets exported from DLLs. */ -DLL_EXPORTED CRITICAL_SECTION *gl_get_setlocale_null_lock (void); +SHLIB_EXPORTED CRITICAL_SECTION *gl_get_setlocale_null_lock (void); static glwthread_initguard_t guard = GLWTHREAD_INITGUARD_INIT; static CRITICAL_SECTION lock; @@ -96,7 +97,7 @@ gl_get_setlocale_null_lock (void) static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; /* Make sure the function gets exported from shared libraries. */ -DLL_EXPORTED pthread_mutex_t *gl_get_setlocale_null_lock (void); +SHLIB_EXPORTED pthread_mutex_t *gl_get_setlocale_null_lock (void); /* Returns the internal lock used by setlocale_null_r. */ pthread_mutex_t * @@ -123,7 +124,7 @@ atomic_init (void) } /* Make sure the function gets exported from shared libraries. */ -DLL_EXPORTED mtx_t *gl_get_setlocale_null_lock (void); +SHLIB_EXPORTED mtx_t *gl_get_setlocale_null_lock (void); /* Returns the internal lock used by setlocale_null_r. */ mtx_t * diff --git a/lib/setlocale_null-unlocked.c b/lib/setlocale_null-unlocked.c new file mode 100644 index 0000000..0a86f0d --- /dev/null +++ b/lib/setlocale_null-unlocked.c @@ -0,0 +1,149 @@ +/* Query the name of the current global locale, without locking. + Copyright (C) 2019-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2019. */ + +#include <config.h> + +/* Specification. */ +#include "setlocale_null.h" + +#include <errno.h> +#include <locale.h> +#include <string.h> +#if defined _WIN32 && !defined __CYGWIN__ +# include <wchar.h> +#endif + +/* Use the system's setlocale() function, not the gnulib override, here. */ +#undef setlocale + +const char * +setlocale_null_unlocked (int category) +{ + const char *result = setlocale (category, NULL); + +#ifdef __ANDROID__ + if (result == NULL) + switch (category) + { + case LC_CTYPE: + case LC_NUMERIC: + case LC_TIME: + case LC_COLLATE: + case LC_MONETARY: + case LC_MESSAGES: + case LC_ALL: + case LC_PAPER: + case LC_NAME: + case LC_ADDRESS: + case LC_TELEPHONE: + case LC_MEASUREMENT: + result = "C"; + break; + default: + break; + } +#endif + + return result; +} + +int +setlocale_null_r_unlocked (int category, char *buf, size_t bufsize) +{ +#if defined _WIN32 && !defined __CYGWIN__ && defined _MSC_VER + /* On native Windows, nowadays, the setlocale() implementation is based + on _wsetlocale() and uses malloc() for the result. We are better off + using _wsetlocale() directly. */ + const wchar_t *result = _wsetlocale (category, NULL); + + if (result == NULL) + { + /* CATEGORY is invalid. */ + if (bufsize > 0) + /* Return an empty string in BUF. + This is a convenience for callers that don't want to write explicit + code for handling EINVAL. */ + buf[0] = '\0'; + return EINVAL; + } + else + { + size_t length = wcslen (result); + if (length < bufsize) + { + size_t i; + + /* Convert wchar_t[] -> char[], assuming plain ASCII. */ + for (i = 0; i <= length; i++) + buf[i] = result[i]; + + return 0; + } + else + { + if (bufsize > 0) + { + /* Return a truncated result in BUF. + This is a convenience for callers that don't want to write + explicit code for handling ERANGE. */ + size_t i; + + /* Convert wchar_t[] -> char[], assuming plain ASCII. */ + for (i = 0; i < bufsize; i++) + buf[i] = result[i]; + buf[bufsize - 1] = '\0'; + } + return ERANGE; + } + } +#else + const char *result = setlocale_null_unlocked (category); + + if (result == NULL) + { + /* CATEGORY is invalid. */ + if (bufsize > 0) + /* Return an empty string in BUF. + This is a convenience for callers that don't want to write explicit + code for handling EINVAL. */ + buf[0] = '\0'; + return EINVAL; + } + else + { + size_t length = strlen (result); + if (length < bufsize) + { + memcpy (buf, result, length + 1); + return 0; + } + else + { + if (bufsize > 0) + { + /* Return a truncated result in BUF. + This is a convenience for callers that don't want to write + explicit code for handling ERANGE. */ + memcpy (buf, result, bufsize - 1); + buf[bufsize - 1] = '\0'; + } + return ERANGE; + } + } +#endif +} diff --git a/lib/setlocale_null.c b/lib/setlocale_null.c index 89c8a06..5ecf413 100644 --- a/lib/setlocale_null.c +++ b/lib/setlocale_null.c @@ -1,5 +1,5 @@ /* Query the name of the current global locale. - Copyright (C) 2019-2023 Free Software Foundation, Inc. + Copyright (C) 2019-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -25,12 +25,14 @@ #include <locale.h> #include <stdlib.h> #include <string.h> -#if defined _WIN32 && !defined __CYGWIN__ -# include <wchar.h> -#endif #if !(SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE) -# if defined _WIN32 && !defined __CYGWIN__ + +# if AVOID_ANY_THREADS + +/* The option '--disable-threads' explicitly requests no locking. */ + +# elif defined _WIN32 && !defined __CYGWIN__ # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include <windows.h> @@ -51,148 +53,34 @@ # include <threads.h> # endif -#endif -/* Use the system's setlocale() function, not the gnulib override, here. */ -#undef setlocale - -static const char * -setlocale_null_androidfix (int category) -{ - const char *result = setlocale (category, NULL); - -#ifdef __ANDROID__ - if (result == NULL) - switch (category) - { - case LC_CTYPE: - case LC_NUMERIC: - case LC_TIME: - case LC_COLLATE: - case LC_MONETARY: - case LC_MESSAGES: - case LC_ALL: - case LC_PAPER: - case LC_NAME: - case LC_ADDRESS: - case LC_TELEPHONE: - case LC_MEASUREMENT: - result = "C"; - break; - default: - break; - } #endif - return result; -} - -static int -setlocale_null_unlocked (int category, char *buf, size_t bufsize) -{ -#if defined _WIN32 && !defined __CYGWIN__ && defined _MSC_VER - /* On native Windows, nowadays, the setlocale() implementation is based - on _wsetlocale() and uses malloc() for the result. We are better off - using _wsetlocale() directly. */ - const wchar_t *result = _wsetlocale (category, NULL); - - if (result == NULL) - { - /* CATEGORY is invalid. */ - if (bufsize > 0) - /* Return an empty string in BUF. - This is a convenience for callers that don't want to write explicit - code for handling EINVAL. */ - buf[0] = '\0'; - return EINVAL; - } - else - { - size_t length = wcslen (result); - if (length < bufsize) - { - size_t i; - - /* Convert wchar_t[] -> char[], assuming plain ASCII. */ - for (i = 0; i <= length; i++) - buf[i] = result[i]; - - return 0; - } - else - { - if (bufsize > 0) - { - /* Return a truncated result in BUF. - This is a convenience for callers that don't want to write - explicit code for handling ERANGE. */ - size_t i; - - /* Convert wchar_t[] -> char[], assuming plain ASCII. */ - for (i = 0; i < bufsize; i++) - buf[i] = result[i]; - buf[bufsize - 1] = '\0'; - } - return ERANGE; - } - } -#else - const char *result = setlocale_null_androidfix (category); - - if (result == NULL) - { - /* CATEGORY is invalid. */ - if (bufsize > 0) - /* Return an empty string in BUF. - This is a convenience for callers that don't want to write explicit - code for handling EINVAL. */ - buf[0] = '\0'; - return EINVAL; - } - else - { - size_t length = strlen (result); - if (length < bufsize) - { - memcpy (buf, result, length + 1); - return 0; - } - else - { - if (bufsize > 0) - { - /* Return a truncated result in BUF. - This is a convenience for callers that don't want to write - explicit code for handling ERANGE. */ - memcpy (buf, result, bufsize - 1); - buf[bufsize - 1] = '\0'; - } - return ERANGE; - } - } -#endif -} - #if !(SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE) /* musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin < 3.4.6 */ -/* Use a lock, so that no two threads can invoke setlocale_null_unlocked +/* Use a lock, so that no two threads can invoke setlocale_null_r_unlocked at the same time. */ /* Prohibit renaming this symbol. */ # undef gl_get_setlocale_null_lock -# if defined _WIN32 && !defined __CYGWIN__ +# if AVOID_ANY_THREADS + +/* The option '--disable-threads' explicitly requests no locking. */ +# define setlocale_null_r_with_lock setlocale_null_r_unlocked + +# elif defined _WIN32 && !defined __CYGWIN__ extern __declspec(dllimport) CRITICAL_SECTION *gl_get_setlocale_null_lock (void); static int -setlocale_null_with_lock (int category, char *buf, size_t bufsize) +setlocale_null_r_with_lock (int category, char *buf, size_t bufsize) { CRITICAL_SECTION *lock = gl_get_setlocale_null_lock (); int ret; EnterCriticalSection (lock); - ret = setlocale_null_unlocked (category, buf, bufsize); + ret = setlocale_null_r_unlocked (category, buf, bufsize); LeaveCriticalSection (lock); return ret; @@ -223,7 +111,7 @@ extern # endif static int -setlocale_null_with_lock (int category, char *buf, size_t bufsize) +setlocale_null_r_with_lock (int category, char *buf, size_t bufsize) { if (pthread_in_use()) { @@ -232,14 +120,14 @@ setlocale_null_with_lock (int category, char *buf, size_t bufsize) if (pthread_mutex_lock (lock)) abort (); - ret = setlocale_null_unlocked (category, buf, bufsize); + ret = setlocale_null_r_unlocked (category, buf, bufsize); if (pthread_mutex_unlock (lock)) abort (); return ret; } else - return setlocale_null_unlocked (category, buf, bufsize); + return setlocale_null_r_unlocked (category, buf, bufsize); } # elif HAVE_THREADS_H @@ -247,14 +135,14 @@ setlocale_null_with_lock (int category, char *buf, size_t bufsize) extern mtx_t *gl_get_setlocale_null_lock (void); static int -setlocale_null_with_lock (int category, char *buf, size_t bufsize) +setlocale_null_r_with_lock (int category, char *buf, size_t bufsize) { mtx_t *lock = gl_get_setlocale_null_lock (); int ret; if (mtx_lock (lock) != thrd_success) abort (); - ret = setlocale_null_unlocked (category, buf, bufsize); + ret = setlocale_null_r_unlocked (category, buf, bufsize); if (mtx_unlock (lock) != thrd_success) abort (); @@ -271,27 +159,27 @@ setlocale_null_r (int category, char *buf, size_t bufsize) #if SETLOCALE_NULL_ALL_MTSAFE # if SETLOCALE_NULL_ONE_MTSAFE - return setlocale_null_unlocked (category, buf, bufsize); + return setlocale_null_r_unlocked (category, buf, bufsize); # else if (category == LC_ALL) - return setlocale_null_unlocked (category, buf, bufsize); + return setlocale_null_r_unlocked (category, buf, bufsize); else - return setlocale_null_with_lock (category, buf, bufsize); + return setlocale_null_r_with_lock (category, buf, bufsize); # endif #else # if SETLOCALE_NULL_ONE_MTSAFE if (category == LC_ALL) - return setlocale_null_with_lock (category, buf, bufsize); + return setlocale_null_r_with_lock (category, buf, bufsize); else - return setlocale_null_unlocked (category, buf, bufsize); + return setlocale_null_r_unlocked (category, buf, bufsize); # else - return setlocale_null_with_lock (category, buf, bufsize); + return setlocale_null_r_with_lock (category, buf, bufsize); # endif #endif @@ -301,7 +189,7 @@ const char * setlocale_null (int category) { #if SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE - return setlocale_null_androidfix (category); + return setlocale_null_unlocked (category); #else /* This call must be multithread-safe. To achieve this without using @@ -317,7 +205,7 @@ setlocale_null (int category) if (category == LC_ALL) { # if SETLOCALE_NULL_ALL_MTSAFE - return setlocale_null_androidfix (LC_ALL); + return setlocale_null_unlocked (LC_ALL); # else char buf[SETLOCALE_NULL_ALL_MAX]; static char resultbuf[SETLOCALE_NULL_ALL_MAX]; @@ -331,7 +219,7 @@ setlocale_null (int category) else { # if SETLOCALE_NULL_ONE_MTSAFE - return setlocale_null_androidfix (category); + return setlocale_null_unlocked (category); # else enum { diff --git a/lib/setlocale_null.h b/lib/setlocale_null.h index c740fa0..966c53c 100644 --- a/lib/setlocale_null.h +++ b/lib/setlocale_null.h @@ -1,5 +1,5 @@ /* Query the name of the current global locale. - Copyright (C) 2019-2023 Free Software Foundation, Inc. + Copyright (C) 2019-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -44,6 +44,34 @@ extern "C" { 55+5*58. */ #define SETLOCALE_NULL_ALL_MAX (148+12*256+1) +/* setlocale_null_r_unlocked (CATEGORY, BUF, BUFSIZE) is like + setlocale (CATEGORY, NULL), except that + - it returns the resulting locale category name or locale name in the + user-supplied buffer BUF, which must be BUFSIZE bytes long. + The recommended minimum buffer size is + - SETLOCALE_NULL_MAX for CATEGORY != LC_ALL, and + - SETLOCALE_NULL_ALL_MAX for CATEGORY == LC_ALL. + The return value is an error code: 0 if the call is successful, EINVAL if + CATEGORY is invalid, or ERANGE if BUFSIZE is smaller than the length needed + size (including the trailing NUL byte). In the latter case, a truncated + result is returned in BUF, but still NUL-terminated if BUFSIZE > 0. + This call is guaranteed to be multithread-safe only if + - CATEGORY != LC_ALL and SETLOCALE_NULL_ONE_MTSAFE is true, or + - CATEGORY == LC_ALL and SETLOCALE_NULL_ALL_MTSAFE is true, + and the other threads must not make other setlocale invocations (since + changing the global locale has side effects on all threads). */ +extern int setlocale_null_r_unlocked (int category, char *buf, size_t bufsize) + _GL_ARG_NONNULL ((2)); + +/* setlocale_null_unlocked (CATEGORY) is like setlocale (CATEGORY, NULL). + The return value is NULL if CATEGORY is invalid. + This call is guaranteed to be multithread-safe only if + - CATEGORY != LC_ALL and SETLOCALE_NULL_ONE_MTSAFE is true, or + - CATEGORY == LC_ALL and SETLOCALE_NULL_ALL_MTSAFE is true, + and the other threads must not make other setlocale invocations (since + changing the global locale has side effects on all threads). */ +extern const char *setlocale_null_unlocked (int category); + /* setlocale_null_r (CATEGORY, BUF, BUFSIZE) is like setlocale (CATEGORY, NULL), except that - it is guaranteed to be multithread-safe, diff --git a/lib/setsockopt.c b/lib/setsockopt.c index d435741..42cc3dc 100644 --- a/lib/setsockopt.c +++ b/lib/setsockopt.c @@ -1,6 +1,6 @@ /* setsockopt.c --- wrappers for Windows setsockopt function - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sha1-stream.c b/lib/sha1-stream.c index 393d9ae..7bf44e5 100644 --- a/lib/sha1-stream.c +++ b/lib/sha1-stream.c @@ -1,7 +1,7 @@ /* sha1.c - Functions to compute SHA1 message digest of files or memory blocks according to the NIST specification FIPS-180-1. - Copyright (C) 2000-2001, 2003-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2003-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -1,7 +1,7 @@ /* sha1.c - Functions to compute SHA1 message digest of files or memory blocks according to the NIST specification FIPS-180-1. - Copyright (C) 2000-2001, 2003-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2003-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -1,6 +1,6 @@ /* Declarations of functions and data types used for SHA1 sum library functions. - Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2023 Free Software + Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify @@ -31,7 +31,21 @@ # ifndef OPENSSL_API_COMPAT # define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API. */ # endif -# include <openssl/sha.h> +/* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL. */ +# include <openssl/opensslv.h> +# if OPENSSL_VERSION_MAJOR >= 3 +# include <openssl/configuration.h> +# if (OPENSSL_CONFIGURED_API \ + < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \ + ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \ + + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \ + + ((OPENSSL_API_COMPAT >> 12) & 0xFF))) +# undef HAVE_OPENSSL_SHA1 +# endif +# endif +# if HAVE_OPENSSL_SHA1 +# include <openssl/sha.h> +# endif # endif # ifdef __cplusplus diff --git a/lib/sha256-stream.c b/lib/sha256-stream.c index 0e83380..08d24b7 100644 --- a/lib/sha256-stream.c +++ b/lib/sha256-stream.c @@ -1,7 +1,7 @@ /* sha256.c - Functions to compute SHA256 and SHA224 message digest of files or memory blocks according to the NIST specification FIPS-180-2. - Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sha256.c b/lib/sha256.c index e5fea02..fe7c544 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -1,7 +1,7 @@ /* sha256.c - Functions to compute SHA256 and SHA224 message digest of files or memory blocks according to the NIST specification FIPS-180-2. - Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sha256.h b/lib/sha256.h index 938b106..a9d7abb 100644 --- a/lib/sha256.h +++ b/lib/sha256.h @@ -1,6 +1,6 @@ /* Declarations of functions and data types used for SHA256 and SHA224 sum library functions. - Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -30,7 +30,21 @@ # ifndef OPENSSL_API_COMPAT # define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API. */ # endif -# include <openssl/sha.h> +/* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL. */ +# include <openssl/opensslv.h> +# if OPENSSL_VERSION_MAJOR >= 3 +# include <openssl/configuration.h> +# if (OPENSSL_CONFIGURED_API \ + < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \ + ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \ + + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \ + + ((OPENSSL_API_COMPAT >> 12) & 0xFF))) +# undef HAVE_OPENSSL_SHA256 +# endif +# endif +# if HAVE_OPENSSL_SHA256 +# include <openssl/sha.h> +# endif # endif # ifdef __cplusplus diff --git a/lib/sha512-stream.c b/lib/sha512-stream.c index 5cf8640..74fdd50 100644 --- a/lib/sha512-stream.c +++ b/lib/sha512-stream.c @@ -1,7 +1,7 @@ /* sha512.c - Functions to compute SHA512 and SHA384 message digest of files or memory blocks according to the NIST specification FIPS-180-2. - Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sha512.c b/lib/sha512.c index 8ca7fa3..9eb036f 100644 --- a/lib/sha512.c +++ b/lib/sha512.c @@ -1,7 +1,7 @@ /* sha512.c - Functions to compute SHA512 and SHA384 message digest of files or memory blocks according to the NIST specification FIPS-180-2. - Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sha512.h b/lib/sha512.h index f3465bc..f6bac85 100644 --- a/lib/sha512.h +++ b/lib/sha512.h @@ -1,6 +1,6 @@ /* Declarations of functions and data types used for SHA512 and SHA384 sum library functions. - Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -30,7 +30,21 @@ # ifndef OPENSSL_API_COMPAT # define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API. */ # endif -# include <openssl/sha.h> +/* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL. */ +# include <openssl/opensslv.h> +# if OPENSSL_VERSION_MAJOR >= 3 +# include <openssl/configuration.h> +# if (OPENSSL_CONFIGURED_API \ + < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \ + ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \ + + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \ + + ((OPENSSL_API_COMPAT >> 12) & 0xFF))) +# undef HAVE_OPENSSL_SHA512 +# endif +# endif +# if HAVE_OPENSSL_SHA512 +# include <openssl/sha.h> +# endif # endif # ifdef __cplusplus diff --git a/lib/sig-handler.c b/lib/sig-handler.c index 5ea345f..fcf82d1 100644 --- a/lib/sig-handler.c +++ b/lib/sig-handler.c @@ -1,6 +1,6 @@ /* Convenience declarations when working with <signal.h>. - Copyright (C) 2012-2023 Free Software Foundation, Inc. + Copyright (C) 2012-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sig-handler.h b/lib/sig-handler.h index e85d30b..076d0ab 100644 --- a/lib/sig-handler.h +++ b/lib/sig-handler.h @@ -1,6 +1,6 @@ /* Convenience declarations when working with <signal.h>. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sigaction.c b/lib/sigaction.c index 19f7665..1b2ceb5 100644 --- a/lib/sigaction.c +++ b/lib/sigaction.c @@ -1,5 +1,5 @@ /* POSIX compatible signal blocking. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. Written by Eric Blake <ebb9@byu.net>, 2008. This file is free software: you can redistribute it and/or modify diff --git a/lib/signal.in.h b/lib/signal.in.h index 418d59c..107226e 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -1,6 +1,6 @@ /* A GNU-like <signal.h>. - Copyright (C) 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sigprocmask.c b/lib/sigprocmask.c index 943383e..3df69b5 100644 --- a/lib/sigprocmask.c +++ b/lib/sigprocmask.c @@ -1,5 +1,5 @@ /* POSIX compatible signal blocking. - Copyright (C) 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2006-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This file is free software: you can redistribute it and/or modify diff --git a/lib/size_max.h b/lib/size_max.h index 2cfd31a..bd2eb43 100644 --- a/lib/size_max.h +++ b/lib/size_max.h @@ -1,5 +1,5 @@ /* size_max.h -- declare SIZE_MAX through system headers - Copyright (C) 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc. Written by Simon Josefsson. This file is free software: you can redistribute it and/or modify diff --git a/lib/snprintf.c b/lib/snprintf.c index cdff314..c1b9356 100644 --- a/lib/snprintf.c +++ b/lib/snprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2024 Free Software Foundation, Inc. Written by Simon Josefsson and Paul Eggert. This file is free software: you can redistribute it and/or modify diff --git a/lib/socket.c b/lib/socket.c index 7ad6eb9..6061a3f 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -1,6 +1,6 @@ /* socket.c --- wrappers for Windows socket function - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sockets.c b/lib/sockets.c index ca99db8..92beb7d 100644 --- a/lib/sockets.c +++ b/lib/sockets.c @@ -1,6 +1,6 @@ /* sockets.c --- wrappers for Windows socket functions - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sockets.h b/lib/sockets.h index 55d5e3a..99d6efc 100644 --- a/lib/sockets.h +++ b/lib/sockets.h @@ -1,6 +1,6 @@ /* sockets.h - wrappers for Windows socket functions - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/spawn-pipe.c b/lib/spawn-pipe.c index d2d21e6..0f03926 100644 --- a/lib/spawn-pipe.c +++ b/lib/spawn-pipe.c @@ -1,5 +1,5 @@ /* Creation of subprocesses, communicating via pipes. - Copyright (C) 2001-2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2024 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -33,7 +33,7 @@ #include <unistd.h> #include "canonicalize.h" -#include "error.h" +#include <error.h> #include "fatal-signal.h" #include "filename.h" #include "findprog.h" diff --git a/lib/spawn-pipe.h b/lib/spawn-pipe.h index 4aa778d..9f558dd 100644 --- a/lib/spawn-pipe.h +++ b/lib/spawn-pipe.h @@ -1,5 +1,5 @@ /* Creation of subprocesses, communicating via pipes. - Copyright (C) 2001-2003, 2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006, 2008-2024 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/lib/spawn.c b/lib/spawn.c index fc78000..43f3030 100644 --- a/lib/spawn.c +++ b/lib/spawn.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/spawn.in.h b/lib/spawn.in.h index 9c4d78c..2a4576f 100644 --- a/lib/spawn.in.h +++ b/lib/spawn.in.h @@ -1,5 +1,5 @@ /* Definitions for POSIX spawn interface. - Copyright (C) 2000, 2003-2004, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2000, 2003-2004, 2008-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/spawn_faction_addchdir.c b/lib/spawn_faction_addchdir.c index cf9287a..fc88a25 100644 --- a/lib/spawn_faction_addchdir.c +++ b/lib/spawn_faction_addchdir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2018-2023 Free Software Foundation, Inc. +/* Copyright (C) 2018-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/spawn_faction_addclose.c b/lib/spawn_faction_addclose.c index c87a237..af1e77a 100644 --- a/lib/spawn_faction_addclose.c +++ b/lib/spawn_faction_addclose.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/spawn_faction_adddup2.c b/lib/spawn_faction_adddup2.c index 27f4aa3..5660a6a 100644 --- a/lib/spawn_faction_adddup2.c +++ b/lib/spawn_faction_adddup2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/spawn_faction_addopen.c b/lib/spawn_faction_addopen.c index fa3e1cb..565dc09 100644 --- a/lib/spawn_faction_addopen.c +++ b/lib/spawn_faction_addopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/spawn_faction_destroy.c b/lib/spawn_faction_destroy.c index 912ce9f..d48c7b4 100644 --- a/lib/spawn_faction_destroy.c +++ b/lib/spawn_faction_destroy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/spawn_faction_init.c b/lib/spawn_faction_init.c index 12089d9..48581e9 100644 --- a/lib/spawn_faction_init.c +++ b/lib/spawn_faction_init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/spawn_int.h b/lib/spawn_int.h index 1cf23f0..021d2ad 100644 --- a/lib/spawn_int.h +++ b/lib/spawn_int.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2008-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2008-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/spawnattr_destroy.c b/lib/spawnattr_destroy.c index 06b6ca6..c7b787f 100644 --- a/lib/spawnattr_destroy.c +++ b/lib/spawnattr_destroy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/spawnattr_init.c b/lib/spawnattr_init.c index 7a75af1..a045619 100644 --- a/lib/spawnattr_init.c +++ b/lib/spawnattr_init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/spawnattr_setflags.c b/lib/spawnattr_setflags.c index 6eaef64..723510e 100644 --- a/lib/spawnattr_setflags.c +++ b/lib/spawnattr_setflags.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2004, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2004, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/spawnattr_setpgroup.c b/lib/spawnattr_setpgroup.c index dea8d3b..e273872 100644 --- a/lib/spawnattr_setpgroup.c +++ b/lib/spawnattr_setpgroup.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/spawnattr_setsigmask.c b/lib/spawnattr_setsigmask.c index a60cd54..9c277ad 100644 --- a/lib/spawnattr_setsigmask.c +++ b/lib/spawnattr_setsigmask.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/spawni.c b/lib/spawni.c index cc9511f..8ddf9c5 100644 --- a/lib/spawni.c +++ b/lib/spawni.c @@ -1,5 +1,5 @@ /* Guts of POSIX spawn interface. Generic POSIX.1 version. - Copyright (C) 2000-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify @@ -857,7 +857,7 @@ __spawni (pid_t *pid, const char *prog_filename, /* The warning "warning: 'vfork' is deprecated: Use posix_spawn or fork" seen on macOS 12 is pointless, as we use vfork only when it is safe or when the user has explicitly requested it. Silence this warning. */ -#if __GNUC__ >= 3 +#if _GL_GNUC_PREREQ (4, 2) # pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif diff --git a/lib/spawnp.c b/lib/spawnp.c index f8af667..b0491f6 100644 --- a/lib/spawnp.c +++ b/lib/spawnp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/stat-time.c b/lib/stat-time.c index bc28223..1ab01f5 100644 --- a/lib/stat-time.c +++ b/lib/stat-time.c @@ -1,6 +1,6 @@ /* stat-related time functions. - Copyright (C) 2012-2023 Free Software Foundation, Inc. + Copyright (C) 2012-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/stat-time.h b/lib/stat-time.h index 5b27023..3cd8478 100644 --- a/lib/stat-time.h +++ b/lib/stat-time.h @@ -1,6 +1,6 @@ /* stat-related time functions. - Copyright (C) 2005, 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -52,11 +52,13 @@ extern "C" { #if _GL_WINDOWS_STAT_TIMESPEC || defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC # if _GL_WINDOWS_STAT_TIMESPEC || defined TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC # define STAT_TIMESPEC(st, st_xtim) ((st)->st_xtim) +# define STAT_TIMESPEC_OFFSETOF(st_xtim) offsetof (struct stat, st_xtim) # else # define STAT_TIMESPEC_NS(st, st_xtim) ((st)->st_xtim.tv_nsec) # endif #elif defined HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC # define STAT_TIMESPEC(st, st_xtim) ((st)->st_xtim##espec) +# define STAT_TIMESPEC_OFFSETOF(st_xtim) offsetof (struct stat, st_xtim##espec) #elif defined HAVE_STRUCT_STAT_ST_ATIMENSEC # define STAT_TIMESPEC_NS(st, st_xtim) ((st)->st_xtim##ensec) #elif defined HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC @@ -122,10 +124,8 @@ get_stat_atime (struct stat const *st) #ifdef STAT_TIMESPEC return STAT_TIMESPEC (st, st_atim); #else - struct timespec t; - t.tv_sec = st->st_atime; - t.tv_nsec = get_stat_atime_ns (st); - return t; + return (struct timespec) { .tv_sec = st->st_atime, + .tv_nsec = get_stat_atime_ns (st) }; #endif } @@ -136,10 +136,8 @@ get_stat_ctime (struct stat const *st) #ifdef STAT_TIMESPEC return STAT_TIMESPEC (st, st_ctim); #else - struct timespec t; - t.tv_sec = st->st_ctime; - t.tv_nsec = get_stat_ctime_ns (st); - return t; + return (struct timespec) { .tv_sec = st->st_ctime, + .tv_nsec = get_stat_ctime_ns (st) }; #endif } @@ -150,10 +148,8 @@ get_stat_mtime (struct stat const *st) #ifdef STAT_TIMESPEC return STAT_TIMESPEC (st, st_mtim); #else - struct timespec t; - t.tv_sec = st->st_mtime; - t.tv_nsec = get_stat_mtime_ns (st); - return t; + return (struct timespec) { .tv_sec = st->st_mtime, + .tv_nsec = get_stat_mtime_ns (st) }; #endif } @@ -168,8 +164,8 @@ get_stat_birthtime (_GL_UNUSED struct stat const *st) || defined HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC) t = STAT_TIMESPEC (st, st_birthtim); #elif defined HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC - t.tv_sec = st->st_birthtime; - t.tv_nsec = st->st_birthtimensec; + t = (struct timespec) { .tv_sec = st->st_birthtime, + .tv_nsec = st->st_birthtimensec }; #elif defined _WIN32 && ! defined __CYGWIN__ /* Native Windows platforms (but not Cygwin) put the "file creation time" in st_ctime (!). See @@ -177,13 +173,11 @@ get_stat_birthtime (_GL_UNUSED struct stat const *st) # if _GL_WINDOWS_STAT_TIMESPEC t = st->st_ctim; # else - t.tv_sec = st->st_ctime; - t.tv_nsec = 0; + t = (struct timespec) { .tv_sec = st->st_ctime }; # endif #else /* Birth time is not supported. */ - t.tv_sec = -1; - t.tv_nsec = -1; + t = (struct timespec) { .tv_sec = -1, .tv_nsec = -1 }; #endif #if (defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC \ @@ -195,30 +189,28 @@ get_stat_birthtime (_GL_UNUSED struct stat const *st) sometimes returns junk in the birth time fields; work around this bug if it is detected. */ if (! (t.tv_sec && 0 <= t.tv_nsec && t.tv_nsec < 1000000000)) - { - t.tv_sec = -1; - t.tv_nsec = -1; - } + t = (struct timespec) { .tv_sec = -1, .tv_nsec = -1 }; #endif return t; } /* If a stat-like function returned RESULT, normalize the timestamps - in *ST, in case this platform suffers from the Solaris 11 bug where + in *ST, if this platform suffers from a macOS and Solaris bug where tv_nsec might be negative. Return the adjusted RESULT, setting errno to EOVERFLOW if normalization overflowed. This function is intended to be private to this .h file. */ _GL_STAT_TIME_INLINE int stat_time_normalize (int result, _GL_UNUSED struct stat *st) { -#if defined __sun && defined STAT_TIMESPEC +#if (((defined __APPLE__ && defined __MACH__) || defined __sun) \ + && defined STAT_TIMESPEC_OFFSETOF) if (result == 0) { long int timespec_hz = 1000000000; - short int const ts_off[] = { offsetof (struct stat, st_atim), - offsetof (struct stat, st_mtim), - offsetof (struct stat, st_ctim) }; + short int const ts_off[] = { STAT_TIMESPEC_OFFSETOF (st_atim), + STAT_TIMESPEC_OFFSETOF (st_mtim), + STAT_TIMESPEC_OFFSETOF (st_ctim) }; int i; for (i = 0; i < sizeof ts_off / sizeof *ts_off; i++) { @@ -232,8 +224,7 @@ stat_time_normalize (int result, _GL_UNUSED struct stat *st) } ts->tv_nsec = r; /* Overflow is possible, as Solaris 11 stat can yield - tv_sec == TYPE_MINIMUM (time_t) && tv_nsec == -1000000000. - INT_ADD_WRAPV is OK, since time_t is signed on Solaris. */ + tv_sec == TYPE_MINIMUM (time_t) && tv_nsec == -1000000000. */ if (ckd_add (&ts->tv_sec, q, ts->tv_sec)) { errno = EOVERFLOW; diff --git a/lib/stat-w32.c b/lib/stat-w32.c index 2f01197..ddd6f59 100644 --- a/lib/stat-w32.c +++ b/lib/stat-w32.c @@ -1,5 +1,5 @@ /* Core of implementation of fstat and stat for native Windows. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/stat-w32.h b/lib/stat-w32.h index c673874..392faed 100644 --- a/lib/stat-w32.h +++ b/lib/stat-w32.h @@ -1,5 +1,5 @@ /* Core of implementation of fstat and stat for native Windows. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -1,5 +1,5 @@ /* Work around platform bugs in stat. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/stdckdint.in.h b/lib/stdckdint.in.h index 71bab5f..9184880 100644 --- a/lib/stdckdint.in.h +++ b/lib/stdckdint.in.h @@ -1,6 +1,6 @@ /* stdckdint.h -- checked integer arithmetic - Copyright 2022-2023 Free Software Foundation, Inc. + Copyright 2022-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published diff --git a/lib/stddef.in.h b/lib/stddef.in.h index 431e819..fa8998d 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -1,6 +1,6 @@ /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -58,7 +58,7 @@ /* On AIX 7.2, with xlc in 64-bit mode, <stddef.h> defines max_align_t to a type with alignment 4, but 'long' has alignment 8. */ -# if defined _AIX && defined __LP64__ +# if defined _AIX && defined __LP64__ && !@HAVE_MAX_ALIGN_T@ # if !GNULIB_defined_max_align_t # ifdef _MAX_ALIGN_T /* /usr/include/stddef.h has already defined max_align_t. Override it. */ @@ -101,11 +101,33 @@ typedef long max_align_t; # ifndef _@GUARD_PREFIX@_STDDEF_H # define _@GUARD_PREFIX@_STDDEF_H -/* This file uses _Noreturn. */ +/* This file uses _Noreturn, _GL_ATTRIBUTE_NOTHROW. */ #if !_GL_CONFIG_H_INCLUDED #error "Please include config.h first." #endif +/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions. + */ +#ifndef _GL_ATTRIBUTE_NOTHROW +# if defined __cplusplus +# if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4 +# if __cplusplus >= 201103L +# define _GL_ATTRIBUTE_NOTHROW noexcept (true) +# else +# define _GL_ATTRIBUTE_NOTHROW throw () +# endif +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif +# else +# if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__ +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif +# endif +#endif + /* Some platforms lack wchar_t. */ #if !@HAVE_WCHAR_T@ # define wchar_t int @@ -178,7 +200,7 @@ extern _Noreturn void abort (void) # if defined __cplusplus && (__GLIBC__ >= 2) -throw () +_GL_ATTRIBUTE_NOTHROW # endif ; # define unreachable() abort () diff --git a/lib/stdint.in.h b/lib/stdint.in.h index 5ddc644..fea7483 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2002, 2004-2023 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2024 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. @@ -306,6 +306,8 @@ typedef gl_uint_fast32_t gl_uint_fast16_t; uintptr_t to avoid conflicting declarations of system functions like _findclose in <io.h>. */ # if !((defined __KLIBC__ && defined _INTPTR_T_DECLARED) \ + || (defined __INTPTR_WIDTH__ \ + && __INTPTR_WIDTH__ != (defined _WIN64 ? LLONG_WIDTH : LONG_WIDTH)) \ || defined __MINGW32__) # undef intptr_t # undef uintptr_t diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h index 46608be..63ebf7c 100644 --- a/lib/stdio-impl.h +++ b/lib/stdio-impl.h @@ -1,5 +1,5 @@ /* Implementation details of FILE streams. - Copyright (C) 2007-2008, 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2008, 2010-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/stdio-read.c b/lib/stdio-read.c index 6e2984c..253b8aa 100644 --- a/lib/stdio-read.c +++ b/lib/stdio-read.c @@ -1,5 +1,5 @@ /* POSIX compatible FILE stream read function. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This file is free software: you can redistribute it and/or modify diff --git a/lib/stdio-write.c b/lib/stdio-write.c index 9cf36cc..ca6aa00 100644 --- a/lib/stdio-write.c +++ b/lib/stdio-write.c @@ -1,5 +1,5 @@ /* POSIX compatible FILE stream write function. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify diff --git a/lib/stdio.in.h b/lib/stdio.in.h index 433e848..4947307 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -1,6 +1,6 @@ /* A GNU-like <stdio.h>. - Copyright (C) 2004, 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -38,8 +38,14 @@ /* Suppress macOS deprecation warnings for sprintf and vsprintf. */ #if (defined __APPLE__ && defined __MACH__) && !defined _POSIX_C_SOURCE -# define _POSIX_C_SOURCE 200809L -# define _GL_DEFINED__POSIX_C_SOURCE +# ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ +# include <AvailabilityMacros.h> +# endif +# if (defined MAC_OS_X_VERSION_MIN_REQUIRED \ + && 130000 <= MAC_OS_X_VERSION_MIN_REQUIRED) +# define _POSIX_C_SOURCE 200809L +# define _GL_DEFINED__POSIX_C_SOURCE +# endif #endif #define _GL_ALREADY_INCLUDING_STDIO_H @@ -58,7 +64,8 @@ #define _@GUARD_PREFIX@_STDIO_H /* This file uses _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_FORMAT, - GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ + _GL_ATTRIBUTE_MALLOC, _GL_ATTRIBUTE_NOTHROW, GNULIB_POSIXCHECK, + HAVE_RAW_DECL_*. */ #if !_GL_CONFIG_H_INCLUDED #error "Please include config.h first." #endif @@ -133,6 +140,38 @@ # endif #endif +/* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly + allocated memory. */ +#ifndef _GL_ATTRIBUTE_MALLOC +# if __GNUC__ >= 3 || defined __clang__ +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +# else +# define _GL_ATTRIBUTE_MALLOC +# endif +#endif + +/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions. + */ +#ifndef _GL_ATTRIBUTE_NOTHROW +# if defined __cplusplus +# if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4 +# if __cplusplus >= 201103L +# define _GL_ATTRIBUTE_NOTHROW noexcept (true) +# else +# define _GL_ATTRIBUTE_NOTHROW throw () +# endif +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif +# else +# if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__ +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif +# endif +#endif + /* An __attribute__ __format__ specifier for a function that takes a format string and arguments, where the format string directives are the ones standardized by ISO C99 and POSIX. @@ -322,7 +361,8 @@ _GL_CXXALIASWARN (fcloseall); # endif _GL_FUNCDECL_RPL (fdopen, FILE *, (int fd, const char *mode) - _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); + _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) + _GL_ATTRIBUTE_MALLOC); _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -333,9 +373,18 @@ _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); # else # if __GNUC__ >= 11 /* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ +# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 +_GL_FUNCDECL_SYS (fdopen, FILE *, + (int fd, const char *mode) + _GL_ATTRIBUTE_NOTHROW + _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) + _GL_ATTRIBUTE_MALLOC); +# else _GL_FUNCDECL_SYS (fdopen, FILE *, (int fd, const char *mode) - _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); + _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) + _GL_ATTRIBUTE_MALLOC); +# endif # endif _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); # endif @@ -343,9 +392,18 @@ _GL_CXXALIASWARN (fdopen); #else # if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fdopen /* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ +# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 +_GL_FUNCDECL_SYS (fdopen, FILE *, + (int fd, const char *mode) + _GL_ATTRIBUTE_NOTHROW + _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) + _GL_ATTRIBUTE_MALLOC); +# else _GL_FUNCDECL_SYS (fdopen, FILE *, (int fd, const char *mode) - _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); + _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) + _GL_ATTRIBUTE_MALLOC); +# endif # endif # if defined GNULIB_POSIXCHECK # undef fdopen @@ -456,7 +514,8 @@ _GL_CXXALIASWARN (fileno); # endif _GL_FUNCDECL_RPL (fopen, FILE *, (const char *restrict filename, const char *restrict mode) - _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); + _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) + _GL_ATTRIBUTE_MALLOC); _GL_CXXALIAS_RPL (fopen, FILE *, (const char *restrict filename, const char *restrict mode)); # else @@ -1111,13 +1170,15 @@ _GL_WARN_ON_USE (perror, "perror is not always POSIX compliant - " # endif _GL_FUNCDECL_RPL (popen, FILE *, (const char *cmd, const char *mode) - _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); + _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1) + _GL_ATTRIBUTE_MALLOC); _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode)); # else # if !@HAVE_POPEN@ || __GNUC__ >= 11 _GL_FUNCDECL_SYS (popen, FILE *, (const char *cmd, const char *mode) - _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); + _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1) + _GL_ATTRIBUTE_MALLOC); # endif _GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode)); # endif @@ -1127,7 +1188,8 @@ _GL_CXXALIASWARN (popen); /* For -Wmismatched-dealloc: Associate popen with pclose or rpl_pclose. */ _GL_FUNCDECL_SYS (popen, FILE *, (const char *cmd, const char *mode) - _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); + _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1) + _GL_ATTRIBUTE_MALLOC); # endif # if defined GNULIB_POSIXCHECK # undef popen @@ -1465,13 +1527,15 @@ _GL_CXXALIASWARN (tempnam); # define tmpfile rpl_tmpfile # endif _GL_FUNCDECL_RPL (tmpfile, FILE *, (void) - _GL_ATTRIBUTE_DEALLOC (fclose, 1)); + _GL_ATTRIBUTE_DEALLOC (fclose, 1) + _GL_ATTRIBUTE_MALLOC); _GL_CXXALIAS_RPL (tmpfile, FILE *, (void)); # else # if __GNUC__ >= 11 /* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ _GL_FUNCDECL_SYS (tmpfile, FILE *, (void) - _GL_ATTRIBUTE_DEALLOC (fclose, 1)); + _GL_ATTRIBUTE_DEALLOC (fclose, 1) + _GL_ATTRIBUTE_MALLOC); # endif _GL_CXXALIAS_SYS (tmpfile, FILE *, (void)); # endif @@ -1482,7 +1546,8 @@ _GL_CXXALIASWARN (tmpfile); # if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined tmpfile /* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ _GL_FUNCDECL_SYS (tmpfile, FILE *, (void) - _GL_ATTRIBUTE_DEALLOC (fclose, 1)); + _GL_ATTRIBUTE_DEALLOC (fclose, 1) + _GL_ATTRIBUTE_MALLOC); # endif # if defined GNULIB_POSIXCHECK # undef tmpfile diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index 1479a2b..e74e7c1 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -1,6 +1,6 @@ /* A GNU-like <stdlib.h>. - Copyright (C) 1995, 2001-2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -38,7 +38,8 @@ #define _@GUARD_PREFIX@_STDLIB_H /* This file uses _Noreturn, _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC, - _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ + _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK, + HAVE_RAW_DECL_*. */ #if !_GL_CONFIG_H_INCLUDED #error "Please include config.h first." #endif @@ -132,6 +133,28 @@ struct random_data # endif #endif +/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions. + */ +#ifndef _GL_ATTRIBUTE_NOTHROW +# if defined __cplusplus +# if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4 +# if __cplusplus >= 201103L +# define _GL_ATTRIBUTE_NOTHROW noexcept (true) +# else +# define _GL_ATTRIBUTE_NOTHROW throw () +# endif +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif +# else +# if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__ +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif +# endif +#endif + /* The __attribute__ feature is available in gcc versions 2.5 and later. The attribute __pure__ was added in gcc 2.96. */ #ifndef _GL_ATTRIBUTE_PURE @@ -200,7 +223,7 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " # define free rpl_free # endif # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_FUNCDECL_RPL (free, void, (void *ptr) throw ()); +_GL_FUNCDECL_RPL (free, void, (void *ptr) _GL_ATTRIBUTE_NOTHROW); # else _GL_FUNCDECL_RPL (free, void, (void *ptr)); # endif @@ -234,9 +257,16 @@ _GL_CXXALIAS_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); # if @HAVE_ALIGNED_ALLOC@ # if __GNUC__ >= 11 /* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ +# if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2 _GL_FUNCDECL_SYS (aligned_alloc, void *, (size_t alignment, size_t size) + _GL_ATTRIBUTE_NOTHROW _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else +_GL_FUNCDECL_SYS (aligned_alloc, void *, + (size_t alignment, size_t size) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif _GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size)); # endif @@ -247,9 +277,16 @@ _GL_CXXALIASWARN (aligned_alloc); #else # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined aligned_alloc /* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ +# if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2 +_GL_FUNCDECL_SYS (aligned_alloc, void *, + (size_t alignment, size_t size) + _GL_ATTRIBUTE_NOTHROW + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else _GL_FUNCDECL_SYS (aligned_alloc, void *, (size_t alignment, size_t size) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif # if defined GNULIB_POSIXCHECK # undef aligned_alloc @@ -292,9 +329,16 @@ _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size)); # else # if __GNUC__ >= 11 /* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ +# if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 +_GL_FUNCDECL_SYS (calloc, void *, + (size_t nmemb, size_t size) + _GL_ATTRIBUTE_NOTHROW + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else _GL_FUNCDECL_SYS (calloc, void *, (size_t nmemb, size_t size) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size)); # endif @@ -304,9 +348,16 @@ _GL_CXXALIASWARN (calloc); #else # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined calloc /* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ +# if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 +_GL_FUNCDECL_SYS (calloc, void *, + (size_t nmemb, size_t size) + _GL_ATTRIBUTE_NOTHROW + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else _GL_FUNCDECL_SYS (calloc, void *, (size_t nmemb, size_t size) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif # if defined GNULIB_POSIXCHECK # undef calloc @@ -328,10 +379,18 @@ _GL_FUNCDECL_RPL (canonicalize_file_name, char *, _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name)); # else # if !@HAVE_CANONICALIZE_FILE_NAME@ || __GNUC__ >= 11 +# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 _GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name) + _GL_ATTRIBUTE_NOTHROW _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else +_GL_FUNCDECL_SYS (canonicalize_file_name, char *, + (const char *name) + _GL_ARG_NONNULL ((1)) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); # endif @@ -344,10 +403,18 @@ _GL_CXXALIASWARN (canonicalize_file_name); # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined canonicalize_file_name /* For -Wmismatched-dealloc: Associate canonicalize_file_name with free or rpl_free. */ +# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 +_GL_FUNCDECL_SYS (canonicalize_file_name, char *, + (const char *name) + _GL_ATTRIBUTE_NOTHROW + _GL_ARG_NONNULL ((1)) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else _GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name) _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif # if defined GNULIB_POSIXCHECK # undef canonicalize_file_name @@ -569,9 +636,16 @@ _GL_CXXALIAS_RPL (malloc, void *, (size_t size)); # else # if __GNUC__ >= 11 /* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ +# if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 +_GL_FUNCDECL_SYS (malloc, void *, + (size_t size) + _GL_ATTRIBUTE_NOTHROW + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else _GL_FUNCDECL_SYS (malloc, void *, (size_t size) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif _GL_CXXALIAS_SYS (malloc, void *, (size_t size)); # endif @@ -581,9 +655,16 @@ _GL_CXXALIASWARN (malloc); #else # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined malloc /* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ +# if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 _GL_FUNCDECL_SYS (malloc, void *, (size_t size) + _GL_ATTRIBUTE_NOTHROW _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else +_GL_FUNCDECL_SYS (malloc, void *, + (size_t size) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif # if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC # undef malloc @@ -966,6 +1047,10 @@ _GL_CXXALIAS_RPL (putenv, int, (char *string)); # define putenv _putenv # endif _GL_CXXALIAS_MDA (putenv, int, (char *string)); +# elif defined __KLIBC__ +/* Need to cast, because on OS/2 kLIBC, the first parameter is + const char *string. */ +_GL_CXXALIAS_SYS_CAST (putenv, int, (char *string)); # else _GL_CXXALIAS_SYS (putenv, int, (char *string)); # endif @@ -982,6 +1067,10 @@ _GL_CXXALIASWARN (putenv); /* Need to cast, because on mingw, the parameter is either 'const char *string' or 'char *string'. */ _GL_CXXALIAS_MDA_CAST (putenv, int, (char *string)); +# elif defined __KLIBC__ +/* Need to cast, because on OS/2 kLIBC, the first parameter is + const char *string. */ +_GL_CXXALIAS_SYS_CAST (putenv, int, (char *string)); # else _GL_CXXALIAS_SYS (putenv, int, (char *string)); # endif @@ -1023,7 +1112,9 @@ _GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, _gl_qsort_r_compar_fn compare, void *arg)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (qsort_r); +# endif #elif defined GNULIB_POSIXCHECK # undef qsort_r # if HAVE_RAW_DECL_QSORT_R @@ -1033,11 +1124,26 @@ _GL_WARN_ON_USE (qsort_r, "qsort_r is not portable - " #endif -#if @GNULIB_RANDOM_R@ -# if !@HAVE_RANDOM_R@ -# ifndef RAND_MAX -# define RAND_MAX 2147483647 +#if @GNULIB_RAND@ || (@GNULIB_RANDOM_R@ && !@HAVE_RANDOM_R@) +# ifndef RAND_MAX +# define RAND_MAX 2147483647 +# endif +#endif + + +#if @GNULIB_RAND@ +# if @REPLACE_RAND@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef rand +# define rand rpl_rand # endif +_GL_FUNCDECL_RPL (rand, int, (void)); +_GL_CXXALIAS_RPL (rand, int, (void)); +# else +_GL_CXXALIAS_SYS (rand, int, (void)); +# endif +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (rand); # endif #endif @@ -1292,8 +1398,16 @@ _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size)); # else # if __GNUC__ >= 11 /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ -_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) - _GL_ATTRIBUTE_DEALLOC_FREE); +# if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 +_GL_FUNCDECL_SYS (realloc, void *, + (void *ptr, size_t size) + _GL_ATTRIBUTE_NOTHROW + _GL_ATTRIBUTE_DEALLOC_FREE); +# else +_GL_FUNCDECL_SYS (realloc, void *, + (void *ptr, size_t size) + _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size)); # endif @@ -1303,8 +1417,16 @@ _GL_CXXALIASWARN (realloc); #else # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined realloc /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ -_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) - _GL_ATTRIBUTE_DEALLOC_FREE); +# if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 +_GL_FUNCDECL_SYS (realloc, void *, + (void *ptr, size_t size) + _GL_ATTRIBUTE_NOTHROW + _GL_ATTRIBUTE_DEALLOC_FREE); +# else +_GL_FUNCDECL_SYS (realloc, void *, + (void *ptr, size_t size) + _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif # if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC # undef realloc @@ -1469,6 +1591,38 @@ _GL_WARN_ON_USE (strtod, "strtod is unportable - " # endif #endif +#if @GNULIB_STRTOF@ + /* Parse a float from STRING, updating ENDP if appropriate. */ +# if @REPLACE_STRTOF@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define strtof rpl_strtof +# endif +# define GNULIB_defined_strtof_function 1 +_GL_FUNCDECL_RPL (strtof, float, + (const char *restrict str, char **restrict endp) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (strtof, float, + (const char *restrict str, char **restrict endp)); +# else +# if !@HAVE_STRTOF@ +_GL_FUNCDECL_SYS (strtof, float, + (const char *restrict str, char **restrict endp) + _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (strtof, float, + (const char *restrict str, char **restrict endp)); +# endif +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (strtof); +# endif +#elif defined GNULIB_POSIXCHECK +# undef strtof +# if HAVE_RAW_DECL_STRTOF +_GL_WARN_ON_USE (strtof, "strtof is unportable - " + "use gnulib module strtof for portability"); +# endif +#endif + #if @GNULIB_STRTOLD@ /* Parse a 'long double' from STRING, updating ENDP if appropriate. */ # if @REPLACE_STRTOLD@ diff --git a/lib/stpcpy.c b/lib/stpcpy.c index 73c1eb7..d451005 100644 --- a/lib/stpcpy.c +++ b/lib/stpcpy.c @@ -1,5 +1,5 @@ /* stpcpy.c -- copy a string and return pointer to end of new string - Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2023 Free Software + Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2024 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. diff --git a/lib/str-two-way.h b/lib/str-two-way.h index dfe7022..cf85e26 100644 --- a/lib/str-two-way.h +++ b/lib/str-two-way.h @@ -1,5 +1,5 @@ /* Byte-wise substring search, using the Two-Way algorithm. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Eric Blake <ebb9@byu.net>, 2008. diff --git a/lib/strcasecmp.c b/lib/strcasecmp.c index 3a5ce3e..7939b40 100644 --- a/lib/strcasecmp.c +++ b/lib/strcasecmp.c @@ -1,5 +1,5 @@ /* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -22,8 +22,6 @@ #include <ctype.h> #include <limits.h> -#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) - /* Compare strings S1 and S2, ignoring case, returning less than, equal to or greater than zero if S1 is lexicographically less than, equal to or greater than S2. @@ -41,8 +39,8 @@ strcasecmp (const char *s1, const char *s2) do { - c1 = TOLOWER (*p1); - c2 = TOLOWER (*p2); + c1 = tolower (*p1); + c2 = tolower (*p2); if (c1 == '\0') break; diff --git a/lib/strchrnul.c b/lib/strchrnul.c index 8724427..f778051 100644 --- a/lib/strchrnul.c +++ b/lib/strchrnul.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2003, 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/strchrnul.valgrind b/lib/strchrnul.valgrind index d998366..0ae2e65 100644 --- a/lib/strchrnul.valgrind +++ b/lib/strchrnul.valgrind @@ -1,6 +1,6 @@ # Suppress a valgrind message about use of uninitialized memory in strchrnul(). -# Copyright (C) 2008-2023 Free Software Foundation, Inc. +# Copyright (C) 2008-2024 Free Software Foundation, Inc. # # This file is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as diff --git a/lib/strdup.c b/lib/strdup.c index 08c40d5..8d9e7c5 100644 --- a/lib/strdup.c +++ b/lib/strdup.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2023 Free Software +/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/streq.h b/lib/streq.h index 712948e..1234346 100644 --- a/lib/streq.h +++ b/lib/streq.h @@ -1,5 +1,5 @@ /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/strerror-override.c b/lib/strerror-override.c index cddaa4a..b9c1c7a 100644 --- a/lib/strerror-override.c +++ b/lib/strerror-override.c @@ -1,6 +1,6 @@ /* strerror-override.c --- POSIX compatible system error routine - Copyright (C) 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2010-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/strerror-override.h b/lib/strerror-override.h index c9b3ba8..872fa7d 100644 --- a/lib/strerror-override.h +++ b/lib/strerror-override.h @@ -1,6 +1,6 @@ /* strerror-override.h --- POSIX compatible system error routine - Copyright (C) 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2010-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/strerror.c b/lib/strerror.c index d754f60..6b760ff 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -1,6 +1,6 @@ /* strerror.c --- POSIX compatible system error routine - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/strerror_r.c b/lib/strerror_r.c index ffe1266..0cd28ad 100644 --- a/lib/strerror_r.c +++ b/lib/strerror_r.c @@ -1,6 +1,6 @@ /* strerror_r.c --- POSIX compatible system error routine - Copyright (C) 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2010-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/string.in.h b/lib/string.in.h index 912d0f7..44ec2e7 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -1,6 +1,6 @@ /* A GNU-like <string.h>. - Copyright (C) 1995-1996, 2001-2023 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -45,7 +45,8 @@ #define _@GUARD_PREFIX@_STRING_H /* This file uses _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC, - _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ + _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK, + HAVE_RAW_DECL_*. */ #if !_GL_CONFIG_H_INCLUDED #error "Please include config.h first." #endif @@ -110,6 +111,28 @@ # endif #endif +/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions. + */ +#ifndef _GL_ATTRIBUTE_NOTHROW +# if defined __cplusplus +# if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4 +# if __cplusplus >= 201103L +# define _GL_ATTRIBUTE_NOTHROW noexcept (true) +# else +# define _GL_ATTRIBUTE_NOTHROW throw () +# endif +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif +# else +# if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__ +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif +# endif +#endif + /* The __attribute__ feature is available in gcc versions 2.5 and later. The attribute __pure__ was added in gcc 2.96. */ #ifndef _GL_ATTRIBUTE_PURE @@ -133,7 +156,7 @@ && !(defined __cplusplus && defined GNULIB_NAMESPACE)) /* We can't do '#define free rpl_free' here. */ # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_EXTERN_C void rpl_free (void *) throw (); +_GL_EXTERN_C void rpl_free (void *) _GL_ATTRIBUTE_NOTHROW; # else _GL_EXTERN_C void rpl_free (void *); # endif @@ -148,7 +171,7 @@ _GL_EXTERN_C void __cdecl free (void *); # else # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_EXTERN_C void free (void *) throw (); +_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW; # else _GL_EXTERN_C void free (void *); # endif @@ -163,7 +186,7 @@ _GL_EXTERN_C void __cdecl free (void *); # else # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_EXTERN_C void free (void *) throw (); +_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW; # else _GL_EXTERN_C void free (void *); # endif @@ -266,9 +289,12 @@ _GL_CXXALIAS_SYS_CAST2 (memchr, # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ || defined __clang__) -_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n) throw ()); +_GL_CXXALIASWARN1 (memchr, void *, + (void *__s, int __c, size_t __n) + _GL_ATTRIBUTE_NOTHROW); _GL_CXXALIASWARN1 (memchr, void const *, - (void const *__s, int __c, size_t __n) throw ()); + (void const *__s, int __c, size_t __n) + _GL_ATTRIBUTE_NOTHROW); # elif __GLIBC__ >= 2 _GL_CXXALIASWARN (memchr); # endif @@ -368,8 +394,12 @@ _GL_CXXALIAS_SYS_CAST2 (memrchr, # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ || defined __clang__) -_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t) throw ()); -_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t) throw ()); +_GL_CXXALIASWARN1 (memrchr, void *, + (void *, int, size_t) + _GL_ATTRIBUTE_NOTHROW); +_GL_CXXALIASWARN1 (memrchr, void const *, + (void const *, int, size_t) + _GL_ATTRIBUTE_NOTHROW); # elif __GLIBC__ >= 2 _GL_CXXALIASWARN (memrchr); # endif @@ -384,11 +414,21 @@ _GL_WARN_ON_USE (memrchr, "memrchr is unportable - " /* Overwrite a block of memory. The compiler will not optimize effects away, even if the block is dead after the call. */ #if @GNULIB_MEMSET_EXPLICIT@ -# if ! @HAVE_MEMSET_EXPLICIT@ +# if @REPLACE_MEMSET_EXPLICIT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef memset_explicit +# define memset_explicit rpl_memset_explicit +# endif +_GL_FUNCDECL_RPL (memset_explicit, void *, + (void *__dest, int __c, size_t __n) _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (memset_explicit, void *, (void *__dest, int __c, size_t __n)); +# else +# if !@HAVE_MEMSET_EXPLICIT@ _GL_FUNCDECL_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n) _GL_ARG_NONNULL ((1))); -# endif +# endif _GL_CXXALIAS_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n)); +# endif _GL_CXXALIASWARN (memset_explicit); #elif defined GNULIB_POSIXCHECK # undef memset_explicit @@ -416,9 +456,12 @@ _GL_CXXALIAS_SYS_CAST2 (rawmemchr, # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ || defined __clang__) -_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in) throw ()); +_GL_CXXALIASWARN1 (rawmemchr, void *, + (void *__s, int __c_in) + _GL_ATTRIBUTE_NOTHROW); _GL_CXXALIASWARN1 (rawmemchr, void const *, - (void const *__s, int __c_in) throw ()); + (void const *__s, int __c_in) + _GL_ATTRIBUTE_NOTHROW); # else _GL_CXXALIASWARN (rawmemchr); # endif @@ -538,9 +581,12 @@ _GL_CXXALIAS_SYS_CAST2 (strchrnul, # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ || defined __clang__) -_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in) throw ()); +_GL_CXXALIASWARN1 (strchrnul, char *, + (char *__s, int __c_in) + _GL_ATTRIBUTE_NOTHROW); _GL_CXXALIASWARN1 (strchrnul, char const *, - (char const *__s, int __c_in) throw ()); + (char const *__s, int __c_in) + _GL_ATTRIBUTE_NOTHROW); # elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strchrnul); # endif @@ -576,10 +622,18 @@ _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); # undef strdup # endif # if (!@HAVE_DECL_STRDUP@ || __GNUC__ >= 11) && !defined strdup +# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 +_GL_FUNCDECL_SYS (strdup, char *, + (char const *__s) + _GL_ATTRIBUTE_NOTHROW + _GL_ARG_NONNULL ((1)) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else _GL_FUNCDECL_SYS (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif _GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); # endif @@ -587,10 +641,18 @@ _GL_CXXALIASWARN (strdup); #else # if __GNUC__ >= 11 && !defined strdup /* For -Wmismatched-dealloc: Associate strdup with free or rpl_free. */ +# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 _GL_FUNCDECL_SYS (strdup, char *, (char const *__s) + _GL_ATTRIBUTE_NOTHROW _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else +_GL_FUNCDECL_SYS (strdup, char *, + (char const *__s) + _GL_ARG_NONNULL ((1)) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif # if defined GNULIB_POSIXCHECK # undef strdup @@ -659,10 +721,18 @@ _GL_FUNCDECL_RPL (strndup, char *, _GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n)); # else # if !@HAVE_DECL_STRNDUP@ || (__GNUC__ >= 11 && !defined strndup) +# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 +_GL_FUNCDECL_SYS (strndup, char *, + (char const *__s, size_t __n) + _GL_ATTRIBUTE_NOTHROW + _GL_ARG_NONNULL ((1)) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else _GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n) _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n)); # endif @@ -670,10 +740,18 @@ _GL_CXXALIASWARN (strndup); #else # if __GNUC__ >= 11 && !defined strndup /* For -Wmismatched-dealloc: Associate strndup with free or rpl_free. */ +# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 +_GL_FUNCDECL_SYS (strndup, char *, + (char const *__s, size_t __n) + _GL_ATTRIBUTE_NOTHROW + _GL_ARG_NONNULL ((1)) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else _GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n) _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif # if defined GNULIB_POSIXCHECK # undef strndup @@ -742,9 +820,12 @@ _GL_CXXALIAS_SYS_CAST2 (strpbrk, # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ || defined __clang__) -_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept) throw ()); +_GL_CXXALIASWARN1 (strpbrk, char *, + (char *__s, char const *__accept) + _GL_ATTRIBUTE_NOTHROW); _GL_CXXALIASWARN1 (strpbrk, char const *, - (char const *__s, char const *__accept) throw ()); + (char const *__s, char const *__accept) + _GL_ATTRIBUTE_NOTHROW); # elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strpbrk); # endif @@ -852,9 +933,11 @@ _GL_CXXALIAS_SYS_CAST2 (strstr, && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ || defined __clang__) _GL_CXXALIASWARN1 (strstr, char *, - (char *haystack, const char *needle) throw ()); + (char *haystack, const char *needle) + _GL_ATTRIBUTE_NOTHROW); _GL_CXXALIASWARN1 (strstr, const char *, - (const char *haystack, const char *needle) throw ()); + (const char *haystack, const char *needle) + _GL_ATTRIBUTE_NOTHROW); # elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strstr); # endif @@ -903,9 +986,11 @@ _GL_CXXALIAS_SYS_CAST2 (strcasestr, && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ || defined __clang__) _GL_CXXALIASWARN1 (strcasestr, char *, - (char *haystack, const char *needle) throw ()); + (char *haystack, const char *needle) + _GL_ATTRIBUTE_NOTHROW); _GL_CXXALIASWARN1 (strcasestr, const char *, - (const char *haystack, const char *needle) throw ()); + (const char *haystack, const char *needle) + _GL_ATTRIBUTE_NOTHROW); # elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strcasestr); # endif @@ -1344,12 +1429,22 @@ _GL_WARN_ON_USE (strsignal, "strsignal is unportable - " #endif #if @GNULIB_STRVERSCMP@ -# if !@HAVE_STRVERSCMP@ +# if @REPLACE_STRVERSCMP@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define strverscmp rpl_strverscmp +# endif +_GL_FUNCDECL_RPL (strverscmp, int, (const char *, const char *) + _GL_ATTRIBUTE_PURE + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (strverscmp, int, (const char *, const char *)); +# else +# if !@HAVE_STRVERSCMP@ _GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *) _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); -# endif +# endif _GL_CXXALIAS_SYS (strverscmp, int, (const char *, const char *)); +# endif _GL_CXXALIASWARN (strverscmp); #elif defined GNULIB_POSIXCHECK # undef strverscmp diff --git a/lib/strings.in.h b/lib/strings.in.h index 929329d..2b3e062 100644 --- a/lib/strings.in.h +++ b/lib/strings.in.h @@ -1,6 +1,6 @@ /* A substitute <strings.h>. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/stripslash.c b/lib/stripslash.c index fe46a9c..c127ce7 100644 --- a/lib/stripslash.c +++ b/lib/stripslash.c @@ -1,6 +1,6 @@ /* stripslash.c -- remove redundant trailing slashes from a file name - Copyright (C) 1990, 2001, 2003-2006, 2009-2023 Free Software Foundation, + Copyright (C) 1990, 2001, 2003-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/strncasecmp.c b/lib/strncasecmp.c index c5c2cd3..c79161f 100644 --- a/lib/strncasecmp.c +++ b/lib/strncasecmp.c @@ -1,5 +1,5 @@ /* strncasecmp.c -- case insensitive string comparator - Copyright (C) 1998-1999, 2005-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -22,8 +22,6 @@ #include <ctype.h> #include <limits.h> -#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) - /* Compare no more than N bytes of strings S1 and S2, ignoring case, returning less than, equal to or greater than zero if S1 is lexicographically less than, equal to or greater than S2. @@ -41,8 +39,8 @@ strncasecmp (const char *s1, const char *s2, size_t n) do { - c1 = TOLOWER (*p1); - c2 = TOLOWER (*p2); + c1 = tolower (*p1); + c2 = tolower (*p2); if (--n == 0 || c1 == '\0') break; diff --git a/lib/strndup.c b/lib/strndup.c index 5c1f32f..abfa017 100644 --- a/lib/strndup.c +++ b/lib/strndup.c @@ -1,6 +1,6 @@ /* A replacement function, for systems that lack strndup. - Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2023 Free Software + Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/strnlen.c b/lib/strnlen.c index 09c010e..80857ec 100644 --- a/lib/strnlen.c +++ b/lib/strnlen.c @@ -1,5 +1,5 @@ /* Find the length of STRING, but scan at most MAXLEN characters. - Copyright (C) 2005-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc. Written by Simon Josefsson. This file is free software: you can redistribute it and/or modify diff --git a/lib/strnlen1.c b/lib/strnlen1.c index 25866c5..27c832a 100644 --- a/lib/strnlen1.c +++ b/lib/strnlen1.c @@ -1,5 +1,5 @@ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/strnlen1.h b/lib/strnlen1.h index 02dcd4c..8943f3e 100644 --- a/lib/strnlen1.h +++ b/lib/strnlen1.h @@ -1,5 +1,5 @@ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/strpbrk.c b/lib/strpbrk.c index 094427c..9e6d35e 100644 --- a/lib/strpbrk.c +++ b/lib/strpbrk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2023 Free Software +/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2024 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. diff --git a/lib/strptime.c b/lib/strptime.c index 23f9ec6..568caf6 100644 --- a/lib/strptime.c +++ b/lib/strptime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2004-2005, 2007, 2009-2023 Free Software Foundation, +/* Copyright (C) 2002, 2004-2005, 2007, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -1102,23 +1102,23 @@ __strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM) if ((have_uweek || have_wweek) && have_wday) { - int save_wday = tm->tm_wday; - int save_mday = tm->tm_mday; - int save_mon = tm->tm_mon; + int saved_wday = tm->tm_wday; + int saved_mday = tm->tm_mday; + int saved_mon = tm->tm_mon; int w_offset = have_uweek ? 0 : 1; tm->tm_mday = 1; tm->tm_mon = 0; day_of_the_week (tm); if (have_mday) - tm->tm_mday = save_mday; + tm->tm_mday = saved_mday; if (have_mon) - tm->tm_mon = save_mon; + tm->tm_mon = saved_mon; if (!have_yday) tm->tm_yday = ((7 - (tm->tm_wday - w_offset)) % 7 + (week_no - 1) *7 - + save_wday - w_offset); + + saved_wday - w_offset); if (!have_mday || !have_mon) { @@ -1134,7 +1134,7 @@ __strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM) - __mon_yday[__isleap(1900 + tm->tm_year)][t_mon - 1] + 1); } - tm->tm_wday = save_wday; + tm->tm_wday = saved_wday; } return (char *) rp; diff --git a/lib/strtok_r.c b/lib/strtok_r.c index e01477c..3a3f0c3 100644 --- a/lib/strtok_r.c +++ b/lib/strtok_r.c @@ -1,5 +1,5 @@ /* Reentrant string tokenizer. Generic version. - Copyright (C) 1991, 1996-1999, 2001, 2004, 2007, 2009-2023 Free Software + Copyright (C) 1991, 1996-1999, 2001, 2004, 2007, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/strtol.c b/lib/strtol.c index b93483d..914cf5b 100644 --- a/lib/strtol.c +++ b/lib/strtol.c @@ -1,6 +1,6 @@ /* Convert string representation of a number into an integer value. - Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2023 Free Software + Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2024 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C diff --git a/lib/strtoll.c b/lib/strtoll.c index 9fdfa19..d3f5e47 100644 --- a/lib/strtoll.c +++ b/lib/strtoll.c @@ -1,5 +1,5 @@ /* Function to parse a 'long long int' from text. - Copyright (C) 1995-1997, 1999, 2001, 2009-2023 Free Software Foundation, + Copyright (C) 1995-1997, 1999, 2001, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/symlink.c b/lib/symlink.c index b5009ae..6ba8366 100644 --- a/lib/symlink.c +++ b/lib/symlink.c @@ -1,5 +1,5 @@ /* Stub for symlink(). - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sys-limits.h b/lib/sys-limits.h index 0e9556d..d2f29d8 100644 --- a/lib/sys-limits.h +++ b/lib/sys-limits.h @@ -1,6 +1,6 @@ /* System call limits - Copyright 2018-2023 Free Software Foundation, Inc. + Copyright 2018-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sys_file.in.h b/lib/sys_file.in.h index dbce799..88cdc03 100644 --- a/lib/sys_file.in.h +++ b/lib/sys_file.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/file.h. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -43,7 +43,7 @@ # define LOCK_EX 2 /* Exclusive lock. */ # define LOCK_UN 8 /* Unlock. */ -/* Can be OR'd in to one of the above. */ +/* Can be OR'd into one of the above. */ # define LOCK_NB 4 /* Don't block when locking. */ #endif diff --git a/lib/sys_ioctl.in.h b/lib/sys_ioctl.in.h index 78a7903..787d35f 100644 --- a/lib/sys_ioctl.in.h +++ b/lib/sys_ioctl.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <sys/ioctl.h>. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sys_random.in.h b/lib/sys_random.in.h index b240033..22f67b1 100644 --- a/lib/sys_random.in.h +++ b/lib/sys_random.in.h @@ -1,5 +1,5 @@ /* Substitute for <sys/random.h>. - Copyright (C) 2020-2023 Free Software Foundation, Inc. + Copyright (C) 2020-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index 3abfc48..de29c77 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -1,5 +1,5 @@ /* Substitute for <sys/select.h>. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sys_socket.c b/lib/sys_socket.c index b7388ce..672d3aa 100644 --- a/lib/sys_socket.c +++ b/lib/sys_socket.c @@ -1,6 +1,6 @@ /* Inline functions for <sys/socket.h>. - Copyright (C) 2012-2023 Free Software Foundation, Inc. + Copyright (C) 2012-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -18,5 +18,5 @@ #include <config.h> #define _GL_SYS_SOCKET_INLINE _GL_EXTERN_INLINE -#include "sys/socket.h" +#include <sys/socket.h> typedef int dummy; diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h index afeedf0..13833c0 100644 --- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -1,6 +1,6 @@ /* Provide a sys/socket header file for systems lacking it (read: MinGW) and for systems where it is incomplete. - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. Written by Simon Josefsson. This file is free software: you can redistribute it and/or modify @@ -358,7 +358,9 @@ _GL_CXXALIAS_SYS_CAST (accept, int, struct sockaddr *restrict addr, socklen_t *restrict addrlen)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (accept); +# endif #elif @HAVE_WINSOCK2_H@ # undef accept # define accept accept_used_without_requesting_gnulib_module_accept @@ -420,7 +422,9 @@ _GL_CXXALIAS_SYS_CAST (getpeername, int, (int fd, struct sockaddr *restrict addr, socklen_t *restrict addrlen)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getpeername); +# endif #elif @HAVE_WINSOCK2_H@ # undef getpeername # define getpeername getpeername_used_without_requesting_gnulib_module_getpeername @@ -452,7 +456,9 @@ _GL_CXXALIAS_SYS_CAST (getsockname, int, (int fd, struct sockaddr *restrict addr, socklen_t *restrict addrlen)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getsockname); +# endif #elif @HAVE_WINSOCK2_H@ # undef getsockname # define getsockname getsockname_used_without_requesting_gnulib_module_getsockname @@ -599,7 +605,9 @@ _GL_CXXALIAS_SYS_CAST (recvfrom, ssize_t, struct sockaddr *restrict from, socklen_t *restrict fromlen)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (recvfrom); +# endif #elif @HAVE_WINSOCK2_H@ # undef recvfrom # define recvfrom recvfrom_used_without_requesting_gnulib_module_recvfrom diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index ad4da17..bf08f33 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -1,5 +1,5 @@ /* Provide a more complete sys/stat.h header file. - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -55,17 +55,41 @@ #ifndef _@GUARD_PREFIX@_SYS_STAT_H #define _@GUARD_PREFIX@_SYS_STAT_H -/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ +/* This file uses _GL_ATTRIBUTE_NOTHROW, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ #if !_GL_CONFIG_H_INCLUDED #error "Please include config.h first." #endif + +/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions. + */ +#ifndef _GL_ATTRIBUTE_NOTHROW +# if defined __cplusplus +# if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4 +# if __cplusplus >= 201103L +# define _GL_ATTRIBUTE_NOTHROW noexcept (true) +# else +# define _GL_ATTRIBUTE_NOTHROW throw () +# endif +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif +# else +# if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__ +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif +# endif +#endif + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definition of _GL_ARG_NONNULL is copied here. */ /* The definition of _GL_WARN_ON_USE is copied here. */ + /* Before doing "#define mknod rpl_mknod" below, we need to include all headers that may declare mknod(). OS/2 kLIBC declares mknod() in <unistd.h>, not in <sys/stat.h>. */ @@ -575,7 +599,11 @@ _GL_WARN_ON_USE (futimens, "futimens is not portable - " #if @GNULIB_GETUMASK@ # if !@HAVE_GETUMASK@ +# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 +_GL_FUNCDECL_SYS (getumask, mode_t, (void) _GL_ATTRIBUTE_NOTHROW); +# else _GL_FUNCDECL_SYS (getumask, mode_t, (void)); +# endif # endif _GL_CXXALIAS_SYS (getumask, mode_t, (void)); # if @HAVE_GETUMASK@ diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 59cce14..4a301c4 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/time.h. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h index ea77e14..0a0ccc3 100644 --- a/lib/sys_types.in.h +++ b/lib/sys_types.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/types.h. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sys_uio.in.h b/lib/sys_uio.in.h index 64c4fb6..5e71859 100644 --- a/lib/sys_uio.in.h +++ b/lib/sys_uio.in.h @@ -1,5 +1,5 @@ /* Substitute for <sys/uio.h>. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sys_wait.in.h b/lib/sys_wait.in.h index 79dc139..0d87631 100644 --- a/lib/sys_wait.in.h +++ b/lib/sys_wait.in.h @@ -1,5 +1,5 @@ /* A POSIX-like <sys/wait.h>. - Copyright (C) 2001-2003, 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/tempname.c b/lib/tempname.c index bf362db..446ddea 100644 --- a/lib/tempname.c +++ b/lib/tempname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2023 Free Software Foundation, Inc. +/* Copyright (C) 1991-2024 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 @@ -193,7 +193,7 @@ try_tempname_len (char *tmpl, int suffixlen, void *args, char *XXXXXX; unsigned int count; int fd = -1; - int save_errno = errno; + int saved_errno = errno; /* A lower bound on the number of temporary files to attempt to generate. The maximum total number of temporary file names that @@ -258,7 +258,7 @@ try_tempname_len (char *tmpl, int suffixlen, void *args, fd = tryfunc (tmpl, args); if (fd >= 0) { - __set_errno (save_errno); + __set_errno (saved_errno); return fd; } else if (errno != EEXIST) diff --git a/lib/tempname.h b/lib/tempname.h index 36a5138..7cbdac9 100644 --- a/lib/tempname.h +++ b/lib/tempname.h @@ -1,6 +1,6 @@ /* Create a temporary file or directory. - Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/thread-optim.h b/lib/thread-optim.h index b5ef15a..4bcc8af 100644 --- a/lib/thread-optim.h +++ b/lib/thread-optim.h @@ -1,6 +1,6 @@ /* Optimization of multithreaded code. - Copyright (C) 2020-2023 Free Software Foundation, Inc. + Copyright (C) 2020-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/time.in.h b/lib/time.in.h index 06428ad..df99c8a 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -1,6 +1,6 @@ /* A more-standard <time.h>. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -143,17 +143,39 @@ _GL_CXXALIAS_SYS (timespec_get, int, (struct timespec *ts, int base)); # if __GLIBC__ >= 2 _GL_CXXALIASWARN (timespec_get); # endif +# elif defined GNULIB_POSIXCHECK +# undef timespec_get +# if HAVE_RAW_DECL_TIMESPEC_GET +_GL_WARN_ON_USE (timespec_get, "timespec_get is unportable - " + "use gnulib module timespec_get for portability"); +# endif # endif /* Set *TS to the current time resolution, and return BASE. Upon failure, return 0. */ # if @GNULIB_TIMESPEC_GETRES@ -# if ! @HAVE_TIMESPEC_GETRES@ +# if @REPLACE_TIMESPEC_GETRES@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef timespec_getres +# define timespec_getres rpl_timespec_getres +# endif +_GL_FUNCDECL_RPL (timespec_getres, int, (struct timespec *ts, int base) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (timespec_getres, int, (struct timespec *ts, int base)); +# else +# if !@HAVE_TIMESPEC_GETRES@ _GL_FUNCDECL_SYS (timespec_getres, int, (struct timespec *ts, int base) _GL_ARG_NONNULL ((1))); -# endif +# endif _GL_CXXALIAS_SYS (timespec_getres, int, (struct timespec *ts, int base)); +# endif _GL_CXXALIASWARN (timespec_getres); +# elif defined GNULIB_POSIXCHECK +# undef timespec_getres +# if HAVE_RAW_DECL_TIMESPEC_GETRES +_GL_WARN_ON_USE (timespec_getres, "timespec_getres is unportable - " + "use gnulib module timespec_getres for portability"); +# endif # endif /* Return the number of seconds that have elapsed since the Epoch. */ @@ -170,6 +192,12 @@ _GL_CXXALIAS_SYS (time, time_t, (time_t *__tp)); # if __GLIBC__ >= 2 _GL_CXXALIASWARN (time); # endif +# elif defined GNULIB_POSIXCHECK +# undef time +# if HAVE_RAW_DECL_TIME +_GL_WARN_ON_USE (time, "time has consistency problems - " + "use gnulib module time for portability"); +# endif # endif /* Sleep for at least RQTP seconds unless interrupted, If interrupted, @@ -195,6 +223,12 @@ _GL_CXXALIAS_SYS (nanosleep, int, (struct timespec const *__rqtp, struct timespec *__rmtp)); # endif _GL_CXXALIASWARN (nanosleep); +# elif defined GNULIB_POSIXCHECK +# undef nanosleep +# if HAVE_RAW_DECL_NANOSLEEP +_GL_WARN_ON_USE (nanosleep, "nanosleep is unportable - " + "use gnulib module nanosleep for portability"); +# endif # endif /* Initialize time conversion information. */ @@ -230,6 +264,12 @@ _GL_CXXALIAS_MDA (tzset, void, (void)); _GL_CXXALIAS_SYS (tzset, void, (void)); # endif _GL_CXXALIASWARN (tzset); +# elif defined GNULIB_POSIXCHECK +# undef tzset +# if HAVE_RAW_DECL_TZSET +_GL_WARN_ON_USE (tzset, "tzset has portability problems - " + "use gnulib module tzset for portability"); +# endif # endif /* Return the 'time_t' representation of TP and normalize TP. */ @@ -246,6 +286,12 @@ _GL_CXXALIAS_SYS (mktime, time_t, (struct tm *__tp)); # if __GLIBC__ >= 2 _GL_CXXALIASWARN (mktime); # endif +# elif defined GNULIB_POSIXCHECK +# undef mktime +# if HAVE_RAW_DECL_MKTIME +_GL_WARN_ON_USE (mktime, "mktime has portability problems - " + "use gnulib module mktime for portability"); +# endif # endif /* Convert TIMER to RESULT, assuming local time and UTC respectively. See @@ -296,6 +342,17 @@ _GL_CXXALIAS_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer, # if @HAVE_DECL_LOCALTIME_R@ _GL_CXXALIASWARN (gmtime_r); # endif +# elif defined GNULIB_POSIXCHECK +# undef localtime_r +# if HAVE_RAW_DECL_LOCALTIME_R +_GL_WARN_ON_USE (localtime_r, "localtime_r is unportable - " + "use gnulib module time_r for portability"); +# endif +# undef gmtime_r +# if HAVE_RAW_DECL_GMTIME_R +_GL_WARN_ON_USE (gmtime_r, "gmtime_r is unportable - " + "use gnulib module time_r for portability"); +# endif # endif /* Convert TIMER to RESULT, assuming local time and UTC respectively. See @@ -316,6 +373,12 @@ _GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer)); # if __GLIBC__ >= 2 _GL_CXXALIASWARN (localtime); # endif +# elif defined GNULIB_POSIXCHECK +# undef localtime +# if HAVE_RAW_DECL_LOCALTIME +_GL_WARN_ON_USE (localtime, "localtime has portability problems - " + "use gnulib module localtime for portability"); +# endif # endif # if 0 || @REPLACE_GMTIME@ @@ -347,6 +410,12 @@ _GL_CXXALIAS_SYS (strptime, char *, (char const *restrict __buf, char const *restrict __format, struct tm *restrict __tm)); _GL_CXXALIASWARN (strptime); +# elif defined GNULIB_POSIXCHECK +# undef strptime +# if HAVE_RAW_DECL_STRPTIME +_GL_WARN_ON_USE (strptime, "strptime is unportable - " + "use gnulib module strptime for portability"); +# endif # endif /* Convert *TP to a date and time string. See @@ -368,6 +437,8 @@ _GL_CXXALIAS_SYS (ctime, char *, (time_t const *__tp)); # if __GLIBC__ >= 2 _GL_CXXALIASWARN (ctime); # endif +# elif defined GNULIB_POSIXCHECK +/* No need to warn about portability, as a more serious warning is below. */ # endif /* Convert *TP to a date and time string. See @@ -392,6 +463,12 @@ _GL_CXXALIAS_SYS (strftime, size_t, # if __GLIBC__ >= 2 _GL_CXXALIASWARN (strftime); # endif +# elif defined GNULIB_POSIXCHECK +# undef strftime +# if HAVE_RAW_DECL_STRFTIME +_GL_WARN_ON_USE (strftime, "strftime has portability problems - " + "use gnulib module strftime-fixes for portability"); +# endif # endif # if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@ @@ -469,6 +546,12 @@ _GL_CXXALIAS_SYS (timegm, time_t, (struct tm *__tm)); # if __GLIBC__ >= 2 _GL_CXXALIASWARN (timegm); # endif +# elif defined GNULIB_POSIXCHECK +# undef timegm +# if HAVE_RAW_DECL_TIMEGM +_GL_WARN_ON_USE (timegm, "timegm is unportable - " + "use gnulib module timegm for portability"); +# endif # endif /* Encourage applications to avoid unsafe functions that can overrun @@ -476,8 +559,10 @@ _GL_CXXALIASWARN (timegm); applications should use strftime (or even sprintf) instead. */ # if defined GNULIB_POSIXCHECK # undef asctime +# if HAVE_RAW_DECL_ASCTIME _GL_WARN_ON_USE (asctime, "asctime can overrun buffers in some cases - " "better use strftime (or even sprintf) instead"); +# endif # endif # if defined GNULIB_POSIXCHECK # undef asctime_r @@ -488,8 +573,10 @@ _GL_WARN_ON_USE (asctime_r, "asctime_r can overrun buffers in some cases - " # endif # if defined GNULIB_POSIXCHECK # undef ctime +# if HAVE_RAW_DECL_CTIME _GL_WARN_ON_USE (ctime, "ctime can overrun buffers in some cases - " "better use strftime (or even sprintf) instead"); +# endif # endif # if defined GNULIB_POSIXCHECK # undef ctime_r diff --git a/lib/time_r.c b/lib/time_r.c index 97be4fd..b724f3b 100644 --- a/lib/time_r.c +++ b/lib/time_r.c @@ -1,6 +1,6 @@ /* Reentrant time functions like localtime_r. - Copyright (C) 2003, 2006-2007, 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2010-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -21,6 +21,11 @@ #include <time.h> +/* The replacement functions in this file are only used on native Windows. + They are multithread-safe, because the gmtime() and localtime() functions + on native Windows — both in the ucrt and in the older MSVCRT — return a + pointer to a 'struct tm' in thread-local memory. */ + static struct tm * copy_tm_result (struct tm *dest, struct tm const *src) { diff --git a/lib/timegm.c b/lib/timegm.c index b47025a..e5cf30c 100644 --- a/lib/timegm.c +++ b/lib/timegm.c @@ -1,6 +1,6 @@ /* Convert UTC calendar time to simple time. Like mktime but assumes UTC. - Copyright (C) 1994-2023 Free Software Foundation, Inc. + Copyright (C) 1994-2024 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/lib/timespec.c b/lib/timespec.c index 5f7ffbd..8cee987 100644 --- a/lib/timespec.c +++ b/lib/timespec.c @@ -1,6 +1,6 @@ /* Inline functions for <timespec.h>. - Copyright (C) 2012-2023 Free Software Foundation, Inc. + Copyright (C) 2012-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/timespec.h b/lib/timespec.h index 0bdfd76..69ce348 100644 --- a/lib/timespec.h +++ b/lib/timespec.h @@ -1,6 +1,6 @@ /* timespec -- System time interface - Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2023 Free Software + Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify @@ -55,10 +55,7 @@ enum { LOG10_TIMESPEC_RESOLUTION = LOG10_TIMESPEC_HZ }; _GL_TIMESPEC_INLINE struct timespec make_timespec (time_t s, long int ns) { - struct timespec r; - r.tv_sec = s; - r.tv_nsec = ns; - return r; + return (struct timespec) { .tv_sec = s, .tv_nsec = ns }; } /* Return negative, zero, positive if A < B, A == B, A > B, respectively. */ diff --git a/lib/tmpdir.c b/lib/tmpdir.c index 9c96a69..dd43fe2 100644 --- a/lib/tmpdir.c +++ b/lib/tmpdir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2001-2002, 2006, 2009-2023 Free Software Foundation, +/* Copyright (C) 1999, 2001-2002, 2006, 2009-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/tmpdir.h b/lib/tmpdir.h index 943d664..ffbf340 100644 --- a/lib/tmpdir.h +++ b/lib/tmpdir.h @@ -1,5 +1,5 @@ /* Determine a temporary directory. - Copyright (C) 2001-2002, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -1,6 +1,6 @@ /* uint64_t-like operations that work even on hosts lacking uint64_t - Copyright (C) 2012-2023 Free Software Foundation, Inc. + Copyright (C) 2012-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -1,6 +1,6 @@ /* uint64_t-like operations that work even on hosts lacking uint64_t - Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/uchar.in.h b/lib/uchar.in.h new file mode 100644 index 0000000..166cbec --- /dev/null +++ b/lib/uchar.in.h @@ -0,0 +1,910 @@ +/* <uchar.h> substitute - 16-bit and 32-bit wide character types. + Copyright (C) 2019-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2019. */ + +/* + * ISO C 23 <uchar.h> for platforms that lack it. + */ + +#ifndef _@GUARD_PREFIX@_UCHAR_H + +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif +@PRAGMA_COLUMNS@ + +/* The include_next requires a split double-inclusion guard. */ +#if @HAVE_UCHAR_H@ +# if defined __HAIKU__ +/* Work around <https://dev.haiku-os.org/ticket/17040>. */ +# include <stdint.h> +# endif +/* On AIX 7.2 with xlclang++, /usr/include/uchar.h produces compilation errors + because it contains typedef definitions of char16_t and char32_t, however + char16_t and char32_t are keywords in this situation. To work around it, + define char16_t and char32_t as macros. */ +# if defined __cplusplus && defined _AIX && defined __ibmxl__ && defined __clang__ +# define char16_t gl_char16_t +# define char32_t gl_char32_t +# endif +# @INCLUDE_NEXT@ @NEXT_UCHAR_H@ +#endif + +#ifndef _@GUARD_PREFIX@_UCHAR_H +#define _@GUARD_PREFIX@_UCHAR_H + +/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _GL_BEGIN_C_LINKAGE, + _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ +#if !_GL_CONFIG_H_INCLUDED + #error "Please include config.h first." +#endif + +/* Get uint_least16_t, uint_least32_t. */ +#include <stdint.h> + +/* Get mbstate_t, size_t. */ +#include <wchar.h> + +/* For the inline functions. */ +#include <string.h> +#include <wctype.h> + +/* The __attribute__ feature is available in gcc versions 2.5 and later. + The attribute __pure__ was added in gcc 2.96. */ +#ifndef _GL_ATTRIBUTE_PURE +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || defined __clang__ +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define _GL_ATTRIBUTE_PURE /* empty */ +# endif +#endif + +/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + +/* The definition of _GL_ARG_NONNULL is copied here. */ + +/* The definition of _GL_WARN_ON_USE is copied here. */ + + +_GL_INLINE_HEADER_BEGIN + + +#if !(@HAVE_UCHAR_H@ || (defined __cplusplus && @CXX_HAS_CHAR8_TYPE@)) + +/* An 8-bit variant of wchar_t. + Note: This type is only mandated by ISO C 23 or newer, and it does + denote UTF-8 units. */ +typedef unsigned char char8_t; + +#elif @GNULIBHEADERS_OVERRIDE_CHAR8_T@ + +typedef unsigned char gl_char8_t; +# define char8_t gl_char8_t + +#endif + +#if !(@HAVE_UCHAR_H@ || (defined __cplusplus && @CXX_HAS_UCHAR_TYPES@)) + +/* A 16-bit variant of wchar_t. + Note: This type is only mandated by ISO C 11 or newer. In ISO C 23 + and newer, it denotes UTF-16 units; in older versions of ISO C it did + so only on platforms on which __STDC_UTF_16__ was defined. */ +typedef uint_least16_t char16_t; + +#elif @GNULIBHEADERS_OVERRIDE_CHAR16_T@ + +typedef uint_least16_t gl_char16_t; +# define char16_t gl_char16_t + +#endif + +#if !(@HAVE_UCHAR_H@ || (defined __cplusplus && @CXX_HAS_UCHAR_TYPES@)) + +/* A 32-bit variant of wchar_t. + Note: This type is only mandated by ISO C 11 or newer. In ISO C 23 + and newer, it denotes UTF-32 code points; in older versions of ISO C + it did so only on platforms on which __STDC_UTF_32__ was defined. + In gnulib, we guarantee that it denotes UTF-32 code points if and + only if the module 'uchar-c23' is in use. */ +typedef uint_least32_t char32_t; + +#elif @GNULIBHEADERS_OVERRIDE_CHAR32_T@ + +typedef uint_least32_t gl_char32_t; +# define char32_t gl_char32_t + +#endif + +/* Define if a 'char32_t' can hold more characters than a 'wchar_t'. */ +#if @SMALL_WCHAR_T@ /* 32-bit AIX, Cygwin, native Windows */ +# define _GL_SMALL_WCHAR_T 1 +#endif + +/* Define if 'wchar_t', like 'char32_t', + - is a 32-bit type, and + - represents Unicode code points. + For this test, we can use __STDC_ISO_10646__ (defined by glibc, musl libc, + Cygwin) but need to consider _GL_SMALL_WCHAR_T, so as to exclude Cygwin. + We cannot use __STDC_UTF_16__ or __STDC_UTF_32__ + - because these macros provide info about char16_t and char32_t (not + wchar_t!), and + - because GCC >= 4.9 defines these macros on all platforms, even on + FreeBSD and Solaris. + We should better not use __STD_UTF_16__, __STD_UTF_32__ either, because + these macros are misspellings, only defined by Android's <uchar.h>. */ +#if defined __STDC_ISO_10646__ && !_GL_SMALL_WCHAR_T +/* glibc, musl libc */ +# define _GL_WCHAR_T_IS_UCS4 1 +#endif +#if _GL_WCHAR_T_IS_UCS4 +static_assert (sizeof (char32_t) == sizeof (wchar_t)); +#endif + + +/* Convert a single-byte character to a 32-bit wide character. */ +#if @GNULIB_BTOC32@ +# if _GL_WCHAR_T_IS_UCS4 && !defined IN_BTOC32 +_GL_BEGIN_C_LINKAGE +_GL_INLINE _GL_ATTRIBUTE_PURE wint_t +btoc32 (int c) +{ + return +# if @GNULIB_BTOWC@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + btowc (c); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (btoc32, wint_t, (int c) _GL_ATTRIBUTE_PURE); +# endif +_GL_CXXALIAS_SYS (btoc32, wint_t, (int c)); +_GL_CXXALIASWARN (btoc32); +#endif + + +/* Test a specific property of a 32-bit wide character. */ +#if @GNULIB_C32ISALNUM@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISALNUM +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32isalnum (wint_t wc) +{ + return +# if defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + iswalnum (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32isalnum, int, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32isalnum, int, (wint_t wc)); +_GL_CXXALIASWARN (c32isalnum); +#endif +#if @GNULIB_C32ISALPHA@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISALPHA +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32isalpha (wint_t wc) +{ + return +# if defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + iswalpha (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32isalpha, int, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32isalpha, int, (wint_t wc)); +_GL_CXXALIASWARN (c32isalpha); +#endif +#if @GNULIB_C32ISBLANK@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISBLANK +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32isblank (wint_t wc) +{ + return +# if defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + iswblank (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32isblank, int, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32isblank, int, (wint_t wc)); +_GL_CXXALIASWARN (c32isblank); +#endif +#if @GNULIB_C32ISCNTRL@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISCNTRL +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32iscntrl (wint_t wc) +{ + return +# if defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + iswcntrl (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32iscntrl, int, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32iscntrl, int, (wint_t wc)); +_GL_CXXALIASWARN (c32iscntrl); +#endif +#if @GNULIB_C32ISDIGIT@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISDIGIT +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32isdigit (wint_t wc) +{ + return +# if @GNULIB_ISWDIGIT@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + iswdigit (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32isdigit, int, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32isdigit, int, (wint_t wc)); +_GL_CXXALIASWARN (c32isdigit); +#endif +#if @GNULIB_C32ISGRAPH@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISGRAPH +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32isgraph (wint_t wc) +{ + return +# if defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + iswgraph (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32isgraph, int, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32isgraph, int, (wint_t wc)); +_GL_CXXALIASWARN (c32isgraph); +#endif +#if @GNULIB_C32ISLOWER@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISLOWER +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32islower (wint_t wc) +{ + return +# if defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + iswlower (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32islower, int, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32islower, int, (wint_t wc)); +_GL_CXXALIASWARN (c32islower); +#endif +#if @GNULIB_C32ISPRINT@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISPRINT +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32isprint (wint_t wc) +{ + return +# if defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + iswprint (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32isprint, int, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32isprint, int, (wint_t wc)); +_GL_CXXALIASWARN (c32isprint); +#endif +#if @GNULIB_C32ISPUNCT@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISPUNCT +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32ispunct (wint_t wc) +{ + return +# if defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + iswpunct (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32ispunct, int, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32ispunct, int, (wint_t wc)); +_GL_CXXALIASWARN (c32ispunct); +#endif +#if @GNULIB_C32ISSPACE@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISSPACE +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32isspace (wint_t wc) +{ + return +# if defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + iswspace (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32isspace, int, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32isspace, int, (wint_t wc)); +_GL_CXXALIASWARN (c32isspace); +#endif +#if @GNULIB_C32ISUPPER@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISUPPER +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32isupper (wint_t wc) +{ + return +# if defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + iswupper (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32isupper, int, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32isupper, int, (wint_t wc)); +_GL_CXXALIASWARN (c32isupper); +#endif +#if @GNULIB_C32ISXDIGIT@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISXDIGIT +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32isxdigit (wint_t wc) +{ + return +# if @GNULIB_ISWXDIGIT@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + iswxdigit (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32isxdigit, int, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32isxdigit, int, (wint_t wc)); +_GL_CXXALIASWARN (c32isxdigit); +#endif + + +/* Case mapping of a 32-bit wide character. */ +#if @GNULIB_C32TOLOWER@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32TOLOWER +_GL_BEGIN_C_LINKAGE +_GL_INLINE wint_t +c32tolower (wint_t wc) +{ + return +# if defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + towlower (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32tolower, wint_t, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32tolower, wint_t, (wint_t wc)); +_GL_CXXALIASWARN (c32tolower); +#endif +#if @GNULIB_C32TOUPPER@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32TOUPPER +_GL_BEGIN_C_LINKAGE +_GL_INLINE wint_t +c32toupper (wint_t wc) +{ + return +# if defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + towupper (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32toupper, wint_t, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32toupper, wint_t, (wint_t wc)); +_GL_CXXALIASWARN (c32toupper); +#endif + + +/* Number of screen columns needed for a 32-bit wide character. */ +#if @GNULIB_C32WIDTH@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32WIDTH +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32width (char32_t wc) +{ + return +# if @GNULIB_WCWIDTH@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + wcwidth (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32width, int, (char32_t wc)); +# endif +_GL_CXXALIAS_SYS (c32width, int, (char32_t wc)); +_GL_CXXALIASWARN (c32width); +#endif + + +/* Converts a 32-bit wide character to a multibyte character. */ +#if @GNULIB_C32RTOMB@ +# if @REPLACE_C32RTOMB@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef c32rtomb +# define c32rtomb rpl_c32rtomb +# endif +_GL_FUNCDECL_RPL (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps)); +_GL_CXXALIAS_RPL (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps)); +# else +# if !@HAVE_C32RTOMB@ +_GL_FUNCDECL_SYS (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps)); +# endif +_GL_CXXALIAS_SYS (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps)); +# endif +# if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2 +_GL_CXXALIASWARN (c32rtomb); +# endif +#elif defined GNULIB_POSIXCHECK +# undef c32rtomb +# if HAVE_RAW_DECL_C32RTOMB +_GL_WARN_ON_USE (c32rtomb, "c32rtomb is not portable - " + "use gnulib module c32rtomb for portability"); +# endif +#endif + + +/* Convert a 32-bit wide string to a string. */ +#if @GNULIB_C32SNRTOMBS@ +# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32SNRTOMBS +_GL_BEGIN_C_LINKAGE +_GL_INLINE _GL_ARG_NONNULL ((2)) size_t +c32snrtombs (char *dest, const char32_t **srcp, size_t srclen, size_t len, + mbstate_t *ps) +{ + return +# if @GNULIB_WCSNRTOMBS@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + wcsnrtombs (dest, (const wchar_t **) srcp, srclen, len, ps); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32snrtombs, size_t, + (char *dest, const char32_t **srcp, size_t srclen, size_t len, + mbstate_t *ps) + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (c32snrtombs, size_t, + (char *dest, const char32_t **srcp, size_t srclen, size_t len, + mbstate_t *ps)); +_GL_CXXALIASWARN (c32snrtombs); +#endif + + +/* Convert a 32-bit wide string to a string. */ +#if @GNULIB_C32SRTOMBS@ +# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32SRTOMBS +_GL_BEGIN_C_LINKAGE +_GL_INLINE _GL_ARG_NONNULL ((2)) size_t +c32srtombs (char *dest, const char32_t **srcp, size_t len, mbstate_t *ps) +{ + return +# if @GNULIB_WCSRTOMBS@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + wcsrtombs (dest, (const wchar_t **) srcp, len, ps); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32srtombs, size_t, + (char *dest, const char32_t **srcp, size_t len, mbstate_t *ps) + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (c32srtombs, size_t, + (char *dest, const char32_t **srcp, size_t len, + mbstate_t *ps)); +_GL_CXXALIASWARN (c32srtombs); +#endif + + +/* Convert a 32-bit wide string to a string. */ +#if @GNULIB_C32STOMBS@ +# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32STOMBS +_GL_BEGIN_C_LINKAGE +_GL_INLINE _GL_ARG_NONNULL ((2)) size_t +c32stombs (char *dest, const char32_t *src, size_t len) +{ + mbstate_t state; + + mbszero (&state); + return c32srtombs (dest, &src, len, &state); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32stombs, size_t, + (char *dest, const char32_t *src, size_t len) + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (c32stombs, size_t, + (char *dest, const char32_t *src, size_t len)); +_GL_CXXALIASWARN (c32stombs); +#endif + + +/* Number of screen columns needed for a size-bounded 32-bit wide string. */ +#if @GNULIB_C32SWIDTH@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32SWIDTH +_GL_BEGIN_C_LINKAGE +_GL_INLINE _GL_ARG_NONNULL ((1)) int +c32swidth (const char32_t *s, size_t n) +{ + return +# if @GNULIB_WCSWIDTH@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + wcswidth ((const wchar_t *) s, n); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32swidth, int, (const char32_t *s, size_t n) + _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (c32swidth, int, (const char32_t *s, size_t n)); +_GL_CXXALIASWARN (c32swidth); +#endif + + +/* Converts a 32-bit wide character to unibyte character. + Returns the single-byte representation of WC if it exists, + or EOF otherwise. */ +#if @GNULIB_C32TOB@ +# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32TOB +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32tob (wint_t wc) +{ + return +# if @GNULIB_WCTOB@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + wctob (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32tob, int, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32tob, int, (wint_t wc)); +_GL_CXXALIASWARN (c32tob); +#endif + + +/* Converts a multibyte character to a 32-bit wide character. */ +#if @GNULIB_MBRTOC32@ +# if @REPLACE_MBRTOC32@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mbrtoc32 +# define mbrtoc32 rpl_mbrtoc32 +# endif +_GL_FUNCDECL_RPL (mbrtoc32, size_t, + (char32_t *pc, const char *s, size_t n, mbstate_t *ps)); +_GL_CXXALIAS_RPL (mbrtoc32, size_t, + (char32_t *pc, const char *s, size_t n, mbstate_t *ps)); +# else +# if !@HAVE_MBRTOC32@ +_GL_FUNCDECL_SYS (mbrtoc32, size_t, + (char32_t *pc, const char *s, size_t n, mbstate_t *ps)); +# endif +_GL_CXXALIAS_SYS (mbrtoc32, size_t, + (char32_t *pc, const char *s, size_t n, mbstate_t *ps)); +# endif +# if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2 +_GL_CXXALIASWARN (mbrtoc32); +# endif +#elif defined GNULIB_POSIXCHECK +# undef mbrtoc32 +# if HAVE_RAW_DECL_MBRTOC32 +_GL_WARN_ON_USE (mbrtoc32, "mbrtoc32 is not portable - " + "use gnulib module mbrtoc32 for portability"); +# endif +#endif + + +/* Converts a multibyte character and returns the next 16-bit wide + character. */ +#if @GNULIB_MBRTOC16@ +# if @REPLACE_MBRTOC16@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mbrtoc16 +# define mbrtoc16 rpl_mbrtoc16 +# endif +_GL_FUNCDECL_RPL (mbrtoc16, size_t, + (char16_t *pc, const char *s, size_t n, mbstate_t *ps)); +_GL_CXXALIAS_RPL (mbrtoc16, size_t, + (char16_t *pc, const char *s, size_t n, mbstate_t *ps)); +# else +# if !@HAVE_MBRTOC32@ +_GL_FUNCDECL_SYS (mbrtoc16, size_t, + (char16_t *pc, const char *s, size_t n, mbstate_t *ps)); +# endif +_GL_CXXALIAS_SYS (mbrtoc16, size_t, + (char16_t *pc, const char *s, size_t n, mbstate_t *ps)); +# endif +# if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2 +_GL_CXXALIASWARN (mbrtoc16); +# endif +#elif defined GNULIB_POSIXCHECK +# undef mbrtoc16 +# if HAVE_RAW_DECL_MBRTOC16 +_GL_WARN_ON_USE (mbrtoc16, "mbrtoc16 is not portable - " + "use gnulib module mbrtoc16 for portability"); +# endif +#endif + + +/* Convert a string to a 32-bit wide string. */ +#if @GNULIB_MBSNRTOC32S@ +# if _GL_WCHAR_T_IS_UCS4 && !defined IN_MBSNRTOC32S +_GL_BEGIN_C_LINKAGE +_GL_INLINE _GL_ARG_NONNULL ((2)) size_t +mbsnrtoc32s (char32_t *dest, const char **srcp, size_t srclen, size_t len, + mbstate_t *ps) +{ + return +# if @GNULIB_MBSNRTOWCS@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + mbsnrtowcs ((wchar_t *) dest, srcp, srclen, len, ps); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (mbsnrtoc32s, size_t, + (char32_t *dest, const char **srcp, size_t srclen, size_t len, + mbstate_t *ps) + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (mbsnrtoc32s, size_t, + (char32_t *dest, const char **srcp, size_t srclen, size_t len, + mbstate_t *ps)); +_GL_CXXALIASWARN (mbsnrtoc32s); +#endif + + +/* Convert a string to a 32-bit wide string. */ +#if @GNULIB_MBSRTOC32S@ +# if _GL_WCHAR_T_IS_UCS4 && !defined IN_MBSRTOC32S +_GL_BEGIN_C_LINKAGE +_GL_INLINE _GL_ARG_NONNULL ((2)) size_t +mbsrtoc32s (char32_t *dest, const char **srcp, size_t len, mbstate_t *ps) +{ + return +# if @GNULIB_MBSRTOWCS@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + mbsrtowcs ((wchar_t *) dest, srcp, len, ps); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (mbsrtoc32s, size_t, + (char32_t *dest, const char **srcp, size_t len, mbstate_t *ps) + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (mbsrtoc32s, size_t, + (char32_t *dest, const char **srcp, size_t len, + mbstate_t *ps)); +_GL_CXXALIASWARN (mbsrtoc32s); +#endif + + +/* Convert a string to a 32-bit wide string. */ +#if @GNULIB_MBSTOC32S@ +# if _GL_WCHAR_T_IS_UCS4 && !defined IN_MBSTOC32S +_GL_BEGIN_C_LINKAGE +_GL_INLINE _GL_ARG_NONNULL ((2)) size_t +mbstoc32s (char32_t *dest, const char *src, size_t len) +{ + mbstate_t state; + + mbszero (&state); + return mbsrtoc32s (dest, &src, len, &state); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (mbstoc32s, size_t, + (char32_t *dest, const char *src, size_t len) + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (mbstoc32s, size_t, + (char32_t *dest, const char *src, size_t len)); +_GL_CXXALIASWARN (mbstoc32s); +#endif + + +#if @GNULIB_C32_GET_TYPE_TEST@ || @GNULIB_C32_APPLY_TYPE_TEST@ +/* A scalar type. Instances of this type, other than (c32_type_test_t) 0, + represent a character property, sometimes also viewed as a "character class". + It can be applied to 32-bit wide characters. It is the counterpart of + type 'wctype_t' for wide characters. + To test whether a given character has a certain property, use the function + 'c32_apply_type_test'. */ +# if _GL_WCHAR_T_IS_UCS4 +typedef wctype_t c32_type_test_t; +# else +typedef /*bool*/int (*c32_type_test_t) (wint_t wc); +# endif +#endif + +/* Return a character property with the given name, or (c32_type_test_t) 0 + if the designated property does not exist. + This function is the counterpart of function 'wctype' for wide characters. + */ +#if @GNULIB_C32_GET_TYPE_TEST@ +# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32_GET_TYPE_TEST +_GL_BEGIN_C_LINKAGE +_GL_INLINE _GL_ARG_NONNULL ((1)) c32_type_test_t +c32_get_type_test (const char *name) +{ + return +# if @GNULIB_WCTYPE@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + wctype (name); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32_get_type_test, c32_type_test_t, (const char *name) + _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (c32_get_type_test, c32_type_test_t, (const char *name)); +_GL_CXXALIASWARN (c32_get_type_test); +#endif + +/* Test whether a given 32-bit wide character has the specified character + property. + Return non-zero if true, zero if false or if the argument is WEOF. + This function is the counterpart of function 'iswctype' for wide characters. + */ +#if @GNULIB_C32_APPLY_TYPE_TEST@ +# if _GL_WCHAR_T_IS_UCS4 +# if !defined IN_C32_APPLY_TYPE_TEST +_GL_BEGIN_C_LINKAGE +_GL_INLINE int +c32_apply_type_test (wint_t wc, c32_type_test_t property) +{ + return +# if @GNULIB_ISWCTYPE@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + iswctype (wc, property); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32_apply_type_test, int, + (wint_t wc, c32_type_test_t property)); +# endif +# else +_GL_FUNCDECL_SYS (c32_apply_type_test, int, + (wint_t wc, c32_type_test_t property) + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (c32_apply_type_test, int, + (wint_t wc, c32_type_test_t property)); +_GL_CXXALIASWARN (c32_apply_type_test); +#endif + + +#if @GNULIB_C32_GET_MAPPING@ || @GNULIB_C32_APPLY_MAPPING@ +/* A scalar type. Instances of this type, other than (c32_mapping_t) 0, + represent a character mapping. It can be applied to 32-bit wide characters. + It is the counterpart of type 'wctrans_t' for wide characters. + To apply a certain mapping to a given character, use the function + 'c32_apply_mapping'. */ +# if _GL_WCHAR_T_IS_UCS4 +typedef wctrans_t c32_mapping_t; +# else +typedef wint_t (*c32_mapping_t) (wint_t wc); +# endif +#endif + +/* Return a character mapping with the given name, or (c32_mapping_t) 0 + if the designated mapping does not exist. + This function is the counterpart of function 'wctrans' for wide characters. + */ +#if @GNULIB_C32_GET_MAPPING@ +# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32_GET_MAPPING +_GL_BEGIN_C_LINKAGE +_GL_INLINE _GL_ARG_NONNULL ((1)) c32_mapping_t +c32_get_mapping (const char *name) +{ + return +# if @GNULIB_WCTRANS@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + wctrans (name); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32_get_mapping, c32_mapping_t, (const char *name) + _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (c32_get_mapping, c32_mapping_t, (const char *name)); +_GL_CXXALIASWARN (c32_get_mapping); +#endif + +/* Apply the specified character mapping to a given 32-bit wide character. + Return the result of this mapping. Return the WC argument unchanged if it is + WEOF. + This function is the counterpart of function 'towctrans' for wide characters. + */ +#if @GNULIB_C32_APPLY_MAPPING@ +# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32_APPLY_MAPPING +_GL_BEGIN_C_LINKAGE +_GL_INLINE _GL_ARG_NONNULL ((2)) wint_t +c32_apply_mapping (wint_t wc, c32_mapping_t mapping) +{ + return +# if @GNULIB_TOWCTRANS@ && defined __cplusplus && defined GNULIB_NAMESPACE + GNULIB_NAMESPACE:: +# endif + towctrans (wc, mapping); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32_apply_mapping, wint_t, + (wint_t wc, c32_mapping_t mapping) + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (c32_apply_mapping, wint_t, + (wint_t wc, c32_mapping_t mapping)); +_GL_CXXALIASWARN (c32_apply_mapping); +#endif + + +_GL_INLINE_HEADER_END + +#endif /* _@GUARD_PREFIX@_UCHAR_H */ +#endif /* _@GUARD_PREFIX@_UCHAR_H */ diff --git a/lib/unicase.in.h b/lib/unicase.in.h index 64ab374..bd705ba 100644 --- a/lib/unicase.in.h +++ b/lib/unicase.in.h @@ -1,5 +1,5 @@ /* Unicode character case mappings. - Copyright (C) 2002, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/unicase/cased.c b/lib/unicase/cased.c index bea791a..6014c62 100644 --- a/lib/unicase/cased.c +++ b/lib/unicase/cased.c @@ -1,5 +1,5 @@ /* Test whether a Unicode character is cased. - Copyright (C) 2002, 2006-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software. diff --git a/lib/unicase/cased.h b/lib/unicase/cased.h index 2fe1268..dca1203 100644 --- a/lib/unicase/cased.h +++ b/lib/unicase/cased.h @@ -1,8 +1,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Casing Properties of Unicode characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 15.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ -/* Copyright (C) 2000-2022 Free Software Foundation, Inc. +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. This file is free software. It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". diff --git a/lib/unicase/caseprop.h b/lib/unicase/caseprop.h index 179d1e8..ac76468 100644 --- a/lib/unicase/caseprop.h +++ b/lib/unicase/caseprop.h @@ -1,5 +1,5 @@ /* Case related properties of Unicode characters. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software. diff --git a/lib/unicase/context.h b/lib/unicase/context.h index 4396c76..541da56 100644 --- a/lib/unicase/context.h +++ b/lib/unicase/context.h @@ -1,5 +1,5 @@ /* Case-mapping contexts of UTF-8/UTF-16/UTF-32 substring. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software. diff --git a/lib/unicase/empty-prefix-context.c b/lib/unicase/empty-prefix-context.c index f217c77..1a99d6f 100644 --- a/lib/unicase/empty-prefix-context.c +++ b/lib/unicase/empty-prefix-context.c @@ -1,5 +1,5 @@ /* Case-mapping context of empty prefix string. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software. diff --git a/lib/unicase/empty-suffix-context.c b/lib/unicase/empty-suffix-context.c index d4d7342..2e5bc33 100644 --- a/lib/unicase/empty-suffix-context.c +++ b/lib/unicase/empty-suffix-context.c @@ -1,5 +1,5 @@ /* Case-mapping context of empty suffix string. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software. diff --git a/lib/unicase/ignorable.c b/lib/unicase/ignorable.c index a000db5..c4d4135 100644 --- a/lib/unicase/ignorable.c +++ b/lib/unicase/ignorable.c @@ -1,5 +1,5 @@ /* Test whether a Unicode character is case-ignorable. - Copyright (C) 2002, 2006-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software. diff --git a/lib/unicase/ignorable.h b/lib/unicase/ignorable.h index 5b986e1..bf41d94 100644 --- a/lib/unicase/ignorable.h +++ b/lib/unicase/ignorable.h @@ -1,8 +1,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Casing Properties of Unicode characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 15.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ -/* Copyright (C) 2000-2022 Free Software Foundation, Inc. +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. This file is free software. It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". diff --git a/lib/unicase/simple-mapping.h b/lib/unicase/simple-mapping.h index 6b44fc2..6102b76 100644 --- a/lib/unicase/simple-mapping.h +++ b/lib/unicase/simple-mapping.h @@ -1,5 +1,5 @@ /* Simple case mapping for Unicode characters. - Copyright (C) 2002, 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software: you can redistribute it and/or modify diff --git a/lib/unicase/special-casing-table.gperf b/lib/unicase/special-casing-table.gperf index 54bfb4a..39e1f5d 100644 --- a/lib/unicase/special-casing-table.gperf +++ b/lib/unicase/special-casing-table.gperf @@ -1,8 +1,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Special casing rules of Unicode characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 15.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ -/* Copyright (C) 2000-2022 Free Software Foundation, Inc. +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. This file is free software. It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". diff --git a/lib/unicase/special-casing.c b/lib/unicase/special-casing.c index d26c7c1..856b904 100644 --- a/lib/unicase/special-casing.c +++ b/lib/unicase/special-casing.c @@ -1,5 +1,5 @@ /* Special casing table. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software. diff --git a/lib/unicase/special-casing.in.h b/lib/unicase/special-casing.in.h index d1feddb..5683a45 100644 --- a/lib/unicase/special-casing.in.h +++ b/lib/unicase/special-casing.in.h @@ -1,5 +1,5 @@ /* Special casing table. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software. diff --git a/lib/unicase/tolower.c b/lib/unicase/tolower.c index 8c8efa5..0a62cd5 100644 --- a/lib/unicase/tolower.c +++ b/lib/unicase/tolower.c @@ -1,5 +1,5 @@ /* Lowercase mapping for Unicode characters (locale and context independent). - Copyright (C) 2002, 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software: you can redistribute it and/or modify diff --git a/lib/unicase/tolower.h b/lib/unicase/tolower.h index 6fa031c..9c125f5 100644 --- a/lib/unicase/tolower.h +++ b/lib/unicase/tolower.h @@ -1,8 +1,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Simple character mapping of Unicode characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 15.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ -/* Copyright (C) 2000-2023 Free Software Foundation, Inc. +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/unicase/u-casemap.h b/lib/unicase/u-casemap.h index 45ac381..20690df 100644 --- a/lib/unicase/u-casemap.h +++ b/lib/unicase/u-casemap.h @@ -1,5 +1,5 @@ /* Case mapping for UTF-8/UTF-16/UTF-32 strings (locale dependent). - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software. diff --git a/lib/unicase/u8-casemap.c b/lib/unicase/u8-casemap.c index 920305c..b94f509 100644 --- a/lib/unicase/u8-casemap.c +++ b/lib/unicase/u8-casemap.c @@ -1,5 +1,5 @@ /* Case mapping for UTF-8 strings (locale dependent). - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software. diff --git a/lib/unicase/u8-tolower.c b/lib/unicase/u8-tolower.c index 5780f59..2ec21ad 100644 --- a/lib/unicase/u8-tolower.c +++ b/lib/unicase/u8-tolower.c @@ -1,5 +1,5 @@ /* Lowercase mapping for UTF-8 strings (locale dependent). - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software. diff --git a/lib/unicase/unicasemap.h b/lib/unicase/unicasemap.h index 736a12d..783b393 100644 --- a/lib/unicase/unicasemap.h +++ b/lib/unicase/unicasemap.h @@ -1,5 +1,5 @@ /* Case mapping for UTF-8/UTF-16/UTF-32 strings (locale dependent). - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software. diff --git a/lib/unictype.in.h b/lib/unictype.in.h index bab2aaf..fdd2cd1 100644 --- a/lib/unictype.in.h +++ b/lib/unictype.in.h @@ -1,5 +1,5 @@ /* Unicode character classification and properties. - Copyright (C) 2002, 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -640,6 +640,8 @@ extern @GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@ const uc_property_t U extern @GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_ID_CONTINUE; extern @GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_XID_START; extern @GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_XID_CONTINUE; +extern @GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ID_COMPAT_MATH_START; +extern @GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ID_COMPAT_MATH_CONTINUE; extern @GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PATTERN_WHITE_SPACE; extern @GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PATTERN_SYNTAX; /* Shaping and rendering. */ @@ -673,6 +675,7 @@ extern @GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@ const uc_property extern @GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDEOGRAPHIC; extern @GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_UNIFIED_IDEOGRAPH; extern @GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_RADICAL; +extern @GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDS_UNARY_OPERATOR; extern @GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDS_BINARY_OPERATOR; extern @GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDS_TRINARY_OPERATOR; /* Emoji. */ @@ -688,6 +691,7 @@ extern @GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@ const uc_property_t UC_PROP extern @GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_NON_BREAK; extern @GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ISO_CONTROL; extern @GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_FORMAT_CONTROL; +extern @GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PREPENDED_CONCATENATION_MARK; extern @GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DASH; extern @GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_HYPHEN; extern @GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PUNCTUATION; @@ -780,6 +784,10 @@ extern bool uc_is_property_xid_start (ucs4_t uc) _UC_ATTRIBUTE_CONST; extern bool uc_is_property_xid_continue (ucs4_t uc) _UC_ATTRIBUTE_CONST; +extern bool uc_is_property_id_compat_math_start (ucs4_t uc) + _UC_ATTRIBUTE_CONST; +extern bool uc_is_property_id_compat_math_continue (ucs4_t uc) + _UC_ATTRIBUTE_CONST; extern bool uc_is_property_pattern_white_space (ucs4_t uc) _UC_ATTRIBUTE_CONST; extern bool uc_is_property_pattern_syntax (ucs4_t uc) @@ -838,6 +846,8 @@ extern bool uc_is_property_unified_ideograph (ucs4_t uc) _UC_ATTRIBUTE_CONST; extern bool uc_is_property_radical (ucs4_t uc) _UC_ATTRIBUTE_CONST; +extern bool uc_is_property_ids_unary_operator (ucs4_t uc) + _UC_ATTRIBUTE_CONST; extern bool uc_is_property_ids_binary_operator (ucs4_t uc) _UC_ATTRIBUTE_CONST; extern bool uc_is_property_ids_trinary_operator (ucs4_t uc) @@ -864,6 +874,8 @@ extern bool uc_is_property_iso_control (ucs4_t uc) _UC_ATTRIBUTE_CONST; extern bool uc_is_property_format_control (ucs4_t uc) _UC_ATTRIBUTE_CONST; +extern bool uc_is_property_prepended_concatenation_mark (ucs4_t uc) + _UC_ATTRIBUTE_CONST; extern bool uc_is_property_dash (ucs4_t uc) _UC_ATTRIBUTE_CONST; extern bool uc_is_property_hyphen (ucs4_t uc) @@ -909,6 +921,40 @@ extern bool uc_is_property_regional_indicator (ucs4_t uc) /* ========================================================================= */ +/* Other attributes. */ + +/* ------------------------------------------------------------------------- */ + +/* Indic_Conjunct_Break (InCB): from the file DerivedCoreProperties.txt + in the Unicode Character Database. */ + +/* Possible values of the Indic_Conjunct_Break attribute. + This enumeration may be extended in the future. */ +enum +{ + UC_INDIC_CONJUNCT_BREAK_NONE, /* None */ + UC_INDIC_CONJUNCT_BREAK_CONSONANT, /* Consonant */ + UC_INDIC_CONJUNCT_BREAK_LINKER, /* Linker */ + UC_INDIC_CONJUNCT_BREAK_EXTEND /* Extend */ +}; + +/* Return the name of an Indic_Conjunct_Break value. */ +extern const char * + uc_indic_conjunct_break_name (int indic_conjunct_break) + _UC_ATTRIBUTE_CONST; + +/* Return the Indic_Conjunct_Break value given by name, e.g. "Consonant". */ +extern int + uc_indic_conjunct_break_byname (const char *indic_conjunct_break_name) + _UC_ATTRIBUTE_PURE; + +/* Return the Indic_Conjunct_Break attribute of a Unicode character. */ +extern int + uc_indic_conjunct_break (ucs4_t uc) + _UC_ATTRIBUTE_CONST; + +/* ========================================================================= */ + /* Subdivision of the Unicode characters into scripts. */ typedef struct diff --git a/lib/unictype/bitmap.h b/lib/unictype/bitmap.h index 9da85c1..dba2365 100644 --- a/lib/unictype/bitmap.h +++ b/lib/unictype/bitmap.h @@ -1,5 +1,5 @@ /* Three-level bitmap lookup. - Copyright (C) 2000-2002, 2005-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2000-2002, 2005-2007, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2000-2002. This file is free software: you can redistribute it and/or modify diff --git a/lib/unictype/combiningclass.c b/lib/unictype/combiningclass.c index 6a9a986..af78bff 100644 --- a/lib/unictype/combiningclass.c +++ b/lib/unictype/combiningclass.c @@ -1,5 +1,5 @@ /* Combining classes of Unicode characters. - Copyright (C) 2002, 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This file is free software: you can redistribute it and/or modify diff --git a/lib/unictype/combiningclass.h b/lib/unictype/combiningclass.h index 1e47395..4b114e6 100644 --- a/lib/unictype/combiningclass.h +++ b/lib/unictype/combiningclass.h @@ -1,8 +1,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Combining class of Unicode characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 15.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ -/* Copyright (C) 2000-2022 Free Software Foundation, Inc. +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/unictype/ctype_alnum.c b/lib/unictype/ctype_alnum.c new file mode 100644 index 0000000..1f69c14 --- /dev/null +++ b/lib/unictype/ctype_alnum.c @@ -0,0 +1,32 @@ +/* ISO C <ctype.h> like properties of Unicode characters. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unictype.h" + +#include "bitmap.h" + +/* Define u_is_alnum table. */ +#include "ctype_alnum.h" + +bool +uc_is_alnum (ucs4_t uc) +{ + return bitmap_lookup (&u_is_alnum, uc); +} diff --git a/lib/unictype/ctype_alnum.h b/lib/unictype/ctype_alnum.h new file mode 100644 index 0000000..9e28bb6 --- /dev/null +++ b/lib/unictype/ctype_alnum.h @@ -0,0 +1,881 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* ISO C <ctype.h> like properties of Unicode characters. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ + +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#define header_0 16 +#define header_2 9 +#define header_3 127 +#define header_4 15 +static const +struct + { + int header[1]; + int level1[4]; + short level2[4 << 7]; + unsigned int level3[81 << 4]; + } +u_is_alnum = +{ + { 4 }, + { + 5 * sizeof (int) / sizeof (short) + 0, + 5 * sizeof (int) / sizeof (short) + 128, + 5 * sizeof (int) / sizeof (short) + 256, + 5 * sizeof (int) / sizeof (short) + 384 + }, + { + 5 + 512 * sizeof (short) / sizeof (int) + 0, + 5 + 512 * sizeof (short) / sizeof (int) + 16, + 5 + 512 * sizeof (short) / sizeof (int) + 32, + 5 + 512 * sizeof (short) / sizeof (int) + 48, + 5 + 512 * sizeof (short) / sizeof (int) + 64, + 5 + 512 * sizeof (short) / sizeof (int) + 80, + 5 + 512 * sizeof (short) / sizeof (int) + 96, + 5 + 512 * sizeof (short) / sizeof (int) + 112, + 5 + 512 * sizeof (short) / sizeof (int) + 128, + 5 + 512 * sizeof (short) / sizeof (int) + 144, + 5 + 512 * sizeof (short) / sizeof (int) + 160, + 5 + 512 * sizeof (short) / sizeof (int) + 176, + 5 + 512 * sizeof (short) / sizeof (int) + 192, + 5 + 512 * sizeof (short) / sizeof (int) + 208, + 5 + 512 * sizeof (short) / sizeof (int) + 224, + 5 + 512 * sizeof (short) / sizeof (int) + 240, + 5 + 512 * sizeof (short) / sizeof (int) + 256, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 272, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 288, + 5 + 512 * sizeof (short) / sizeof (int) + 304, + 5 + 512 * sizeof (short) / sizeof (int) + 320, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 352, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 368, + 5 + 512 * sizeof (short) / sizeof (int) + 384, + 5 + 512 * sizeof (short) / sizeof (int) + 400, + 5 + 512 * sizeof (short) / sizeof (int) + 416, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 432, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 448, + 5 + 512 * sizeof (short) / sizeof (int) + 464, + 5 + 512 * sizeof (short) / sizeof (int) + 480, + 5 + 512 * sizeof (short) / sizeof (int) + 496, + 5 + 512 * sizeof (short) / sizeof (int) + 512, + 5 + 512 * sizeof (short) / sizeof (int) + 528, + 5 + 512 * sizeof (short) / sizeof (int) + 544, + 5 + 512 * sizeof (short) / sizeof (int) + 560, + 5 + 512 * sizeof (short) / sizeof (int) + 576, + 5 + 512 * sizeof (short) / sizeof (int) + 592, + 5 + 512 * sizeof (short) / sizeof (int) + 608, + 5 + 512 * sizeof (short) / sizeof (int) + 624, + 5 + 512 * sizeof (short) / sizeof (int) + 640, + 5 + 512 * sizeof (short) / sizeof (int) + 656, + 5 + 512 * sizeof (short) / sizeof (int) + 672, + 5 + 512 * sizeof (short) / sizeof (int) + 688, + 5 + 512 * sizeof (short) / sizeof (int) + 704, + 5 + 512 * sizeof (short) / sizeof (int) + 720, + 5 + 512 * sizeof (short) / sizeof (int) + 736, + 5 + 512 * sizeof (short) / sizeof (int) + 752, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 768, + 5 + 512 * sizeof (short) / sizeof (int) + 784, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 800, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 816, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 832, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 848, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 864, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 880, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 896, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 912, + 5 + 512 * sizeof (short) / sizeof (int) + 928, + 5 + 512 * sizeof (short) / sizeof (int) + 944, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 960, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 976, + 5 + 512 * sizeof (short) / sizeof (int) + 992, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 1008, + 5 + 512 * sizeof (short) / sizeof (int) + 1024, + 5 + 512 * sizeof (short) / sizeof (int) + 1040, + 5 + 512 * sizeof (short) / sizeof (int) + 1056, + 5 + 512 * sizeof (short) / sizeof (int) + 1072, + 5 + 512 * sizeof (short) / sizeof (int) + 1088, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 1104, + 5 + 512 * sizeof (short) / sizeof (int) + 1120, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 1136, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1152, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1168, + 5 + 512 * sizeof (short) / sizeof (int) + 1184, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1200, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1216, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1232, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1248, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1264, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1280, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1 + }, + { + 0x00000000U, 0x03FF0000U, 0x07FFFFFEU, 0x07FFFFFEU, + 0x00000000U, 0x04200400U, 0xFF7FFFFFU, 0xFF7FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0003FFC3U, 0x0000501FU, + 0x00000000U, 0x00000000U, 0x00000020U, 0xBCDF0000U, + 0xFFFFD740U, 0xFFFFFFFBU, 0xFFFFFFFFU, 0xFFBFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFC03U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFEFFFFU, 0x027FFFFFU, 0xFFFFFFFFU, + 0x000001FFU, 0x00000000U, 0xFFFF0000U, 0x000787FFU, + 0x00000000U, 0xFFFFFFFFU, 0x000007FFU, 0xFFFEC3FFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x002FFFFFU, 0x9FFFC060U, + 0xFFFD0000U, 0x0000FFFFU, 0xFFFFE000U, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x0002003FU, 0xFFFFFFFFU, 0x043007FFU, + 0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0xFFFF07FFU, + 0x00007EFFU, 0xFFFFFFFFU, 0x000003FFU, 0x00000000U, + 0xFFFFFFF0U, 0x23FFFFFFU, 0xFF010000U, 0xFFFEFFC3U, + 0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x1003FFC3U, + 0xFFF987E0U, 0x036DFDFFU, 0x5E000000U, 0x001CFFC0U, + 0xFFFBBFE0U, 0x23EDFDFFU, 0x00010000U, 0x0200FFC3U, + 0xFFF99FE0U, 0x23EDFDFFU, 0xB0000000U, 0x0002FFC3U, + 0xD63DC7E8U, 0x03FFC718U, 0x00010000U, 0x0000FFC0U, + 0xFFFDDFE0U, 0x23FFFDFFU, 0x27000000U, 0x0000FFC3U, + 0xFFFDDFE1U, 0x23EFFDFFU, 0x60000000U, 0x0006FFC3U, + 0xFFFDDFF0U, 0x27FFFFFFU, 0x80704000U, 0xFC00FFC3U, + 0xFC7FFFE0U, 0x2FFBFFFFU, 0x0000007FU, 0x0000FFC0U, + 0xFFFFFFFEU, 0x07FF7FFFU, 0x03FF7FBFU, 0x00000000U, + 0xFFFFF7D6U, 0x200DFFAFU, 0xF3FF005FU, 0x00000000U, + 0x00000001U, 0x000003FFU, 0xFFFFFEFFU, 0x00001FFFU, + 0x00001F00U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x800007FFU, 0x3C3F03FFU, 0xFFE1C062U, + 0x03FF4003U, 0xFFFFFFFFU, 0xFFFF20BFU, 0xF7FFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3D7F3DFFU, 0xFFFFFFFFU, + 0xFFFF3DFFU, 0x7F3DFFFFU, 0xFF7FFF3DU, 0xFFFFFFFFU, + 0xFF3DFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU, 0x00000000U, + 0x0000FFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3F3FFFFFU, + 0xFFFFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF9FFFU, + 0x07FFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFC7FFU, + 0x8003FFFFU, 0x0003FFFFU, 0x0003FFFFU, 0x0001DFFFU, + 0xFFFFFFFFU, 0x000FFFFFU, 0x10800000U, 0x000003FFU, + 0x03FF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFFFFFU, + 0xFFFFFF9FU, 0xFFFF05FFU, 0xFFFFFFFFU, 0x003FFFFFU, + 0x7FFFFFFFU, 0x00000000U, 0xFFFFFFC0U, 0x001F3FFFU, + 0xFFFFFFFFU, 0xFFFF0FFFU, 0x03FF03FFU, 0x00000000U, + 0x007FFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U, + 0x03FF03FFU, 0x00000080U, 0x00000000U, 0x00000000U, + 0xFFFFFFE0U, 0x000FFFFFU, 0x03FF1FE0U, 0x00000000U, + 0xFFFFFFF8U, 0xFFFFC001U, 0xFFFFFFFFU, 0x0000003FU, + 0xFFFFFFFFU, 0x0000000FU, 0xFFFFE3FFU, 0x3FFFFFFFU, + 0xFFFF01FFU, 0xE7FFFFFFU, 0x00000000U, 0x046FDE00U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU, + 0xFFFFFFFFU, 0x5FDFFFFFU, 0x0FCF1FDCU, 0x1FDC1FFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x80020000U, + 0x1FFF0000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x3E2FFC84U, 0xF3FFBF50U, 0x000043E0U, 0xFFFFFFFFU, + 0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xF0000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000003FFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000C781FU, + 0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU, 0x000080FFU, + 0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0x00000000U, + 0x00000000U, 0x00008000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x000000E0U, 0x1F3E03FEU, 0xFFFFFFFEU, 0xFFFFFFFFU, + 0xE07FFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, 0xF7FFFFFFU, + 0xFFFFFFE0U, 0xFFFEFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00007FFFU, 0xFFFFFFFFU, 0x00000000U, 0xFFFF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00001FFFU, 0x00000000U, 0xFFFF0000U, 0x3FFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFF1FFFU, 0x00000FFFU, 0xFFFFFFFFU, 0x80007FFFU, + 0x3FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU, + 0xFF800000U, 0xFFFFFFFCU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFF9FFU, 0xFFFFFFFFU, 0x03EB07FFU, 0xFFFC0000U, + 0xFFFFF7BBU, 0x00000007U, 0xFFFFFFFFU, 0x000FFFFFU, + 0xFFFFFFFCU, 0x000FFFFFU, 0x03FF0000U, 0x68FC0000U, + 0xFFFFFFFFU, 0xFFFF003FU, 0x0000007FU, 0x1FFFFFFFU, + 0xFFFFFFF0U, 0x0007FFFFU, 0x03FF8000U, 0x7FFFFFDFU, + 0xFFFFFFFFU, 0x000001FFU, 0x03FF0FF7U, 0xC47FFFFFU, + 0xFFFFFFFFU, 0x3E62FFFFU, 0x38000005U, 0x001C07FFU, + 0x007E7E7EU, 0xFFFF7F7FU, 0xF7FFFFFFU, 0xFFFF03FFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF0007U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFF000FU, 0xFFFFF87FU, 0x0FFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF3FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00000000U, + 0xA0F8007FU, 0x5F7FFDFFU, 0xFFFFFFDBU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x0003FFFFU, 0xFFF80000U, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x3FFFFFFFU, 0xFFFF0000U, 0xFFFFFFFFU, + 0xFFFCFFFFU, 0xFFFFFFFFU, 0x000000FFU, 0x0FFF0000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0xFFDF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFFFFFFU, + 0x03FF0000U, 0x07FFFFFEU, 0x07FFFFFEU, 0xFFFFFFC0U, + 0xFFFFFFFFU, 0x7FFFFFFFU, 0x1CFCFCFCU, 0x00000000U, + 0xFFFFEFFFU, 0xB7FFFF7FU, 0x3FFF3FFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU, + 0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x001FFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFE000U, 0xFFFF07FFU, 0x003FFFFFU, + 0x3FFFFFFFU, 0xFFFFFFFFU, 0x003EFF0FU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU, + 0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU, 0xF7FF000FU, + 0xFFB7F7FFU, 0x1BFBFFFBU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x007FFFFFU, 0x003FFFFFU, 0x000000FFU, + 0xFFFFFFBFU, 0x07FDFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFD3FU, 0x91BFFFFFU, 0x003FFFFFU, 0x007FFFFFU, + 0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0x0037FFFFU, + 0x003FFFFFU, 0x03FFFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xC0FFFFFFU, 0x00000000U, 0x00000000U, + 0xFEEF0001U, 0x003FFFFFU, 0x00000000U, 0x1FFFFFFFU, + 0x1FFFFFFFU, 0x00000000U, 0xFFFFFEFFU, 0x0000001FU, + 0xFFFFFFFFU, 0x003FFFFFU, 0x003FFFFFU, 0x0007FFFFU, + 0x0003FFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000001FFU, 0x00000000U, + 0xFFFFFFFFU, 0x0007FFFFU, 0xFFFFFFFFU, 0x0007FFFFU, + 0xFFFFFFFFU, 0x03FF000FU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x000303FFU, 0x00000000U, 0x00000000U, + 0x1FFFFFFFU, 0xFFFF0080U, 0x0000003FU, 0xFFFF0000U, + 0x00000003U, 0xFFFF0000U, 0x0000001FU, 0x007FFFFFU, + 0xFFFFFFF8U, 0x00FFFFFFU, 0x00000000U, 0x0026FFC0U, + 0xFFFFFFF8U, 0x0000FFFFU, 0xFFFF0000U, 0x03FF01FFU, + 0xFFFFFFF8U, 0xFFC0007FU, 0xFFFF0090U, 0x0047FFFFU, + 0xFFFFFFF8U, 0x0007FFFFU, 0x17FF001EU, 0x00000000U, + 0xFFFBFFFFU, 0x80000FFFU, 0x00000001U, 0x00000000U, + 0xBFFFBD7FU, 0xFFFF01FFU, 0x7FFFFFFFU, 0x03FF0000U, + 0xFFF99FE0U, 0x23EDFDFFU, 0xE0010000U, 0x00000003U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x001FFFFFU, 0x83FF0780U, 0x00000003U, + 0xFFFFFFFFU, 0x0000FFFFU, 0x03FF00B0U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x00007FFFU, 0x0F000000U, 0x00000000U, + 0xFFFFFFFFU, 0x0000FFFFU, 0x03FF0010U, 0x00000000U, + 0xFFFFFFFFU, 0x010007FFU, 0x000003FFU, 0x00000000U, + 0x07FFFFFFU, 0x03FF0000U, 0x0000007FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x00000FFFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x800003FFU, + 0xFF6FF27FU, 0x8000FFFFU, 0x03FF0002U, 0x00000000U, + 0x00000000U, 0xFFFFFCFFU, 0x0001FFFFU, 0x0000000AU, + 0xFFFFF801U, 0x0407FFFFU, 0xF0010000U, 0xFFFFFFFFU, + 0x200003FFU, 0xFFFF0000U, 0xFFFFFFFFU, 0x01FFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFDFFU, 0x00007FFFU, 0x03FF0001U, 0xFFFC0000U, + 0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFB7FU, 0x0001FFFFU, 0x03FF0040U, 0xFFFFFDBFU, + 0x010003FFU, 0x000003FFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x0007FFFFU, + 0xFFFDFFF4U, 0x000FFFFFU, 0x03FF0000U, 0x00000000U, + 0x00000000U, 0x00010000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x03FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00007FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, + 0xFFFFFFFFU, 0x0000FFFFU, 0x0000007EU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x01FFFFFFU, 0x7FFFFFFFU, 0xFFFF03FFU, + 0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFF03FFU, 0x00003FFFU, + 0xFFFFFFFFU, 0x0000FFFFU, 0x03FF000FU, 0xE0FFFFF8U, + 0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000107FFU, 0x00000000U, + 0xFFF80000U, 0x00000000U, 0x00000000U, 0x0000000BU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U, + 0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x6FEF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x00040007U, 0x00270000U, 0xFFFF00F0U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU, + 0x03FF01FFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFDFFFFFU, 0xFFFFFFFFU, + 0xDFFFFFFFU, 0xEBFFDE64U, 0xFFFFFFEFU, 0xFFFFFFFFU, + 0xDFDFE7BFU, 0x7BFFFFFFU, 0xFFFDFC5FU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFF3FU, 0xF7FFFFFDU, 0xF7FFFFFFU, + 0xFFDFFFFFU, 0xFFDFFFFFU, 0xFFFF7FFFU, 0xFFFF7FFFU, + 0xFFFFFDFFU, 0xFFFFFDFFU, 0xFFFFCFF7U, 0xFFFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x7FFFFFFFU, 0x000007E0U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFF0000U, 0xFFFFFFFFU, 0x00003FFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x3F801FFFU, 0x000043FFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFF0000U, 0x00003FFFU, 0xFFFFFFFFU, 0x03FF0FFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFF0000U, 0x03FF0FFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x7FFF6F7FU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000001FU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF080FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFEFU, 0x0AF7FE96U, 0xAA96EA84U, 0x5EF7F796U, + 0x0FFFFBFFU, 0x0FFFFBEEU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFF0000U, 0xFFFF1FFFU, 0xFFFF03FFU, 0xFFFF03FFU, + 0x000007FFU, 0x00000020U, 0x00000000U, 0xFFFFFFC0U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x03FF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x3FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF0001U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF07FFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U, 0x00000000U + } +}; diff --git a/lib/unictype/ctype_alpha.c b/lib/unictype/ctype_alpha.c new file mode 100644 index 0000000..16cddc9 --- /dev/null +++ b/lib/unictype/ctype_alpha.c @@ -0,0 +1,32 @@ +/* ISO C <ctype.h> like properties of Unicode characters. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unictype.h" + +#include "bitmap.h" + +/* Define u_is_alpha table. */ +#include "ctype_alpha.h" + +bool +uc_is_alpha (ucs4_t uc) +{ + return bitmap_lookup (&u_is_alpha, uc); +} diff --git a/lib/unictype/ctype_alpha.h b/lib/unictype/ctype_alpha.h new file mode 100644 index 0000000..7709886 --- /dev/null +++ b/lib/unictype/ctype_alpha.h @@ -0,0 +1,881 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* ISO C <ctype.h> like properties of Unicode characters. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ + +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#define header_0 16 +#define header_2 9 +#define header_3 127 +#define header_4 15 +static const +struct + { + int header[1]; + int level1[4]; + short level2[4 << 7]; + unsigned int level3[81 << 4]; + } +u_is_alpha = +{ + { 4 }, + { + 5 * sizeof (int) / sizeof (short) + 0, + 5 * sizeof (int) / sizeof (short) + 128, + 5 * sizeof (int) / sizeof (short) + 256, + 5 * sizeof (int) / sizeof (short) + 384 + }, + { + 5 + 512 * sizeof (short) / sizeof (int) + 0, + 5 + 512 * sizeof (short) / sizeof (int) + 16, + 5 + 512 * sizeof (short) / sizeof (int) + 32, + 5 + 512 * sizeof (short) / sizeof (int) + 48, + 5 + 512 * sizeof (short) / sizeof (int) + 64, + 5 + 512 * sizeof (short) / sizeof (int) + 80, + 5 + 512 * sizeof (short) / sizeof (int) + 96, + 5 + 512 * sizeof (short) / sizeof (int) + 112, + 5 + 512 * sizeof (short) / sizeof (int) + 128, + 5 + 512 * sizeof (short) / sizeof (int) + 144, + 5 + 512 * sizeof (short) / sizeof (int) + 160, + 5 + 512 * sizeof (short) / sizeof (int) + 176, + 5 + 512 * sizeof (short) / sizeof (int) + 192, + 5 + 512 * sizeof (short) / sizeof (int) + 208, + 5 + 512 * sizeof (short) / sizeof (int) + 224, + 5 + 512 * sizeof (short) / sizeof (int) + 240, + 5 + 512 * sizeof (short) / sizeof (int) + 256, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 272, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 288, + 5 + 512 * sizeof (short) / sizeof (int) + 304, + 5 + 512 * sizeof (short) / sizeof (int) + 320, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 352, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 368, + 5 + 512 * sizeof (short) / sizeof (int) + 384, + 5 + 512 * sizeof (short) / sizeof (int) + 400, + 5 + 512 * sizeof (short) / sizeof (int) + 416, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 432, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 448, + 5 + 512 * sizeof (short) / sizeof (int) + 464, + 5 + 512 * sizeof (short) / sizeof (int) + 480, + 5 + 512 * sizeof (short) / sizeof (int) + 496, + 5 + 512 * sizeof (short) / sizeof (int) + 512, + 5 + 512 * sizeof (short) / sizeof (int) + 528, + 5 + 512 * sizeof (short) / sizeof (int) + 544, + 5 + 512 * sizeof (short) / sizeof (int) + 560, + 5 + 512 * sizeof (short) / sizeof (int) + 576, + 5 + 512 * sizeof (short) / sizeof (int) + 592, + 5 + 512 * sizeof (short) / sizeof (int) + 608, + 5 + 512 * sizeof (short) / sizeof (int) + 624, + 5 + 512 * sizeof (short) / sizeof (int) + 640, + 5 + 512 * sizeof (short) / sizeof (int) + 656, + 5 + 512 * sizeof (short) / sizeof (int) + 672, + 5 + 512 * sizeof (short) / sizeof (int) + 688, + 5 + 512 * sizeof (short) / sizeof (int) + 704, + 5 + 512 * sizeof (short) / sizeof (int) + 720, + 5 + 512 * sizeof (short) / sizeof (int) + 736, + 5 + 512 * sizeof (short) / sizeof (int) + 752, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 768, + 5 + 512 * sizeof (short) / sizeof (int) + 784, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 800, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 816, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 832, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 848, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 864, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 880, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 896, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 912, + 5 + 512 * sizeof (short) / sizeof (int) + 928, + 5 + 512 * sizeof (short) / sizeof (int) + 944, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 960, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 976, + 5 + 512 * sizeof (short) / sizeof (int) + 992, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 1008, + 5 + 512 * sizeof (short) / sizeof (int) + 1024, + 5 + 512 * sizeof (short) / sizeof (int) + 1040, + 5 + 512 * sizeof (short) / sizeof (int) + 1056, + 5 + 512 * sizeof (short) / sizeof (int) + 1072, + 5 + 512 * sizeof (short) / sizeof (int) + 1088, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 1104, + 5 + 512 * sizeof (short) / sizeof (int) + 1120, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 1136, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1152, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1168, + 5 + 512 * sizeof (short) / sizeof (int) + 1184, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1200, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1216, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1232, + -1, + -1, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1248, + -1, + -1, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1264, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 336, + 5 + 512 * sizeof (short) / sizeof (int) + 1280, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1 + }, + { + 0x00000000U, 0x00000000U, 0x07FFFFFEU, 0x07FFFFFEU, + 0x00000000U, 0x04200400U, 0xFF7FFFFFU, 0xFF7FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0003FFC3U, 0x0000501FU, + 0x00000000U, 0x00000000U, 0x00000020U, 0xBCDF0000U, + 0xFFFFD740U, 0xFFFFFFFBU, 0xFFFFFFFFU, 0xFFBFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFC03U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFEFFFFU, 0x027FFFFFU, 0xFFFFFFFFU, + 0x000001FFU, 0x00000000U, 0xFFFF0000U, 0x000787FFU, + 0x00000000U, 0xFFFFFFFFU, 0x000007FFU, 0xFFFEC3FFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x002FFFFFU, 0x9FFFC060U, + 0xFFFD0000U, 0x0000FFFFU, 0xFFFFE000U, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x0002003FU, 0xFFFFFFFFU, 0x043007FFU, + 0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0xFFFF07FFU, + 0x00007EFFU, 0xFFFFFFFFU, 0x000003FFU, 0x00000000U, + 0xFFFFFFF0U, 0x23FFFFFFU, 0xFF010000U, 0xFFFEFFC3U, + 0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x1003FFC3U, + 0xFFF987E0U, 0x036DFDFFU, 0x5E000000U, 0x001CFFC0U, + 0xFFFBBFE0U, 0x23EDFDFFU, 0x00010000U, 0x0200FFC3U, + 0xFFF99FE0U, 0x23EDFDFFU, 0xB0000000U, 0x0002FFC3U, + 0xD63DC7E8U, 0x03FFC718U, 0x00010000U, 0x0000FFC0U, + 0xFFFDDFE0U, 0x23FFFDFFU, 0x27000000U, 0x0000FFC3U, + 0xFFFDDFE1U, 0x23EFFDFFU, 0x60000000U, 0x0006FFC3U, + 0xFFFDDFF0U, 0x27FFFFFFU, 0x80704000U, 0xFC00FFC3U, + 0xFC7FFFE0U, 0x2FFBFFFFU, 0x0000007FU, 0x0000FFC0U, + 0xFFFFFFFEU, 0x07FF7FFFU, 0x03FF7FBFU, 0x00000000U, + 0xFFFFF7D6U, 0x200DFFAFU, 0xF3FF005FU, 0x00000000U, + 0x00000001U, 0x000003FFU, 0xFFFFFEFFU, 0x00001FFFU, + 0x00001F00U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x800007FFU, 0x3C3F03FFU, 0xFFE1C062U, + 0x03FF4003U, 0xFFFFFFFFU, 0xFFFF20BFU, 0xF7FFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3D7F3DFFU, 0xFFFFFFFFU, + 0xFFFF3DFFU, 0x7F3DFFFFU, 0xFF7FFF3DU, 0xFFFFFFFFU, + 0xFF3DFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU, 0x00000000U, + 0x0000FFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3F3FFFFFU, + 0xFFFFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF9FFFU, + 0x07FFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFC7FFU, + 0x8003FFFFU, 0x0003FFFFU, 0x0003FFFFU, 0x0001DFFFU, + 0xFFFFFFFFU, 0x000FFFFFU, 0x10800000U, 0x000003FFU, + 0x03FF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFFFFFU, + 0xFFFFFF9FU, 0xFFFF05FFU, 0xFFFFFFFFU, 0x003FFFFFU, + 0x7FFFFFFFU, 0x00000000U, 0xFFFFFFC0U, 0x001F3FFFU, + 0xFFFFFFFFU, 0xFFFF0FFFU, 0x03FF03FFU, 0x00000000U, + 0x007FFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U, + 0x03FF03FFU, 0x00000080U, 0x00000000U, 0x00000000U, + 0xFFFFFFE0U, 0x000FFFFFU, 0x03FF1FE0U, 0x00000000U, + 0xFFFFFFF8U, 0xFFFFC001U, 0xFFFFFFFFU, 0x0000003FU, + 0xFFFFFFFFU, 0x0000000FU, 0xFFFFE3FFU, 0x3FFFFFFFU, + 0xFFFF01FFU, 0xE7FFFFFFU, 0x00000000U, 0x046FDE00U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU, + 0xFFFFFFFFU, 0x5FDFFFFFU, 0x0FCF1FDCU, 0x1FDC1FFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x80020000U, + 0x1FFF0000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x3E2FFC84U, 0xF3FFBF50U, 0x000043E0U, 0xFFFFFFFFU, + 0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xF0000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000003FFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000C781FU, + 0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU, 0x000080FFU, + 0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0x00000000U, + 0x00000000U, 0x00008000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x000000E0U, 0x1F3E03FEU, 0xFFFFFFFEU, 0xFFFFFFFFU, + 0xE07FFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, 0xF7FFFFFFU, + 0xFFFFFFE0U, 0xFFFEFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00007FFFU, 0xFFFFFFFFU, 0x00000000U, 0xFFFF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00001FFFU, 0x00000000U, 0xFFFF0000U, 0x3FFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFF1FFFU, 0x00000FFFU, 0xFFFFFFFFU, 0x80007FFFU, + 0x3FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU, + 0xFF800000U, 0xFFFFFFFCU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFF9FFU, 0xFFFFFFFFU, 0x03EB07FFU, 0xFFFC0000U, + 0xFFFFF7BBU, 0x00000007U, 0xFFFFFFFFU, 0x000FFFFFU, + 0xFFFFFFFCU, 0x000FFFFFU, 0x03FF0000U, 0x68FC0000U, + 0xFFFFFFFFU, 0xFFFF003FU, 0x0000007FU, 0x1FFFFFFFU, + 0xFFFFFFF0U, 0x0007FFFFU, 0x03FF8000U, 0x7FFFFFDFU, + 0xFFFFFFFFU, 0x000001FFU, 0x03FF0FF7U, 0xC47FFFFFU, + 0xFFFFFFFFU, 0x3E62FFFFU, 0x38000005U, 0x001C07FFU, + 0x007E7E7EU, 0xFFFF7F7FU, 0xF7FFFFFFU, 0xFFFF03FFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF0007U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFF000FU, 0xFFFFF87FU, 0x0FFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF3FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00000000U, + 0xA0F8007FU, 0x5F7FFDFFU, 0xFFFFFFDBU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x0003FFFFU, 0xFFF80000U, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x3FFFFFFFU, 0xFFFF0000U, 0xFFFFFFFFU, + 0xFFFCFFFFU, 0xFFFFFFFFU, 0x000000FFU, 0x0FFF0000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0xFFDF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFFFFFFU, + 0x03FF0000U, 0x07FFFFFEU, 0x07FFFFFEU, 0xFFFFFFC0U, + 0xFFFFFFFFU, 0x7FFFFFFFU, 0x1CFCFCFCU, 0x00000000U, + 0xFFFFEFFFU, 0xB7FFFF7FU, 0x3FFF3FFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU, + 0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x001FFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFE000U, 0xFFFF07FFU, 0x003FFFFFU, + 0x3FFFFFFFU, 0xFFFFFFFFU, 0x003EFF0FU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU, + 0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU, 0xF7FF000FU, + 0xFFB7F7FFU, 0x1BFBFFFBU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x007FFFFFU, 0x003FFFFFU, 0x000000FFU, + 0xFFFFFFBFU, 0x07FDFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFD3FU, 0x91BFFFFFU, 0x003FFFFFU, 0x007FFFFFU, + 0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0x0037FFFFU, + 0x003FFFFFU, 0x03FFFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xC0FFFFFFU, 0x00000000U, 0x00000000U, + 0xFEEF0001U, 0x003FFFFFU, 0x00000000U, 0x1FFFFFFFU, + 0x1FFFFFFFU, 0x00000000U, 0xFFFFFEFFU, 0x0000001FU, + 0xFFFFFFFFU, 0x003FFFFFU, 0x003FFFFFU, 0x0007FFFFU, + 0x0003FFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000001FFU, 0x00000000U, + 0xFFFFFFFFU, 0x0007FFFFU, 0xFFFFFFFFU, 0x0007FFFFU, + 0xFFFFFFFFU, 0x03FF000FU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x000303FFU, 0x00000000U, 0x00000000U, + 0x1FFFFFFFU, 0xFFFF0080U, 0x0000003FU, 0xFFFF0000U, + 0x00000003U, 0xFFFF0000U, 0x0000001FU, 0x007FFFFFU, + 0xFFFFFFF8U, 0x00FFFFFFU, 0x00000000U, 0x0026FFC0U, + 0xFFFFFFF8U, 0x0000FFFFU, 0xFFFF0000U, 0x03FF01FFU, + 0xFFFFFFF8U, 0xFFC0007FU, 0xFFFF0090U, 0x0047FFFFU, + 0xFFFFFFF8U, 0x0007FFFFU, 0x17FF001EU, 0x00000000U, + 0xFFFBFFFFU, 0x80000FFFU, 0x00000001U, 0x00000000U, + 0xBFFFBD7FU, 0xFFFF01FFU, 0x7FFFFFFFU, 0x03FF0000U, + 0xFFF99FE0U, 0x23EDFDFFU, 0xE0010000U, 0x00000003U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x001FFFFFU, 0x83FF0780U, 0x00000003U, + 0xFFFFFFFFU, 0x0000FFFFU, 0x03FF00B0U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x00007FFFU, 0x0F000000U, 0x00000000U, + 0xFFFFFFFFU, 0x0000FFFFU, 0x03FF0010U, 0x00000000U, + 0xFFFFFFFFU, 0x010007FFU, 0x000003FFU, 0x00000000U, + 0x07FFFFFFU, 0x03FF0000U, 0x0000007FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x00000FFFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x800003FFU, + 0xFF6FF27FU, 0x8000FFFFU, 0x03FF0002U, 0x00000000U, + 0x00000000U, 0xFFFFFCFFU, 0x0001FFFFU, 0x0000000AU, + 0xFFFFF801U, 0x0407FFFFU, 0xF0010000U, 0xFFFFFFFFU, + 0x200003FFU, 0xFFFF0000U, 0xFFFFFFFFU, 0x01FFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFDFFU, 0x00007FFFU, 0x03FF0001U, 0xFFFC0000U, + 0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFB7FU, 0x0001FFFFU, 0x03FF0040U, 0xFFFFFDBFU, + 0x010003FFU, 0x000003FFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x0007FFFFU, + 0xFFFDFFF4U, 0x000FFFFFU, 0x03FF0000U, 0x00000000U, + 0x00000000U, 0x00010000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x03FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00007FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, + 0xFFFFFFFFU, 0x0000FFFFU, 0x0000007EU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x01FFFFFFU, 0x7FFFFFFFU, 0xFFFF03FFU, + 0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFF03FFU, 0x00003FFFU, + 0xFFFFFFFFU, 0x0000FFFFU, 0x03FF000FU, 0xE0FFFFF8U, + 0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000107FFU, 0x00000000U, + 0xFFF80000U, 0x00000000U, 0x00000000U, 0x0000000BU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U, + 0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x6FEF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x00040007U, 0x00270000U, 0xFFFF00F0U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU, + 0x03FF01FFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFDFFFFFU, 0xFFFFFFFFU, + 0xDFFFFFFFU, 0xEBFFDE64U, 0xFFFFFFEFU, 0xFFFFFFFFU, + 0xDFDFE7BFU, 0x7BFFFFFFU, 0xFFFDFC5FU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFF3FU, 0xF7FFFFFDU, 0xF7FFFFFFU, + 0xFFDFFFFFU, 0xFFDFFFFFU, 0xFFFF7FFFU, 0xFFFF7FFFU, + 0xFFFFFDFFU, 0xFFFFFDFFU, 0xFFFFCFF7U, 0xFFFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x7FFFFFFFU, 0x000007E0U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFF0000U, 0xFFFFFFFFU, 0x00003FFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x3F801FFFU, 0x000043FFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFF0000U, 0x00003FFFU, 0xFFFFFFFFU, 0x03FF0FFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFF0000U, 0x03FF0FFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x7FFF6F7FU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000001FU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF080FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFEFU, 0x0AF7FE96U, 0xAA96EA84U, 0x5EF7F796U, + 0x0FFFFBFFU, 0x0FFFFBEEU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFF0000U, 0xFFFF1FFFU, 0xFFFF03FFU, 0xFFFF03FFU, + 0x000007FFU, 0x00000020U, 0x00000000U, 0xFFFFFFC0U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x03FF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x3FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF0001U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF07FFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U, 0x00000000U + } +}; diff --git a/lib/unictype/ctype_blank.c b/lib/unictype/ctype_blank.c new file mode 100644 index 0000000..cec8e02 --- /dev/null +++ b/lib/unictype/ctype_blank.c @@ -0,0 +1,32 @@ +/* ISO C <ctype.h> like properties of Unicode characters. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unictype.h" + +#include "bitmap.h" + +/* Define u_is_blank table. */ +#include "ctype_blank.h" + +bool +uc_is_blank (ucs4_t uc) +{ + return bitmap_lookup (&u_is_blank, uc); +} diff --git a/lib/unictype/ctype_blank.h b/lib/unictype/ctype_blank.h new file mode 100644 index 0000000..5ba76c7 --- /dev/null +++ b/lib/unictype/ctype_blank.h @@ -0,0 +1,184 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* ISO C <ctype.h> like properties of Unicode characters. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ + +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#define header_0 16 +#define header_2 9 +#define header_3 127 +#define header_4 15 +static const +struct + { + int header[1]; + int level1[1]; + short level2[1 << 7]; + unsigned int level3[4 << 4]; + } +u_is_blank = +{ + { 1 }, + { 2 * sizeof (int) / sizeof (short) + 0 }, + { + 2 + 128 * sizeof (short) / sizeof (int) + 0, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 2 + 128 * sizeof (short) / sizeof (int) + 16, + -1, + -1, + -1, + -1, + 2 + 128 * sizeof (short) / sizeof (int) + 32, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 2 + 128 * sizeof (short) / sizeof (int) + 48, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1 + }, + { + 0x00000200U, 0x00000001U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000001U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x0000077FU, 0x00000000U, 0x80000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000001U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U + } +}; diff --git a/lib/unictype/ctype_cntrl.c b/lib/unictype/ctype_cntrl.c new file mode 100644 index 0000000..6ed5273 --- /dev/null +++ b/lib/unictype/ctype_cntrl.c @@ -0,0 +1,32 @@ +/* ISO C <ctype.h> like properties of Unicode characters. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unictype.h" + +#include "bitmap.h" + +/* Define u_is_cntrl table. */ +#include "ctype_cntrl.h" + +bool +uc_is_cntrl (ucs4_t uc) +{ + return bitmap_lookup (&u_is_cntrl, uc); +} diff --git a/lib/unictype/ctype_cntrl.h b/lib/unictype/ctype_cntrl.h new file mode 100644 index 0000000..8eb1651 --- /dev/null +++ b/lib/unictype/ctype_cntrl.h @@ -0,0 +1,176 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* ISO C <ctype.h> like properties of Unicode characters. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ + +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#define header_0 16 +#define header_2 9 +#define header_3 127 +#define header_4 15 +static const +struct + { + int header[1]; + int level1[1]; + short level2[1 << 7]; + unsigned int level3[2 << 4]; + } +u_is_cntrl = +{ + { 1 }, + { 2 * sizeof (int) / sizeof (short) + 0 }, + { + 2 + 128 * sizeof (short) / sizeof (int) + 0, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 2 + 128 * sizeof (short) / sizeof (int) + 16, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1 + }, + { + 0xFFFFFFFFU, 0x00000000U, 0x00000000U, 0x80000000U, + 0xFFFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000300U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U + } +}; diff --git a/lib/unictype/ctype_digit.c b/lib/unictype/ctype_digit.c new file mode 100644 index 0000000..906e737 --- /dev/null +++ b/lib/unictype/ctype_digit.c @@ -0,0 +1,32 @@ +/* ISO C <ctype.h> like properties of Unicode characters. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unictype.h" + +#include "bitmap.h" + +/* Define u_is_digit table. */ +#include "ctype_digit.h" + +bool +uc_is_digit (ucs4_t uc) +{ + return bitmap_lookup (&u_is_digit, uc); +} diff --git a/lib/unictype/ctype_digit.h b/lib/unictype/ctype_digit.h new file mode 100644 index 0000000..4421f6f --- /dev/null +++ b/lib/unictype/ctype_digit.h @@ -0,0 +1,172 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* ISO C <ctype.h> like properties of Unicode characters. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ + +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#define header_0 16 +#define header_2 9 +#define header_3 127 +#define header_4 15 +static const +struct + { + int header[1]; + int level1[1]; + short level2[1 << 7]; + unsigned int level3[1 << 4]; + } +u_is_digit = +{ + { 1 }, + { 2 * sizeof (int) / sizeof (short) + 0 }, + { + 2 + 128 * sizeof (short) / sizeof (int) + 0, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1 + }, + { + 0x00000000U, 0x03FF0000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U + } +}; diff --git a/lib/unictype/ctype_graph.c b/lib/unictype/ctype_graph.c new file mode 100644 index 0000000..e58f69e --- /dev/null +++ b/lib/unictype/ctype_graph.c @@ -0,0 +1,32 @@ +/* ISO C <ctype.h> like properties of Unicode characters. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unictype.h" + +#include "bitmap.h" + +/* Define u_is_graph table. */ +#include "ctype_graph.h" + +bool +uc_is_graph (ucs4_t uc) +{ + return bitmap_lookup (&u_is_graph, uc); +} diff --git a/lib/unictype/ctype_graph.h b/lib/unictype/ctype_graph.h new file mode 100644 index 0000000..bb5281b --- /dev/null +++ b/lib/unictype/ctype_graph.h @@ -0,0 +1,1186 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* ISO C <ctype.h> like properties of Unicode characters. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ + +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#define header_0 16 +#define header_2 9 +#define header_3 127 +#define header_4 15 +static const +struct + { + int header[1]; + int level1[17]; + short level2[6 << 7]; + unsigned int level3[90 << 4]; + } +u_is_graph = +{ + { 17 }, + { + 18 * sizeof (int) / sizeof (short) + 0, + 18 * sizeof (int) / sizeof (short) + 128, + 18 * sizeof (int) / sizeof (short) + 256, + 18 * sizeof (int) / sizeof (short) + 384, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 * sizeof (int) / sizeof (short) + 512, + 18 * sizeof (int) / sizeof (short) + 640, + 18 * sizeof (int) / sizeof (short) + 640 + }, + { + 18 + 768 * sizeof (short) / sizeof (int) + 0, + 18 + 768 * sizeof (short) / sizeof (int) + 16, + 18 + 768 * sizeof (short) / sizeof (int) + 32, + 18 + 768 * sizeof (short) / sizeof (int) + 48, + 18 + 768 * sizeof (short) / sizeof (int) + 64, + 18 + 768 * sizeof (short) / sizeof (int) + 80, + 18 + 768 * sizeof (short) / sizeof (int) + 96, + 18 + 768 * sizeof (short) / sizeof (int) + 112, + 18 + 768 * sizeof (short) / sizeof (int) + 128, + 18 + 768 * sizeof (short) / sizeof (int) + 144, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 176, + 18 + 768 * sizeof (short) / sizeof (int) + 192, + 18 + 768 * sizeof (short) / sizeof (int) + 208, + 18 + 768 * sizeof (short) / sizeof (int) + 224, + 18 + 768 * sizeof (short) / sizeof (int) + 240, + 18 + 768 * sizeof (short) / sizeof (int) + 256, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 272, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 288, + 18 + 768 * sizeof (short) / sizeof (int) + 304, + 18 + 768 * sizeof (short) / sizeof (int) + 320, + 18 + 768 * sizeof (short) / sizeof (int) + 336, + 18 + 768 * sizeof (short) / sizeof (int) + 352, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 368, + 18 + 768 * sizeof (short) / sizeof (int) + 384, + 18 + 768 * sizeof (short) / sizeof (int) + 400, + 18 + 768 * sizeof (short) / sizeof (int) + 416, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 432, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 448, + 18 + 768 * sizeof (short) / sizeof (int) + 464, + 18 + 768 * sizeof (short) / sizeof (int) + 480, + 18 + 768 * sizeof (short) / sizeof (int) + 496, + 18 + 768 * sizeof (short) / sizeof (int) + 512, + 18 + 768 * sizeof (short) / sizeof (int) + 528, + 18 + 768 * sizeof (short) / sizeof (int) + 544, + 18 + 768 * sizeof (short) / sizeof (int) + 560, + 18 + 768 * sizeof (short) / sizeof (int) + 576, + 18 + 768 * sizeof (short) / sizeof (int) + 592, + 18 + 768 * sizeof (short) / sizeof (int) + 608, + 18 + 768 * sizeof (short) / sizeof (int) + 624, + 18 + 768 * sizeof (short) / sizeof (int) + 640, + 18 + 768 * sizeof (short) / sizeof (int) + 656, + 18 + 768 * sizeof (short) / sizeof (int) + 672, + 18 + 768 * sizeof (short) / sizeof (int) + 688, + 18 + 768 * sizeof (short) / sizeof (int) + 704, + 18 + 768 * sizeof (short) / sizeof (int) + 720, + 18 + 768 * sizeof (short) / sizeof (int) + 736, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 752, + 18 + 768 * sizeof (short) / sizeof (int) + 768, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 784, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 800, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 816, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 832, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 848, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 864, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 880, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 896, + 18 + 768 * sizeof (short) / sizeof (int) + 912, + 18 + 768 * sizeof (short) / sizeof (int) + 928, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 944, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 960, + 18 + 768 * sizeof (short) / sizeof (int) + 976, + 18 + 768 * sizeof (short) / sizeof (int) + 992, + 18 + 768 * sizeof (short) / sizeof (int) + 1008, + 18 + 768 * sizeof (short) / sizeof (int) + 1024, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1040, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 1056, + 18 + 768 * sizeof (short) / sizeof (int) + 1072, + 18 + 768 * sizeof (short) / sizeof (int) + 1088, + 18 + 768 * sizeof (short) / sizeof (int) + 1104, + 18 + 768 * sizeof (short) / sizeof (int) + 1120, + 18 + 768 * sizeof (short) / sizeof (int) + 1136, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 1152, + 18 + 768 * sizeof (short) / sizeof (int) + 1168, + 18 + 768 * sizeof (short) / sizeof (int) + 1184, + 18 + 768 * sizeof (short) / sizeof (int) + 1200, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1216, + 18 + 768 * sizeof (short) / sizeof (int) + 1232, + 18 + 768 * sizeof (short) / sizeof (int) + 1248, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1264, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1280, + 18 + 768 * sizeof (short) / sizeof (int) + 1296, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1312, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1328, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1344, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1360, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1376, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1392, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 1408, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1424 + }, + { + 0x00000000U, 0xFFFFFFFEU, 0xFFFFFFFFU, 0x7FFFFFFFU, + 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFCFFFFFFU, + 0xFFFFD7F0U, 0xFFFFFFFBU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFEFFFFU, 0xFE7FFFFFU, 0xFFFFFFFFU, + 0xFFFEE7FFU, 0xFFFFFFFFU, 0xFFFF00FFU, 0x001F87FFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFBFFFU, 0xFFFFFFFFU, 0xFFFFE7FFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x0003FFFFU, 0xFFFFFFFFU, 0xE7FFFFFFU, + 0xFFFFFFFFU, 0x7FFF3FFFU, 0x4FFFFFFFU, 0xFFFF07FFU, + 0xFF037FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFF99FEFU, 0xF3C5FDFFU, 0xB080799FU, 0x7FFFFFCFU, + 0xFFF987EEU, 0xD36DFDFFU, 0x5E023987U, 0x007FFFC0U, + 0xFFFBBFEEU, 0xF3EDFDFFU, 0x00013BBFU, 0xFE03FFCFU, + 0xFFF99FEEU, 0xF3EDFDFFU, 0xB0E0399FU, 0x00FFFFCFU, + 0xD63DC7ECU, 0xC3FFC718U, 0x00813DC7U, 0x07FFFFC0U, + 0xFFFDDFFFU, 0xF3FFFDFFU, 0x27603DDFU, 0xFF80FFCFU, + 0xFFFDDFFFU, 0xF3EFFDFFU, 0x60603DDFU, 0x000EFFCFU, + 0xFFFDDFFFU, 0xFFFFFFFFU, 0xFFF0FDDFU, 0xFFFFFFCFU, + 0xFC7FFFEEU, 0x2FFBFFFFU, 0xFF5F847FU, 0x001CFFC0U, + 0xFFFFFFFEU, 0x87FFFFFFU, 0x0FFFFFFFU, 0x00000000U, + 0xFFFFF7D6U, 0x3FFFFFAFU, 0xF3FF7F5FU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFEFFU, 0xFFFE1FFFU, + 0xFEFFFFFFU, 0xDFFFFFFFU, 0x07FFDFFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3D7F3DFFU, 0xFFFFFFFFU, + 0xFFFF3DFFU, 0x7F3DFFFFU, 0xFF7FFF3DU, 0xFFFFFFFFU, + 0xFF3DFFFFU, 0xFFFFFFFFU, 0xE7FFFFFFU, 0x1FFFFFFFU, + 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3F3FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x1FFFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFFFFFU, + 0x803FFFFFU, 0x007FFFFFU, 0x000FFFFFU, 0x000DDFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x03FF03FFU, + 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFFFFFU, + 0xFFFFFFFFU, 0xFFFF07FFU, 0xFFFFFFFFU, 0x003FFFFFU, + 0x7FFFFFFFU, 0x0FFF0FFFU, 0xFFFFFFF1U, 0x001F3FFFU, + 0xFFFFFFFFU, 0xFFFF0FFFU, 0xC7FF03FFU, 0xFFFFFFFFU, + 0xCFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU, 0x9FFFFFFFU, + 0x03FF03FFU, 0xFFFF3FFFU, 0x00007FFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF1FFFU, 0x7FFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF00FFFFFU, + 0xFFFFFFFFU, 0xF8FFFFFFU, 0xFFFFE3FFU, 0xFFFFFFFFU, + 0xFFFF01FFU, 0xE7FFFFFFU, 0xFFFF00FFU, 0x07FFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU, + 0xFFFFFFFFU, 0xFFDFFFFFU, 0xEFCFFFDFU, 0x7FDCFFFFU, + 0xFFFFF880U, 0xFFFFFCFFU, 0x7FFFFFFFU, 0xFFF3FFDFU, + 0x1FFF7FFFU, 0xFFFFFFFFU, 0xFFFF0001U, 0x0001FFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x0000007FU, 0x000007FFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFCFFFFFU, + 0xFFBFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFE0FFFFFU, + 0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU, 0x800180FFU, + 0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x00000000U, + 0xFBFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0xFFFF0000U, + 0xFFFFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, + 0xFE7FFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFE0U, 0xFFFEFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFF7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF800FU, + 0x7FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFF1FFFU, 0xFFFFFFFFU, 0xFFFF007FU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x00000FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03EB07FFU, 0xFFFC0000U, + 0xFFFFFFFFU, 0x03FF1FFFU, 0xFFFFFFFFU, 0x00FFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFC03FU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x800FFFFFU, 0x1FFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xC3FFBFFFU, 0x7FFFFFFFU, + 0xFFFFFFFFU, 0x007FFFFFU, 0xF3FF3FFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF8000007U, 0x007FFFFFU, + 0x007E7E7EU, 0xFFFF7F7FU, 0xFFFFFFFFU, 0xFFFF0FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF3FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFF000FU, 0xFFFFF87FU, 0x0FFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF3FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00000000U, + 0xE0F8007FU, 0x5F7FFFFFU, 0xFFFFFFDBU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFF80007U, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFCFFFFU, 0xFFFFFFFFU, 0x000080FFU, 0xFFFF0000U, + 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFF7FFFFU, 0xFFDF0F7FU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x9FFFFFFFU, + 0xFFFFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x7FFFFFFFU, 0x1CFCFCFCU, 0x3E007F7FU, + 0xFFFFEFFFU, 0xB7FFFF7FU, 0x3FFF3FFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU, + 0xFFFFFF87U, 0xFF8FFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x1FFF7FFFU, 0x00000001U, 0xFFFF0000U, 0x3FFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x0FFFFFFFU, + 0xFFFFFFFFU, 0xFFFFE00FU, 0xFFFF07FFU, 0x07FFFFFFU, + 0xBFFFFFFFU, 0xFFFFFFFFU, 0x003FFF0FU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU, + 0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU, 0xF7FF800FU, + 0xFFB7F7FFU, 0x1BFBFFFBU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x007FFFFFU, 0x003FFFFFU, 0x000000FFU, + 0xFFFFFFBFU, 0x07FDFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFD3FU, 0x91BFFFFFU, 0xFFBFFFFFU, 0xFFFFFFFFU, + 0x7FFFFFFFU, 0x0000FF80U, 0x00000000U, 0xF837FFFFU, + 0x8FFFFFFFU, 0x83FFFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xF0FFFFFFU, 0xFFFCFFFFU, 0xFFFFFFFFU, + 0xFEEFF06FU, 0x873FFFFFU, 0x01FF01FFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x00000000U, 0xFFFFFFFFU, 0x007FF87FU, + 0xFFFFFFFFU, 0xFE3FFFFFU, 0xFF3FFFFFU, 0xFF07FFFFU, + 0x1E03FFFFU, 0x0000FE00U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000001FFU, 0x00000000U, + 0xFFFFFFFFU, 0x0007FFFFU, 0xFFFFFFFFU, 0xFC07FFFFU, + 0xFFFFFFFFU, 0x03FF00FFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x7FFFFFFFU, + 0xFFFFFFFFU, 0x00033BFFU, 0x00000000U, 0xE0000000U, + 0xFFFFFFFFU, 0xFFFF00FFU, 0x03FFFFFFU, 0xFFFF0000U, + 0x000003FFU, 0xFFFF0000U, 0x00000FFFU, 0x007FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFC3FFFU, 0x803FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF2007U, 0x03FF01FFU, + 0xFFFFFFFFU, 0xFFDFFFFFU, 0xFFFF00FFU, 0x007FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFEU, + 0xFFFBFFFFU, 0xFFFFFFFFU, 0x00000003U, 0x00000000U, + 0xBFFFBD7FU, 0xFFFF03FFU, 0xFFFFFFFFU, 0x03FF07FFU, + 0xFFF99FEFU, 0xFBEDFDFFU, 0xE081399FU, 0x001F1FCFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xEFFFFFFFU, 0x00000003U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFF3FFFFFU, 0x3FFFFFFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF001FU, 0x00001FFFU, + 0xFFFFFFFFU, 0x03FFFFFFU, 0x000003FFU, 0x00000000U, + 0xE7FFFFFFU, 0xFFFF0FFFU, 0x0000007FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x0FFFFFFFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x8007FFFFU, + 0xFF6FF27FU, 0xF9BFFFFFU, 0x03FF007FU, 0x00000000U, + 0x00000000U, 0xFFFFFCFFU, 0xFCFFFFFFU, 0x0000001FU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFF0007U, 0xFFFFFFFFU, 0x01FFFFFFU, + 0x000003FFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFDFFU, 0xFF7FFFFFU, 0xFFFF003FU, 0xFFFF1FFFU, + 0xFFFCFFFFU, 0x007FFEFFU, 0x00000000U, 0x00000000U, + 0xFFFFFB7FU, 0xB47FFFFFU, 0x03FF00FFU, 0xFFFFFDBFU, + 0x01FB7FFFU, 0x000003FFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x01FFFFFFU, + 0xFFFDFFFFU, 0xC7FFFFFFU, 0x03FFFFFFU, 0x00000000U, + 0x00000000U, 0x00010000U, 0xFFFFFFFFU, 0x8003FFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x03FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x001F7FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x01FFFFFFU, 0x7FFFFFFFU, 0xFFFFC3FFU, + 0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFF03FFU, 0x003F3FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFBFF003FU, 0xE0FFFFFBU, + 0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x07FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF87FFU, 0xFFFFFFFFU, + 0xFFFF80FFU, 0x00000000U, 0x00000000U, 0x0003001FU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U, + 0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x6FEF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x00040007U, 0x00270000U, 0xFFFF00F0U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU, + 0xF3FF01FFU, 0x0000000FU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFF3FFFU, 0xFFFF007FU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, + 0xFFFFFFFFU, 0xFFFFFE7FU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000003FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x000FFFFFU, 0x000FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFFFFU, 0x01FFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFDFFFFFU, 0xFFFFFFFFU, + 0xDFFFFFFFU, 0xEBFFDE64U, 0xFFFFFFEFU, 0xFFFFFFFFU, + 0xDFDFE7BFU, 0x7BFFFFFFU, 0xFFFDFC5FU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFF3FU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFCFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xF8000FFFU, 0x0000FFFEU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x7FFFFFFFU, 0x000007E0U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xF9FFFF7FU, 0xFFFF07DBU, 0xFFFFFFFFU, 0x00003FFFU, + 0x00008000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x3FFF1FFFU, 0x0000C3FFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFF0000U, 0x00007FFFU, 0xFFFFFFFFU, 0x83FFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFF0000U, 0x03FFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x7FFF6F7FU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFF9FU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xC3FF0FFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0xFFFE0000U, + 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFEU, 0x3FFFFFFFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFEFU, 0x0AF7FE96U, 0xAA96EA84U, 0x5EF7F796U, + 0x0FFFFBFFU, 0x0FFFFBEEU, 0x00000000U, 0x00030000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x000FFFFFU, 0xFFFE7FFFU, 0xFFFEFFFEU, 0x003FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x00003FFFU, 0x00000000U, 0xFFFFFFC0U, + 0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x0000003FU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF0FFFFFFU, 0x1FFF1FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF87FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00010FFFU, + 0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU, + 0xFFFF00FFU, 0x00033FFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU, 0x1FFF3FFFU, + 0xFFFF01FFU, 0xBFFFFFFFU, 0x0FFFC03FU, 0x01FF01FFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFF7FFFFU, 0xFFFFFFFFU, 0x000007FFU, 0x03FF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x3FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF0001U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF07FFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U, 0x00000000U, + 0x00000002U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU + } +}; diff --git a/lib/unictype/ctype_lower.c b/lib/unictype/ctype_lower.c new file mode 100644 index 0000000..76c6763 --- /dev/null +++ b/lib/unictype/ctype_lower.c @@ -0,0 +1,32 @@ +/* ISO C <ctype.h> like properties of Unicode characters. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unictype.h" + +#include "bitmap.h" + +/* Define u_is_lower table. */ +#include "ctype_lower.h" + +bool +uc_is_lower (ucs4_t uc) +{ + return bitmap_lookup (&u_is_lower, uc); +} diff --git a/lib/unictype/ctype_lower.h b/lib/unictype/ctype_lower.h new file mode 100644 index 0000000..6bde410 --- /dev/null +++ b/lib/unictype/ctype_lower.h @@ -0,0 +1,371 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* ISO C <ctype.h> like properties of Unicode characters. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ + +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#define header_0 16 +#define header_2 9 +#define header_3 127 +#define header_4 15 +static const +struct + { + int header[1]; + int level1[2]; + short level2[2 << 7]; + unsigned int level3[18 << 4]; + } +u_is_lower = +{ + { 2 }, + { + 3 * sizeof (int) / sizeof (short) + 0, + 3 * sizeof (int) / sizeof (short) + 128 + }, + { + 3 + 256 * sizeof (short) / sizeof (int) + 0, + 3 + 256 * sizeof (short) / sizeof (int) + 16, + 3 + 256 * sizeof (short) / sizeof (int) + 32, + -1, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 48, + 3 + 256 * sizeof (short) / sizeof (int) + 64, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 80, + 3 + 256 * sizeof (short) / sizeof (int) + 96, + 3 + 256 * sizeof (short) / sizeof (int) + 112, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 128, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 144, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 160, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 176, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 192, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 208, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 224, + -1, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 240, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 256, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 272, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1 + }, + { + 0x00000000U, 0x00000000U, 0x00000000U, 0x07FFFFFEU, + 0x00000000U, 0x00200000U, 0x80000000U, 0xFF7FFFFFU, + 0xAAAAAAAAU, 0x54AAAAAAU, 0xAAAAA955U, 0xD4AAAAAAU, + 0x46241129U, 0xA251212AU, 0xB5555B60U, 0xAA2CAAAAU, + 0xAAAAAAAAU, 0x900AAAA8U, 0x1ADFAA85U, 0x20269F6BU, + 0x60041F8DU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000020U, 0x388A0000U, + 0x00000000U, 0xFFFEF000U, 0xAAE37FFFU, 0x092FAAAAU, + 0x00000000U, 0xFFFF0000U, 0xFFFFFFFFU, 0xAAAAAAAAU, + 0xAAAAA802U, 0xAAAAAAAAU, 0xAAAAD554U, 0xAAAAAAAAU, + 0xAAAAAAAAU, 0x0000AAAAU, 0x00000000U, 0xFFFFFFFEU, + 0x0000007FU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFF0000U, 0xE7FFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x3F000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x22000000U, + 0x00004000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xAAAAAAAAU, 0xAAAAAAAAU, 0xAAAAAAAAU, 0xAAAAAAAAU, + 0x082AAAAAU, 0xAAAAAAAAU, 0xAAAAAAAAU, 0xAAAAAAAAU, + 0x003F00FFU, 0x00FF00FFU, 0x00AA003FU, 0x3FFF00FFU, + 0x00FF00FFU, 0x400B00FFU, 0x00030008U, 0x00080023U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00004000U, 0xFFFF0000U, + 0x00000010U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFF0000U, 0x000003FFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFF0000U, 0xFFFFFFFFU, 0x00481562U, + 0xAAAAAAAAU, 0xAAAAAAAAU, 0xAAAAAAAAU, 0x0008500AU, + 0xFFFFFFFFU, 0x000020BFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xAAAAAAAAU, 0x00002AAAU, + 0x0AAAAAAAU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xAAA8AAA8U, 0xAAAAAAAAU, 0x9400AAAAU, + 0xAA9A10AAU, 0xAAA002AAU, 0x0282050AU, 0x00400000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00080000U, 0xFFFF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x07FFFFFEU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFFFF00U, 0x0000FFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFF000000U, 0x0FFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFF800000U, 0x1BFBFFFBU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x0007FFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0xFFFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFFFFFCU, 0x0000000FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U + } +}; diff --git a/lib/unictype/ctype_print.c b/lib/unictype/ctype_print.c new file mode 100644 index 0000000..5e73e42 --- /dev/null +++ b/lib/unictype/ctype_print.c @@ -0,0 +1,32 @@ +/* ISO C <ctype.h> like properties of Unicode characters. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unictype.h" + +#include "bitmap.h" + +/* Define u_is_print table. */ +#include "ctype_print.h" + +bool +uc_is_print (ucs4_t uc) +{ + return bitmap_lookup (&u_is_print, uc); +} diff --git a/lib/unictype/ctype_print.h b/lib/unictype/ctype_print.h new file mode 100644 index 0000000..d5d6a2a --- /dev/null +++ b/lib/unictype/ctype_print.h @@ -0,0 +1,1186 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* ISO C <ctype.h> like properties of Unicode characters. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ + +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#define header_0 16 +#define header_2 9 +#define header_3 127 +#define header_4 15 +static const +struct + { + int header[1]; + int level1[17]; + short level2[6 << 7]; + unsigned int level3[90 << 4]; + } +u_is_print = +{ + { 17 }, + { + 18 * sizeof (int) / sizeof (short) + 0, + 18 * sizeof (int) / sizeof (short) + 128, + 18 * sizeof (int) / sizeof (short) + 256, + 18 * sizeof (int) / sizeof (short) + 384, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 * sizeof (int) / sizeof (short) + 512, + 18 * sizeof (int) / sizeof (short) + 640, + 18 * sizeof (int) / sizeof (short) + 640 + }, + { + 18 + 768 * sizeof (short) / sizeof (int) + 0, + 18 + 768 * sizeof (short) / sizeof (int) + 16, + 18 + 768 * sizeof (short) / sizeof (int) + 32, + 18 + 768 * sizeof (short) / sizeof (int) + 48, + 18 + 768 * sizeof (short) / sizeof (int) + 64, + 18 + 768 * sizeof (short) / sizeof (int) + 80, + 18 + 768 * sizeof (short) / sizeof (int) + 96, + 18 + 768 * sizeof (short) / sizeof (int) + 112, + 18 + 768 * sizeof (short) / sizeof (int) + 128, + 18 + 768 * sizeof (short) / sizeof (int) + 144, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 176, + 18 + 768 * sizeof (short) / sizeof (int) + 192, + 18 + 768 * sizeof (short) / sizeof (int) + 208, + 18 + 768 * sizeof (short) / sizeof (int) + 224, + 18 + 768 * sizeof (short) / sizeof (int) + 240, + 18 + 768 * sizeof (short) / sizeof (int) + 256, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 272, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 288, + 18 + 768 * sizeof (short) / sizeof (int) + 304, + 18 + 768 * sizeof (short) / sizeof (int) + 320, + 18 + 768 * sizeof (short) / sizeof (int) + 336, + 18 + 768 * sizeof (short) / sizeof (int) + 352, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 368, + 18 + 768 * sizeof (short) / sizeof (int) + 384, + 18 + 768 * sizeof (short) / sizeof (int) + 400, + 18 + 768 * sizeof (short) / sizeof (int) + 416, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 432, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 448, + 18 + 768 * sizeof (short) / sizeof (int) + 464, + 18 + 768 * sizeof (short) / sizeof (int) + 480, + 18 + 768 * sizeof (short) / sizeof (int) + 496, + 18 + 768 * sizeof (short) / sizeof (int) + 512, + 18 + 768 * sizeof (short) / sizeof (int) + 528, + 18 + 768 * sizeof (short) / sizeof (int) + 544, + 18 + 768 * sizeof (short) / sizeof (int) + 560, + 18 + 768 * sizeof (short) / sizeof (int) + 576, + 18 + 768 * sizeof (short) / sizeof (int) + 592, + 18 + 768 * sizeof (short) / sizeof (int) + 608, + 18 + 768 * sizeof (short) / sizeof (int) + 624, + 18 + 768 * sizeof (short) / sizeof (int) + 640, + 18 + 768 * sizeof (short) / sizeof (int) + 656, + 18 + 768 * sizeof (short) / sizeof (int) + 672, + 18 + 768 * sizeof (short) / sizeof (int) + 688, + 18 + 768 * sizeof (short) / sizeof (int) + 704, + 18 + 768 * sizeof (short) / sizeof (int) + 720, + 18 + 768 * sizeof (short) / sizeof (int) + 736, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 752, + 18 + 768 * sizeof (short) / sizeof (int) + 768, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 784, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 800, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 816, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 832, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 848, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 864, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 880, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 896, + 18 + 768 * sizeof (short) / sizeof (int) + 912, + 18 + 768 * sizeof (short) / sizeof (int) + 928, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 944, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 960, + 18 + 768 * sizeof (short) / sizeof (int) + 976, + 18 + 768 * sizeof (short) / sizeof (int) + 992, + 18 + 768 * sizeof (short) / sizeof (int) + 1008, + 18 + 768 * sizeof (short) / sizeof (int) + 1024, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1040, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 1056, + 18 + 768 * sizeof (short) / sizeof (int) + 1072, + 18 + 768 * sizeof (short) / sizeof (int) + 1088, + 18 + 768 * sizeof (short) / sizeof (int) + 1104, + 18 + 768 * sizeof (short) / sizeof (int) + 1120, + 18 + 768 * sizeof (short) / sizeof (int) + 1136, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 1152, + 18 + 768 * sizeof (short) / sizeof (int) + 1168, + 18 + 768 * sizeof (short) / sizeof (int) + 1184, + 18 + 768 * sizeof (short) / sizeof (int) + 1200, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1216, + 18 + 768 * sizeof (short) / sizeof (int) + 1232, + 18 + 768 * sizeof (short) / sizeof (int) + 1248, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1264, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1280, + 18 + 768 * sizeof (short) / sizeof (int) + 1296, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1312, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1328, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1344, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1360, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1376, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1392, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 1408, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 160, + 18 + 768 * sizeof (short) / sizeof (int) + 1424 + }, + { + 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU, + 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFCFFFFFFU, + 0xFFFFD7F0U, 0xFFFFFFFBU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFEFFFFU, 0xFE7FFFFFU, 0xFFFFFFFFU, + 0xFFFEE7FFU, 0xFFFFFFFFU, 0xFFFF00FFU, 0x001F87FFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFBFFFU, 0xFFFFFFFFU, 0xFFFFE7FFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x0003FFFFU, 0xFFFFFFFFU, 0xE7FFFFFFU, + 0xFFFFFFFFU, 0x7FFF3FFFU, 0x4FFFFFFFU, 0xFFFF07FFU, + 0xFF037FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFF99FEFU, 0xF3C5FDFFU, 0xB080799FU, 0x7FFFFFCFU, + 0xFFF987EEU, 0xD36DFDFFU, 0x5E023987U, 0x007FFFC0U, + 0xFFFBBFEEU, 0xF3EDFDFFU, 0x00013BBFU, 0xFE03FFCFU, + 0xFFF99FEEU, 0xF3EDFDFFU, 0xB0E0399FU, 0x00FFFFCFU, + 0xD63DC7ECU, 0xC3FFC718U, 0x00813DC7U, 0x07FFFFC0U, + 0xFFFDDFFFU, 0xF3FFFDFFU, 0x27603DDFU, 0xFF80FFCFU, + 0xFFFDDFFFU, 0xF3EFFDFFU, 0x60603DDFU, 0x000EFFCFU, + 0xFFFDDFFFU, 0xFFFFFFFFU, 0xFFF0FDDFU, 0xFFFFFFCFU, + 0xFC7FFFEEU, 0x2FFBFFFFU, 0xFF5F847FU, 0x001CFFC0U, + 0xFFFFFFFEU, 0x87FFFFFFU, 0x0FFFFFFFU, 0x00000000U, + 0xFFFFF7D6U, 0x3FFFFFAFU, 0xF3FF7F5FU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFEFFU, 0xFFFE1FFFU, + 0xFEFFFFFFU, 0xDFFFFFFFU, 0x07FFDFFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3D7F3DFFU, 0xFFFFFFFFU, + 0xFFFF3DFFU, 0x7F3DFFFFU, 0xFF7FFF3DU, 0xFFFFFFFFU, + 0xFF3DFFFFU, 0xFFFFFFFFU, 0xE7FFFFFFU, 0x1FFFFFFFU, + 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3F3FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x1FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFFFFFU, + 0x803FFFFFU, 0x007FFFFFU, 0x000FFFFFU, 0x000DDFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x03FF03FFU, + 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFFFFFU, + 0xFFFFFFFFU, 0xFFFF07FFU, 0xFFFFFFFFU, 0x003FFFFFU, + 0x7FFFFFFFU, 0x0FFF0FFFU, 0xFFFFFFF1U, 0x001F3FFFU, + 0xFFFFFFFFU, 0xFFFF0FFFU, 0xC7FF03FFU, 0xFFFFFFFFU, + 0xCFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU, 0x9FFFFFFFU, + 0x03FF03FFU, 0xFFFF3FFFU, 0x00007FFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF1FFFU, 0x7FFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF00FFFFFU, + 0xFFFFFFFFU, 0xF8FFFFFFU, 0xFFFFE3FFU, 0xFFFFFFFFU, + 0xFFFF01FFU, 0xE7FFFFFFU, 0xFFFF00FFU, 0x07FFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU, + 0xFFFFFFFFU, 0xFFDFFFFFU, 0xEFCFFFDFU, 0x7FDCFFFFU, + 0xFFFFFFFFU, 0xFFFFFCFFU, 0xFFFFFFFFU, 0xFFF3FFDFU, + 0x1FFF7FFFU, 0xFFFFFFFFU, 0xFFFF0001U, 0x0001FFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x0000007FU, 0x000007FFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFCFFFFFU, + 0xFFBFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFE0FFFFFU, + 0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU, 0x800180FFU, + 0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x00000000U, + 0xFBFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0xFFFF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, + 0xFE7FFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFE0U, 0xFFFEFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFF7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF800FU, + 0x7FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFF1FFFU, 0xFFFFFFFFU, 0xFFFF007FU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x00000FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03EB07FFU, 0xFFFC0000U, + 0xFFFFFFFFU, 0x03FF1FFFU, 0xFFFFFFFFU, 0x00FFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFC03FU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x800FFFFFU, 0x1FFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xC3FFBFFFU, 0x7FFFFFFFU, + 0xFFFFFFFFU, 0x007FFFFFU, 0xF3FF3FFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF8000007U, 0x007FFFFFU, + 0x007E7E7EU, 0xFFFF7F7FU, 0xFFFFFFFFU, 0xFFFF0FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF3FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFF000FU, 0xFFFFF87FU, 0x0FFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF3FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00000000U, + 0xE0F8007FU, 0x5F7FFFFFU, 0xFFFFFFDBU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFF80007U, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFCFFFFU, 0xFFFFFFFFU, 0x000080FFU, 0xFFFF0000U, + 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFF7FFFFU, 0xFFDF0F7FU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x9FFFFFFFU, + 0xFFFFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x7FFFFFFFU, 0x1CFCFCFCU, 0x3E007F7FU, + 0xFFFFEFFFU, 0xB7FFFF7FU, 0x3FFF3FFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU, + 0xFFFFFF87U, 0xFF8FFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x1FFF7FFFU, 0x00000001U, 0xFFFF0000U, 0x3FFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x0FFFFFFFU, + 0xFFFFFFFFU, 0xFFFFE00FU, 0xFFFF07FFU, 0x07FFFFFFU, + 0xBFFFFFFFU, 0xFFFFFFFFU, 0x003FFF0FU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU, + 0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU, 0xF7FF800FU, + 0xFFB7F7FFU, 0x1BFBFFFBU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x007FFFFFU, 0x003FFFFFU, 0x000000FFU, + 0xFFFFFFBFU, 0x07FDFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFD3FU, 0x91BFFFFFU, 0xFFBFFFFFU, 0xFFFFFFFFU, + 0x7FFFFFFFU, 0x0000FF80U, 0x00000000U, 0xF837FFFFU, + 0x8FFFFFFFU, 0x83FFFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xF0FFFFFFU, 0xFFFCFFFFU, 0xFFFFFFFFU, + 0xFEEFF06FU, 0x873FFFFFU, 0x01FF01FFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x00000000U, 0xFFFFFFFFU, 0x007FF87FU, + 0xFFFFFFFFU, 0xFE3FFFFFU, 0xFF3FFFFFU, 0xFF07FFFFU, + 0x1E03FFFFU, 0x0000FE00U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000001FFU, 0x00000000U, + 0xFFFFFFFFU, 0x0007FFFFU, 0xFFFFFFFFU, 0xFC07FFFFU, + 0xFFFFFFFFU, 0x03FF00FFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x7FFFFFFFU, + 0xFFFFFFFFU, 0x00033BFFU, 0x00000000U, 0xE0000000U, + 0xFFFFFFFFU, 0xFFFF00FFU, 0x03FFFFFFU, 0xFFFF0000U, + 0x000003FFU, 0xFFFF0000U, 0x00000FFFU, 0x007FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFC3FFFU, 0x803FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF2007U, 0x03FF01FFU, + 0xFFFFFFFFU, 0xFFDFFFFFU, 0xFFFF00FFU, 0x007FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFEU, + 0xFFFBFFFFU, 0xFFFFFFFFU, 0x00000003U, 0x00000000U, + 0xBFFFBD7FU, 0xFFFF03FFU, 0xFFFFFFFFU, 0x03FF07FFU, + 0xFFF99FEFU, 0xFBEDFDFFU, 0xE081399FU, 0x001F1FCFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xEFFFFFFFU, 0x00000003U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFF3FFFFFU, 0x3FFFFFFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF001FU, 0x00001FFFU, + 0xFFFFFFFFU, 0x03FFFFFFU, 0x000003FFU, 0x00000000U, + 0xE7FFFFFFU, 0xFFFF0FFFU, 0x0000007FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x0FFFFFFFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x8007FFFFU, + 0xFF6FF27FU, 0xF9BFFFFFU, 0x03FF007FU, 0x00000000U, + 0x00000000U, 0xFFFFFCFFU, 0xFCFFFFFFU, 0x0000001FU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFF0007U, 0xFFFFFFFFU, 0x01FFFFFFU, + 0x000003FFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFDFFU, 0xFF7FFFFFU, 0xFFFF003FU, 0xFFFF1FFFU, + 0xFFFCFFFFU, 0x007FFEFFU, 0x00000000U, 0x00000000U, + 0xFFFFFB7FU, 0xB47FFFFFU, 0x03FF00FFU, 0xFFFFFDBFU, + 0x01FB7FFFU, 0x000003FFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x01FFFFFFU, + 0xFFFDFFFFU, 0xC7FFFFFFU, 0x03FFFFFFU, 0x00000000U, + 0x00000000U, 0x00010000U, 0xFFFFFFFFU, 0x8003FFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x03FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x001F7FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x01FFFFFFU, 0x7FFFFFFFU, 0xFFFFC3FFU, + 0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFF03FFU, 0x003F3FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFBFF003FU, 0xE0FFFFFBU, + 0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x07FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF87FFU, 0xFFFFFFFFU, + 0xFFFF80FFU, 0x00000000U, 0x00000000U, 0x0003001FU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U, + 0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x6FEF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x00040007U, 0x00270000U, 0xFFFF00F0U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU, + 0xF3FF01FFU, 0x0000000FU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFF3FFFU, 0xFFFF007FU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, + 0xFFFFFFFFU, 0xFFFFFE7FU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000003FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x000FFFFFU, 0x000FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFFFFU, 0x01FFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFDFFFFFU, 0xFFFFFFFFU, + 0xDFFFFFFFU, 0xEBFFDE64U, 0xFFFFFFEFU, 0xFFFFFFFFU, + 0xDFDFE7BFU, 0x7BFFFFFFU, 0xFFFDFC5FU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFF3FU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFCFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xF8000FFFU, 0x0000FFFEU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x7FFFFFFFU, 0x000007E0U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xF9FFFF7FU, 0xFFFF07DBU, 0xFFFFFFFFU, 0x00003FFFU, + 0x00008000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x3FFF1FFFU, 0x0000C3FFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFF0000U, 0x00007FFFU, 0xFFFFFFFFU, 0x83FFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFF0000U, 0x03FFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x7FFF6F7FU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFF9FU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xC3FF0FFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0xFFFE0000U, + 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFEU, 0x3FFFFFFFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFEFU, 0x0AF7FE96U, 0xAA96EA84U, 0x5EF7F796U, + 0x0FFFFBFFU, 0x0FFFFBEEU, 0x00000000U, 0x00030000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x000FFFFFU, 0xFFFE7FFFU, 0xFFFEFFFEU, 0x003FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x00003FFFU, 0x00000000U, 0xFFFFFFC0U, + 0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x0000003FU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF0FFFFFFU, 0x1FFF1FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF87FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00010FFFU, + 0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU, + 0xFFFF00FFU, 0x00033FFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU, 0x1FFF3FFFU, + 0xFFFF01FFU, 0xBFFFFFFFU, 0x0FFFC03FU, 0x01FF01FFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFF7FFFFU, 0xFFFFFFFFU, 0x000007FFU, 0x03FF0000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x3FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF0001U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF07FFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U, 0x00000000U, + 0x00000002U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU + } +}; diff --git a/lib/unictype/ctype_punct.c b/lib/unictype/ctype_punct.c new file mode 100644 index 0000000..3991fee --- /dev/null +++ b/lib/unictype/ctype_punct.c @@ -0,0 +1,32 @@ +/* ISO C <ctype.h> like properties of Unicode characters. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unictype.h" + +#include "bitmap.h" + +/* Define u_is_punct table. */ +#include "ctype_punct.h" + +bool +uc_is_punct (ucs4_t uc) +{ + return bitmap_lookup (&u_is_punct, uc); +} diff --git a/lib/unictype/ctype_punct.h b/lib/unictype/ctype_punct.h new file mode 100644 index 0000000..6a0f287 --- /dev/null +++ b/lib/unictype/ctype_punct.h @@ -0,0 +1,858 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* ISO C <ctype.h> like properties of Unicode characters. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ + +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#define header_0 16 +#define header_2 9 +#define header_3 127 +#define header_4 15 +static const +struct + { + int header[1]; + int level1[17]; + short level2[4 << 7]; + unsigned int level3[72 << 4]; + } +u_is_punct = +{ + { 17 }, + { + 18 * sizeof (int) / sizeof (short) + 0, + 18 * sizeof (int) / sizeof (short) + 128, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 * sizeof (int) / sizeof (short) + 256, + 18 * sizeof (int) / sizeof (short) + 384, + 18 * sizeof (int) / sizeof (short) + 384 + }, + { + 18 + 512 * sizeof (short) / sizeof (int) + 0, + 18 + 512 * sizeof (short) / sizeof (int) + 16, + 18 + 512 * sizeof (short) / sizeof (int) + 32, + 18 + 512 * sizeof (short) / sizeof (int) + 48, + 18 + 512 * sizeof (short) / sizeof (int) + 64, + 18 + 512 * sizeof (short) / sizeof (int) + 80, + 18 + 512 * sizeof (short) / sizeof (int) + 96, + 18 + 512 * sizeof (short) / sizeof (int) + 112, + 18 + 512 * sizeof (short) / sizeof (int) + 128, + 18 + 512 * sizeof (short) / sizeof (int) + 144, + 18 + 512 * sizeof (short) / sizeof (int) + 160, + 18 + 512 * sizeof (short) / sizeof (int) + 176, + 18 + 512 * sizeof (short) / sizeof (int) + 192, + 18 + 512 * sizeof (short) / sizeof (int) + 208, + 18 + 512 * sizeof (short) / sizeof (int) + 224, + 18 + 512 * sizeof (short) / sizeof (int) + 240, + 18 + 512 * sizeof (short) / sizeof (int) + 256, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 288, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 304, + 18 + 512 * sizeof (short) / sizeof (int) + 320, + 18 + 512 * sizeof (short) / sizeof (int) + 336, + 18 + 512 * sizeof (short) / sizeof (int) + 352, + 18 + 512 * sizeof (short) / sizeof (int) + 368, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 384, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 400, + 18 + 512 * sizeof (short) / sizeof (int) + 416, + 18 + 512 * sizeof (short) / sizeof (int) + 432, + 18 + 512 * sizeof (short) / sizeof (int) + 448, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 464, + 18 + 512 * sizeof (short) / sizeof (int) + 480, + 18 + 512 * sizeof (short) / sizeof (int) + 496, + 18 + 512 * sizeof (short) / sizeof (int) + 512, + 18 + 512 * sizeof (short) / sizeof (int) + 528, + 18 + 512 * sizeof (short) / sizeof (int) + 544, + 18 + 512 * sizeof (short) / sizeof (int) + 560, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 576, + 18 + 512 * sizeof (short) / sizeof (int) + 592, + 18 + 512 * sizeof (short) / sizeof (int) + 608, + 18 + 512 * sizeof (short) / sizeof (int) + 624, + 18 + 512 * sizeof (short) / sizeof (int) + 640, + 18 + 512 * sizeof (short) / sizeof (int) + 656, + 18 + 512 * sizeof (short) / sizeof (int) + 672, + 18 + 512 * sizeof (short) / sizeof (int) + 688, + 18 + 512 * sizeof (short) / sizeof (int) + 704, + 18 + 512 * sizeof (short) / sizeof (int) + 720, + 18 + 512 * sizeof (short) / sizeof (int) + 736, + 18 + 512 * sizeof (short) / sizeof (int) + 752, + -1, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 768, + -1, + -1, + -1, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 784, + -1, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 800, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 816, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 832, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 848, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 864, + 18 + 512 * sizeof (short) / sizeof (int) + 880, + 18 + 512 * sizeof (short) / sizeof (int) + 896, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 912, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 928, + -1, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 944, + 18 + 512 * sizeof (short) / sizeof (int) + 960, + 18 + 512 * sizeof (short) / sizeof (int) + 976, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 992, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 1008, + 18 + 512 * sizeof (short) / sizeof (int) + 1024, + 18 + 512 * sizeof (short) / sizeof (int) + 1040, + 18 + 512 * sizeof (short) / sizeof (int) + 1056, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 1072, + 18 + 512 * sizeof (short) / sizeof (int) + 1088, + 18 + 512 * sizeof (short) / sizeof (int) + 1104, + -1, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 1120, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 272, + 18 + 512 * sizeof (short) / sizeof (int) + 1136 + }, + { + 0x00000000U, 0xFC00FFFEU, 0xF8000001U, 0x78000001U, + 0x00000000U, 0xFBDFFBFFU, 0x00800000U, 0x00800000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFC003CU, 0xFFFFAFE0U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFDFU, 0x4020FFFFU, + 0x000000B0U, 0x00000000U, 0x00000000U, 0x00400000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x000003FCU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFC000000U, 0x00000000U, + 0xFFFEE600U, 0xFFFFFFFFU, 0x000000FFU, 0x00180000U, + 0xFFFFFFFFU, 0x00000000U, 0xFFFFF800U, 0x00013C00U, + 0x00000000U, 0x00000000U, 0xFFD00000U, 0x60003F9FU, + 0x0002BFFFU, 0xFFFF0000U, 0x000007FFU, 0x00000000U, + 0x00000000U, 0x0001FFC0U, 0x00000000U, 0xE3CFF800U, + 0xFBC00000U, 0x7FFF3EEFU, 0x4E000000U, 0x00000000U, + 0xFF030100U, 0x00000000U, 0xFFFFFC00U, 0xFFFFFFFFU, + 0x0000000FU, 0xDC000000U, 0x00FEFFFFU, 0x0001003CU, + 0x0000000EU, 0xD0000000U, 0x0080399FU, 0x6FFC000CU, + 0x0000000EU, 0xD0000000U, 0x00023987U, 0x00630000U, + 0x0000000EU, 0xD0000000U, 0x00003BBFU, 0xFC03000CU, + 0x0000000EU, 0xD0000000U, 0x00E0399FU, 0x00FD000CU, + 0x00000004U, 0xC0000000U, 0x00803DC7U, 0x07FF0000U, + 0x0000001FU, 0xD0000000U, 0x00603DDFU, 0xFF80000CU, + 0x0000001EU, 0xD0000000U, 0x00603DDFU, 0x0008000CU, + 0x0000000FU, 0xD8000000U, 0x7F80BDDFU, 0x03FF000CU, + 0x0000000EU, 0x00000000U, 0xFF5F8400U, 0x001C0000U, + 0x00000000U, 0x80008000U, 0x0C008040U, 0x00000000U, + 0x00000000U, 0x1FF20000U, 0x00007F00U, 0x00000000U, + 0xFFFFFFFEU, 0xFFFFFC00U, 0x00000000U, 0xFFFE0000U, + 0xFEFFE0FFU, 0xDFFFFFFFU, 0x07FFDFFFU, 0x00000000U, + 0x00000000U, 0x7FFFF800U, 0xC3C0FC00U, 0x001E3F9DU, + 0xFC00BFFCU, 0x00000000U, 0x00000000U, 0x08000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xE0000000U, 0x1FFFFFFFU, + 0x03FF0000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000001U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00006000U, + 0x18000000U, 0x00000000U, 0x00000000U, 0x00003800U, + 0x003C0000U, 0x007C0000U, 0x000C0000U, 0x000C0000U, + 0x00000000U, 0xFFF00000U, 0x2F7FFFFFU, 0x03FF0000U, + 0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000060U, 0x00000200U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x0FFF0FFFU, 0x00000031U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xC4000000U, 0xFFFFFFFFU, + 0xCF800000U, 0x00000000U, 0x7FE00000U, 0x9FFFFFFFU, + 0x00000000U, 0xFFFF3F7FU, 0x00007FFFU, 0x00000000U, + 0x0000001FU, 0xFFF00000U, 0xFC00001FU, 0x7FFFFFFFU, + 0x00000007U, 0x00003FFEU, 0x00000000U, 0xF00FFFC0U, + 0x00000000U, 0xF8FFFFF0U, 0x00000000U, 0xC0000000U, + 0x00000000U, 0x00000000U, 0xFFFF00FFU, 0x039021FFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xA0000000U, 0xE000E003U, 0x6000E000U, + 0xFFFFF880U, 0xFFFFFCFFU, 0x7FFFFFFFU, 0x7FF1FFDFU, + 0x00007FFFU, 0xFFFFFFFFU, 0xFFFF0001U, 0x0001FFFFU, + 0xC1D0037BU, 0x0C0040AFU, 0xFFFFBC1FU, 0x00000000U, + 0xFFFF0E00U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0x0000007FU, 0x000007FFU, 0xFFFFFFFFU, + 0x0FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFFFC00U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFCFFFFFU, + 0xFFBFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0xFE0387E0U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x80010000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFF7FFFU, 0x3FFFFFFFU, 0x00000000U, + 0xFBFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0xFFFF0000U, + 0xFFFFFF1EU, 0xE0C1FC01U, 0x00000000U, 0x00000000U, + 0x1E000000U, 0x00000001U, 0x00000000U, 0x08000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFF0000U, 0x00000000U, 0xFFFFFFFFU, 0x0000800FU, + 0x7FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFF0000U, 0xFFFFFFFFU, 0x0000007FU, 0xC0000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x0000E000U, 0x00000000U, 0x00000000U, 0x7FFF8000U, + 0xC0000000U, 0x00000000U, 0x00000000U, 0x00FF0000U, + 0x007FFFFFU, 0x00000003U, 0x00000000U, 0x00000000U, + 0x00000600U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000844U, 0x03FF1FF8U, 0x00000000U, 0x00F00000U, + 0x00000003U, 0xFFF00000U, 0x0000C03FU, 0x9703FFFFU, + 0x00000000U, 0x0000FFC0U, 0x800FFF80U, 0x00000000U, + 0x0000000FU, 0xFFF80000U, 0xC0003FFFU, 0x00000020U, + 0x00000000U, 0x007FFE00U, 0xF0003008U, 0x3B800000U, + 0x00000000U, 0xC19D0000U, 0xC0000002U, 0x0063F800U, + 0x00000000U, 0x00000000U, 0x08000000U, 0x00000C00U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00003FF8U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x40000000U, 0x00000200U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFC0000U, 0x00000007U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xC0000000U, 0x0000FFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00008000U, 0xF0000000U, + 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFF7FFFFU, 0x00000F7FU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x80000000U, + 0xFC00FFFEU, 0xF8000001U, 0xF8000001U, 0x0000003FU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x3E007F7FU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFF87U, 0xFF8FFFFFU, 0x00000000U, 0xFFE00000U, + 0x1FFF7FFFU, 0x00000001U, 0xFFFF0000U, 0x3FFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x0FFFFFFFU, + 0x00000000U, 0x0000000FU, 0x00000000U, 0x07C00000U, + 0x80000000U, 0x00000000U, 0x00010000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00008000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFF800000U, 0xFF800000U, + 0x00000000U, 0x0000FF80U, 0x00000000U, 0xF8000000U, + 0x8FC00000U, 0x80000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x30000000U, 0xFFFCFFFFU, 0xFFFFFFFFU, + 0x0000F06EU, 0x87000000U, 0x01FF01FFU, 0xE0000000U, + 0xE0000000U, 0x00000000U, 0x00000100U, 0x007FF860U, + 0x00000000U, 0xFE000000U, 0xFF000000U, 0xFF000000U, + 0x1E000000U, 0x0000FE00U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0xFC000000U, + 0x00000000U, 0x000000F0U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x7FFFFFFFU, + 0x00000000U, 0x00003800U, 0x00000000U, 0xE0000000U, + 0xE0000000U, 0x0000007FU, 0x03FFFFC0U, 0x00000000U, + 0x000003FCU, 0x00000000U, 0x00000FE0U, 0x00000000U, + 0x00000007U, 0xFF000000U, 0xFFFC3FFFU, 0x8019003FU, + 0x00000007U, 0xFFFF0000U, 0x00002007U, 0x00000000U, + 0x00000007U, 0x001FFF80U, 0x0000006FU, 0x00380000U, + 0x00000007U, 0xFFF80000U, 0xE800FFE1U, 0x001FFFFEU, + 0x00000000U, 0x7FFFF000U, 0x00000002U, 0x00000000U, + 0x00000000U, 0x00000200U, 0x80000000U, 0x000007FFU, + 0x0000000FU, 0xD8000000U, 0x0080399FU, 0x001F1FCCU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFE00000U, 0x6C00F87FU, 0x00000000U, + 0x00000000U, 0xFFFF0000U, 0x0000004FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFF3F8000U, 0x30FFFFFFU, 0x00000000U, + 0x00000000U, 0xFFFF0000U, 0x0000000FU, 0x00001FFFU, + 0x00000000U, 0x02FFF800U, 0x00000000U, 0x00000000U, + 0xE0000000U, 0xFC000FFFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x0FFFF000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x0007FC00U, + 0x00000000U, 0x79BF0000U, 0x0000007DU, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFCFE0000U, 0x00000015U, + 0x000007FEU, 0xFBF80000U, 0x0FFE00FFU, 0x00000000U, + 0xDFFFFC00U, 0x00000007U, 0x00000000U, 0x00000000U, + 0x000003FFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFF7F8000U, 0xFC00003EU, 0x00031FFFU, + 0xFFFC0000U, 0x007FFEFFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0xB47E0000U, 0x000000BFU, 0x00000000U, + 0x00FB7C00U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x01F80000U, + 0x0000000BU, 0xC7F00000U, 0x0000FFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x8003FFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00060000U, + 0x00000000U, 0xFFFF0000U, 0x003FFF81U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x0000C000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x003F0000U, + 0x00000000U, 0xFFFF0000U, 0xF8000030U, 0x00000003U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x07FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFE8000U, 0xFFFFFFFFU, + 0x000780FFU, 0x00000000U, 0x00000000U, 0x00030014U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xF0000000U, 0x0000000FU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFF3FFFU, 0xFFFF007FU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, + 0xFFFFFFFFU, 0xFFFFFE7FU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000003FU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x000FFFFFU, 0x000FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFFFFU, 0x01FFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x08000002U, 0x08000000U, + 0x00200000U, 0x00200000U, 0x00008000U, 0x00008000U, + 0x00000200U, 0x00000200U, 0x00000008U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xF8000FFFU, 0x0000FFFEU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xF9FFFF7FU, 0x000007DBU, 0x00000000U, 0x00000000U, + 0x00008000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x007F0000U, 0x00008000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00004000U, 0x00000000U, 0x8000F000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x0000F000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x007FFF80U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xC00007F0U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0xFFFE0000U, + 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFEU, 0x3FFFFFFFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00030000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x000FFFFFU, 0xFFFE7FFFU, 0xFFFEFFFEU, 0x003FFFFFU, + 0x0000FFFFU, 0x0000E000U, 0x0000FC00U, 0x0000FC00U, + 0xFFFFF800U, 0x00003FDFU, 0x00000000U, 0x00000000U, + 0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x0000003FU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF0FFFFFFU, 0x1FFF1FFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF87FFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00010FFFU, + 0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU, + 0xFFFF00FFU, 0x00033FFFU, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU, 0x1FFF3FFFU, + 0xFFFF01FFU, 0xBFFFFFFFU, 0x0FFFC03FU, 0x01FF01FFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFF7FFFFU, 0xFFFFFFFFU, 0x000007FFU, 0x00000000U, + 0x00000002U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU + } +}; diff --git a/lib/unictype/ctype_space.c b/lib/unictype/ctype_space.c new file mode 100644 index 0000000..cdfe54d --- /dev/null +++ b/lib/unictype/ctype_space.c @@ -0,0 +1,32 @@ +/* ISO C <ctype.h> like properties of Unicode characters. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unictype.h" + +#include "bitmap.h" + +/* Define u_is_space table. */ +#include "ctype_space.h" + +bool +uc_is_space (ucs4_t uc) +{ + return bitmap_lookup (&u_is_space, uc); +} diff --git a/lib/unictype/ctype_space.h b/lib/unictype/ctype_space.h new file mode 100644 index 0000000..89e3a32 --- /dev/null +++ b/lib/unictype/ctype_space.h @@ -0,0 +1,184 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* ISO C <ctype.h> like properties of Unicode characters. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ + +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#define header_0 16 +#define header_2 9 +#define header_3 127 +#define header_4 15 +static const +struct + { + int header[1]; + int level1[1]; + short level2[1 << 7]; + unsigned int level3[4 << 4]; + } +u_is_space = +{ + { 1 }, + { 2 * sizeof (int) / sizeof (short) + 0 }, + { + 2 + 128 * sizeof (short) / sizeof (int) + 0, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 2 + 128 * sizeof (short) / sizeof (int) + 16, + -1, + -1, + -1, + -1, + 2 + 128 * sizeof (short) / sizeof (int) + 32, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 2 + 128 * sizeof (short) / sizeof (int) + 48, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1 + }, + { + 0x00003E00U, 0x00000001U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000001U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x0000077FU, 0x00000300U, 0x80000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000001U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U + } +}; diff --git a/lib/unictype/ctype_upper.c b/lib/unictype/ctype_upper.c new file mode 100644 index 0000000..02110cc --- /dev/null +++ b/lib/unictype/ctype_upper.c @@ -0,0 +1,32 @@ +/* ISO C <ctype.h> like properties of Unicode characters. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unictype.h" + +#include "bitmap.h" + +/* Define u_is_upper table. */ +#include "ctype_upper.h" + +bool +uc_is_upper (ucs4_t uc) +{ + return bitmap_lookup (&u_is_upper, uc); +} diff --git a/lib/unictype/ctype_upper.h b/lib/unictype/ctype_upper.h new file mode 100644 index 0000000..d9259bf --- /dev/null +++ b/lib/unictype/ctype_upper.h @@ -0,0 +1,367 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* ISO C <ctype.h> like properties of Unicode characters. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ + +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#define header_0 16 +#define header_2 9 +#define header_3 127 +#define header_4 15 +static const +struct + { + int header[1]; + int level1[2]; + short level2[2 << 7]; + unsigned int level3[17 << 4]; + } +u_is_upper = +{ + { 2 }, + { + 3 * sizeof (int) / sizeof (short) + 0, + 3 * sizeof (int) / sizeof (short) + 128 + }, + { + 3 + 256 * sizeof (short) / sizeof (int) + 0, + 3 + 256 * sizeof (short) / sizeof (int) + 16, + 3 + 256 * sizeof (short) / sizeof (int) + 32, + -1, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 48, + 3 + 256 * sizeof (short) / sizeof (int) + 64, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 80, + 3 + 256 * sizeof (short) / sizeof (int) + 96, + 3 + 256 * sizeof (short) / sizeof (int) + 112, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 128, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 144, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 160, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 176, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 192, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 208, + -1, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 224, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 240, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 3 + 256 * sizeof (short) / sizeof (int) + 256, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1 + }, + { + 0x00000000U, 0x00000000U, 0x07FFFFFEU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x7F7FFFFFU, 0x00000000U, + 0x55555555U, 0xAA555555U, 0x555554AAU, 0x2B555555U, + 0xB1DBCED6U, 0x11AED2D5U, 0x4AAAADB0U, 0x55D65555U, + 0x55555555U, 0x6C055555U, 0x0000557AU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x80450000U, + 0xFFFED740U, 0x00000FFBU, 0x55008000U, 0xE6905555U, + 0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U, 0x55555555U, + 0x55555401U, 0x55555555U, 0x55552AABU, 0x55555555U, + 0x55555555U, 0xFFFE5555U, 0x007FFFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFFFFFFU, 0x000020BFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFF0000U, 0xE7FFFFFFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x55555555U, 0x55555555U, 0x55555555U, 0x55555555U, + 0x40155555U, 0x55555555U, 0x55555555U, 0x55555555U, + 0x3F00FF00U, 0xFF00FF00U, 0xAA003F00U, 0x0000FF00U, + 0xFF00FF00U, 0x1F00FF00U, 0x0F001F00U, 0x1F001F00U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00040C40U, 0x00000000U, 0x0000FFFFU, + 0x00000008U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFC00000U, 0x0000FFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U, 0xC025EA9DU, + 0x55555555U, 0x55555555U, 0x55555555U, 0x00042805U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x55555555U, 0x00001555U, + 0x05555555U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x55545554U, 0x55555555U, 0x6A005555U, + 0x55452855U, 0x555F7D55U, 0x014102F5U, 0x00200000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x07FFFFFEU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x000000FFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFF0000U, 0x000FFFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0xF7FF0000U, + 0x0037F7FFU, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x0007FFFFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0xFFFFFFFFU, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U + } +}; diff --git a/lib/unictype/ctype_xdigit.c b/lib/unictype/ctype_xdigit.c new file mode 100644 index 0000000..1e5a162 --- /dev/null +++ b/lib/unictype/ctype_xdigit.c @@ -0,0 +1,32 @@ +/* ISO C <ctype.h> like properties of Unicode characters. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unictype.h" + +#include "bitmap.h" + +/* Define u_is_xdigit table. */ +#include "ctype_xdigit.h" + +bool +uc_is_xdigit (ucs4_t uc) +{ + return bitmap_lookup (&u_is_xdigit, uc); +} diff --git a/lib/unictype/ctype_xdigit.h b/lib/unictype/ctype_xdigit.h new file mode 100644 index 0000000..02d9c2d --- /dev/null +++ b/lib/unictype/ctype_xdigit.h @@ -0,0 +1,172 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* ISO C <ctype.h> like properties of Unicode characters. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ + +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#define header_0 16 +#define header_2 9 +#define header_3 127 +#define header_4 15 +static const +struct + { + int header[1]; + int level1[1]; + short level2[1 << 7]; + unsigned int level3[1 << 4]; + } +u_is_xdigit = +{ + { 1 }, + { 2 * sizeof (int) / sizeof (short) + 0 }, + { + 2 + 128 * sizeof (short) / sizeof (int) + 0, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1 + }, + { + 0x00000000U, 0x03FF0000U, 0x0000007EU, 0x0000007EU, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, + 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U + } +}; diff --git a/lib/unictype/pr_soft_dotted.c b/lib/unictype/pr_soft_dotted.c index 1c66b0c..61792a6 100644 --- a/lib/unictype/pr_soft_dotted.c +++ b/lib/unictype/pr_soft_dotted.c @@ -1,5 +1,5 @@ /* Properties of Unicode characters. - Copyright (C) 2002, 2006-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This file is free software. diff --git a/lib/unictype/pr_soft_dotted.h b/lib/unictype/pr_soft_dotted.h index 95958a2..5239a99 100644 --- a/lib/unictype/pr_soft_dotted.h +++ b/lib/unictype/pr_soft_dotted.h @@ -1,8 +1,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Properties of Unicode characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 15.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ -/* Copyright (C) 2000-2022 Free Software Foundation, Inc. +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. This file is free software. It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". diff --git a/lib/uninorm.in.h b/lib/uninorm.in.h index 0698246..a7f6ec3 100644 --- a/lib/uninorm.in.h +++ b/lib/uninorm.in.h @@ -1,5 +1,5 @@ /* Normalization forms (composition and decomposition) of Unicode strings. - Copyright (C) 2001-2002, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software: you can redistribute it and/or modify diff --git a/lib/uninorm/decompose-internal.c b/lib/uninorm/decompose-internal.c index 2d48c29..483ff4a 100644 --- a/lib/uninorm/decompose-internal.c +++ b/lib/uninorm/decompose-internal.c @@ -1,5 +1,5 @@ /* Decomposition of Unicode strings. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software: you can redistribute it and/or modify diff --git a/lib/uninorm/decompose-internal.h b/lib/uninorm/decompose-internal.h index 4450f2e..b964040 100644 --- a/lib/uninorm/decompose-internal.h +++ b/lib/uninorm/decompose-internal.h @@ -1,5 +1,5 @@ /* Decomposition of Unicode strings. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software: you can redistribute it and/or modify diff --git a/lib/uninorm/normalize-internal.h b/lib/uninorm/normalize-internal.h index 64f8b8d..a53d2dd 100644 --- a/lib/uninorm/normalize-internal.h +++ b/lib/uninorm/normalize-internal.h @@ -1,5 +1,5 @@ /* Normalization of Unicode strings. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software: you can redistribute it and/or modify diff --git a/lib/uninorm/u-normalize-internal.h b/lib/uninorm/u-normalize-internal.h index f1d165f..9f5e0b0 100644 --- a/lib/uninorm/u-normalize-internal.h +++ b/lib/uninorm/u-normalize-internal.h @@ -1,5 +1,5 @@ /* Decomposition and composition of Unicode strings. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software: you can redistribute it and/or modify diff --git a/lib/uninorm/u8-normalize.c b/lib/uninorm/u8-normalize.c index 93c4847..488a8a1 100644 --- a/lib/uninorm/u8-normalize.c +++ b/lib/uninorm/u8-normalize.c @@ -1,5 +1,5 @@ /* Normalization of UTF-8 strings. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software. diff --git a/lib/unistd--.h b/lib/unistd--.h index ae4fb68..4c555d4 100644 --- a/lib/unistd--.h +++ b/lib/unistd--.h @@ -1,6 +1,6 @@ /* Like unistd.h, but redefine some names to avoid glitches. - Copyright (C) 2005, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/unistd-safer.h b/lib/unistd-safer.h index 32686e7..c117926 100644 --- a/lib/unistd-safer.h +++ b/lib/unistd-safer.h @@ -1,6 +1,6 @@ /* Invoke unistd-like functions, but avoid some glitches. - Copyright (C) 2001, 2003, 2005, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/unistd.c b/lib/unistd.c index be7a825..f3b3f7b 100644 --- a/lib/unistd.c +++ b/lib/unistd.c @@ -1,6 +1,6 @@ /* Inline functions for <unistd.h>. - Copyright (C) 2012-2023 Free Software Foundation, Inc. + Copyright (C) 2012-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -18,5 +18,5 @@ #include <config.h> #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE -#include "unistd.h" +#include <unistd.h> typedef int dummy; diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 2ae040a..b412966 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <unistd.h>. - Copyright (C) 2003-2023 Free Software Foundation, Inc. + Copyright (C) 2003-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -971,23 +971,28 @@ _GL_WARN_ON_USE (faccessat, "faccessat is not portable - " Return 0 if successful, otherwise -1 and errno set. See the POSIX:2008 specification <https://pubs.opengroup.org/onlinepubs/9699919799/functions/fchdir.html>. */ -# if ! @HAVE_FCHDIR@ +# if @REPLACE_FCHDIR@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef fchdir +# define fchdir rpl_fchdir +# endif +_GL_FUNCDECL_RPL (fchdir, int, (int /*fd*/)); +_GL_CXXALIAS_RPL (fchdir, int, (int /*fd*/)); +# else +# if !@HAVE_FCHDIR@ || !@HAVE_DECL_FCHDIR@ _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/)); - +# endif +_GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/)); +# endif +_GL_CXXALIASWARN (fchdir); +# if @REPLACE_FCHDIR@ || !@HAVE_FCHDIR@ /* Gnulib internal hooks needed to maintain the fchdir metadata. */ _GL_EXTERN_C int _gl_register_fd (int fd, const char *filename) _GL_ARG_NONNULL ((2)); _GL_EXTERN_C void _gl_unregister_fd (int fd); _GL_EXTERN_C int _gl_register_dup (int oldfd, int newfd); _GL_EXTERN_C const char *_gl_directory_name (int fd); - -# else -# if !@HAVE_DECL_FCHDIR@ -_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/)); -# endif # endif -_GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/)); -_GL_CXXALIASWARN (fchdir); #elif defined GNULIB_POSIXCHECK # undef fchdir # if HAVE_RAW_DECL_FCHDIR @@ -1113,10 +1118,10 @@ _GL_WARN_ON_USE (ftruncate, "ftruncate is unportable - " or SIZE was too small. See the POSIX:2008 specification <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getcwd.html>. - Additionally, the gnulib module 'getcwd' guarantees the following GNU - extension: If BUF is NULL, an array is allocated with 'malloc'; the array - is SIZE bytes long, unless SIZE == 0, in which case it is as big as - necessary. */ + Additionally, the gnulib module 'getcwd' or 'getcwd-lgpl' guarantees the + following GNU extension: If BUF is NULL, an array is allocated with + 'malloc'; the array is SIZE bytes long, unless SIZE == 0, in which case + it is as big as necessary. */ # if @REPLACE_GETCWD@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define getcwd rpl_getcwd diff --git a/lib/unistr.in.h b/lib/unistr.in.h index d85ad51..424678f 100644 --- a/lib/unistr.in.h +++ b/lib/unistr.in.h @@ -1,5 +1,5 @@ /* Elementary Unicode string functions. - Copyright (C) 2001-2002, 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -380,6 +380,15 @@ extern uint16_t * extern uint32_t * u32_cpy (uint32_t *_UC_RESTRICT dest, const uint32_t *src, size_t n); +/* Copy N units from SRC to DEST, returning pointer after last written unit. */ +/* Similar to mempcpy(). */ +extern uint8_t * + u8_pcpy (uint8_t *_UC_RESTRICT dest, const uint8_t *src, size_t n); +extern uint16_t * + u16_pcpy (uint16_t *_UC_RESTRICT dest, const uint16_t *src, size_t n); +extern uint32_t * + u32_pcpy (uint32_t *_UC_RESTRICT dest, const uint32_t *src, size_t n); + /* Copy N units from SRC to DEST, guaranteeing correct behavior for overlapping memory areas. */ /* Similar to memmove(). */ diff --git a/lib/unistr/u-cpy.h b/lib/unistr/u-cpy.h index 8ee3c83..4848c14 100644 --- a/lib/unistr/u-cpy.h +++ b/lib/unistr/u-cpy.h @@ -1,5 +1,5 @@ /* Copy piece of UTF-8/UTF-16/UTF-32 string. - Copyright (C) 1999, 2002, 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This file is free software: you can redistribute it and/or modify diff --git a/lib/unistr/u-pcpy.h b/lib/unistr/u-pcpy.h new file mode 100644 index 0000000..8124197 --- /dev/null +++ b/lib/unistr/u-pcpy.h @@ -0,0 +1,22 @@ +/* Copy piece of UTF-8/16/32 string, return pointer after last written unit. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2023. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +UNIT * +FUNC (UNIT *dest, const UNIT *src, size_t n) +{ + return U_CPY (dest, src, n) + n; +} diff --git a/lib/unistr/u-strcat.h b/lib/unistr/u-strcat.h new file mode 100644 index 0000000..a4a4e93 --- /dev/null +++ b/lib/unistr/u-strcat.h @@ -0,0 +1,26 @@ +/* Concatenate UTF-8/UTF-16/UTF-32 strings. + Copyright (C) 1999, 2002, 2006, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +UNIT * +FUNC (UNIT *dest, const UNIT *src) +{ + UNIT *destptr = dest + U_STRLEN (dest); + + for (; (*destptr = *src) != 0; src++, destptr++) + ; + return dest; +} diff --git a/lib/unistr/u-strlen.h b/lib/unistr/u-strlen.h new file mode 100644 index 0000000..03106a1 --- /dev/null +++ b/lib/unistr/u-strlen.h @@ -0,0 +1,26 @@ +/* Determine length of UTF-8/UTF-16/UTF-32 string. + Copyright (C) 1999, 2002, 2006, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +size_t +FUNC (const UNIT *s) +{ + const UNIT *ptr; + + for (ptr = s; *ptr != 0; ptr++) + ; + return ptr - s; +} diff --git a/lib/unistr/u32-chr.c b/lib/unistr/u32-chr.c new file mode 100644 index 0000000..65500d8 --- /dev/null +++ b/lib/unistr/u32-chr.c @@ -0,0 +1,32 @@ +/* Search character in piece of UTF-32 string. + Copyright (C) 1999, 2002, 2006, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unistr.h" + +uint32_t * +u32_chr (const uint32_t *s, size_t n, ucs4_t uc) +{ + for (; n > 0; s++, n--) + { + if (*s == uc) + return (uint32_t *) s; + } + return NULL; +} diff --git a/lib/unistr/u32-cpy.c b/lib/unistr/u32-cpy.c new file mode 100644 index 0000000..a1a840f --- /dev/null +++ b/lib/unistr/u32-cpy.c @@ -0,0 +1,25 @@ +/* Copy piece of UTF-32 string. + Copyright (C) 1999, 2002, 2006, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unistr.h" + +#define FUNC u32_cpy +#define UNIT uint32_t +#include "u-cpy.h" diff --git a/lib/unistr/u32-pcpy.c b/lib/unistr/u32-pcpy.c new file mode 100644 index 0000000..922f704 --- /dev/null +++ b/lib/unistr/u32-pcpy.c @@ -0,0 +1,26 @@ +/* Copy piece of UTF-32 string, return pointer after last written unit. + Copyright (C) 2020-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2023. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unistr.h" + +#define FUNC u32_pcpy +#define UNIT uint32_t +#define U_CPY u32_cpy +#include "u-pcpy.h" diff --git a/lib/unistr/u32-strcat.c b/lib/unistr/u32-strcat.c new file mode 100644 index 0000000..2da08b1 --- /dev/null +++ b/lib/unistr/u32-strcat.c @@ -0,0 +1,26 @@ +/* Concatenate UTF-32 strings. + Copyright (C) 1999, 2002, 2006, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unistr.h" + +#define FUNC u32_strcat +#define UNIT uint32_t +#define U_STRLEN u32_strlen +#include "u-strcat.h" diff --git a/lib/unistr/u32-strlen.c b/lib/unistr/u32-strlen.c new file mode 100644 index 0000000..1c43a30 --- /dev/null +++ b/lib/unistr/u32-strlen.c @@ -0,0 +1,25 @@ +/* Determine length of UTF-32 string. + Copyright (C) 1999, 2002, 2006, 2009-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "unistr.h" + +#define FUNC u32_strlen +#define UNIT uint32_t +#include "u-strlen.h" diff --git a/lib/unistr/u8-cpy.c b/lib/unistr/u8-cpy.c index e884b32..e2c89c3 100644 --- a/lib/unistr/u8-cpy.c +++ b/lib/unistr/u8-cpy.c @@ -1,5 +1,5 @@ /* Copy piece of UTF-8 string. - Copyright (C) 2002, 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This file is free software. diff --git a/lib/unistr/u8-mbtouc-unsafe-aux.c b/lib/unistr/u8-mbtouc-unsafe-aux.c index 9e2e34b..c763bd4 100644 --- a/lib/unistr/u8-mbtouc-unsafe-aux.c +++ b/lib/unistr/u8-mbtouc-unsafe-aux.c @@ -1,5 +1,5 @@ /* Conversion UTF-8 to UCS-4. - Copyright (C) 2001-2002, 2006-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This file is free software: you can redistribute it and/or modify diff --git a/lib/unistr/u8-mbtouc-unsafe.c b/lib/unistr/u8-mbtouc-unsafe.c index 71d0db8..bfd6494 100644 --- a/lib/unistr/u8-mbtouc-unsafe.c +++ b/lib/unistr/u8-mbtouc-unsafe.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-8 string. - Copyright (C) 1999-2002, 2006-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This file is free software: you can redistribute it and/or modify diff --git a/lib/unistr/u8-strlen.c b/lib/unistr/u8-strlen.c index 40b35a3..7f489e3 100644 --- a/lib/unistr/u8-strlen.c +++ b/lib/unistr/u8-strlen.c @@ -1,5 +1,5 @@ /* Determine length of UTF-8 string. - Copyright (C) 2002, 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This file is free software: you can redistribute it and/or modify diff --git a/lib/unistr/u8-uctomb-aux.c b/lib/unistr/u8-uctomb-aux.c index 6deeeb7..ffe567d 100644 --- a/lib/unistr/u8-uctomb-aux.c +++ b/lib/unistr/u8-uctomb-aux.c @@ -1,5 +1,5 @@ /* Conversion UCS-4 to UTF-8. - Copyright (C) 2002, 2006-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This file is free software: you can redistribute it and/or modify diff --git a/lib/unistr/u8-uctomb.c b/lib/unistr/u8-uctomb.c index 58de19b..0f903fd 100644 --- a/lib/unistr/u8-uctomb.c +++ b/lib/unistr/u8-uctomb.c @@ -1,5 +1,5 @@ /* Store a character in UTF-8 string. - Copyright (C) 2002, 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This file is free software: you can redistribute it and/or modify diff --git a/lib/unitypes.in.h b/lib/unitypes.in.h index d3a4c67..1b14d3b 100644 --- a/lib/unitypes.in.h +++ b/lib/unitypes.in.h @@ -1,5 +1,5 @@ /* Elementary types and macros for the GNU UniString library. - Copyright (C) 2002, 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/uniwidth.in.h b/lib/uniwidth.in.h index 66829e4..58bfe9c 100644 --- a/lib/uniwidth.in.h +++ b/lib/uniwidth.in.h @@ -1,5 +1,5 @@ /* Display width functions. - Copyright (C) 2001-2002, 2005, 2007, 2009-2023 Free Software Foundation, + Copyright (C) 2001-2002, 2005, 2007, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/uniwidth/cjk.h b/lib/uniwidth/cjk.h index 98f7e92..5fab365 100644 --- a/lib/uniwidth/cjk.h +++ b/lib/uniwidth/cjk.h @@ -1,5 +1,5 @@ /* Test for CJK encoding. - Copyright (C) 2001-2002, 2005-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2007, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This file is free software: you can redistribute it and/or modify diff --git a/lib/uniwidth/width.c b/lib/uniwidth/width.c index c9d4d1d..4942aa1 100644 --- a/lib/uniwidth/width.c +++ b/lib/uniwidth/width.c @@ -1,5 +1,5 @@ /* Determine display width of Unicode character. - Copyright (C) 2001-2002, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This file is free software: you can redistribute it and/or modify diff --git a/lib/uniwidth/width0.h b/lib/uniwidth/width0.h index 0c1713a..6cc3553 100644 --- a/lib/uniwidth/width0.h +++ b/lib/uniwidth/width0.h @@ -1,8 +1,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Table of non-spacing or control characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 15.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ -/* Copyright (C) 2000-2022 Free Software Foundation, Inc. +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -46,19 +46,19 @@ static const unsigned char nonspacing_table_data[48*64] = { 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf, /* 0x0580-0x05bf */ 0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x05c0-0x05ff */ /* 0x0600-0x07ff */ - 0x3f, 0x00, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */ + 0x00, 0x00, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */ 0x00, 0xf8, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0680-0x06bf */ - 0x00, 0x00, 0xc0, 0xbf, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */ - 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0x0700-0x073f */ + 0x00, 0x00, 0xc0, 0x9f, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */ + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0x0700-0x073f */ 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0740-0x077f */ 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x01, 0x00, /* 0x0780-0x07bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x20, /* 0x07c0-0x07ff */ /* 0x0800-0x09ff */ 0x00, 0x00, 0xc0, 0xfb, 0xef, 0x3e, 0x00, 0x00, /* 0x0800-0x083f */ 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */ - 0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */ - 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0x08c0-0x08ff */ + 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */ + 0x00, 0xfc, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, /* 0x08c0-0x08ff */ 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, /* 0x0900-0x093f */ 0xfe, 0x21, 0xfe, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0980-0x09bf */ @@ -273,8 +273,8 @@ static const unsigned char nonspacing_table_data[48*64] = { /* 0x11000-0x111ff */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0x11000-0x1103f */ 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x80, /* 0x11040-0x1107f */ - 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x26, /* 0x11080-0x110bf */ - 0x04, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x110c0-0x110ff */ + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x06, /* 0x11080-0x110bf */ + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x110c0-0x110ff */ 0x07, 0x00, 0x00, 0x00, 0x80, 0xef, 0x1f, 0x00, /* 0x11100-0x1113f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, /* 0x11140-0x1117f */ 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x7f, /* 0x11180-0x111bf */ diff --git a/lib/uniwidth/width2.h b/lib/uniwidth/width2.h index 19c8c02..47979b5 100644 --- a/lib/uniwidth/width2.h +++ b/lib/uniwidth/width2.h @@ -1,8 +1,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Width 2 property of Unicode characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 15.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0. */ -/* Copyright (C) 2000-2022 Free Software Foundation, Inc. +/* Copyright (C) 2000-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/unlink.c b/lib/unlink.c index d77d262..ca656e3 100644 --- a/lib/unlink.c +++ b/lib/unlink.c @@ -1,6 +1,6 @@ /* Work around unlink bugs. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/unlocked-io.h b/lib/unlocked-io.h index 4830df4..0cd9bbf 100644 --- a/lib/unlocked-io.h +++ b/lib/unlocked-io.h @@ -1,6 +1,6 @@ /* Prefer faster, non-thread-safe stdio functions if available. - Copyright (C) 2001-2004, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -101,7 +101,7 @@ # define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z) # endif -# if HAVE_DECL_GETC_UNLOCKED || defined get_unlocked +# if HAVE_DECL_GETC_UNLOCKED || defined getc_unlocked # undef getc # define getc(x) getc_unlocked (x) # else diff --git a/lib/utime.c b/lib/utime.c index 3cf1840..3535764 100644 --- a/lib/utime.c +++ b/lib/utime.c @@ -1,5 +1,5 @@ /* Work around platform bugs in utime. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/utime.in.h b/lib/utime.in.h index da49169..378427f 100644 --- a/lib/utime.in.h +++ b/lib/utime.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <utime.h>. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/utimens.c b/lib/utimens.c index 4c5377e..4bfb9c9 100644 --- a/lib/utimens.c +++ b/lib/utimens.c @@ -1,6 +1,6 @@ /* Set file access and modification times. - Copyright (C) 2003-2023 Free Software Foundation, Inc. + Copyright (C) 2003-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -231,8 +231,8 @@ fdutimens (int fd, char const *file, struct timespec const timespec[2]) The same bug occurs in Solaris 11.1 (Apr 2013). - FIXME: Simplify this for Linux in 2016 and for Solaris in - 2024, when file system bugs are no longer common. */ + FIXME: Simplify this in 2024, when these file system bugs are + no longer common on Gnulib target platforms. */ if (adjustment_needed == 2) { if (fd < 0 ? stat (file, &st) : fstat (fd, &st)) @@ -405,10 +405,10 @@ fdutimens (int fd, char const *file, struct timespec const timespec[2]) struct timeval *t; if (ts) { - timeval[0].tv_sec = ts[0].tv_sec; - timeval[0].tv_usec = ts[0].tv_nsec / 1000; - timeval[1].tv_sec = ts[1].tv_sec; - timeval[1].tv_usec = ts[1].tv_nsec / 1000; + timeval[0] = (struct timeval) { .tv_sec = ts[0].tv_sec, + .tv_usec = ts[0].tv_nsec / 1000 }; + timeval[1] = (struct timeval) { .tv_sec = ts[1].tv_sec, + .tv_usec = ts[1].tv_nsec / 1000 }; t = timeval; } else @@ -502,8 +502,8 @@ fdutimens (int fd, char const *file, struct timespec const timespec[2]) struct utimbuf *ut; if (ts) { - utimbuf.actime = ts[0].tv_sec; - utimbuf.modtime = ts[1].tv_sec; + utimbuf = (struct utimbuf) { .actime = ts[0].tv_sec, + .modtime = ts[1].tv_sec }; ut = &utimbuf; } else @@ -621,10 +621,10 @@ lutimens (char const *file, struct timespec const timespec[2]) int result; if (ts) { - timeval[0].tv_sec = ts[0].tv_sec; - timeval[0].tv_usec = ts[0].tv_nsec / 1000; - timeval[1].tv_sec = ts[1].tv_sec; - timeval[1].tv_usec = ts[1].tv_nsec / 1000; + timeval[0] = (struct timeval) { .tv_sec = ts[0].tv_sec, + .tv_usec = ts[0].tv_nsec / 1000 }; + timeval[1] = (struct timeval) { .tv_sec = ts[1].tv_sec, + .tv_usec = ts[1].tv_nsec / 1000 }; t = timeval; } else diff --git a/lib/utimens.h b/lib/utimens.h index 4a21792..7c740af 100644 --- a/lib/utimens.h +++ b/lib/utimens.h @@ -1,6 +1,6 @@ /* Set file access and modification times. - Copyright 2012-2023 Free Software Foundation, Inc. + Copyright 2012-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 802790e..de20445 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 1999, 2002-2023 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -83,7 +83,7 @@ #include <stdio.h> /* snprintf(), sprintf() */ #include <stdlib.h> /* abort(), malloc(), realloc(), free() */ #include <string.h> /* memcpy(), strlen() */ -#include <wchar.h> /* mbstate_t, mbrtowc(), mbrlen(), wcrtomb() */ +#include <wchar.h> /* mbstate_t, mbrtowc(), mbrlen(), wcrtomb(), mbszero() */ #include <errno.h> /* errno */ #include <limits.h> /* CHAR_BIT, INT_WIDTH, LONG_WIDTH */ #include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */ @@ -247,7 +247,7 @@ local_strnlen (const char *string, size_t maxlen) # endif #endif -#if (((!USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T +#if (((!USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_WPRINTF_DIRECTIVE_LC) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T # if HAVE_WCSLEN # define local_wcslen wcslen # else @@ -294,7 +294,7 @@ local_wcsnlen (const wchar_t *s, size_t maxlen) static size_t wctomb_fallback (char *s, wchar_t wc) { - static char hex[16] = "0123456789ABCDEF"; + static char const hex[16] = "0123456789ABCDEF"; s[0] = '\\'; if (sizeof (wchar_t) > 2 && wc > 0xffff) @@ -927,6 +927,14 @@ divide (mpn_t a, mpn_t b, mpn_t *q) return roomptr; } +/* Avoid pointless GCC warning "argument 1 value '18446744073709551615' exceeds + maximum object size 9223372036854775807", triggered by the use of xsum as + argument of malloc. */ +# if __GNUC__ >= 7 +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Walloc-size-larger-than=" +# endif + /* Convert a bignum a >= 0, multiplied with 10^extra_zeroes, to decimal representation. Destroys the contents of a. @@ -983,6 +991,10 @@ convert_to_decimal (mpn_t a, size_t extra_zeroes) return c_ptr; } +# if __GNUC__ >= 7 +# pragma GCC diagnostic pop +# endif + # if NEED_PRINTF_LONG_DOUBLE /* Assuming x is finite and >= 0: @@ -1177,8 +1189,6 @@ scale10_round_decimal_decoded (int e, mpn_t m, void *memory, int n) void *z_memory; char *digits; - if (memory == NULL) - return NULL; /* x = 2^e * m, hence y = round (2^e * 10^n * m) = round (2^(e+n) * 5^n * m) = round (2^s * 5^n * m). */ @@ -1386,10 +1396,13 @@ scale10_round_decimal_decoded (int e, mpn_t m, void *memory, int n) static char * scale10_round_decimal_long_double (long double x, int n) { - int e IF_LINT(= 0); + int e; mpn_t m; void *memory = decode_long_double (x, &e, &m); - return scale10_round_decimal_decoded (e, m, memory, n); + if (memory != NULL) + return scale10_round_decimal_decoded (e, m, memory, n); + else + return NULL; } # endif @@ -1404,10 +1417,13 @@ scale10_round_decimal_long_double (long double x, int n) static char * scale10_round_decimal_double (double x, int n) { - int e IF_LINT(= 0); + int e; mpn_t m; void *memory = decode_double (x, &e, &m); - return scale10_round_decimal_decoded (e, m, memory, n); + if (memory != NULL) + return scale10_round_decimal_decoded (e, m, memory, n); + else + return NULL; } # endif @@ -2319,6 +2335,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (dp->conversion == 'n') { +#if NEED_PRINTF_WITH_N_DIRECTIVE switch (a.arg[dp->arg_index].type) { case TYPE_COUNT_SCHAR_POINTER: @@ -2363,6 +2380,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, default: abort (); } +#else + abort (); +#endif } #if ENABLE_UNISTDIO /* The unistdio extensions. */ @@ -2749,14 +2769,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } } #endif -#if WIDE_CHAR_VERSION && !DCHAR_IS_TCHAR +#if WIDE_CHAR_VERSION && (!DCHAR_IS_TCHAR || NEED_WPRINTF_DIRECTIVE_LC) else if ((dp->conversion == 's' && a.arg[dp->arg_index].type == TYPE_WIDE_STRING) || (dp->conversion == 'c' && a.arg[dp->arg_index].type == TYPE_WIDE_CHAR)) { /* %ls or %lc in vasnwprintf. See the specification of - fwprintf. */ + fwprintf. */ /* It would be silly to use snprintf ("%ls", ...) and then convert back the result from a char[] to a wchar_t[]. Instead, just copy the argument wchar_t[] to the result. */ @@ -2991,7 +3011,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, wide characters, from the left. */ # if HAVE_MBRTOWC mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); # endif arg_end = arg; characters = 0; @@ -3019,7 +3039,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, characters. */ # if HAVE_MBRTOWC mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); # endif arg_end = arg; characters = 0; @@ -3063,7 +3083,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, size_t remaining; # if HAVE_MBRTOWC mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); # endif ENSURE_ALLOCATION (xsum (length, characters)); for (remaining = characters; remaining > 0; remaining--) @@ -3089,7 +3109,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { # if HAVE_MBRTOWC mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); # endif while (arg < arg_end) { @@ -3141,7 +3161,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, at most PRECISION bytes, from the left. */ # if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); # endif arg_end = arg; characters = 0; @@ -3174,7 +3194,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, bytes. */ # if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); # endif arg_end = arg; characters = 0; @@ -3214,7 +3234,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, size_t remaining; # if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); # endif for (remaining = characters; remaining > 0; ) { @@ -3283,7 +3303,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, size_t remaining; # if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); # endif ENSURE_ALLOCATION (xsum (length, characters)); for (remaining = characters; remaining > 0; ) @@ -3309,7 +3329,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { # if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); # endif while (arg < arg_end) { @@ -3408,21 +3428,18 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { /* Count the number of bytes. */ characters = 0; - if (arg != 0) - { - char cbuf[64]; /* Assume MB_CUR_MAX <= 64. */ - int count; + char cbuf[64]; /* Assume MB_CUR_MAX <= 64. */ + int count; # if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t - mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbstate_t state; + mbszero (&state); # endif - count = local_wcrtomb (cbuf, arg, &state); - if (count < 0) - /* Cannot convert. */ - goto fail_with_EILSEQ; - characters = count; - } + count = local_wcrtomb (cbuf, arg, &state); + if (count < 0) + /* Cannot convert. */ + goto fail_with_EILSEQ; + characters = count; } # if DCHAR_IS_TCHAR else @@ -3434,13 +3451,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, # if !DCHAR_IS_TCHAR /* Convert the string into a piece of temporary memory. */ - if (characters > 0) /* implies arg != 0 */ + if (characters > 0) { char cbuf[64]; /* Assume MB_CUR_MAX <= 64. */ int count; # if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); # endif count = local_wcrtomb (cbuf, arg, &state); @@ -3491,12 +3508,12 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { /* We know the number of bytes in advance. */ ENSURE_ALLOCATION (xsum (length, characters)); - if (characters > 0) /* implies arg != 0 */ + if (characters > 0) { int count; # if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); # endif count = local_wcrtomb (result + length, arg, &state); @@ -3508,23 +3525,20 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } else { - if (arg != 0) - { - char cbuf[64]; /* Assume MB_CUR_MAX <= 64. */ - int count; + char cbuf[64]; /* Assume MB_CUR_MAX <= 64. */ + int count; # if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t - mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbstate_t state; + mbszero (&state); # endif - count = local_wcrtomb (cbuf, arg, &state); - if (count < 0) - /* Cannot convert. */ - goto fail_with_EILSEQ; - ENSURE_ALLOCATION (xsum (length, count)); - memcpy (result + length, cbuf, count); - length += count; - } + count = local_wcrtomb (cbuf, arg, &state); + if (count < 0) + /* Cannot convert. */ + goto fail_with_EILSEQ; + ENSURE_ALLOCATION (xsum (length, count)); + memcpy (result + length, cbuf, count); + length += count; } # else ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), @@ -3588,7 +3602,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, mbstate_t state; wchar_t wc; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); int count = mbrtowc (&wc, &arg, 1, &state); if (count < 0) /* Invalid or incomplete multibyte character. */ @@ -5606,24 +5620,24 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { arg_type type = a.arg[dp->arg_index].type; int flags = dp->flags; -#if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION int has_width; #endif -#if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION size_t width; #endif -#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION int has_precision; size_t precision; #endif -#if NEED_PRINTF_UNBOUNDED_PRECISION +#if NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION int prec_ourselves; #else # define prec_ourselves 0 #endif #if (WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST # define pad_ourselves 1 -#elif !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#elif !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION int pad_ourselves; #else # define pad_ourselves 0 @@ -5638,10 +5652,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, TCHAR_T *tmp; #endif -#if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION has_width = 0; #endif -#if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION width = 0; if (dp->width_start != dp->width_end) { @@ -5669,13 +5683,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, width = xsum (xtimes (width, 10), *digitp++ - '0'); while (digitp != dp->width_end); } -# if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +# if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION has_width = 1; # endif } #endif -#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION has_precision = 0; precision = 6; if (dp->precision_start != dp->precision_end) @@ -5708,9 +5722,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #endif /* Decide whether to handle the precision ourselves. */ -#if NEED_PRINTF_UNBOUNDED_PRECISION +#if NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION switch (dp->conversion) { +# if NEED_PRINTF_UNBOUNDED_PRECISION case 'd': case 'i': case 'u': case 'b': #if SUPPORT_GNU_PRINTF_DIRECTIVES \ @@ -5718,9 +5733,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, case 'B': #endif case 'o': - case 'x': case 'X': case 'p': prec_ourselves = has_precision && (precision > 0); break; +# endif + case 'x': case 'X': case 'p': + prec_ourselves = + has_precision + && (0 +# if NEED_PRINTF_FLAG_ALT_PRECISION_ZERO + || (precision == 0) +# endif +# if NEED_PRINTF_UNBOUNDED_PRECISION + || (precision > 0) +# endif + ); + break; default: prec_ourselves = 0; break; @@ -5728,7 +5755,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #endif /* Decide whether to perform the padding ourselves. */ -#if !((WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST) && (!DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION) +#if !((WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST) && (!DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION) switch (dp->conversion) { # if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO @@ -6492,7 +6519,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } #endif -#if NEED_PRINTF_UNBOUNDED_PRECISION +#if NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION if (prec_ourselves) { /* Handle the precision. */ @@ -6552,6 +6579,15 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, count += insert; } +# if NEED_PRINTF_FLAG_ALT_PRECISION_ZERO + else if (precision == 0 + && move == 1 + && prec_ptr[prefix_count] == '0') + { + /* Replace the "0" result with an empty string. */ + count = prefix_count; + } +# endif } #endif @@ -6586,7 +6622,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, wide character array. */ mbstate_t state; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); tmpdst_len = 0; { const TCHAR_T *src = tmpsrc; @@ -6610,7 +6646,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (tmpdst == NULL) goto out_of_memory; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); { DCHAR_T *destptr = tmpdst; const TCHAR_T *src = tmpsrc; @@ -6706,7 +6742,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, /* Here count <= allocated - length. */ /* Perform padding. */ -#if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION if (pad_ourselves && has_width) { size_t w; diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h index 2d13407..7ed9145 100644 --- a/lib/vasnprintf.h +++ b/lib/vasnprintf.h @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004, 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/vasprintf.c b/lib/vasprintf.c index d2878cd..e52aaca 100644 --- a/lib/vasprintf.c +++ b/lib/vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/verify.h b/lib/verify.h index e4af915..08268c2 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -1,6 +1,6 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -188,9 +188,9 @@ template <int w> _gl_verify_type<(R) ? 1 : -1> #elif defined _GL_HAVE__STATIC_ASSERT # define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - struct { \ - _Static_assert (R, DIAGNOSTIC); \ - int _gl_dummy; \ + struct { \ + _Static_assert (R, DIAGNOSTIC); \ + int _gl_dummy; \ } #else # define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ @@ -212,8 +212,8 @@ template <int w> #elif defined _GL_HAVE__STATIC_ASSERT # define _GL_VERIFY(R, DIAGNOSTIC, ...) _Static_assert (R, DIAGNOSTIC) #else -# define _GL_VERIFY(R, DIAGNOSTIC, ...) \ - extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ +# define _GL_VERIFY(R, DIAGNOSTIC, ...) \ + extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] # if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) # pragma GCC diagnostic ignored "-Wnested-externs" diff --git a/lib/vsnprintf.c b/lib/vsnprintf.c index acd4e2d..e6676a1 100644 --- a/lib/vsnprintf.c +++ b/lib/vsnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2024 Free Software Foundation, Inc. Written by Simon Josefsson and Yoann Vandoorselaere <yoann@prelude-ids.org>. This file is free software: you can redistribute it and/or modify diff --git a/lib/w32sock.h b/lib/w32sock.h index 84e46e3..166a5f7 100644 --- a/lib/w32sock.h +++ b/lib/w32sock.h @@ -1,6 +1,6 @@ /* w32sock.h --- internal auxiliary functions for Windows socket functions - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/wait-process.c b/lib/wait-process.c index 3e95b4e..afb88eb 100644 --- a/lib/wait-process.c +++ b/lib/wait-process.c @@ -1,5 +1,5 @@ /* Waiting for a subprocess to finish. - Copyright (C) 2001-2003, 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2024 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -29,7 +29,7 @@ #include <sys/types.h> #include <sys/wait.h> -#include "error.h" +#include <error.h> #include "fatal-signal.h" #include "xalloc.h" #include "gettext.h" diff --git a/lib/wait-process.h b/lib/wait-process.h index 5543d74..a09101c 100644 --- a/lib/wait-process.h +++ b/lib/wait-process.h @@ -1,5 +1,5 @@ /* Waiting for a subprocess to finish. - Copyright (C) 2001-2003, 2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006, 2008-2024 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/lib/waitpid.c b/lib/waitpid.c index 763d563..e1d36be 100644 --- a/lib/waitpid.c +++ b/lib/waitpid.c @@ -1,5 +1,5 @@ /* Wait for process state change. - Copyright (C) 2001-2003, 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/warn-on-use.h b/lib/warn-on-use.h index 3075603..701013a 100644 --- a/lib/warn-on-use.h +++ b/lib/warn-on-use.h @@ -1,5 +1,5 @@ /* A C macro for emitting warnings if a function is used. - Copyright (C) 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2010-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published @@ -32,6 +32,10 @@ _GL_WARN_ON_USE_ATTRIBUTE is for functions with 'static' or 'inline' linkage. + _GL_WARN_ON_USE should not be used more than once for a given function + in a given compilation unit (because this may generate a warning even + if the function is never called). + However, one of the reasons that a function is a portability trap is if it has the wrong signature. Declaring FUNCTION with a different signature in C is a compilation error, so this macro must use the diff --git a/lib/wchar.in.h b/lib/wchar.in.h index 69fa2f8..a33a10f 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -85,7 +85,8 @@ #define _@GUARD_PREFIX@_WCHAR_H /* This file uses _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC, - _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ + _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK, + HAVE_RAW_DECL_*. */ #if !_GL_CONFIG_H_INCLUDED #error "Please include config.h first." #endif @@ -136,6 +137,28 @@ # endif #endif +/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions. + */ +#ifndef _GL_ATTRIBUTE_NOTHROW +# if defined __cplusplus +# if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4 +# if __cplusplus >= 201103L +# define _GL_ATTRIBUTE_NOTHROW noexcept (true) +# else +# define _GL_ATTRIBUTE_NOTHROW throw () +# endif +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif +# else +# if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__ +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif +# endif +#endif + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definition of _GL_ARG_NONNULL is copied here. */ @@ -195,7 +218,7 @@ typedef int rpl_mbstate_t; && !(defined __cplusplus && defined GNULIB_NAMESPACE)) /* We can't do '#define free rpl_free' here. */ # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_EXTERN_C void rpl_free (void *) throw (); +_GL_EXTERN_C void rpl_free (void *) _GL_ATTRIBUTE_NOTHROW; # else _GL_EXTERN_C void rpl_free (void *); # endif @@ -210,7 +233,7 @@ _GL_EXTERN_C void __cdecl free (void *); # else # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_EXTERN_C void free (void *) throw (); +_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW; # else _GL_EXTERN_C void free (void *); # endif @@ -225,13 +248,20 @@ _GL_EXTERN_C void __cdecl free (void *); # else # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_EXTERN_C void free (void *) throw (); +_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW; # else _GL_EXTERN_C void free (void *); # endif # endif #endif + +#if @GNULIB_MBSZERO@ +/* Get memset(). */ +# include <string.h> +#endif + + /* Convert a single-byte character to a wide character. */ #if @GNULIB_BTOWC@ # if @REPLACE_BTOWC@ @@ -288,7 +318,7 @@ _GL_WARN_ON_USE (wctob, "wctob is unportable - " #endif -/* Test whether *PS is in the initial state. */ +/* Test whether *PS is in an initial state. */ #if @GNULIB_MBSINIT@ # if @REPLACE_MBSINIT@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -315,6 +345,208 @@ _GL_WARN_ON_USE (mbsinit, "mbsinit is unportable - " #endif +/* Put *PS into an initial state. */ +#if @GNULIB_MBSZERO@ +/* ISO C 23 § 7.31.6.(3) says that zeroing an mbstate_t is a way to put the + mbstate_t into an initial state. However, on many platforms an mbstate_t + is large, and it is possible - as an optimization - to get away with zeroing + only part of it. So, instead of + + mbstate_t state = { 0 }; + + or + + mbstate_t state; + memset (&state, 0, sizeof (mbstate_t)); + + we can write this faster code: + + mbstate_t state; + mbszero (&state); + */ +/* _GL_MBSTATE_INIT_SIZE describes how mbsinit() behaves: It is the number of + bytes at the beginning of an mbstate_t that need to be zero, for mbsinit() + to return true. + _GL_MBSTATE_ZERO_SIZE is the number of bytes at the beginning of an mbstate_t + that need to be zero, + - for mbsinit() to return true, and + - for all other multibyte-aware functions to operate properly. + 0 < _GL_MBSTATE_INIT_SIZE <= _GL_MBSTATE_ZERO_SIZE <= sizeof (mbstate_t). + These values are determined by source code inspection, where possible, and + by running the gnulib unit tests. + We need _GL_MBSTATE_INIT_SIZE because if we define _GL_MBSTATE_ZERO_SIZE + without considering what mbsinit() does, we get test failures such as + assertion "mbsinit (&iter->state)" failed + */ +# if GNULIB_defined_mbstate_t /* AIX, IRIX */ +/* mbstate_t has at least 4 bytes. They are used as coded in + gnulib/lib/mbrtowc.c. */ +# define _GL_MBSTATE_INIT_SIZE 1 +/* define _GL_MBSTATE_ZERO_SIZE 4 + does not work: it causes test failures. + So, use the safe fallback value, below. */ +# elif __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 /* glibc */ +/* mbstate_t is defined in <bits/types/__mbstate_t.h>. + For more details, see glibc/iconv/skeleton.c. */ +# define _GL_MBSTATE_INIT_SIZE 4 /* sizeof (((mbstate_t) {0}).__count) */ +# define _GL_MBSTATE_ZERO_SIZE /* 8 */ sizeof (mbstate_t) +# elif defined MUSL_LIBC /* musl libc */ +/* mbstate_t is defined in <bits/alltypes.h>. + It is an opaque aligned 8-byte struct, of which at most the first + 4 bytes are used. + For more details, see src/multibyte/mbrtowc.c. */ +# define _GL_MBSTATE_INIT_SIZE 4 /* sizeof (unsigned) */ +# define _GL_MBSTATE_ZERO_SIZE 4 +# elif defined __APPLE__ && defined __MACH__ /* macOS */ +/* On macOS, mbstate_t is defined in <machine/_types.h>. + It is an opaque aligned 128-byte struct, of which at most the first + 12 bytes are used. + For more details, see the __mbsinit implementations in + Libc-<version>/locale/FreeBSD/ + {ascii,none,euc,mskanji,big5,gb2312,gbk,gb18030,utf8,utf2}.c. */ +/* File INIT_SIZE ZERO_SIZE + ascii.c 0 0 + none.c 0 0 + euc.c 12 12 + mskanji.c 4 4 + big5.c 4 4 + gb2312.c 4 6 + gbk.c 4 4 + gb18030.c 4 8 + utf8.c 8 10 + utf2.c 8 12 */ +# define _GL_MBSTATE_INIT_SIZE 12 +# define _GL_MBSTATE_ZERO_SIZE 12 +# elif defined __FreeBSD__ /* FreeBSD */ +/* On FreeBSD, mbstate_t is defined in src/sys/sys/_types.h. + It is an opaque aligned 128-byte struct, of which at most the first + 12 bytes are used. + For more details, see the __mbsinit implementations in + src/lib/libc/locale/ + {ascii,none,euc,mskanji,big5,gb2312,gbk,gb18030,utf8}.c. */ +/* File INIT_SIZE ZERO_SIZE + ascii.c 0 0 + none.c 0 0 + euc.c 12 12 + mskanji.c 4 4 + big5.c 4 4 + gb2312.c 4 6 + gbk.c 4 4 + gb18030.c 4 8 + utf8.c 8 12 */ +# define _GL_MBSTATE_INIT_SIZE 12 +# define _GL_MBSTATE_ZERO_SIZE 12 +# elif defined __NetBSD__ /* NetBSD */ +/* On NetBSD, mbstate_t is defined in src/sys/sys/ansi.h. + It is an opaque aligned 128-byte struct, of which at most the first + 28 bytes are used. + For more details, see the *State types in + src/lib/libc/citrus/modules/citrus_*.c + (ignoring citrus_{hz,iso2022,utf7,viqr,zw}.c, since these implement + stateful encodings, not usable as locale encodings). */ +/* File ZERO_SIZE + citrus/citrus_none.c 0 + citrus/modules/citrus_euc.c 8 + citrus/modules/citrus_euctw.c 8 + citrus/modules/citrus_mskanji.c 8 + citrus/modules/citrus_big5.c 8 + citrus/modules/citrus_gbk2k.c 8 + citrus/modules/citrus_dechanyu.c 8 + citrus/modules/citrus_johab.c 6 + citrus/modules/citrus_utf8.c 12 */ +/* But 12 is not the correct value for _GL_MBSTATE_ZERO_SIZE: we get test + failures for values < 28. */ +# define _GL_MBSTATE_ZERO_SIZE 28 +# elif defined __OpenBSD__ /* OpenBSD */ +/* On OpenBSD, mbstate_t is defined in src/sys/sys/_types.h. + It is an opaque aligned 128-byte struct, of which at most the first + 12 bytes are used. + For more details, see src/lib/libc/citrus/citrus_*.c. */ +/* File INIT_SIZE ZERO_SIZE + citrus_none.c 0 0 + citrus_utf8.c 12 12 */ +# define _GL_MBSTATE_INIT_SIZE 12 +# define _GL_MBSTATE_ZERO_SIZE 12 +# elif defined __minix /* Minix */ +/* On Minix, mbstate_t is defined in sys/sys/ansi.h. + It is an opaque aligned 128-byte struct. + For more details, see the *State types in + lib/libc/citrus/citrus_*.c. */ +/* File INIT_SIZE ZERO_SIZE + citrus_none.c 0 0 */ +/* But 1 is not the correct value for _GL_MBSTATE_ZERO_SIZE: we get test + failures for values < 4. */ +# define _GL_MBSTATE_ZERO_SIZE 4 +# elif defined __sun /* Solaris */ +/* On Solaris, mbstate_t is defined in <wchar_impl.h>. + It is an opaque aligned 24-byte or 32-byte struct, of which at most the first + 20 or 28 bytes are used. + For more details on OpenSolaris derivatives, see the *State types in + illumos-gate/usr/src/lib/libc/port/locale/ + {none,euc,mskanji,big5,gb2312,gbk,gb18030,utf8}.c. */ +/* File INIT_SIZE ZERO_SIZE + none.c 0 0 + euc.c 12 12 + mskanji.c 4 4 + big5.c 4 4 + gb2312.c 4 6 + gbk.c 4 4 + gb18030.c 4 8 + utf8.c 12 12 */ +/* But 12 is not the correct value for _GL_MBSTATE_ZERO_SIZE: we get test + failures + - in OpenIndiana and OmniOS: for values < 16, + - in Solaris 10 and 11: for values < 20 (in 32-bit mode) + or < 28 (in 64-bit mode). + Since we don't have a good way to distinguish the OpenSolaris derivatives + from the proprietary Solaris versions, and can't inspect the Solaris source + code, use the safe fallback values, below. */ +# elif defined __CYGWIN__ /* Cygwin */ +/* On Cygwin, mbstate_t is defined in <sys/_types.h>. + For more details, see newlib/libc/stdlib/mbtowc_r.c and + winsup/cygwin/strfuncs.cc. */ +# define _GL_MBSTATE_INIT_SIZE 4 /* sizeof (int) */ +# define _GL_MBSTATE_ZERO_SIZE 8 +# elif defined _WIN32 && !defined __CYGWIN__ /* Native Windows. */ +/* MSVC defines 'mbstate_t' as an aligned 8-byte struct. + On mingw, 'mbstate_t' is sometimes defined as 'int', sometimes defined + as an aligned 8-byte struct, of which the first 4 bytes matter. + Use the safe values, below. */ +# elif defined __ANDROID__ /* Android */ +/* Android defines 'mbstate_t' in <bits/mbstate_t.h>. + It is an opaque 4-byte or 8-byte struct. + For more details, see + bionic/libc/private/bionic_mbstate.h + bionic/libc/bionic/mbrtoc32.cpp + bionic/libc/bionic/mbrtoc16.cpp + */ +# define _GL_MBSTATE_INIT_SIZE 4 +# define _GL_MBSTATE_ZERO_SIZE 4 +# endif +/* Use safe values as defaults. */ +# ifndef _GL_MBSTATE_INIT_SIZE +# define _GL_MBSTATE_INIT_SIZE sizeof (mbstate_t) +# endif +# ifndef _GL_MBSTATE_ZERO_SIZE +# define _GL_MBSTATE_ZERO_SIZE sizeof (mbstate_t) +# endif +_GL_BEGIN_C_LINKAGE +# if defined IN_MBSZERO +_GL_EXTERN_INLINE +# else +_GL_INLINE +# endif +_GL_ARG_NONNULL ((1)) void +mbszero (mbstate_t *ps) +{ + memset (ps, 0, _GL_MBSTATE_ZERO_SIZE); +} +_GL_END_C_LINKAGE +_GL_CXXALIAS_SYS (mbszero, void, (mbstate_t *ps)); +_GL_CXXALIASWARN (mbszero); +#endif + + /* Convert a multibyte character to a wide character. */ #if @GNULIB_MBRTOWC@ # if @REPLACE_MBRTOWC@ @@ -1094,9 +1326,16 @@ _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); namespace, not in the global namespace. So, force a declaration in the global namespace. */ # if !@HAVE_WCSDUP@ || (defined __sun && defined __cplusplus) || __GNUC__ >= 11 +# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 _GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s) + _GL_ATTRIBUTE_NOTHROW _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else +_GL_FUNCDECL_SYS (wcsdup, wchar_t *, + (const wchar_t *s) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); # endif @@ -1104,9 +1343,16 @@ _GL_CXXALIASWARN (wcsdup); #else # if __GNUC__ >= 11 && !defined wcsdup /* For -Wmismatched-dealloc: Associate wcsdup with free or rpl_free. */ +# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 +_GL_FUNCDECL_SYS (wcsdup, wchar_t *, + (const wchar_t *s) + _GL_ATTRIBUTE_NOTHROW + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else _GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # endif # if defined GNULIB_POSIXCHECK # undef wcsdup @@ -1125,9 +1371,16 @@ _GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - " # endif _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); # else +# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 +_GL_FUNCDECL_SYS (wcsdup, wchar_t *, + (const wchar_t *s) + _GL_ATTRIBUTE_NOTHROW + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# else _GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# endif # if @HAVE_DECL_WCSDUP@ _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); # endif @@ -1199,7 +1452,7 @@ _GL_WARN_ON_USE (wcsrchr, "wcsrchr is unportable - " #endif -/* Return the length of the initial segmet of WCS which consists entirely +/* Return the length of the initial segment of WCS which consists entirely of wide characters not in REJECT. */ #if @GNULIB_WCSCSPN@ # if !@HAVE_WCSCSPN@ @@ -1219,7 +1472,7 @@ _GL_WARN_ON_USE (wcscspn, "wcscspn is unportable - " #endif -/* Return the length of the initial segmet of WCS which consists entirely +/* Return the length of the initial segment of WCS which consists entirely of wide characters in ACCEPT. */ #if @GNULIB_WCSSPN@ # if !@HAVE_WCSSPN@ @@ -1431,6 +1684,24 @@ _GL_WARN_ON_USE (wcsftime, "wcsftime is unportable - " #endif +#if @GNULIB_WGETCWD@ && (defined _WIN32 && !defined __CYGWIN__) +/* Gets the name of the current working directory. + (a) If BUF is non-NULL, it is assumed to have room for SIZE wide characters. + This function stores the working directory (NUL-terminated) in BUF and + returns BUF. + (b) If BUF is NULL, an array is allocated with 'malloc'. The array is SIZE + wide characters long, unless SIZE == 0, in which case it is as big as + necessary. + If the directory couldn't be determined or SIZE was too small, this function + returns NULL and sets errno. For a directory of length LEN, SIZE should be + >= LEN + 3 in case (a) or >= LEN + 1 in case (b). + Possible errno values include: + - ERANGE if SIZE is too small. + - ENOMEM if the memory could no be allocated. */ +_GL_FUNCDECL_SYS (wgetcwd, wchar_t *, (wchar_t *buf, size_t size)); +#endif + + #endif /* _@GUARD_PREFIX@_WCHAR_H */ #endif /* _@GUARD_PREFIX@_WCHAR_H */ #endif diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c index 48a6c8e..197b020 100644 --- a/lib/wcrtomb.c +++ b/lib/wcrtomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify @@ -29,7 +29,7 @@ wcrtomb (char *s, wchar_t wc, mbstate_t *ps) #undef wcrtomb { /* This implementation of wcrtomb supports only stateless encodings. - ps must be in the initial state. */ + ps must be in an initial state. */ if (ps != NULL && !mbsinit (ps)) { errno = EINVAL; diff --git a/lib/wctype-h.c b/lib/wctype-h.c index 7d3e14a..7e4ff13 100644 --- a/lib/wctype-h.c +++ b/lib/wctype-h.c @@ -1,6 +1,6 @@ /* Inline functions for <wctype.h>. - Copyright (C) 2012-2023 Free Software Foundation, Inc. + Copyright (C) 2012-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -20,4 +20,4 @@ #include <config.h> #define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE -#include "wctype.h" +#include <wctype.h> diff --git a/lib/wctype-impl.h b/lib/wctype-impl.h new file mode 100644 index 0000000..26d68b4 --- /dev/null +++ b/lib/wctype-impl.h @@ -0,0 +1,96 @@ +/* Get descriptor for a wide character property. + Copyright (C) 2011-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2011. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +wctype_t +wctype (const char* name) +{ + switch (name[0]) + { + case 'a': + switch (name[1]) + { + case 'l': + switch (name[2]) + { + case 'n': + if (strcmp (name + 3, "um") == 0) + return (wctype_t) iswalnum; + break; + case 'p': + if (strcmp (name + 3, "ha") == 0) + return (wctype_t) iswalpha; + break; + default: + break; + } + break; + default: + break; + } + break; + case 'b': + if (strcmp (name + 1, "lank") == 0) + return (wctype_t) iswblank; + break; + case 'c': + if (strcmp (name + 1, "ntrl") == 0) + return (wctype_t) iswcntrl; + break; + case 'd': + if (strcmp (name + 1, "igit") == 0) + return (wctype_t) iswdigit; + break; + case 'g': + if (strcmp (name + 1, "raph") == 0) + return (wctype_t) iswgraph; + break; + case 'l': + if (strcmp (name + 1, "ower") == 0) + return (wctype_t) iswlower; + break; + case 'p': + switch (name[1]) + { + case 'r': + if (strcmp (name + 2, "int") == 0) + return (wctype_t) iswprint; + break; + case 'u': + if (strcmp (name + 2, "nct") == 0) + return (wctype_t) iswpunct; + break; + default: + break; + } + break; + case 's': + if (strcmp (name + 1, "pace") == 0) + return (wctype_t) iswspace; + break; + case 'u': + if (strcmp (name + 1, "pper") == 0) + return (wctype_t) iswupper; + break; + case 'x': + if (strcmp (name + 1, "digit") == 0) + return (wctype_t) iswxdigit; + break; + default: + break; + } + return NULL; +} diff --git a/lib/wctype.c b/lib/wctype.c new file mode 100644 index 0000000..914f684 --- /dev/null +++ b/lib/wctype.c @@ -0,0 +1,25 @@ +/* Get descriptor for a wide character property. + Copyright (C) 2011-2024 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2011. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include <wctype.h> + +#include <string.h> + +#include "wctype-impl.h" diff --git a/lib/wctype.in.h b/lib/wctype.in.h index 227fdac..851c4f4 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 <wctype.h>, for platforms that lack it. - Copyright (C) 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -81,6 +81,8 @@ _GL_INLINE_HEADER_BEGIN /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ +/* The definition of _GL_ARG_NONNULL is copied here. */ + /* The definition of _GL_WARN_ON_USE is copied here. */ /* Solaris 2.6 <wctype.h> includes <widec.h> which includes <euc.h> which @@ -130,7 +132,8 @@ typedef unsigned int rpl_wint_t; /* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions. Linux libc5 has <wctype.h> and the functions but they are broken. mingw and MSVC have <wctype.h> and the functions but they take a wchar_t - as argument, not an rpl_wint_t. + as argument, not an rpl_wint_t. Additionally, the mingw iswprint function + and the Android iswpunct function are broken. Assume all 11 functions (all isw* except iswblank) are implemented the same way, or not at all. */ # if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ @@ -182,7 +185,11 @@ rpl_iswlower (wint_t wc) _GL_WCTYPE_INLINE int rpl_iswprint (wint_t wc) { +# ifdef __MINGW32__ + return ((wchar_t) wc == wc ? wc == ' ' || iswgraph ((wchar_t) wc) : 0); +# else return ((wchar_t) wc == wc ? iswprint ((wchar_t) wc) : 0); +# endif } _GL_WCTYPE_INLINE int @@ -487,6 +494,16 @@ _GL_FUNCDECL_RPL (iswdigit, int, (wint_t wc)); # endif # endif +# if @GNULIB_ISWPUNCT@ +# if @REPLACE_ISWPUNCT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef iswpunct +# define iswpunct rpl_iswpunct +# endif +_GL_FUNCDECL_RPL (iswpunct, int, (wint_t wc)); +# endif +# endif + # if @GNULIB_ISWXDIGIT@ # if @REPLACE_ISWXDIGIT@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -626,14 +643,32 @@ _GL_CXXALIASWARN (iswblank); typedef void * wctype_t; # define GNULIB_defined_wctype_t 1 # endif +#elif @REPLACE_WCTYPE@ +# if !GNULIB_defined_wctype_t +typedef void *rpl_wctype_t; +# undef wctype_t +# define wctype_t rpl_wctype_t +# define GNULIB_defined_wctype_t 1 +# endif #endif /* Get a descriptor for a wide character property. */ #if @GNULIB_WCTYPE@ -# if !@HAVE_WCTYPE_T@ -_GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name)); -# endif +# if @REPLACE_WCTYPE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wctype +# define wctype rpl_wctype +# endif +_GL_FUNCDECL_RPL (wctype, wctype_t, (const char *name) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (wctype, wctype_t, (const char *name)); +# else +# if !@HAVE_WCTYPE_T@ +_GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name) + _GL_ARG_NONNULL ((1))); +# endif _GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name)); +# endif # if __GLIBC__ >= 2 _GL_CXXALIASWARN (wctype); # endif @@ -649,7 +684,7 @@ _GL_WARN_ON_USE (wctype, "wctype is unportable - " The argument WC must be either a wchar_t value or WEOF. The argument DESC must have been returned by the wctype() function. */ #if @GNULIB_ISWCTYPE@ -# if @GNULIBHEADERS_OVERRIDE_WINT_T@ +# if @GNULIBHEADERS_OVERRIDE_WINT_T@ || @REPLACE_WCTYPE@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef iswctype # define iswctype rpl_iswctype @@ -690,14 +725,32 @@ _GL_CXXALIASWARN (towupper); typedef void * wctrans_t; # define GNULIB_defined_wctrans_t 1 # endif +#elif @REPLACE_WCTRANS@ +# if !GNULIB_defined_wctrans_t +typedef void *rpl_wctrans_t; +# undef wctrans_t +# define wctrans_t rpl_wctrans_t +# define GNULIB_defined_wctrans_t 1 +# endif #endif /* Get a descriptor for a wide character case conversion. */ #if @GNULIB_WCTRANS@ -# if !@HAVE_WCTRANS_T@ -_GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name)); -# endif +# if @REPLACE_WCTRANS@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wctrans +# define wctrans rpl_wctrans +# endif +_GL_FUNCDECL_RPL (wctrans, wctrans_t, (const char *name) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (wctrans, wctrans_t, (const char *name)); +# else +# if !@HAVE_WCTRANS_T@ +_GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name) + _GL_ARG_NONNULL ((1))); +# endif _GL_CXXALIAS_SYS (wctrans, wctrans_t, (const char *name)); +# endif # if __GLIBC__ >= 2 _GL_CXXALIASWARN (wctrans); # endif @@ -713,10 +766,19 @@ _GL_WARN_ON_USE (wctrans, "wctrans is unportable - " The argument WC must be either a wchar_t value or WEOF. The argument DESC must have been returned by the wctrans() function. */ #if @GNULIB_TOWCTRANS@ -# if !@HAVE_WCTRANS_T@ +# if @REPLACE_WCTRANS@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef towctrans +# define towctrans rpl_towctrans +# endif +_GL_FUNCDECL_RPL (towctrans, wint_t, (wint_t wc, wctrans_t desc)); +_GL_CXXALIAS_RPL (towctrans, wint_t, (wint_t wc, wctrans_t desc)); +# else +# if !@HAVE_WCTRANS_T@ _GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc)); -# endif +# endif _GL_CXXALIAS_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc)); +# endif # if __GLIBC__ >= 2 _GL_CXXALIASWARN (towctrans); # endif diff --git a/lib/wcwidth.c b/lib/wcwidth.c index 1d03665..328a893 100644 --- a/lib/wcwidth.c +++ b/lib/wcwidth.c @@ -1,5 +1,5 @@ /* Determine the number of screen columns needed for a character. - Copyright (C) 2006-2007, 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2010-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-initguard.h b/lib/windows-initguard.h index 9d36f53..6bace3f 100644 --- a/lib/windows-initguard.h +++ b/lib/windows-initguard.h @@ -1,5 +1,5 @@ /* Init guards, somewhat like spinlocks (native Windows implementation). - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-mutex.c b/lib/windows-mutex.c index ab7258c..b112e13 100644 --- a/lib/windows-mutex.c +++ b/lib/windows-mutex.c @@ -1,5 +1,5 @@ /* Plain mutexes (native Windows implementation). - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-mutex.h b/lib/windows-mutex.h index 039eb70..88de4bd 100644 --- a/lib/windows-mutex.h +++ b/lib/windows-mutex.h @@ -1,5 +1,5 @@ /* Plain mutexes (native Windows implementation). - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-once.c b/lib/windows-once.c index 0d28281..17854f5 100644 --- a/lib/windows-once.c +++ b/lib/windows-once.c @@ -1,5 +1,5 @@ /* Once-only control (native Windows implementation). - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-once.h b/lib/windows-once.h index 5488568..c5bbcd5 100644 --- a/lib/windows-once.h +++ b/lib/windows-once.h @@ -1,5 +1,5 @@ /* Once-only control (native Windows implementation). - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-recmutex.c b/lib/windows-recmutex.c index a8ce9a0..e5672ba 100644 --- a/lib/windows-recmutex.c +++ b/lib/windows-recmutex.c @@ -1,5 +1,5 @@ /* Plain recursive mutexes (native Windows implementation). - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-recmutex.h b/lib/windows-recmutex.h index 08ff459..9fa445b 100644 --- a/lib/windows-recmutex.h +++ b/lib/windows-recmutex.h @@ -1,5 +1,5 @@ /* Plain recursive mutexes (native Windows implementation). - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-rwlock.c b/lib/windows-rwlock.c index 7cbd7bb..e60c4ef 100644 --- a/lib/windows-rwlock.c +++ b/lib/windows-rwlock.c @@ -1,5 +1,5 @@ /* Read-write locks (native Windows implementation). - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-rwlock.h b/lib/windows-rwlock.h index fe8381e..08d6775 100644 --- a/lib/windows-rwlock.h +++ b/lib/windows-rwlock.h @@ -1,5 +1,5 @@ /* Read-write locks (native Windows implementation). - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-spawn.c b/lib/windows-spawn.c index f864db1..203e3e8 100644 --- a/lib/windows-spawn.c +++ b/lib/windows-spawn.c @@ -1,5 +1,5 @@ /* Auxiliary functions for the creation of subprocesses. Native Windows API. - Copyright (C) 2001, 2003-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This file is free software: you can redistribute it and/or modify diff --git a/lib/windows-spawn.h b/lib/windows-spawn.h index b218181..a48b976 100644 --- a/lib/windows-spawn.h +++ b/lib/windows-spawn.h @@ -1,5 +1,5 @@ /* Auxiliary functions for the creation of subprocesses. Native Windows API. - Copyright (C) 2001, 2003-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This file is free software: you can redistribute it and/or modify diff --git a/lib/wmemchr-impl.h b/lib/wmemchr-impl.h index 96b9ad3..0cdecb8 100644 --- a/lib/wmemchr-impl.h +++ b/lib/wmemchr-impl.h @@ -1,5 +1,5 @@ /* Search wide character array for a wide character. - Copyright (C) 1999, 2011-2023 Free Software Foundation, Inc. + Copyright (C) 1999, 2011-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 1999. This file is free software: you can redistribute it and/or modify diff --git a/lib/wmemchr.c b/lib/wmemchr.c index 5d28247..268d81b 100644 --- a/lib/wmemchr.c +++ b/lib/wmemchr.c @@ -1,5 +1,5 @@ /* Search wide character array for a wide character. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This file is free software: you can redistribute it and/or modify diff --git a/lib/wmempcpy.c b/lib/wmempcpy.c index 6803ecb..d0163f5 100644 --- a/lib/wmempcpy.c +++ b/lib/wmempcpy.c @@ -1,5 +1,5 @@ /* Copy wide character array, return pointer after last written wide character. - Copyright (C) 2020-2023 Free Software Foundation, Inc. + Copyright (C) 2020-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/write.c b/lib/write.c index d2fc18a..59b3a77 100644 --- a/lib/write.c +++ b/lib/write.c @@ -1,5 +1,5 @@ /* POSIX compatible write() function. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c index 7605eee..c053c7a 100644 --- a/lib/xalloc-die.c +++ b/lib/xalloc-die.c @@ -1,6 +1,6 @@ /* Report a memory allocation failure and exit. - Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2023 Free Software + Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -22,7 +22,7 @@ #include <stdlib.h> -#include "error.h" +#include <error.h> #include "exitfail.h" #include "gettext.h" diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h index 5dbdfb5..7f30f83 100644 --- a/lib/xalloc-oversized.h +++ b/lib/xalloc-oversized.h @@ -1,6 +1,6 @@ /* xalloc-oversized.h -- memory allocation size checking - Copyright (C) 1990-2000, 2003-2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -29,8 +29,7 @@ is SIZE_MAX - 1. */ #define __xalloc_oversized(n, s) \ ((s) != 0 \ - && ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) \ - < (n))) + && (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n)) /* Return 1 if and only if an array of N objects, each of size S, cannot exist reliably because its total size in bytes would exceed @@ -48,13 +47,13 @@ #if 7 <= __GNUC__ && !defined __clang__ && PTRDIFF_MAX < SIZE_MAX # define xalloc_oversized(n, s) \ __builtin_mul_overflow_p (n, s, (ptrdiff_t) 1) -#elif (5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ \ - && PTRDIFF_MAX < SIZE_MAX) +#elif 5 <= __GNUC__ && !defined __ICC && PTRDIFF_MAX < SIZE_MAX # define xalloc_oversized(n, s) \ (__builtin_constant_p (n) && __builtin_constant_p (s) \ ? __xalloc_oversized (n, s) \ - : ({ ptrdiff_t __xalloc_count; \ - __builtin_mul_overflow (n, s, &__xalloc_count); })) + : __extension__ \ + ({ ptrdiff_t __xalloc_count; \ + __builtin_mul_overflow (n, s, &__xalloc_count); })) /* Other compilers use integer division; this may be slower but is more portable. */ diff --git a/lib/xalloc.h b/lib/xalloc.h index 0a951e1..75a5db3 100644 --- a/lib/xalloc.h +++ b/lib/xalloc.h @@ -1,6 +1,6 @@ /* xalloc.h -- malloc with out-of-memory checking - Copyright (C) 1990-2000, 2003-2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ extern "C" { or by using gnulib's xalloc-die module. This is the function to call when one wants the program to die because of a memory allocation failure. */ -/*extern*/ _Noreturn void xalloc_die (void); +_Noreturn void xalloc_die (void); #endif /* GNULIB_XALLOC_DIE */ diff --git a/lib/xmalloc.c b/lib/xmalloc.c index 289cbd0..5befdab 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -1,6 +1,6 @@ /* xmalloc.c -- malloc with out of memory checking - Copyright (C) 1990-2000, 2002-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2002-2006, 2008-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ #include <string.h> static void * _GL_ATTRIBUTE_PURE -nonnull (void *p) +check_nonnull (void *p) { if (!p) xalloc_die (); @@ -42,13 +42,13 @@ nonnull (void *p) void * xmalloc (size_t s) { - return nonnull (malloc (s)); + return check_nonnull (malloc (s)); } void * ximalloc (idx_t s) { - return nonnull (imalloc (s)); + return check_nonnull (imalloc (s)); } char * @@ -72,7 +72,7 @@ xrealloc (void *p, size_t s) void * xirealloc (void *p, idx_t s) { - return nonnull (irealloc (p, s)); + return check_nonnull (irealloc (p, s)); } /* Change the size of an allocated block of memory P to an array of N @@ -90,7 +90,7 @@ xreallocarray (void *p, size_t n, size_t s) void * xireallocarray (void *p, idx_t n, idx_t s) { - return nonnull (ireallocarray (p, n, s)); + return check_nonnull (ireallocarray (p, n, s)); } /* Allocate an array of N objects, each with S bytes of memory, @@ -295,13 +295,13 @@ xizalloc (idx_t s) void * xcalloc (size_t n, size_t s) { - return nonnull (calloc (n, s)); + return check_nonnull (calloc (n, s)); } void * xicalloc (idx_t n, idx_t s) { - return nonnull (icalloc (n, s)); + return check_nonnull (icalloc (n, s)); } /* Clone an object P of size S, with error checking. There's no need diff --git a/lib/xmemdup0.c b/lib/xmemdup0.c index 7cedeb5..e901e1c 100644 --- a/lib/xmemdup0.c +++ b/lib/xmemdup0.c @@ -1,6 +1,6 @@ /* xmemdup0.c -- copy a block of arbitrary bytes, plus a trailing NUL - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xmemdup0.h b/lib/xmemdup0.h index 256cb4e..8a68a8d 100644 --- a/lib/xmemdup0.h +++ b/lib/xmemdup0.h @@ -1,6 +1,6 @@ /* xmemdup0.h -- copy a block of arbitrary bytes, plus a trailing NUL - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xsize.c b/lib/xsize.c index 279ae82..8774467 100644 --- a/lib/xsize.c +++ b/lib/xsize.c @@ -1,6 +1,6 @@ /* Checked size_t computations. - Copyright (C) 2012-2023 Free Software Foundation, Inc. + Copyright (C) 2012-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/xsize.h b/lib/xsize.h index 5b08d61..71c9c07 100644 --- a/lib/xsize.h +++ b/lib/xsize.h @@ -1,6 +1,6 @@ /* xsize.h -- Checked size_t computations. - Copyright (C) 2003, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2003, 2008-2024 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/xstrndup.c b/lib/xstrndup.c index 2c3796e..612a3d6 100644 --- a/lib/xstrndup.c +++ b/lib/xstrndup.c @@ -1,6 +1,6 @@ /* Duplicate a bounded initial segment of a string, with out-of-memory checking. - Copyright (C) 2003, 2006-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xstrndup.h b/lib/xstrndup.h index 5844731..d54d5bb 100644 --- a/lib/xstrndup.h +++ b/lib/xstrndup.h @@ -1,6 +1,6 @@ /* Duplicate a bounded initial segment of a string, with out-of-memory checking. - Copyright (C) 2003, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2003, 2009-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index 7fe03e0..99c99d1 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,5 +1,5 @@ -# 00gnulib.m4 serial 8 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +# 00gnulib.m4 serial 9 +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -49,14 +49,14 @@ dnl AC_REQUIRE([gl_COMPILER_CLANG]) [if test $gl_cv_compiler_clang = yes; then dnl Test whether the compiler supports the option dnl '-Werror=implicit-function-declaration'. - save_ac_compile="$ac_compile" + saved_ac_compile="$ac_compile" ac_compile="$ac_compile -Werror=implicit-function-declaration" dnl Use _AC_COMPILE_IFELSE instead of AC_COMPILE_IFELSE, to avoid a dnl warning "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS". _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])], [gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration'], [gl_cv_compiler_check_decl_option=none]) - ac_compile="$save_ac_compile" + ac_compile="$saved_ac_compile" else gl_cv_compiler_check_decl_option=none fi @@ -71,11 +71,11 @@ dnl Redefine _AC_CHECK_DECL_BODY so that it references ac_compile_for_check_decl dnl instead of ac_compile. If, for whatever reason, the override of AC_PROG_CC dnl in zzgnulib.m4 is inactive, use the original ac_compile. m4_define([_AC_CHECK_DECL_BODY], -[ ac_save_ac_compile="$ac_compile" +[ ac_saved_ac_compile="$ac_compile" if test -n "$ac_compile_for_check_decl"; then ac_compile="$ac_compile_for_check_decl" fi] -m4_defn([_AC_CHECK_DECL_BODY])[ ac_compile="$ac_save_ac_compile" +m4_defn([_AC_CHECK_DECL_BODY])[ ac_compile="$ac_saved_ac_compile" ]) # gl_00GNULIB diff --git a/m4/__inline.m4 b/m4/__inline.m4 index acf8668..992e16f 100644 --- a/m4/__inline.m4 +++ b/m4/__inline.m4 @@ -1,5 +1,5 @@ # Test for __inline keyword -dnl Copyright 2017-2023 Free Software Foundation, Inc. +dnl Copyright 2017-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4 index e794764..0e9f9ba 100644 --- a/m4/absolute-header.m4 +++ b/m4/absolute-header.m4 @@ -1,5 +1,5 @@ -# absolute-header.m4 serial 17 -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +# absolute-header.m4 serial 18 +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -66,7 +66,7 @@ AC_DEFUN([gl_ABSOLUTE_HEADER_ONE], esac changequote(,) case "$host_os" in - mingw*) + mingw* | windows*) dnl For the sake of native Windows compilers (excluding gcc), dnl treat backslash as a directory separator, like /. dnl Actually, these compilers use a double-backslash as diff --git a/m4/access.m4 b/m4/access.m4 index 0c8064f..c2c347f 100644 --- a/m4/access.m4 +++ b/m4/access.m4 @@ -1,5 +1,5 @@ -# access.m4 serial 1 -dnl Copyright (C) 2019-2023 Free Software Foundation, Inc. +# access.m4 serial 3 +dnl Copyright (C) 2019-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,6 +11,55 @@ AC_DEFUN([gl_FUNC_ACCESS], dnl On native Windows, access (= _access) does not support the X_OK mode. dnl It works by chance on some versions of mingw. case "$host_os" in - mingw*) REPLACE_ACCESS=1 ;; + mingw* | windows*) + REPLACE_ACCESS=1 + ;; + *) + dnl Mac OS X 10.5 mistakenly allows access("link-to-file/",amode). + AC_CHECK_FUNCS_ONCE([lstat]) + AC_CACHE_CHECK([whether access honors trailing slash], + [gl_cv_func_access_slash_works], + [# Assume that if we have lstat, we can also check symlinks. + if test $ac_cv_func_lstat = yes; then + rm -rf conftest.f conftest.lnk + touch conftest.f || AC_MSG_ERROR([cannot create temporary files]) + ln -s conftest.f conftest.lnk + AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ + #include <unistd.h> + ]], + [[int result = 0; + if (access ("conftest.lnk/", R_OK) == 0) + result |= 1; + return result; + ]])], + [gl_cv_func_access_slash_works=yes], + [gl_cv_func_access_slash_works=no], + dnl When crosscompiling, assume access is broken. + [case "$host_os" in + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_access_slash_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_access_slash_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_access_slash_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_access_slash_works="$gl_cross_guess_normal" ;; + esac + ]) + rm -rf conftest.f conftest.lnk + else + gl_cv_func_access_slash_works="guessing yes" + fi + ]) + case "$gl_cv_func_access_slash_works" in + *yes) ;; + *) + REPLACE_ACCESS=1 + AC_DEFINE([ACCESS_TRAILING_SLASH_BUG], [1], + [Define if access does not correctly handle trailing slashes.]) + ;; + esac + ;; esac ]) diff --git a/m4/af_alg.m4 b/m4/af_alg.m4 index f4c0d62..e88d624 100644 --- a/m4/af_alg.m4 +++ b/m4/af_alg.m4 @@ -1,5 +1,5 @@ # af_alg.m4 serial 6 -dnl Copyright 2018-2023 Free Software Foundation, Inc. +dnl Copyright 2018-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/alloca.m4 b/m4/alloca.m4 index c685fac..9096021 100644 --- a/m4/alloca.m4 +++ b/m4/alloca.m4 @@ -1,5 +1,5 @@ # alloca.m4 serial 21 -dnl Copyright (C) 2002-2004, 2006-2007, 2009-2023 Free Software Foundation, +dnl Copyright (C) 2002-2004, 2006-2007, 2009-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4 index fa5fe83..754b38e 100644 --- a/m4/arpa_inet_h.m4 +++ b/m4/arpa_inet_h.m4 @@ -1,5 +1,5 @@ # arpa_inet_h.m4 serial 17 -dnl Copyright (C) 2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/asm-underscore.m4 b/m4/asm-underscore.m4 index 65ae55a..cc63465 100644 --- a/m4/asm-underscore.m4 +++ b/m4/asm-underscore.m4 @@ -1,5 +1,5 @@ # asm-underscore.m4 serial 5 -dnl Copyright (C) 2010-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/assert_h.m4 b/m4/assert_h.m4 index d255855..d3d4c42 100644 --- a/m4/assert_h.m4 +++ b/m4/assert_h.m4 @@ -1,5 +1,5 @@ # assert-h.m4 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,10 +9,10 @@ dnl From Paul Eggert. AC_DEFUN([gl_ASSERT_H], [ AC_CACHE_CHECK([for static_assert], [gl_cv_static_assert], - [gl_save_CFLAGS=$CFLAGS + [gl_saved_CFLAGS=$CFLAGS for gl_working in "yes, a keyword" "yes, an <assert.h> macro"; do AS_CASE([$gl_working], - [*assert.h*], [CFLAGS="$gl_save_CFLAGS -DINCLUDE_ASSERT_H"]) + [*assert.h*], [CFLAGS="$gl_saved_CFLAGS -DINCLUDE_ASSERT_H"]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( @@ -32,7 +32,7 @@ AC_DEFUN([gl_ASSERT_H], ]])], [gl_cv_static_assert=$gl_working], [gl_cv_static_assert=no]) - CFLAGS=$gl_save_CFLAGS + CFLAGS=$gl_saved_CFLAGS test "$gl_cv_static_assert" != no && break done]) diff --git a/m4/base32.m4 b/m4/base32.m4 index 06dcdaf..dd768cf 100644 --- a/m4/base32.m4 +++ b/m4/base32.m4 @@ -1,5 +1,5 @@ # base32.m4 serial 4 -dnl Copyright (C) 2004, 2006, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/btowc.m4 b/m4/btowc.m4 index 1cd100a..8bb55dc 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,5 +1,5 @@ -# btowc.m4 serial 13 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +# btowc.m4 serial 14 +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -40,12 +40,12 @@ int main () [ changequote(,)dnl case "$host_os" in - # Guess no on Cygwin. - cygwin*) gl_cv_func_btowc_nul="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_btowc_nul="guessing yes" ;; - # Guess yes otherwise. - *) gl_cv_func_btowc_nul="guessing yes" ;; + # Guess no on Cygwin. + cygwin*) gl_cv_func_btowc_nul="guessing no" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_btowc_nul="guessing yes" ;; + # Guess yes otherwise. + *) gl_cv_func_btowc_nul="guessing yes" ;; esac changequote([,])dnl ]) @@ -59,12 +59,12 @@ changequote([,])dnl dnl is present. changequote(,)dnl case "$host_os" in - # Guess no on IRIX. - irix*) gl_cv_func_btowc_eof="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_btowc_eof="guessing yes" ;; - # Guess yes otherwise. - *) gl_cv_func_btowc_eof="guessing yes" ;; + # Guess no on IRIX. + irix*) gl_cv_func_btowc_eof="guessing no" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_btowc_eof="guessing yes" ;; + # Guess yes otherwise. + *) gl_cv_func_btowc_eof="guessing yes" ;; esac changequote([,])dnl if test $LOCALE_FR != none; then @@ -116,17 +116,18 @@ int main () [gl_cv_func_btowc_consistent=yes], [gl_cv_func_btowc_consistent=no], [case "$host_os" in - # Guess no on mingw. - mingw*) AC_EGREP_CPP([Problem], [ + # Guess no on mingw. + mingw* | windows*) + AC_EGREP_CPP([Problem], [ #ifdef __MINGW32__ Problem #endif - ], - [gl_cv_func_btowc_consistent="guessing no"], - [gl_cv_func_btowc_consistent="guessing yes"]) - ;; - # Guess yes otherwise. - *) gl_cv_func_btowc_consistent="guessing yes" ;; + ], + [gl_cv_func_btowc_consistent="guessing no"], + [gl_cv_func_btowc_consistent="guessing yes"]) + ;; + # Guess yes otherwise. + *) gl_cv_func_btowc_consistent="guessing yes" ;; esac ]) ]) diff --git a/m4/build-to-host.m4 b/m4/build-to-host.m4 new file mode 100644 index 0000000..ad22a0a --- /dev/null +++ b/m4/build-to-host.m4 @@ -0,0 +1,79 @@ +# build-to-host.m4 serial 3 +dnl Copyright (C) 2023 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl Written by Bruno Haible. + +dnl When the build environment ($build_os) is different from the target runtime +dnl environment ($host_os), file names may need to be converted from the build +dnl environment syntax to the target runtime environment syntax. This is +dnl because the Makefiles are executed (mostly) by build environment tools and +dnl therefore expect file names in build environment syntax, whereas the runtime +dnl expects file names in target runtime environment syntax. +dnl +dnl For example, if $build_os = cygwin and $host_os = mingw32, filenames need +dnl be converted from Cygwin syntax to native Windows syntax: +dnl /cygdrive/c/foo/bar -> C:\foo\bar +dnl /usr/local/share -> C:\cygwin64\usr\local\share +dnl +dnl gl_BUILD_TO_HOST([somedir]) +dnl This macro takes as input an AC_SUBSTed variable 'somedir', which must +dnl already have its final value assigned, and produces two additional +dnl AC_SUBSTed variables 'somedir_c' and 'somedir_c_make', that designate the +dnl same file name value, just in different syntax: +dnl - somedir_c is the file name in target runtime environment syntax, +dnl as a C string (starting and ending with a double-quote, +dnl and with escaped backslashes and double-quotes in +dnl between). +dnl - somedir_c_make is the same thing, escaped for use in a Makefile. + +AC_DEFUN([gl_BUILD_TO_HOST], +[ + AC_REQUIRE([AC_CANONICAL_BUILD]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_BUILD_TO_HOST_INIT]) + + dnl Define somedir_c. + gl_final_[$1]="$[$1]" + dnl Translate it from build syntax to host syntax. + case "$build_os" in + cygwin*) + case "$host_os" in + mingw* | windows*) + gl_final_[$1]=`cygpath -w "$gl_final_[$1]"` ;; + esac + ;; + esac + dnl Convert it to C string syntax. + [$1]_c=`printf '%s\n' "$gl_final_[$1]" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"` + [$1]_c='"'"$[$1]_c"'"' + AC_SUBST([$1_c]) + + dnl Define somedir_c_make. + [$1]_c_make=`printf '%s\n' "$[$1]_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"` + dnl Use the substituted somedir variable, when possible, so that the user + dnl may adjust somedir a posteriori when there are no special characters. + if test "$[$1]_c_make" = '\"'"${gl_final_[$1]}"'\"'; then + [$1]_c_make='\"$([$1])\"' + fi + AC_SUBST([$1_c_make]) +]) + +dnl Some initializations for gl_BUILD_TO_HOST. +AC_DEFUN([gl_BUILD_TO_HOST_INIT], +[ + gl_sed_double_backslashes='s/\\/\\\\/g' + gl_sed_escape_doublequotes='s/"/\\"/g' +changequote(,)dnl + gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g" +changequote([,])dnl + gl_sed_escape_for_make_2='s,\$,\\$$,g' + dnl Find out how to remove carriage returns from output. Solaris /usr/ucb/tr + dnl does not understand '\r'. + case `echo r | tr -d '\r'` in + '') gl_tr_cr='\015' ;; + *) gl_tr_cr='\r' ;; + esac +]) diff --git a/m4/builtin-expect.m4 b/m4/builtin-expect.m4 index 531ed48..8faffc5 100644 --- a/m4/builtin-expect.m4 +++ b/m4/builtin-expect.m4 @@ -1,6 +1,6 @@ dnl Check for __builtin_expect. -dnl Copyright 2016-2023 Free Software Foundation, Inc. +dnl Copyright 2016-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/byteswap.m4 b/m4/byteswap.m4 index 8058d17..5493d90 100644 --- a/m4/byteswap.m4 +++ b/m4/byteswap.m4 @@ -1,5 +1,5 @@ # byteswap.m4 serial 5 -dnl Copyright (C) 2005, 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/c-bool.m4 b/m4/c-bool.m4 index f614371..44fba3c 100644 --- a/m4/c-bool.m4 +++ b/m4/c-bool.m4 @@ -1,6 +1,6 @@ # Check for bool that conforms to C2023. -dnl Copyright 2022-2023 Free Software Foundation, Inc. +dnl Copyright 2022-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/calloc.m4 b/m4/calloc.m4 index 3789cbf..49303d9 100644 --- a/m4/calloc.m4 +++ b/m4/calloc.m4 @@ -1,6 +1,6 @@ -# calloc.m4 serial 30 +# calloc.m4 serial 31 -# Copyright (C) 2004-2023 Free Software Foundation, Inc. +# Copyright (C) 2004-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -41,7 +41,7 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF], # Guess yes on musl systems. *-musl* | midipix*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; # Guess yes on native Windows. - mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; + mingw* | windows*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) ac_cv_func_calloc_0_nonnull="$gl_cross_guess_normal" ;; esac diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 index d319645..05dc6dd 100644 --- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -1,6 +1,6 @@ -# canonicalize.m4 serial 38 +# canonicalize.m4 serial 39 -dnl Copyright (C) 2003-2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -66,8 +66,8 @@ AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE], dnl available through the linker option '-loldnames'. AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in - mingw*) ;; - *) AC_CHECK_FUNCS([getcwd]) ;; + mingw* | windows*) ;; + *) AC_CHECK_FUNCS([getcwd]) ;; esac AC_REQUIRE([gl_DOUBLE_SLASH_ROOT]) @@ -158,16 +158,16 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS], esac ], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;; - # Guess 'nearly' on musl systems. - *-musl*) gl_cv_func_realpath_works="guessing nearly" ;; - # Guess no on Cygwin. - cygwin*) gl_cv_func_realpath_works="guessing no" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_realpath_works="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_realpath_works="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;; + # Guess 'nearly' on musl systems. + *-musl*) gl_cv_func_realpath_works="guessing nearly" ;; + # Guess no on Cygwin. + cygwin*) gl_cv_func_realpath_works="guessing no" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_realpath_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_realpath_works="$gl_cross_guess_normal" ;; esac ]) rm -rf conftest.a conftest.l conftest.d diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4 index 4a92b30..62c7a79 100644 --- a/m4/chdir-long.m4 +++ b/m4/chdir-long.m4 @@ -6,7 +6,7 @@ # never fails with ENAMETOOLONG. # Arrange to compile chdir-long.c only on systems that define PATH_MAX. -dnl Copyright (C) 2004-2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/clock_time.m4 b/m4/clock_time.m4 index d624a73..c016575 100644 --- a/m4/clock_time.m4 +++ b/m4/clock_time.m4 @@ -1,5 +1,5 @@ -# clock_time.m4 serial 12 -dnl Copyright (C) 2002-2006, 2009-2023 Free Software Foundation, Inc. +# clock_time.m4 serial 14 +dnl Copyright (C) 2002-2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,9 +12,17 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_CLOCK_TIME], [ + AC_REQUIRE([AC_CANONICAL_HOST]) + dnl Persuade glibc and Solaris <time.h> to declare these functions. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + # On mingw, these functions are defined in the libwinpthread library, + # which is better avoided. In fact, the clock_gettime function is buggy + # in 32-bit mingw, when -D__MINGW_USE_VC2005_COMPAT is used (which Gnulib's + # year2038 module does): It leaves the upper 32 bits of the tv_sec field + # of the result uninitialized. + # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function. # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. @@ -23,12 +31,22 @@ AC_DEFUN([gl_CLOCK_TIME], # library, inducing unnecessary run-time overhead. CLOCK_TIME_LIB= AC_SUBST([CLOCK_TIME_LIB]) - gl_saved_libs=$LIBS - AC_SEARCH_LIBS([clock_gettime], [rt posix4], - [test "$ac_cv_search_clock_gettime" = "none required" || - CLOCK_TIME_LIB=$ac_cv_search_clock_gettime]) - AC_CHECK_FUNCS([clock_getres clock_gettime clock_settime]) - LIBS=$gl_saved_libs + case "$host_os" in + mingw* | windows*) + ac_cv_func_clock_getres=no + ac_cv_func_clock_gettime=no + ac_cv_func_clock_settime=no + ;; + *) + gl_saved_libs=$LIBS + AC_SEARCH_LIBS([clock_gettime], [rt posix4], + [test "$ac_cv_search_clock_gettime" = "none required" || + CLOCK_TIME_LIB=$ac_cv_search_clock_gettime]) + AC_CHECK_FUNCS([clock_getres clock_gettime clock_settime]) + LIBS=$gl_saved_libs + ;; + esac + # For backward compatibility. LIB_CLOCK_GETTIME="$CLOCK_TIME_LIB" AC_SUBST([LIB_CLOCK_GETTIME]) diff --git a/m4/close.m4 b/m4/close.m4 index 0feabd6..6b6d382 100644 --- a/m4/close.m4 +++ b/m4/close.m4 @@ -1,5 +1,5 @@ # close.m4 serial 10 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/closedir.m4 b/m4/closedir.m4 index 7e702de..3774806 100644 --- a/m4/closedir.m4 +++ b/m4/closedir.m4 @@ -1,5 +1,5 @@ -# closedir.m4 serial 7 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +# closedir.m4 serial 8 +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,15 +13,12 @@ AC_DEFUN([gl_FUNC_CLOSEDIR], if test $ac_cv_func_closedir = no; then HAVE_CLOSEDIR=0 else - dnl Replace closedir() on native Windows, to support fdopendir(). + dnl Replace closedir() on native Windows and OS/2 kLIBC, + dnl to support fdopendir(). AC_REQUIRE([gl_DIRENT_DIR]) if test $DIR_HAS_FD_MEMBER = 0; then REPLACE_CLOSEDIR=1 fi - dnl Replace closedir() for supporting the gnulib-defined dirfd() function. - case $host_os in - os2*) REPLACE_CLOSEDIR=1 ;; - esac dnl Replace closedir() for supporting the gnulib-defined fchdir() function, dnl to keep fchdir's bookkeeping up-to-date. m4_ifdef([gl_FUNC_FCHDIR], [ diff --git a/m4/codeset.m4 b/m4/codeset.m4 index 5804f47..94dccce 100644 --- a/m4/codeset.m4 +++ b/m4/codeset.m4 @@ -1,5 +1,5 @@ # codeset.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019-2023 Free Software +dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019-2024 Free Software dnl Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/ctype_h.m4 b/m4/ctype_h.m4 index 219f2ed..ef0ee7f 100644 --- a/m4/ctype_h.m4 +++ b/m4/ctype_h.m4 @@ -1,5 +1,5 @@ # ctype_h.m4 serial 9 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/d-ino.m4 b/m4/d-ino.m4 index 58f3311..b127ab2 100644 --- a/m4/d-ino.m4 +++ b/m4/d-ino.m4 @@ -1,11 +1,11 @@ -# serial 21 +# serial 22 dnl From Jim Meyering. dnl dnl Check whether struct dirent has a member named d_ino. dnl -# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2023 Free Software +# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2024 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation @@ -40,16 +40,16 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO], [gl_cv_struct_dirent_d_ino=yes], [gl_cv_struct_dirent_d_ino=no], [case "$host_os" in - # Guess yes on glibc systems with Linux kernel. - linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; - # Guess yes on musl systems with Linux kernel. - linux*-musl*) gl_cv_struct_dirent_d_ino="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_struct_dirent_d_ino="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_struct_dirent_d_ino="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems with Linux kernel. + linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; + # Guess yes on musl systems with Linux kernel. + linux*-musl*) gl_cv_struct_dirent_d_ino="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_struct_dirent_d_ino="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_struct_dirent_d_ino="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_struct_dirent_d_ino="$gl_cross_guess_normal" ;; esac ])]) case "$gl_cv_struct_dirent_d_ino" in diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4 index b6c189c..3e3d967 100644 --- a/m4/dirent_h.m4 +++ b/m4/dirent_h.m4 @@ -1,5 +1,5 @@ -# dirent_h.m4 serial 20 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +# dirent_h.m4 serial 22 +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,14 +32,13 @@ AC_DEFUN_ONCE([gl_DIRENT_H], dnl Determine whether <dirent.h> needs to override the DIR type. AC_DEFUN_ONCE([gl_DIRENT_DIR], [ - dnl Set DIR_HAS_FD_MEMBER if dirfd() works, i.e. not always returns -1, - dnl or has the __KLIBC__ workaround as in lib/dirfd.c. + dnl Set DIR_HAS_FD_MEMBER if dirfd() works, i.e. not always returns -1. dnl We could use the findings from gl_FUNC_DIRFD and gl_PREREQ_DIRFD, but dnl it's simpler since we know the affected platforms. AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in - mingw*) DIR_HAS_FD_MEMBER=0 ;; - *) DIR_HAS_FD_MEMBER=1 ;; + mingw* | windows* | os2*) DIR_HAS_FD_MEMBER=0 ;; + *) DIR_HAS_FD_MEMBER=1 ;; esac AC_SUBST([DIR_HAS_FD_MEMBER]) ]) diff --git a/m4/dirfd.m4 b/m4/dirfd.m4 index 7968b12..e58582e 100644 --- a/m4/dirfd.m4 +++ b/m4/dirfd.m4 @@ -1,8 +1,8 @@ -# serial 28 -*- Autoconf -*- +# serial 30 -*- Autoconf -*- dnl Find out how to get the file descriptor associated with an open DIR*. -# Copyright (C) 2001-2006, 2008-2023 Free Software Foundation, Inc. +# Copyright (C) 2001-2006, 2008-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -40,15 +40,12 @@ AC_DEFUN([gl_FUNC_DIRFD], HAVE_DIRFD=0 else HAVE_DIRFD=1 - dnl Replace dirfd() on native Windows, to support fdopendir(). + dnl Replace dirfd() on native Windows and OS/2 kLIBC, + dnl to support fdopendir(). AC_REQUIRE([gl_DIRENT_DIR]) if test $DIR_HAS_FD_MEMBER = 0; then REPLACE_DIRFD=1 fi - dnl OS/2 kLIBC dirfd() does not work. - case "$host_os" in - os2*) REPLACE_DIRFD=1 ;; - esac fi ]) @@ -58,7 +55,7 @@ AC_DEFUN([gl_PREREQ_DIRFD], AC_CACHE_CHECK([how to get the file descriptor associated with an open DIR*], [gl_cv_sys_dir_fd_member_name], [ - dirfd_save_CFLAGS=$CFLAGS + gl_saved_CFLAGS=$CFLAGS for ac_expr in d_fd dd_fd; do CFLAGS="$CFLAGS -DDIR_FD_MEMBER_NAME=$ac_expr" @@ -68,7 +65,7 @@ AC_DEFUN([gl_PREREQ_DIRFD], [[DIR *dir_p = opendir("."); (void) dir_p->DIR_FD_MEMBER_NAME;]])], [dir_fd_found=yes] ) - CFLAGS=$dirfd_save_CFLAGS + CFLAGS=$gl_saved_CFLAGS test "$dir_fd_found" = yes && break done test "$dir_fd_found" = yes || ac_expr=no_such_member diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4 index 1776e5e..00f23a7 100644 --- a/m4/double-slash-root.m4 +++ b/m4/double-slash-root.m4 @@ -1,5 +1,5 @@ # double-slash-root.m4 serial 4 -*- Autoconf -*- -dnl Copyright (C) 2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ -# dup.m4 serial 7 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +# dup.m4 serial 8 +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -36,9 +36,9 @@ AC_DEFUN([gl_FUNC_DUP], [gl_cv_func_dup_works=yes], [gl_cv_func_dup_works=no], [case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_dup_works="guessing no" ;; - *) gl_cv_func_dup_works="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_dup_works="guessing no" ;; + *) gl_cv_func_dup_works="guessing yes" ;; esac ]) ]) @@ -1,5 +1,5 @@ -#serial 27 -dnl Copyright (C) 2002, 2005, 2007, 2009-2023 Free Software Foundation, Inc. +#serial 28 +dnl Copyright (C) 2002, 2005, 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -67,7 +67,7 @@ AC_DEFUN([gl_FUNC_DUP2], ], [gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no], [case "$host_os" in - mingw*) # on this platform, dup2 always returns 0 for success + mingw* | windows*) # on this platform, dup2 always returns 0 for success gl_cv_func_dup2_works="guessing no" ;; cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 gl_cv_func_dup2_works="guessing no" ;; diff --git a/m4/eaccess.m4 b/m4/eaccess.m4 index 19134c0..e1cbcd1 100644 --- a/m4/eaccess.m4 +++ b/m4/eaccess.m4 @@ -1,5 +1,5 @@ # eaccess.m4 serial 2 -dnl Copyright (C) 2003, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/eealloc.m4 b/m4/eealloc.m4 index cb3e08f..d8862a1 100644 --- a/m4/eealloc.m4 +++ b/m4/eealloc.m4 @@ -1,5 +1,5 @@ # eealloc.m4 serial 3 -dnl Copyright (C) 2003, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/environ.m4 b/m4/environ.m4 index 741dfc5..5b9e06b 100644 --- a/m4/environ.m4 +++ b/m4/environ.m4 @@ -1,5 +1,5 @@ # environ.m4 serial 8 -dnl Copyright (C) 2001-2004, 2006-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/errno_h.m4 b/m4/errno_h.m4 index 4c70d22..8900d6c 100644 --- a/m4/errno_h.m4 +++ b/m4/errno_h.m4 @@ -1,5 +1,5 @@ # errno_h.m4 serial 14 -dnl Copyright (C) 2004, 2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/error.m4 b/m4/error.m4 index 93a7558..5688afc 100644 --- a/m4/error.m4 +++ b/m4/error.m4 @@ -1,6 +1,6 @@ #serial 16 -# Copyright (C) 1996-1998, 2001-2004, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 1996-1998, 2001-2004, 2009-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/error_h.m4 b/m4/error_h.m4 index f38e4ea..006770c 100644 --- a/m4/error_h.m4 +++ b/m4/error_h.m4 @@ -1,11 +1,11 @@ -# error_h.m4 serial 3 -dnl Copyright (C) 1996-2023 Free Software Foundation, Inc. +# error_h.m4 serial 4 +dnl Copyright (C) 1996-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -dnl Provide a working "error.h". +dnl Provide a working <error.h>. AC_DEFUN_ONCE([gl_ERROR_H], [ @@ -112,10 +112,9 @@ AC_DEFUN_ONCE([gl_ERROR_H], if test $HAVE_ERROR = 0 || test $REPLACE_ERROR = 1 \ || test $HAVE_ERROR_AT_LINE = 0 || test $REPLACE_ERROR_AT_LINE = 1; then - dnl Provide a substitute <error.h> file. - GL_GENERATE_ERROR_H=true + COMPILE_ERROR_C=1 else - GL_GENERATE_ERROR_H=false + COMPILE_ERROR_C=0 fi AC_SUBST([HAVE_ERROR]) diff --git a/m4/exponentd.m4 b/m4/exponentd.m4 index 163114b..0a4b1b6 100644 --- a/m4/exponentd.m4 +++ b/m4/exponentd.m4 @@ -1,5 +1,5 @@ # exponentd.m4 serial 4 -dnl Copyright (C) 2007-2008, 2010-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2008, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/extensions.m4 b/m4/extensions.m4 index 5336b8d..6fc2e30 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,7 +1,7 @@ # serial 23 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2023 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index f9894d7..680250e 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -1,6 +1,6 @@ dnl 'extern inline' a la ISO C99. -dnl Copyright 2012-2023 Free Software Foundation, Inc. +dnl Copyright 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fatal-signal.m4 b/m4/fatal-signal.m4 index 0c29bd4..720ff1a 100644 --- a/m4/fatal-signal.m4 +++ b/m4/fatal-signal.m4 @@ -1,5 +1,5 @@ # fatal-signal.m4 serial 9 -dnl Copyright (C) 2003-2004, 2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2004, 2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fchdir.m4 b/m4/fchdir.m4 index b587e0e..fc0ed33 100644 --- a/m4/fchdir.m4 +++ b/m4/fchdir.m4 @@ -1,5 +1,5 @@ -# fchdir.m4 serial 28 -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +# fchdir.m4 serial 32 +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,7 +16,15 @@ AC_DEFUN([gl_FUNC_FCHDIR], fi AC_REQUIRE([gl_TEST_FCHDIR]) - if test $HAVE_FCHDIR = 0; then + if test $HAVE_FCHDIR = 1; then + AC_REQUIRE([gl_DIRENT_DIR]) + if test $DIR_HAS_FD_MEMBER = 0; then + dnl fchdir() should be replaced if dirfd() does not work. + REPLACE_FCHDIR=1 + fi + fi + + if test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1; then AC_DEFINE([REPLACE_FCHDIR], [1], [Define to 1 if gnulib's fchdir() replacement is used.]) dnl We must also replace anything that can manipulate a directory fd, @@ -32,16 +40,16 @@ AC_DEFUN([gl_FUNC_FCHDIR], [gl_cv_func_open_directory_works=yes], [gl_cv_func_open_directory_works=no], [case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_open_directory_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_open_directory_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_open_directory_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_open_directory_works="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_open_directory_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_open_directory_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_open_directory_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_open_directory_works="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_open_directory_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_open_directory_works="$gl_cross_guess_normal" ;; esac ])]) case "$gl_cv_func_open_directory_works" in diff --git a/m4/fclose.m4 b/m4/fclose.m4 index e9291f0..9547f03 100644 --- a/m4/fclose.m4 +++ b/m4/fclose.m4 @@ -1,5 +1,5 @@ -# fclose.m4 serial 11 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +# fclose.m4 serial 12 +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -88,7 +88,7 @@ AC_DEFUN([gl_FUNC_FCLOSE_STDIN], # Guess yes on musl systems. *-musl* | midipix*) gl_cv_func_fclose_stdin="guessing yes" ;; # Guess no on native Windows. - mingw*) gl_cv_func_fclose_stdin="guessing no" ;; + mingw* | windows*) gl_cv_func_fclose_stdin="guessing no" ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_fclose_stdin="$gl_cross_guess_normal" ;; esac diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4 index 59d558b..49ab34d 100644 --- a/m4/fcntl-o.m4 +++ b/m4/fcntl-o.m4 @@ -1,5 +1,5 @@ -# fcntl-o.m4 serial 7 -dnl Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. +# fcntl-o.m4 serial 8 +dnl Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -117,9 +117,9 @@ AC_DEFUN([gl_FCNTL_O_FLAGS], *) gl_cv_header_working_fcntl_h='no';; esac], [case "$host_os" in - # Guess 'no' on native Windows. - mingw*) gl_cv_header_working_fcntl_h='no' ;; - *) gl_cv_header_working_fcntl_h=cross-compiling ;; + # Guess 'no' on native Windows. + mingw* | windows*) gl_cv_header_working_fcntl_h='no' ;; + *) gl_cv_header_working_fcntl_h=cross-compiling ;; esac ]) ]) diff --git a/m4/fcntl.m4 b/m4/fcntl.m4 index 524a99a..02b93f8 100644 --- a/m4/fcntl.m4 +++ b/m4/fcntl.m4 @@ -1,5 +1,5 @@ # fcntl.m4 serial 11 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index 68f4e64..ba4eb44 100644 --- a/m4/fcntl_h.m4 +++ b/m4/fcntl_h.m4 @@ -1,6 +1,6 @@ # serial 20 # Configure fcntl.h. -dnl Copyright (C) 2006-2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4 index dfcc46c..bf361ff 100644 --- a/m4/fdopendir.m4 +++ b/m4/fdopendir.m4 @@ -1,7 +1,7 @@ # serial 15 # See if we need to provide fdopendir. -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fflush.m4 b/m4/fflush.m4 index 3e3c890..85cf3be 100644 --- a/m4/fflush.m4 +++ b/m4/fflush.m4 @@ -1,6 +1,6 @@ -# fflush.m4 serial 18 +# fflush.m4 serial 19 -# Copyright (C) 2007-2023 Free Software Foundation, Inc. +# Copyright (C) 2007-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -79,9 +79,9 @@ AC_DEFUN([gl_FUNC_FFLUSH_STDIN], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no], [case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_fflush_stdin="guessing no" ;; - *) gl_cv_func_fflush_stdin=cross ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_fflush_stdin="guessing no" ;; + *) gl_cv_func_fflush_stdin=cross ;; esac ]) rm conftest.txt diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4 index 3dab236..7feb7f8 100644 --- a/m4/filenamecat.m4 +++ b/m4/filenamecat.m4 @@ -1,5 +1,5 @@ # filenamecat.m4 serial 12 -dnl Copyright (C) 2002-2006, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/findprog-in.m4 b/m4/findprog-in.m4 index 394f79a..4979125 100644 --- a/m4/findprog-in.m4 +++ b/m4/findprog-in.m4 @@ -1,5 +1,5 @@ # findprog-in.m4 serial 1 -dnl Copyright (C) 2003, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/flexmember.m4 b/m4/flexmember.m4 index 13f7e87..9df6c03 100644 --- a/m4/flexmember.m4 +++ b/m4/flexmember.m4 @@ -1,7 +1,7 @@ # serial 5 # Check for flexible array member support. -# Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/float_h.m4 b/m4/float_h.m4 index 2f0c9c4..60e8144 100644 --- a/m4/float_h.m4 +++ b/m4/float_h.m4 @@ -1,5 +1,5 @@ -# float_h.m4 serial 13 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +# float_h.m4 serial 14 +dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -84,9 +84,11 @@ int main () [gl_cv_func_itold_works="guessing no"], [gl_cv_func_itold_works="guessing yes"]) ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_itold_works="guessing yes" ;; - *) gl_cv_func_itold_works="guessing yes" ;; + # Guess yes on native Windows. + mingw* | windows*) + gl_cv_func_itold_works="guessing yes" ;; + *) + gl_cv_func_itold_works="guessing yes" ;; esac ]) ]) diff --git a/m4/flock.m4 b/m4/flock.m4 index e547876..72f52bb 100644 --- a/m4/flock.m4 +++ b/m4/flock.m4 @@ -1,5 +1,5 @@ # flock.m4 serial 4 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 index 895db13..54d5c7b 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,6 +1,6 @@ -# Check for fnmatch - serial 16. -*- coding: utf-8 -*- +# Check for fnmatch - serial 20 -*- coding: utf-8 -*- -# Copyright (C) 2000-2007, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2000-2007, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX], m4_divert_text([DEFAULTS], [gl_fnmatch_required=POSIX]) AC_REQUIRE([gl_FNMATCH_H]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_REQUIRE([AC_CANONICAL_HOST]) gl_fnmatch_required_lowercase=` echo $gl_fnmatch_required | LC_ALL=C tr '[[A-Z]]' '[[a-z]]' ` @@ -40,6 +40,8 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX], AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#include <fnmatch.h> + #include <locale.h> + #include <stddef.h> static int y (char const *pattern, char const *string, int flags) { @@ -60,60 +62,96 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX], static char const bs_1[] = { '\\\\' - 1, 0 }; static char const bs01[] = { '\\\\' + 1, 0 }; int result = 0; + /* ==== Start of tests in the "C" locale ==== */ + /* These are sanity checks. They all succeed on current platforms. */ if (!n ("a*", "", 0)) return 1; if (!y ("a*", "abc", 0)) return 1; - if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */ - return 1; if (!n ("d*/*1", "d/s/1", FNM_PATHNAME)) - return 2; + return 1; if (!y ("a\\\\bc", "abc", 0)) - return 3; + return 1; if (!n ("a\\\\bc", "abc", FNM_NOESCAPE)) - return 3; + return 1; if (!y ("*x", ".x", 0)) - return 4; + return 1; if (!n ("*x", ".x", FNM_PERIOD)) - return 4; + return 1; + /* glibc bug <https://sourceware.org/bugzilla/show_bug.cgi?id=361> + exists in glibc 2.3.3, fixed in glibc 2.5. */ if (!y (Apat, "\\\\", 0)) - return 5; + result |= 2; if (!y (Apat, "A", 0)) - return 5; + result |= 2; if (!y (apat, "\\\\", 0)) - return 5; + result |= 2; if (!y (apat, "a", 0)) - return 5; + result |= 2; if (!(n (Apat, A_1, 0) == ('A' < '\\\\'))) - return 5; + result |= 2; if (!(n (apat, a_1, 0) == ('a' < '\\\\'))) - return 5; + result |= 2; if (!(y (Apat, A01, 0) == ('A' < '\\\\'))) - return 5; + result |= 2; if (!(y (apat, a01, 0) == ('a' < '\\\\'))) - return 5; + result |= 2; if (!(y (Apat, bs_1, 0) == ('A' < '\\\\'))) - return 5; + result |= 2; if (!(y (apat, bs_1, 0) == ('a' < '\\\\'))) - return 5; + result |= 2; if (!(n (Apat, bs01, 0) == ('A' < '\\\\'))) - return 5; + result |= 2; if (!(n (apat, bs01, 0) == ('a' < '\\\\'))) - return 5; - $gl_fnmatch_gnu_start - if (!y ("xxXX", "xXxX", FNM_CASEFOLD)) + result |= 2; + /* glibc bug <https://sourceware.org/bugzilla/show_bug.cgi?id=12378> + exists in glibc 2.12, fixed in glibc 2.13. */ + if (!y ("[/b", "[/b", 0)) /*"]]"*/ + result |= 4; + /* glibc bug <https://sourceware.org/bugzilla/show_bug.cgi?id=17062> + is fixed in glibc 2.20. + glibc bugs <https://sourceware.org/bugzilla/show_bug.cgi?id=18032> + <https://sourceware.org/bugzilla/show_bug.cgi?id=18036> + are fixed in glibc 2.22. + These bugs are not easy to test for reliably (without mmap), + therefore test the glibc version. */ + #if defined __GLIBC__ + if (__GLIBC__ == 2 && __GLIBC_MINOR__ < 22) + result |= 4; + #endif + /* This test fails on FreeBSD 13.2, NetBSD 9.3, Cygwin 3.4.6. */ + if (!y ("[[:alnum:]]", "a", 0)) result |= 8; + $gl_fnmatch_gnu_start /* ==== Start of GNU extensions tests ==== */ + /* Sanity checks, mainly to check the presence of the FNM_* macros. */ + if (!y ("xxXX", "xXxX", FNM_CASEFOLD)) + result |= 64; if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH)) - result |= 16; + result |= 64; if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME)) - result |= 32; + result |= 64; if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR)) result |= 64; if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR)) result |= 64; if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR)) result |= 64; - $gl_fnmatch_gnu_end + $gl_fnmatch_gnu_end /* ==== End of GNU extensions tests ==== */ + /* ==== End of tests in the "C" locale ==== */ + /* ==== Start of tests that require a specific locale ==== */ + /* This test fails on Solaris 11.4. */ + if (setlocale (LC_ALL, "en_US.UTF-8") != NULL) + { + if (!n ("[!a-z]", "", 0)) + result |= 16; + } + /* This test fails on NetBSD 9.3, Android 13. */ + if (setlocale (LC_ALL, "C.UTF-8") != NULL) + { + if (!y ("x?y", "x\\303\\274y", 0)) + result |= 32; + } + /* ==== End of tests that require a specific locale ==== */ return result; ]])], [eval "$gl_fnmatch_cache_var=yes"], @@ -131,6 +169,24 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX], *yes) ;; *) REPLACE_FNMATCH=1 ;; esac + dnl On AIX 7.2 in 32-bit mode, fnmatch()'s only POSIX compliance problem is + dnl that is does not support characters outside the Unicode BMP correctly. + dnl Test case: fnmatch ("x?y", "x\360\237\230\213y", 0) == 0 + dnl This is due to wchar_t being only 16 bits wide. + AC_REQUIRE([gl_UCHAR_H]) + if test $SMALL_WCHAR_T = 1; then + case "$host_os" in + cygwin*) + dnl On Cygwin < 3.5.0, the above $gl_fnmatch_result came out as 'no', + dnl On Cygwin >= 3.5.0, fnmatch supports all Unicode characters, + dnl despite wchar_t being only 16 bits wide (because internally it + dnl works on wint_t values). + ;; + *) + REPLACE_FNMATCH=1 + ;; + esac + fi fi if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then gl_REPLACE_FNMATCH_H diff --git a/m4/fnmatch_h.m4 b/m4/fnmatch_h.m4 index 40a62b6..58cd7dc 100644 --- a/m4/fnmatch_h.m4 +++ b/m4/fnmatch_h.m4 @@ -1,5 +1,5 @@ # fnmatch_h.m4 serial 8 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fopen.m4 b/m4/fopen.m4 index 7daa4ca..1fcffa4 100644 --- a/m4/fopen.m4 +++ b/m4/fopen.m4 @@ -1,5 +1,5 @@ -# fopen.m4 serial 15 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# fopen.m4 serial 16 +dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_FOPEN_ITSELF], AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in - mingw* | pw*) + mingw* | windows* | pw*) dnl Replace fopen, for handling of "/dev/null". REPLACE_FOPEN=1 dnl fopen on mingw also has the trailing slash bug. @@ -136,7 +136,7 @@ int main () linux*-gnu* | gnu* | kfreebsd*-gnu | *-musl* | midipix*) gl_cv_func_fopen_mode_e="guessing yes" ;; # Guess no on native Windows. - mingw*) + mingw* | windows*) gl_cv_func_fopen_mode_e="guessing no" ;; # If we don't know, obey --enable-cross-guesses. *) diff --git a/m4/fpurge.m4 b/m4/fpurge.m4 index fe25596..e9b7050 100644 --- a/m4/fpurge.m4 +++ b/m4/fpurge.m4 @@ -1,5 +1,5 @@ # fpurge.m4 serial 14 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/freading.m4 b/m4/freading.m4 index f0f4893..9a95cba 100644 --- a/m4/freading.m4 +++ b/m4/freading.m4 @@ -1,5 +1,5 @@ # freading.m4 serial 3 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ # free.m4 serial 6 -# Copyright (C) 2003-2005, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2003-2005, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/fseek.m4 b/m4/fseek.m4 index c5fe688..4d72ac5 100644 --- a/m4/fseek.m4 +++ b/m4/fseek.m4 @@ -1,5 +1,5 @@ # fseek.m4 serial 4 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fseeko.m4 b/m4/fseeko.m4 index 05ee06b..cf11a9c 100644 --- a/m4/fseeko.m4 +++ b/m4/fseeko.m4 @@ -1,5 +1,5 @@ # fseeko.m4 serial 20 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fstat.m4 b/m4/fstat.m4 index 7cb2edb..5e73b4e 100644 --- a/m4/fstat.m4 +++ b/m4/fstat.m4 @@ -1,5 +1,5 @@ -# fstat.m4 serial 8 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +# fstat.m4 serial 10 +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,10 +10,10 @@ AC_DEFUN([gl_FUNC_FSTAT], AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) case "$host_os" in - mingw* | solaris*) + darwin* | mingw* | windows* | solaris*) + dnl macOS and Solaris stat can return a negative tv_nsec. dnl On MinGW, the original stat() returns st_atime, st_mtime, dnl st_ctime values that are affected by the time zone. - dnl Solaris stat can return a negative tv_nsec. REPLACE_FSTAT=1 ;; esac diff --git a/m4/fstatat.m4 b/m4/fstatat.m4 index 0830769..c22569b 100644 --- a/m4/fstatat.m4 +++ b/m4/fstatat.m4 @@ -1,5 +1,5 @@ -# fstatat.m4 serial 4 -dnl Copyright (C) 2004-2023 Free Software Foundation, Inc. +# fstatat.m4 serial 5 +dnl Copyright (C) 2004-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -50,7 +50,7 @@ AC_DEFUN([gl_FUNC_FSTATAT], esac case $host_os in - solaris*) + darwin* | solaris*) REPLACE_FSTATAT=1 ;; esac diff --git a/m4/ftell.m4 b/m4/ftell.m4 index 79f1aaf..a38ec5f 100644 --- a/m4/ftell.m4 +++ b/m4/ftell.m4 @@ -1,5 +1,5 @@ # ftell.m4 serial 3 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ftello.m4 b/m4/ftello.m4 index e13fcd9..bda8d6a 100644 --- a/m4/ftello.m4 +++ b/m4/ftello.m4 @@ -1,5 +1,5 @@ -# ftello.m4 serial 15 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# ftello.m4 serial 16 +dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -46,7 +46,7 @@ AC_DEFUN([gl_FUNC_FTELLO], dnl designates a pipe. See also dnl https://github.com/python/cpython/issues/78961#issuecomment-1093800325 case "$host_os" in - mingw*) REPLACE_FTELLO=1 ;; + mingw* | windows*) REPLACE_FTELLO=1 ;; esac fi if test $REPLACE_FTELLO = 0; then @@ -62,12 +62,12 @@ AC_DEFUN([gl_FUNC_FTELLO], dnl be opened. changequote(,)dnl case "$host_os" in - # Guess no on Solaris. - solaris*) gl_cv_func_ftello_works="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_ftello_works="guessing yes" ;; - # Guess yes otherwise. - *) gl_cv_func_ftello_works="guessing yes" ;; + # Guess no on Solaris. + solaris*) gl_cv_func_ftello_works="guessing no" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_ftello_works="guessing yes" ;; + # Guess yes otherwise. + *) gl_cv_func_ftello_works="guessing yes" ;; esac changequote([,])dnl AC_RUN_IFELSE( diff --git a/m4/futimens.m4 b/m4/futimens.m4 index dc0b21b..ac961e7 100644 --- a/m4/futimens.m4 +++ b/m4/futimens.m4 @@ -1,7 +1,7 @@ # serial 11 # See if we need to provide futimens replacement. -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 index 15f09ff..371136c 100644 --- a/m4/getaddrinfo.m4 +++ b/m4/getaddrinfo.m4 @@ -1,5 +1,5 @@ -# getaddrinfo.m4 serial 34 -dnl Copyright (C) 2004-2023 Free Software Foundation, Inc. +# getaddrinfo.m4 serial 35 +dnl Copyright (C) 2004-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -41,7 +41,7 @@ AC_DEFUN([gl_GETADDRINFO], AC_CACHE_CHECK([for getaddrinfo in ws2tcpip.h and -lws2_32], gl_cv_w32_getaddrinfo, [ gl_cv_w32_getaddrinfo=no - am_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #ifdef HAVE_WS2TCPIP_H @@ -49,7 +49,7 @@ AC_DEFUN([gl_GETADDRINFO], #endif #include <stddef.h> ]], [[getaddrinfo(NULL, NULL, NULL, NULL);]])], [gl_cv_w32_getaddrinfo=yes]) - LIBS="$am_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test "$gl_cv_w32_getaddrinfo" = "yes"; then GETADDRINFO_LIB="-lws2_32" diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4 index cd1240c..11f6a8a 100644 --- a/m4/getcwd-abort-bug.m4 +++ b/m4/getcwd-abort-bug.m4 @@ -3,7 +3,7 @@ # name is unusually large. Any length between 4k and 16k trigger the bug # when using glibc-2.4.90-9 or older. -# Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4 index 516c078..d30e75a 100644 --- a/m4/getcwd-path-max.m4 +++ b/m4/getcwd-path-max.m4 @@ -6,7 +6,7 @@ # I've heard that this is due to a Linux kernel bug, and that it has # been fixed between 2.4.21-pre3 and 2.4.21-pre4. -# Copyright (C) 2003-2007, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2003-2007, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 index e95db05..ed3d7b6 100644 --- a/m4/getcwd.m4 +++ b/m4/getcwd.m4 @@ -1,12 +1,12 @@ # getcwd.m4 - check for working getcwd that is compatible with glibc -# Copyright (C) 2001, 2003-2007, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # Written by Paul Eggert. -# serial 20 +# serial 22 AC_DEFUN([gl_FUNC_GETCWD_NULL], [ @@ -21,11 +21,8 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], # else /* on Windows with MSVC */ # include <direct.h> # endif - ]GL_MDA_DEFINES[ -# ifndef getcwd - char *getcwd (); -# endif -]], [[ + ]GL_MDA_DEFINES], + [[ #if defined _WIN32 && ! defined __CYGWIN__ /* mingw cwd does not start with '/', but _getcwd does allocate. However, mingw fails to honor non-zero size. */ @@ -116,7 +113,7 @@ AC_DEFUN([gl_FUNC_GETCWD], gl_abort_bug=no case "$host_os" in - mingw*) + mingw* | windows*) gl_cv_func_getcwd_path_max=yes ;; *) diff --git a/m4/getdelim.m4 b/m4/getdelim.m4 index 60555b9..0dbd8bc 100644 --- a/m4/getdelim.m4 +++ b/m4/getdelim.m4 @@ -1,6 +1,6 @@ # getdelim.m4 serial 19 -dnl Copyright (C) 2005-2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc. dnl dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4 index 8bcda90..3b89456 100644 --- a/m4/getdtablesize.m4 +++ b/m4/getdtablesize.m4 @@ -1,5 +1,5 @@ # getdtablesize.m4 serial 8 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 index 241fec8..f6e0cbd 100644 --- a/m4/getgroups.m4 +++ b/m4/getgroups.m4 @@ -1,9 +1,9 @@ -# serial 24 +# serial 25 dnl From Jim Meyering. dnl A wrapper around AC_FUNC_GETGROUPS. -# Copyright (C) 1996-1997, 1999-2004, 2008-2023 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2004, 2008-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ AC_DEFUN([AC_FUNC_GETGROUPS], # If we don't yet have getgroups, see if it's in -lbsd. # This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1. - ac_save_LIBS=$LIBS + gl_saved_LIBS=$LIBS if test $ac_cv_func_getgroups = no; then AC_CHECK_LIB(bsd, getgroups, [GETGROUPS_LIB=-lbsd]) fi @@ -56,7 +56,7 @@ AC_DEFUN([AC_FUNC_GETGROUPS], [Define to 1 if your system has a working `getgroups' function.]) ;; esac - LIBS=$ac_save_LIBS + LIBS=$gl_saved_LIBS ])# AC_FUNC_GETGROUPS AC_DEFUN([gl_FUNC_GETGROUPS], diff --git a/m4/getline.m4 b/m4/getline.m4 index 83e7e93..1a7e890 100644 --- a/m4/getline.m4 +++ b/m4/getline.m4 @@ -1,6 +1,6 @@ # getline.m4 serial 33 -dnl Copyright (C) 1998-2003, 2005-2007, 2009-2023 Free Software Foundation, +dnl Copyright (C) 1998-2003, 2005-2007, 2009-2024 Free Software Foundation, dnl Inc. dnl dnl This file is free software; the Free Software Foundation diff --git a/m4/getopt.m4 b/m4/getopt.m4 index 7981a09..be812d8 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ -# getopt.m4 serial 48 -dnl Copyright (C) 2002-2006, 2008-2023 Free Software Foundation, Inc. +# getopt.m4 serial 49 +dnl Copyright (C) 2002-2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -197,8 +197,8 @@ main () fi else case "$host_os" in - darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";; - *) gl_cv_func_getopt_posix="guessing yes";; + darwin* | aix* | mingw* | windows*) gl_cv_func_getopt_posix="guessing no";; + *) gl_cv_func_getopt_posix="guessing yes";; esac fi ]) diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4 index 79925a7..35dc257 100644 --- a/m4/getpagesize.m4 +++ b/m4/getpagesize.m4 @@ -1,5 +1,5 @@ -# getpagesize.m4 serial 10 -dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2023 Free Software Foundation, +# getpagesize.m4 serial 11 +dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -22,7 +22,7 @@ AC_DEFUN([gl_FUNC_GETPAGESIZE], fi fi case "$host_os" in - mingw*) + mingw* | windows*) REPLACE_GETPAGESIZE=1 ;; esac diff --git a/m4/getpass.m4 b/m4/getpass.m4 index 27a31f8..79afe08 100644 --- a/m4/getpass.m4 +++ b/m4/getpass.m4 @@ -1,5 +1,5 @@ # getpass.m4 serial 20 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2023 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/getprogname.m4 b/m4/getprogname.m4 index 2b741f5..b8f9f23 100644 --- a/m4/getprogname.m4 +++ b/m4/getprogname.m4 @@ -1,6 +1,6 @@ # getprogname.m4 - check for getprogname or replacements for it -# Copyright (C) 2016-2023 Free Software Foundation, Inc. +# Copyright (C) 2016-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/getrandom.m4 b/m4/getrandom.m4 index 7b7f9ce..55be445 100644 --- a/m4/getrandom.m4 +++ b/m4/getrandom.m4 @@ -1,5 +1,5 @@ -# getrandom.m4 serial 11 -dnl Copyright 2020-2023 Free Software Foundation, Inc. +# getrandom.m4 serial 13 +dnl Copyright 2020-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,6 +9,8 @@ dnl Written by Paul Eggert. AC_DEFUN([gl_FUNC_GETRANDOM], [ AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) + gl_CHECK_FUNCS_ANDROID([getrandom], [[/* Additional includes are needed before <sys/random.h> on uClibc and Mac OS X. */ @@ -45,7 +47,7 @@ AC_DEFUN([gl_FUNC_GETRANDOM], fi case "$host_os" in - mingw*) + mingw* | windows*) AC_CHECK_HEADERS([bcrypt.h], [], [], [[#include <windows.h> ]]) diff --git a/m4/gettext.m4 b/m4/gettext.m4 index f449240..16f9db1 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 72 (gettext-0.21.1) -dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc. +# gettext.m4 serial 78 (gettext-0.22.4) +dnl Copyright (C) 1995-2014, 2016, 2018-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -20,11 +20,13 @@ dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010. dnl Macro to add for using GNU gettext. dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). -dnl INTLSYMBOL must be one of 'external', 'use-libtool'. -dnl INTLSYMBOL should be 'external' for packages other than GNU gettext, and -dnl 'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'. -dnl If INTLSYMBOL is 'use-libtool', then a libtool library -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, +dnl INTLSYMBOL must be one of 'external', 'use-libtool', 'here'. +dnl INTLSYMBOL should be 'external' for packages other than GNU gettext. +dnl It should be 'use-libtool' for the packages 'gettext-runtime' and +dnl 'gettext-tools'. +dnl It should be 'here' for the package 'gettext-runtime/intl'. +dnl If INTLSYMBOL is 'here', then a libtool library +dnl $(top_builddir)/libintl.la will be created (shared and/or static, dnl depending on --{enable,disable}-{shared,static} and on the presence of dnl AM-DISABLE-SHARED). dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext @@ -55,24 +57,21 @@ dnl AC_DEFUN([AM_GNU_GETTEXT], [ dnl Argument checking. - m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], , + m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], , [m4_if([$1], [here], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -])])])]) +])])])])]) m4_if(m4_if([$1], [], [old])[]m4_if([$1], [no-libtool], [old]), [old], [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported. ])]) m4_if([$2], [], , [m4_if([$2], [need-ngettext], , [m4_if([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) - define([gt_included_intl], - m4_if([$1], [external], [no], [yes])) + define([gt_building_libintl_in_same_build_tree], + m4_if([$1], [use-libtool], [yes], [m4_if([$1], [here], [yes], [no])])) gt_NEEDS_INIT AM_GNU_GETTEXT_NEED([$2]) AC_REQUIRE([AM_PO_SUBDIRS])dnl - m4_if(gt_included_intl, yes, [ - AC_REQUIRE([AM_INTL_SUBDIR])dnl - ]) dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) @@ -82,13 +81,13 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl Ideally we would do this search only after the dnl if test "$USE_NLS" = "yes"; then dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT + dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT dnl the configure script would need to contain the same shell code dnl again, outside any 'if'. There are two solutions: dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it. - m4_if(gt_included_intl, yes, , [ + m4_if(gt_building_libintl_in_same_build_tree, yes, , [ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) @@ -98,8 +97,7 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl Set USE_NLS. AC_REQUIRE([AM_NLS]) - m4_if(gt_included_intl, yes, [ - BUILD_INCLUDED_LIBINTL=no + m4_if(gt_building_libintl_in_same_build_tree, yes, [ USE_INCLUDED_LIBINTL=no ]) LIBINTL= @@ -118,7 +116,7 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no - m4_if(gt_included_intl, yes, [ + m4_if(gt_building_libintl_in_same_build_tree, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH([included-gettext], [ --with-included-gettext use the GNU gettext library included here], @@ -174,7 +172,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then dnl Sometimes libintl requires libiconv, so first search for libiconv. - m4_if(gt_included_intl, yes, , [ + m4_if(gt_building_libintl_in_same_build_tree, yes, , [ AM_ICONV_LINK ]) dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL @@ -212,9 +210,16 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION ]])], [eval "$gt_func_gnugettext_libintl=yes"], [eval "$gt_func_gnugettext_libintl=no"]) - dnl Now see whether libintl exists and depends on libiconv. - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then - LIBS="$LIBS $LIBICONV" + dnl Now see whether libintl exists and depends on libiconv or other + dnl OS dependent libraries, specifically on macOS and AIX. + gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS" + AC_REQUIRE([AC_CANONICAL_HOST]) + case "$host_os" in + aix*) gt_LIBINTL_EXTRA="-lpthread" ;; + esac + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \ + && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then + LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA" AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[ @@ -236,8 +241,8 @@ $gt_revision_test_code bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION ]])], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" + [LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA" + LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA" eval "$gt_func_gnugettext_libintl=yes" ]) fi @@ -252,7 +257,8 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then + && test "$PACKAGE" != gettext-tools \ + && test "$PACKAGE" != libintl; }; then gt_use_preinstalled_gnugettext=yes else dnl Reset the values set by searching for libintl. @@ -261,7 +267,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION INCINTL= fi - m4_if(gt_included_intl, yes, [ + m4_if(gt_building_libintl_in_same_build_tree, yes, [ if test "$gt_use_preinstalled_gnugettext" != "yes"; then dnl GNU gettext is not found in the C library. dnl Fall back on included GNU gettext library. @@ -271,7 +277,6 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. - BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD" LTLIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD" @@ -341,25 +346,39 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION POSUB=po fi - m4_if(gt_included_intl, yes, [ - dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes' - dnl because some of the testsuite requires it. - BUILD_INCLUDED_LIBINTL=yes - + m4_if(gt_building_libintl_in_same_build_tree, yes, [ dnl Make all variables we use known to autoconf. - AC_SUBST([BUILD_INCLUDED_LIBINTL]) AC_SUBST([USE_INCLUDED_LIBINTL]) AC_SUBST([CATOBJEXT]) ]) - dnl For backward compatibility. Some Makefiles may be using this. - INTLLIBS="$LIBINTL" - AC_SUBST([INTLLIBS]) + m4_if(gt_building_libintl_in_same_build_tree, yes, [], [ + dnl For backward compatibility. Some Makefiles may be using this. + INTLLIBS="$LIBINTL" + AC_SUBST([INTLLIBS]) + ]) dnl Make all documented variables known to autoconf. AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) AC_SUBST([POSUB]) + + dnl Define localedir_c and localedir_c_make. + dnl Find the final value of localedir. + gt_save_prefix="${prefix}" + gt_save_datarootdir="${datarootdir}" + gt_save_localedir="${localedir}" + dnl Unfortunately, prefix gets only finally determined at the end of + dnl configure. + if test "X$prefix" = "XNONE"; then + prefix="$ac_default_prefix" + fi + eval datarootdir="$datarootdir" + eval localedir="$localedir" + gl_BUILD_TO_HOST([localedir]) + localedir="${gt_save_localedir}" + datarootdir="${gt_save_datarootdir}" + prefix="${gt_save_prefix}" ]) diff --git a/m4/gettime.m4 b/m4/gettime.m4 index ec1f97e..1ec018d 100644 --- a/m4/gettime.m4 +++ b/m4/gettime.m4 @@ -1,5 +1,5 @@ -# gettime.m4 serial 14 -dnl Copyright (C) 2002, 2004-2006, 2009-2023 Free Software Foundation, Inc. +# gettime.m4 serial 15 +dnl Copyright (C) 2002, 2004-2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -64,5 +64,5 @@ AC_DEFUN([gl_GETTIME_RES], dnl Prerequisites of lib/gettime-res.c. AC_REQUIRE([gl_CLOCK_TIME]) AC_REQUIRE([gl_TIMESPEC]) - AC_CHECK_FUNCS_ONCE([timespec_getres]) + gl_CHECK_FUNCS_ANDROID([timespec_getres], [[#include <time.h>]]) ]) diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index 5051d61..3526991 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ -# serial 29 +# serial 30 -# Copyright (C) 2001-2003, 2005, 2007, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ int gettimeofday (struct timeval *restrict, struct timezone *restrict); dnl On mingw, the original gettimeofday has only a precision of 15.6 dnl milliseconds. So override it. case "$host_os" in - mingw*) REPLACE_GETTIMEOFDAY=1 ;; + mingw* | windows*) REPLACE_GETTIMEOFDAY=1 ;; esac fi AC_DEFINE_UNQUOTED([GETTIMEOFDAY_TIMEZONE], [$gl_gettimeofday_timezone], diff --git a/m4/gl-openssl.m4 b/m4/gl-openssl.m4 index 7eab4e1..7f38955 100644 --- a/m4/gl-openssl.m4 +++ b/m4/gl-openssl.m4 @@ -1,5 +1,5 @@ -# gl-openssl.m4 serial 6 -dnl Copyright (C) 2013-2023 Free Software Foundation, Inc. +# gl-openssl.m4 serial 7 +dnl Copyright (C) 2013-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -39,6 +39,9 @@ AC_DEFUN([gl_CRYPTO_CHECK], AC_SUBST([LIB_CRYPTO]) if test "x$with_openssl" != xno; then if test "x$with_openssl" = xauto-gpl-compat; then + dnl OpenSSL versions < 3 are under the OpenSSL license, which is not + dnl GPL compatible. + dnl See <https://www.gnu.org/licenses/license-list.en.html#OpenSSL>. AC_CACHE_CHECK([whether openssl is GPL compatible], [gl_cv_openssl_gpl_compat], [AC_COMPILE_IFELSE( diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index edb8572..d8d0904 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 86 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# gnulib-common.m4 serial 92 +dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -76,48 +76,58 @@ AC_DEFUN([gl_COMMON_BODY], [ #endif]) AH_VERBATIM([attribute], [/* Attributes. */ -#if (defined __has_attribute \ - && (!defined __clang_minor__ \ - || (defined __apple_build_version__ \ - ? 6000000 <= __apple_build_version__ \ - : 5 <= __clang_major__))) -# define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) -#else -# define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr -# define _GL_ATTR_alloc_size _GL_GNUC_PREREQ (4, 3) -# define _GL_ATTR_always_inline _GL_GNUC_PREREQ (3, 2) -# define _GL_ATTR_artificial _GL_GNUC_PREREQ (4, 3) -# define _GL_ATTR_cold _GL_GNUC_PREREQ (4, 3) -# define _GL_ATTR_const _GL_GNUC_PREREQ (2, 95) -# define _GL_ATTR_deprecated _GL_GNUC_PREREQ (3, 1) -# define _GL_ATTR_diagnose_if 0 -# define _GL_ATTR_error _GL_GNUC_PREREQ (4, 3) -# define _GL_ATTR_externally_visible _GL_GNUC_PREREQ (4, 1) -# define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) -# define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) -# define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) -# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) -# ifdef _ICC -# define _GL_ATTR_may_alias 0 +/* Define _GL_HAS_ATTRIBUTE only once, because on FreeBSD, with gcc < 5, if + <config.h> gets included once again after <sys/cdefs.h>, __has_attribute(x) + expands to 0 always, and redefining _GL_HAS_ATTRIBUTE would turn off all + attributes. */ +#ifndef _GL_HAS_ATTRIBUTE +# if (defined __has_attribute \ + && (!defined __clang_minor__ \ + || (defined __apple_build_version__ \ + ? 7000000 <= __apple_build_version__ \ + : 5 <= __clang_major__))) +# define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) # else -# define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) +# define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr +# define _GL_ATTR_alloc_size _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_always_inline _GL_GNUC_PREREQ (3, 2) +# define _GL_ATTR_artificial _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_cold _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_const _GL_GNUC_PREREQ (2, 95) +# define _GL_ATTR_deprecated _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_diagnose_if 0 +# define _GL_ATTR_error _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_externally_visible _GL_GNUC_PREREQ (4, 1) +# define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) +# define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) +# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) +# ifdef _ICC +# define _GL_ATTR_may_alias 0 +# else +# define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) +# endif +# define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) +# define _GL_ATTR_nothrow _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_packed _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_pure _GL_GNUC_PREREQ (2, 96) +# define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9) +# define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0) +# define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) # endif -# define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) -# define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) -# define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) -# define _GL_ATTR_nothrow _GL_GNUC_PREREQ (3, 3) -# define _GL_ATTR_packed _GL_GNUC_PREREQ (2, 7) -# define _GL_ATTR_pure _GL_GNUC_PREREQ (2, 96) -# define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9) -# define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0) -# define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7) -# define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) #endif -/* Disable GCC -Wpedantic if using __has_c_attribute and this is not C23+. */ -#if (defined __has_c_attribute && _GL_GNUC_PREREQ (4, 6) \ - && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710) -# pragma GCC diagnostic ignored "-Wpedantic" +/* Use __has_c_attribute if available. However, do not use with + pre-C23 GCC, which can issue false positives if -Wpedantic. */ +#if (defined __has_c_attribute \ + && ! (_GL_GNUC_PREREQ (4, 6) \ + && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710)) +# define _GL_HAVE___HAS_C_ATTRIBUTE 1 +#else +# define _GL_HAVE___HAS_C_ATTRIBUTE 0 #endif /* Define if, in a function declaration, the attributes in bracket syntax @@ -242,7 +252,7 @@ AC_DEFUN([gl_COMMON_BODY], [ in C++ also: namespace, class, template specialization. */ #ifndef _GL_ATTRIBUTE_DEPRECATED # ifndef _GL_BRACKET_BEFORE_ATTRIBUTE -# ifdef __has_c_attribute +# if _GL_HAVE___HAS_C_ATTRIBUTE # if __has_c_attribute (__deprecated__) # define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] # endif @@ -291,7 +301,7 @@ AC_DEFUN([gl_COMMON_BODY], [ /* Applies to: Empty statement (;), inside a 'switch' statement. */ /* Always expands to something. */ #ifndef _GL_ATTRIBUTE_FALLTHROUGH -# ifdef __has_c_attribute +# if _GL_HAVE___HAS_C_ATTRIBUTE # if __has_c_attribute (__fallthrough__) # define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] # endif @@ -380,7 +390,7 @@ AC_DEFUN([gl_COMMON_BODY], [ # if !defined __apple_build_version__ && __clang_major__ >= 10 # define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] # endif -# elif defined __has_c_attribute +# elif _GL_HAVE___HAS_C_ATTRIBUTE # if __has_c_attribute (__maybe_unused__) # define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] # endif @@ -411,7 +421,7 @@ AC_DEFUN([gl_COMMON_BODY], [ # if __clang_major__ >= 1000 # define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] # endif -# elif defined __has_c_attribute +# elif _GL_HAVE___HAS_C_ATTRIBUTE # if __has_c_attribute (__nodiscard__) # define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] # endif @@ -466,11 +476,25 @@ AC_DEFUN([gl_COMMON_BODY], [ /* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions. */ /* Applies to: functions. */ +/* After a function's parameter list, this attribute must come first, before + other attributes. */ #ifndef _GL_ATTRIBUTE_NOTHROW -# if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus -# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +# if defined __cplusplus +# if _GL_GNUC_PREREQ (2, 8) || __clang_major >= 4 +# if __cplusplus >= 201103L +# define _GL_ATTRIBUTE_NOTHROW noexcept (true) +# else +# define _GL_ATTRIBUTE_NOTHROW throw () +# endif +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif # else -# define _GL_ATTRIBUTE_NOTHROW +# if _GL_HAS_ATTRIBUTE (nothrow) +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif # endif #endif @@ -1056,6 +1080,7 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS], dnl -Wno-pedantic >= 4.8 >= 3.9 dnl -Wno-sign-compare >= 3 >= 3.9 dnl -Wno-sign-conversion >= 4.3 >= 3.9 + dnl -Wno-tautological-out-of-range-compare - >= 3.9 dnl -Wno-type-limits >= 4.3 >= 3.9 dnl -Wno-undef >= 3 >= 3.9 dnl -Wno-unsuffixed-float-constants >= 4.5 @@ -1081,6 +1106,9 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS], #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) -Wno-pedantic #endif + #if 3 < __clang_major__ + (9 <= __clang_minor__) + -Wno-tautological-constant-out-of-range-compare + #endif #if __GNUC__ + (__GNUC_MINOR__ >= 3) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) -Wno-sign-conversion -Wno-type-limits @@ -1144,12 +1172,12 @@ AC_DEFUN([gl_PREPARE_CHECK_FUNCS_MACOS], if test $gl_cv_compiler_clang = yes; then dnl Test whether the compiler supports the option dnl '-Werror=unguarded-availability-new'. - save_ac_compile="$ac_compile" + saved_ac_compile="$ac_compile" ac_compile="$ac_compile -Werror=unguarded-availability-new" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])], [gl_cv_compiler_check_future_option='-Werror=unguarded-availability-new'], [gl_cv_compiler_check_future_option=none]) - ac_compile="$save_ac_compile" + ac_compile="$saved_ac_compile" else gl_cv_compiler_check_future_option=none fi @@ -1197,14 +1225,14 @@ AC_DEFUN([gl_CHECK_FUNCS_CASE_FOR_MACOS], darwin*) if test "x$gl_cv_compiler_check_future_option" != "xnone"; then dnl Use a compile test, not a link test. - save_ac_compile="$ac_compile" + saved_ac_compile="$ac_compile" ac_compile="$ac_compile $gl_cv_compiler_check_future_option" - save_ac_compile_for_check_decl="$ac_compile_for_check_decl" + saved_ac_compile_for_check_decl="$ac_compile_for_check_decl" ac_compile_for_check_decl="$ac_compile_for_check_decl $gl_cv_compiler_check_future_option" unset [ac_cv_have_decl_][$1] AC_CHECK_DECL([$1], , , [$2]) - ac_compile="$save_ac_compile" - ac_compile_for_check_decl="$save_ac_compile_for_check_decl" + ac_compile="$saved_ac_compile" + ac_compile_for_check_decl="$saved_ac_compile_for_check_decl" [ac_cv_func_][$1]="$[ac_cv_have_decl_][$1]" if test $[ac_cv_func_][$1] = yes; then [gl_cv_onwards_func_][$1]=yes diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index d0c35e8..96bbdc2 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1,5 +1,5 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2023 Free Software Foundation, Inc. +# Copyright (C) 2002-2024 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -60,6 +60,7 @@ AC_DEFUN([gl_EARLY], # Code from module binary-io: # Code from module bind: # Code from module bitrotate: + # Code from module btoc32: # Code from module btowc: # Code from module builtin-expect: # Code from module byteswap: @@ -67,6 +68,22 @@ AC_DEFUN([gl_EARLY], # Code from module c-strcase: # Code from module c-strcaseeq: # Code from module c-strcasestr: + # Code from module c32_apply_type_test: + # Code from module c32_get_type_test: + # Code from module c32isalnum: + # Code from module c32isalpha: + # Code from module c32isblank: + # Code from module c32iscntrl: + # Code from module c32isdigit: + # Code from module c32isgraph: + # Code from module c32islower: + # Code from module c32isprint: + # Code from module c32ispunct: + # Code from module c32isspace: + # Code from module c32isupper: + # Code from module c32isxdigit: + # Code from module c32tolower: + # Code from module c32width: # Code from module c99: # Code from module calloc-gnu: # Code from module calloc-posix: @@ -99,6 +116,7 @@ AC_DEFUN([gl_EARLY], # Code from module dirfd: # Code from module dirname: # Code from module dirname-lgpl: + # Code from module do-release-commit-and-tag: # Code from module double-slash-root: # Code from module dup: # Code from module dup2: @@ -191,7 +209,9 @@ AC_DEFUN([gl_EARLY], # Code from module ioctl: # Code from module isblank: # Code from module iswblank: + # Code from module iswctype: # Code from module iswdigit: + # Code from module iswpunct: # Code from module iswxdigit: # Code from module langinfo: # Code from module largefile: @@ -213,9 +233,12 @@ AC_DEFUN([gl_EARLY], # Code from module malloca: # Code from module mbchar: # Code from module mbiter: + # Code from module mbrtoc32: # Code from module mbrtowc: # Code from module mbsinit: + # Code from module mbsrtoc32s: # Code from module mbsrtowcs: + # Code from module mbszero: # Code from module mbtowc: # Code from module memchr: # Code from module mempcpy: @@ -282,6 +305,7 @@ AC_DEFUN([gl_EARLY], # Code from module send: # Code from module servent: # Code from module setlocale-null: + # Code from module setlocale-null-unlocked: # Code from module setsockopt: # Code from module sh-filename: # Code from module sigaction: @@ -350,6 +374,7 @@ AC_DEFUN([gl_EARLY], # Code from module timespec: # Code from module tmpdir: # Code from module u64: + # Code from module uchar: # Code from module unicase/base: # Code from module unicase/cased: # Code from module unicase/empty-prefix-context: @@ -361,6 +386,18 @@ AC_DEFUN([gl_EARLY], # Code from module unicase/u8-tolower: # Code from module unictype/base: # Code from module unictype/combining-class: + # Code from module unictype/ctype-alnum: + # Code from module unictype/ctype-alpha: + # Code from module unictype/ctype-blank: + # Code from module unictype/ctype-cntrl: + # Code from module unictype/ctype-digit: + # Code from module unictype/ctype-graph: + # Code from module unictype/ctype-lower: + # Code from module unictype/ctype-print: + # Code from module unictype/ctype-punct: + # Code from module unictype/ctype-space: + # Code from module unictype/ctype-upper: + # Code from module unictype/ctype-xdigit: # Code from module unictype/property-soft-dotted: # Code from module uninorm/base: # Code from module uninorm/decompose-internal: @@ -368,6 +405,11 @@ AC_DEFUN([gl_EARLY], # Code from module unistd: # Code from module unistd-safer: # Code from module unistr/base: + # Code from module unistr/u32-chr: + # Code from module unistr/u32-cpy: + # Code from module unistr/u32-pcpy: + # Code from module unistr/u32-strcat: + # Code from module unistr/u32-strlen: # Code from module unistr/u8-cpy: # Code from module unistr/u8-mbtouc-unsafe: # Code from module unistr/u8-strlen: @@ -394,6 +436,7 @@ AC_DEFUN([gl_EARLY], # Code from module warnings: # Code from module wchar: # Code from module wcrtomb: + # Code from module wctype: # Code from module wctype-h: # Code from module wcwidth: # Code from module windows-mutex: @@ -453,6 +496,7 @@ AC_DEFUN([gl_INIT], AC_REQUIRE([gl_SYS_SOCKET_H]) gl_CONDITIONAL([GL_COND_OBJ_BIND], [test "$ac_cv_header_winsock2_h" = yes]) gl_SYS_SOCKET_MODULE_INDICATOR([bind]) + gl_UCHAR_MODULE_INDICATOR([btoc32]) gl_FUNC_BTOWC gl_CONDITIONAL([GL_COND_OBJ_BTOWC], [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1]) @@ -464,6 +508,92 @@ AC_DEFUN([gl_INIT], gl_BYTESWAP gl_CONDITIONAL_HEADER([byteswap.h]) AC_PROG_MKDIR_P + gl_UCHAR_MODULE_INDICATOR([c32_apply_type_test]) + gl_UCHAR_MODULE_INDICATOR([c32_get_type_test]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32isalnum]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32isalpha]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32isblank]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32iscntrl]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32isdigit]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32isgraph]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32islower]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32isprint]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32ispunct]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32isspace]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32isupper]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32isxdigit]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32tolower]) + AC_REQUIRE([gl_UCHAR_H]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how mbrtoc32 is implemented. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + gl_UCHAR_MODULE_INDICATOR([c32width]) gl_FUNC_CALLOC_GNU if test $REPLACE_CALLOC_FOR_CALLOC_GNU = 1; then AC_LIBOBJ([calloc]) @@ -550,7 +680,7 @@ AC_DEFUN([gl_INIT], AC_PROG_MKDIR_P AC_REQUIRE([gl_ERROR_H]) gl_ERROR - gl_CONDITIONAL([GL_COND_OBJ_ERROR], [test $GL_GENERATE_ERROR_H = true]) + gl_CONDITIONAL([GL_COND_OBJ_ERROR], [test $COMPILE_ERROR_C = 1]) AM_COND_IF([GL_COND_OBJ_ERROR], [ gl_PREREQ_ERROR ]) @@ -558,12 +688,12 @@ AC_DEFUN([gl_INIT], [AM_][XGETTEXT_OPTION([--flag=error:3:c-format]) AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])]) gl_ERROR_H - gl_CONDITIONAL_HEADER([error.h]) AC_PROG_MKDIR_P AC_REQUIRE([gl_EXTERN_INLINE]) gl_FATAL_SIGNAL gl_FUNC_FCHDIR - gl_CONDITIONAL([GL_COND_OBJ_FCHDIR], [test $HAVE_FCHDIR = 0]) + gl_CONDITIONAL([GL_COND_OBJ_FCHDIR], + [test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1]) AM_COND_IF([GL_COND_OBJ_FCHDIR], [ gl_PREREQ_FCHDIR ]) @@ -658,7 +788,7 @@ AC_DEFUN([gl_INIT], gl_CONDITIONAL([GL_COND_OBJ_FSTAT], [test $REPLACE_FSTAT = 1]) AM_COND_IF([GL_COND_OBJ_FSTAT], [ case "$host_os" in - mingw*) + mingw* | windows*) AC_LIBOBJ([stat-w32]) ;; esac @@ -837,10 +967,18 @@ AC_DEFUN([gl_INIT], gl_CONDITIONAL([GL_COND_OBJ_ISWBLANK], [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && { test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; }]) gl_WCTYPE_MODULE_INDICATOR([iswblank]) + gl_FUNC_ISWCTYPE + gl_CONDITIONAL([GL_COND_OBJ_ISWCTYPE], + [test $HAVE_WCTYPE_T = 0 || test $GNULIBHEADERS_OVERRIDE_WINT_T = 1 || test $REPLACE_WCTYPE = 1]) + gl_WCTYPE_MODULE_INDICATOR([iswctype]) gl_FUNC_ISWDIGIT gl_CONDITIONAL([GL_COND_OBJ_ISWDIGIT], [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && test $REPLACE_ISWDIGIT = 1]) gl_WCTYPE_MODULE_INDICATOR([iswdigit]) + gl_FUNC_ISWPUNCT + gl_CONDITIONAL([GL_COND_OBJ_ISWPUNCT], + [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && test $REPLACE_ISWPUNCT = 1]) + gl_WCTYPE_MODULE_INDICATOR([iswpunct]) gl_FUNC_ISWXDIGIT gl_CONDITIONAL([GL_COND_OBJ_ISWXDIGIT], [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && test $REPLACE_ISWXDIGIT = 1]) @@ -902,6 +1040,18 @@ AC_DEFUN([gl_INIT], gl_MALLOCA gl_MBCHAR gl_MBITER + gl_FUNC_MBRTOC32 + gl_CONDITIONAL([GL_COND_OBJ_MBRTOC32], + [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]) + AM_COND_IF([GL_COND_OBJ_MBRTOC32], [ + if test $REPLACE_MBSTATE_T = 1; then + AC_LIBOBJ([lc-charset-dispatch]) + AC_LIBOBJ([mbtowc-lock]) + gl_PREREQ_MBTOWC_LOCK + fi + gl_PREREQ_MBRTOC32 + ]) + gl_UCHAR_MODULE_INDICATOR([mbrtoc32]) gl_FUNC_MBRTOWC gl_CONDITIONAL([GL_COND_OBJ_MBRTOWC], [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]) @@ -921,6 +1071,9 @@ AC_DEFUN([gl_INIT], gl_PREREQ_MBSINIT ]) gl_WCHAR_MODULE_INDICATOR([mbsinit]) + AC_REQUIRE([gl_UCHAR_H]) + AC_LIBOBJ([mbsrtoc32s-state]) + gl_UCHAR_MODULE_INDICATOR([mbsrtoc32s]) gl_FUNC_MBSRTOWCS gl_CONDITIONAL([GL_COND_OBJ_MBSRTOWCS], [test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1]) @@ -929,6 +1082,10 @@ AC_DEFUN([gl_INIT], gl_PREREQ_MBSRTOWCS ]) gl_WCHAR_MODULE_INDICATOR([mbsrtowcs]) + AC_REQUIRE([AC_TYPE_MBSTATE_T]) + gl_MBSTATE_T_BROKEN + gl_MUSL_LIBC + gl_WCHAR_MODULE_INDICATOR([mbszero]) gl_FUNC_MBTOWC gl_CONDITIONAL([GL_COND_OBJ_MBTOWC], [test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1]) @@ -1256,7 +1413,7 @@ AC_DEFUN([gl_INIT], gl_CONDITIONAL([GL_COND_OBJ_STAT], [test $REPLACE_STAT = 1]) AM_COND_IF([GL_COND_OBJ_STAT], [ case "$host_os" in - mingw*) + mingw* | windows*) AC_LIBOBJ([stat-w32]) ;; esac @@ -1360,7 +1517,7 @@ AC_DEFUN([gl_INIT], gl_PREREQ_STRERROR_R ]) gl_STRING_MODULE_INDICATOR([strerror_r]) - dnl For the modules argp, error. + dnl For the modules argp, error, xstrerror. gl_MODULE_INDICATOR([strerror_r-posix]) gl_STRING_H gl_STRING_H_REQUIRE_DEFAULTS @@ -1466,6 +1623,9 @@ AC_DEFUN([gl_INIT], gl_TIME_MODULE_INDICATOR([timegm]) gl_TIMESPEC gt_TMPDIR + gl_UCHAR_H + gl_UCHAR_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P gl_LIBUNISTRING_LIBHEADER([1.2], [unicase.h]) gl_UNICASE_H gl_UNICASE_H_REQUIRE_DEFAULTS @@ -1485,6 +1645,30 @@ AC_DEFUN([gl_INIT], AC_PROG_MKDIR_P gl_LIBUNISTRING_MODULE([1.1], [unictype/combining-class]) AC_REQUIRE([AC_C_INLINE]) + gl_LIBUNISTRING_MODULE([1.2], [unictype/ctype-alnum]) + AC_REQUIRE([AC_C_INLINE]) + gl_LIBUNISTRING_MODULE([1.2], [unictype/ctype-alpha]) + AC_REQUIRE([AC_C_INLINE]) + gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-blank]) + AC_REQUIRE([AC_C_INLINE]) + gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-cntrl]) + AC_REQUIRE([AC_C_INLINE]) + gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-digit]) + AC_REQUIRE([AC_C_INLINE]) + gl_LIBUNISTRING_MODULE([1.2], [unictype/ctype-graph]) + AC_REQUIRE([AC_C_INLINE]) + gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-lower]) + AC_REQUIRE([AC_C_INLINE]) + gl_LIBUNISTRING_MODULE([1.2], [unictype/ctype-print]) + AC_REQUIRE([AC_C_INLINE]) + gl_LIBUNISTRING_MODULE([1.2], [unictype/ctype-punct]) + AC_REQUIRE([AC_C_INLINE]) + gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-space]) + AC_REQUIRE([AC_C_INLINE]) + gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-upper]) + AC_REQUIRE([AC_C_INLINE]) + gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-xdigit]) + AC_REQUIRE([AC_C_INLINE]) gl_UNICTYPE_H_REQUIRE_DEFAULTS gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-soft-dotted]) gl_LIBUNISTRING_LIBHEADER([1.2], [uninorm.h]) @@ -1497,8 +1681,13 @@ AC_DEFUN([gl_INIT], gl_UNISTD_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P gl_UNISTD_SAFER - gl_LIBUNISTRING_LIBHEADER([0.9.11], [unistr.h]) + gl_LIBUNISTRING_LIBHEADER([1.2], [unistr.h]) AC_PROG_MKDIR_P + gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-chr]) + gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-cpy]) + gl_LIBUNISTRING_MODULE([1.2], [unistr/u32-pcpy]) + gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strcat]) + gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strlen]) gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-cpy]) gl_MODULE_INDICATOR([unistr/u8-mbtouc-unsafe]) gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-mbtouc-unsafe]) @@ -1524,7 +1713,7 @@ AC_DEFUN([gl_INIT], ]) gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniwidth.h]) AC_PROG_MKDIR_P - gl_LIBUNISTRING_MODULE([1.1], [uniwidth/width]) + gl_LIBUNISTRING_MODULE([1.2], [uniwidth/width]) gl_FUNC_UNLINK gl_CONDITIONAL([GL_COND_OBJ_UNLINK], [test $REPLACE_UNLINK = 1]) gl_UNISTD_MODULE_INDICATOR([unlink]) @@ -1574,6 +1763,9 @@ AC_DEFUN([gl_INIT], gl_PREREQ_WCRTOMB ]) gl_WCHAR_MODULE_INDICATOR([wcrtomb]) + gl_FUNC_WCTYPE + gl_CONDITIONAL([GL_COND_OBJ_WCTYPE], [test $HAVE_WCTYPE = 0 || test $REPLACE_WCTYPE = 1]) + gl_WCTYPE_MODULE_INDICATOR([wctype]) gl_WCTYPE_H gl_WCTYPE_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P @@ -1586,19 +1778,19 @@ AC_DEFUN([gl_INIT], gl_WCHAR_MODULE_INDICATOR([wcwidth]) AC_REQUIRE([AC_CANONICAL_HOST]) gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_MUTEX], - [case "$host_os" in mingw*) true;; *) false;; esac]) + [case "$host_os" in mingw* | windows*) true;; *) false;; esac]) AC_REQUIRE([AC_CANONICAL_HOST]) gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_ONCE], - [case "$host_os" in mingw*) true;; *) false;; esac]) + [case "$host_os" in mingw* | windows*) true;; *) false;; esac]) AC_REQUIRE([AC_CANONICAL_HOST]) gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_RECMUTEX], - [case "$host_os" in mingw*) true;; *) false;; esac]) + [case "$host_os" in mingw* | windows*) true;; *) false;; esac]) AC_REQUIRE([AC_CANONICAL_HOST]) gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_RWLOCK], - [case "$host_os" in mingw*) true;; *) false;; esac]) + [case "$host_os" in mingw* | windows*) true;; *) false;; esac]) AC_REQUIRE([AC_CANONICAL_HOST]) gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_SPAWN], - [case "$host_os" in mingw*) true;; *) false;; esac]) + [case "$host_os" in mingw* | windows*) true;; *) false;; esac]) gl_FUNC_WMEMCHR gl_CONDITIONAL([GL_COND_OBJ_WMEMCHR], [test $HAVE_WMEMCHR = 0]) gl_WCHAR_MODULE_INDICATOR([wmemchr]) @@ -1791,6 +1983,7 @@ AC_DEFUN([gltests_LIBSOURCES], [ AC_DEFUN([gl_FILE_LIST], [ build-aux/announce-gen build-aux/config.rpath + build-aux/do-release-commit-and-tag build-aux/gendocs.sh build-aux/git-version-gen build-aux/gitlog-to-changelog @@ -1827,6 +2020,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/bind.c lib/bitrotate.c lib/bitrotate.h + lib/btoc32.c lib/btowc.c lib/byteswap.in.h lib/c++defs.h @@ -1838,6 +2032,24 @@ AC_DEFUN([gl_FILE_LIST], [ lib/c-strcasestr.c lib/c-strcasestr.h lib/c-strncasecmp.c + lib/c32_apply_type_test.c + lib/c32_get_type_test.c + lib/c32is-impl.h + lib/c32isalnum.c + lib/c32isalpha.c + lib/c32isblank.c + lib/c32iscntrl.c + lib/c32isdigit.c + lib/c32isgraph.c + lib/c32islower.c + lib/c32isprint.c + lib/c32ispunct.c + lib/c32isspace.c + lib/c32isupper.c + lib/c32isxdigit.c + lib/c32to-impl.h + lib/c32tolower.c + lib/c32width.c lib/calloc.c lib/canonicalize-lgpl.c lib/canonicalize.c @@ -1959,7 +2171,10 @@ AC_DEFUN([gl_FILE_LIST], [ lib/ioctl.c lib/isblank.c lib/iswblank.c + lib/iswctype-impl.h + lib/iswctype.c lib/iswdigit.c + lib/iswpunct.c lib/iswxdigit.c lib/itold.c lib/langinfo.in.h @@ -1994,13 +2209,17 @@ AC_DEFUN([gl_FILE_LIST], [ lib/mbchar.h lib/mbiter.c lib/mbiter.h + lib/mbrtoc32.c lib/mbrtowc-impl-utf8.h lib/mbrtowc-impl.h lib/mbrtowc.c lib/mbsinit.c + lib/mbsrtoc32s-state.c + lib/mbsrtoc32s.c lib/mbsrtowcs-impl.h lib/mbsrtowcs-state.c lib/mbsrtowcs.c + lib/mbszero.c lib/mbtowc-impl.h lib/mbtowc-lock.c lib/mbtowc-lock.h @@ -2073,6 +2292,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/rename.c lib/rewinddir.c lib/rmdir.c + lib/same-inode.c lib/same-inode.h lib/save-cwd.c lib/save-cwd.h @@ -2082,6 +2302,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/select.c lib/send.c lib/setlocale-lock.c + lib/setlocale_null-unlocked.c lib/setlocale_null.c lib/setlocale_null.h lib/setsockopt.c @@ -2184,6 +2405,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/tmpdir.h lib/u64.c lib/u64.h + lib/uchar.in.h lib/unicase.in.h lib/unicase/cased.c lib/unicase/cased.h @@ -2207,6 +2429,30 @@ AC_DEFUN([gl_FILE_LIST], [ lib/unictype/bitmap.h lib/unictype/combiningclass.c lib/unictype/combiningclass.h + lib/unictype/ctype_alnum.c + lib/unictype/ctype_alnum.h + lib/unictype/ctype_alpha.c + lib/unictype/ctype_alpha.h + lib/unictype/ctype_blank.c + lib/unictype/ctype_blank.h + lib/unictype/ctype_cntrl.c + lib/unictype/ctype_cntrl.h + lib/unictype/ctype_digit.c + lib/unictype/ctype_digit.h + lib/unictype/ctype_graph.c + lib/unictype/ctype_graph.h + lib/unictype/ctype_lower.c + lib/unictype/ctype_lower.h + lib/unictype/ctype_print.c + lib/unictype/ctype_print.h + lib/unictype/ctype_punct.c + lib/unictype/ctype_punct.h + lib/unictype/ctype_space.c + lib/unictype/ctype_space.h + lib/unictype/ctype_upper.c + lib/unictype/ctype_upper.h + lib/unictype/ctype_xdigit.c + lib/unictype/ctype_xdigit.h lib/unictype/pr_soft_dotted.c lib/unictype/pr_soft_dotted.h lib/uninorm.in.h @@ -2221,6 +2467,14 @@ AC_DEFUN([gl_FILE_LIST], [ lib/unistd.in.h lib/unistr.in.h lib/unistr/u-cpy.h + lib/unistr/u-pcpy.h + lib/unistr/u-strcat.h + lib/unistr/u-strlen.h + lib/unistr/u32-chr.c + lib/unistr/u32-cpy.c + lib/unistr/u32-pcpy.c + lib/unistr/u32-strcat.c + lib/unistr/u32-strlen.c lib/unistr/u8-cpy.c lib/unistr/u8-mbtouc-unsafe-aux.c lib/unistr/u8-mbtouc-unsafe.c @@ -2252,6 +2506,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/wchar.in.h lib/wcrtomb.c lib/wctype-h.c + lib/wctype-impl.h + lib/wctype.c lib/wctype.in.h lib/wcwidth.c lib/windows-initguard.h @@ -2373,7 +2629,9 @@ AC_DEFUN([gl_FILE_LIST], [ m4/ioctl.m4 m4/isblank.m4 m4/iswblank.m4 + m4/iswctype.m4 m4/iswdigit.m4 + m4/iswpunct.m4 m4/iswxdigit.m4 m4/langinfo_h.m4 m4/largefile.m4 @@ -2399,6 +2657,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/math_h.m4 m4/mbchar.m4 m4/mbiter.m4 + m4/mbrtoc32.m4 m4/mbrtowc.m4 m4/mbsinit.m4 m4/mbsrtowcs.m4 @@ -2521,6 +2780,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/timespec.m4 m4/tm_gmtoff.m4 m4/tmpdir.m4 + m4/uchar_h.m4 m4/ungetc.m4 m4/unicase_h.m4 m4/unictype_h.m4 @@ -2545,6 +2805,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/wchar_h.m4 m4/wchar_t.m4 m4/wcrtomb.m4 + m4/wctype.m4 m4/wctype_h.m4 m4/wcwidth.m4 m4/wint_t.m4 diff --git a/m4/group-member.m4 b/m4/group-member.m4 index 7c56ee3..60b3d52 100644 --- a/m4/group-member.m4 +++ b/m4/group-member.m4 @@ -1,6 +1,6 @@ # serial 14 -# Copyright (C) 1999-2001, 2003-2007, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2007, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4 index 134f228..e860a19 100644 --- a/m4/host-cpu-c-abi.m4 +++ b/m4/host-cpu-c-abi.m4 @@ -1,5 +1,5 @@ -# host-cpu-c-abi.m4 serial 15 -dnl Copyright (C) 2002-2023 Free Software Foundation, Inc. +# host-cpu-c-abi.m4 serial 17 +dnl Copyright (C) 2002-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -461,217 +461,66 @@ EOF dnl Sets the HOST_CPU_C_ABI_32BIT variable to 'yes' if the C language ABI dnl (application binary interface) is a 32-bit one, to 'no' if it is a 64-bit -dnl one, or to 'unknown' if unknown. +dnl one. dnl This is a simplified variant of gl_HOST_CPU_C_ABI. AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT], [ AC_REQUIRE([AC_CANONICAL_HOST]) AC_CACHE_CHECK([32-bit host C ABI], [gl_cv_host_cpu_c_abi_32bit], - [if test -n "$gl_cv_host_cpu_c_abi"; then - case "$gl_cv_host_cpu_c_abi" in - i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) - gl_cv_host_cpu_c_abi_32bit=yes ;; - x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) - gl_cv_host_cpu_c_abi_32bit=no ;; - *) - gl_cv_host_cpu_c_abi_32bit=unknown ;; - esac - else - case "$host_cpu" in - - # CPUs that only support a 32-bit ABI. - arc \ - | bfin \ - | cris* \ - | csky \ - | epiphany \ - | ft32 \ - | h8300 \ - | m68k \ - | microblaze | microblazeel \ - | nds32 | nds32le | nds32be \ - | nios2 | nios2eb | nios2el \ - | or1k* \ - | or32 \ - | sh | sh[1234] | sh[1234]e[lb] \ - | tic6x \ - | xtensa* ) - gl_cv_host_cpu_c_abi_32bit=yes - ;; + [case "$host_cpu" in - # CPUs that only support a 64-bit ABI. -changequote(,)dnl - alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ - | mmix ) -changequote([,])dnl - gl_cv_host_cpu_c_abi_32bit=no - ;; + # CPUs that only support a 32-bit ABI. + arc \ + | bfin \ + | cris* \ + | csky \ + | epiphany \ + | ft32 \ + | h8300 \ + | m68k \ + | microblaze | microblazeel \ + | nds32 | nds32le | nds32be \ + | nios2 | nios2eb | nios2el \ + | or1k* \ + | or32 \ + | sh | sh[1234] | sh[1234]e[lb] \ + | tic6x \ + | xtensa* ) + gl_cv_host_cpu_c_abi_32bit=yes + ;; + # CPUs that only support a 64-bit ABI. changequote(,)dnl - i[34567]86 ) + alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ + | mmix ) changequote([,])dnl - gl_cv_host_cpu_c_abi_32bit=yes - ;; - - x86_64 ) - # On x86_64 systems, the C compiler may be generating code in one of - # these ABIs: - # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64. - # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64 - # with native Windows (mingw, MSVC). - # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32. - # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if (defined __x86_64__ || defined __amd64__ \ - || defined _M_X64 || defined _M_AMD64) \ - && !(defined __ILP32__ || defined _ILP32) - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi_32bit=no], - [gl_cv_host_cpu_c_abi_32bit=yes]) - ;; - - arm* | aarch64 ) - # Assume arm with EABI. - # On arm64 systems, the C compiler may be generating code in one of - # these ABIs: - # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64. - # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32. - # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32) - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi_32bit=no], - [gl_cv_host_cpu_c_abi_32bit=yes]) - ;; - - hppa1.0 | hppa1.1 | hppa2.0* | hppa64 ) - # On hppa, the C compiler may be generating 32-bit code or 64-bit - # code. In the latter case, it defines _LP64 and __LP64__. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#ifdef __LP64__ - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi_32bit=no], - [gl_cv_host_cpu_c_abi_32bit=yes]) - ;; - - ia64* ) - # On ia64 on HP-UX, the C compiler may be generating 64-bit code or - # 32-bit code. In the latter case, it defines _ILP32. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#ifdef _ILP32 - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi_32bit=yes], - [gl_cv_host_cpu_c_abi_32bit=no]) - ;; - - mips* ) - # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this - # at 32. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64) - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi_32bit=no], - [gl_cv_host_cpu_c_abi_32bit=yes]) - ;; - - powerpc* ) - # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD. - # No need to distinguish them here; the caller may distinguish - # them based on the OS. - # On powerpc64 systems, the C compiler may still be generating - # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may - # be generating 64-bit code. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined __powerpc64__ || defined __LP64__ - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi_32bit=no], - [gl_cv_host_cpu_c_abi_32bit=yes]) - ;; - - rs6000 ) - gl_cv_host_cpu_c_abi_32bit=yes - ;; - - riscv32 | riscv64 ) - # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d. - # Size of 'long' and 'void *': - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined __LP64__ - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi_32bit=no], - [gl_cv_host_cpu_c_abi_32bit=yes]) - ;; - - s390* ) - # On s390x, the C compiler may be generating 64-bit (= s390x) code - # or 31-bit (= s390) code. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined __LP64__ || defined __s390x__ - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi_32bit=no], - [gl_cv_host_cpu_c_abi_32bit=yes]) - ;; + gl_cv_host_cpu_c_abi_32bit=no + ;; - sparc | sparc64 ) - # UltraSPARCs running Linux have `uname -m` = "sparc64", but the - # C compiler still generates 32-bit code. + *) + if test -n "$gl_cv_host_cpu_c_abi"; then + dnl gl_HOST_CPU_C_ABI has already been run. Use its result. + case "$gl_cv_host_cpu_c_abi" in + i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) + gl_cv_host_cpu_c_abi_32bit=yes ;; + x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + gl_cv_host_cpu_c_abi_32bit=no ;; + *) + gl_cv_host_cpu_c_abi_32bit=unknown ;; + esac + else + gl_cv_host_cpu_c_abi_32bit=unknown + fi + if test $gl_cv_host_cpu_c_abi_32bit = unknown; then AC_COMPILE_IFELSE( [AC_LANG_SOURCE( - [[#if defined __sparcv9 || defined __arch64__ - int ok; - #else - error fail - #endif + [[int test_pointer_size[sizeof (void *) - 5]; ]])], [gl_cv_host_cpu_c_abi_32bit=no], [gl_cv_host_cpu_c_abi_32bit=yes]) - ;; - - *) - gl_cv_host_cpu_c_abi_32bit=unknown - ;; - esac - fi + fi + ;; + esac ]) HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit" diff --git a/m4/hostent.m4 b/m4/hostent.m4 index 3b2cc2b..182189f 100644 --- a/m4/hostent.m4 +++ b/m4/hostent.m4 @@ -1,5 +1,5 @@ -# hostent.m4 serial 4 -dnl Copyright (C) 2008, 2010-2023 Free Software Foundation, Inc. +# hostent.m4 serial 5 +dnl Copyright (C) 2008, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -26,7 +26,7 @@ AC_DEFUN([gl_HOSTENT], AC_CACHE_CHECK([for gethostbyname in winsock2.h and -lws2_32], [gl_cv_w32_gethostbyname], [gl_cv_w32_gethostbyname=no - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -38,7 +38,7 @@ AC_DEFUN([gl_HOSTENT], ]], [[gethostbyname(NULL);]])], [gl_cv_w32_gethostbyname=yes]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test "$gl_cv_w32_gethostbyname" = "yes"; then HOSTENT_LIB="-lws2_32" diff --git a/m4/iconv.m4 b/m4/iconv.m4 index ff5d526..2a7edd3 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,5 +1,5 @@ -# iconv.m4 serial 26 -dnl Copyright (C) 2000-2002, 2007-2014, 2016-2023 Free Software Foundation, +# iconv.m4 serial 27 +dnl Copyright (C) 2000-2002, 2007-2014, 2016-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -38,7 +38,7 @@ AC_DEFUN([AM_ICONV_LINK], dnl because if the user has installed libiconv and not disabled its use dnl via --without-libiconv-prefix, he wants to use it. The first dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. - am_save_CPPFLAGS="$CPPFLAGS" + gl_saved_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ @@ -55,7 +55,7 @@ AC_DEFUN([AM_ICONV_LINK], iconv_close(cd);]])], [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -68,14 +68,14 @@ AC_DEFUN([AM_ICONV_LINK], iconv_close(cd);]])], [am_cv_lib_iconv=yes] [am_cv_func_iconv=yes]) - LIBS="$am_save_LIBS" + LIBS="$gl_saved_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, dnl Solaris 10. - am_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi @@ -205,7 +205,7 @@ AC_DEFUN([AM_ICONV_LINK], esac]) test "$am_cv_func_iconv_works" = no || break done - LIBS="$am_save_LIBS" + LIBS="$gl_saved_LIBS" ]) case "$am_cv_func_iconv_works" in *no) am_func_iconv=no am_cv_lib_iconv=no ;; @@ -224,7 +224,7 @@ AC_DEFUN([AM_ICONV_LINK], else dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV dnl either. - CPPFLAGS="$am_save_CPPFLAGS" + CPPFLAGS="$gl_saved_CPPFLAGS" LIBICONV= LTLIBICONV= fi diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 index 40c985e..7b56088 100644 --- a/m4/iconv_h.m4 +++ b/m4/iconv_h.m4 @@ -1,5 +1,5 @@ # iconv_h.m4 serial 16 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/include_next.m4 b/m4/include_next.m4 index 9f19215..70cb746 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,5 +1,5 @@ -# include_next.m4 serial 26 -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +# include_next.m4 serial 27 +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -74,17 +74,17 @@ EOF #endif #define DEFINED_IN_CONFTESTD2 EOF - gl_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2" + gl_saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$gl_saved_CPPFLAGS -Iconftestd1b -Iconftestd2" dnl We intentionally avoid using AC_LANG_SOURCE here. AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]], [gl_cv_have_include_next=yes], - [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2" + [CPPFLAGS="$gl_saved_CPPFLAGS -Iconftestd1a -Iconftestd2" AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]], [gl_cv_have_include_next=buggy], [gl_cv_have_include_next=no]) ]) - CPPFLAGS="$gl_save_CPPFLAGS" + CPPFLAGS="$gl_saved_CPPFLAGS" rm -rf conftestd1a conftestd1b conftestd2 ]) PRAGMA_SYSTEM_HEADER= diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4 index 48822d6..63a9dc7 100644 --- a/m4/inet_ntop.m4 +++ b/m4/inet_ntop.m4 @@ -1,5 +1,5 @@ -# inet_ntop.m4 serial 21 -dnl Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc. +# inet_ntop.m4 serial 22 +dnl Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -36,14 +36,14 @@ AC_DEFUN([gl_FUNC_INET_NTOP], HAVE_DECL_INET_NTOP=0 fi else - gl_save_LIBS=$LIBS + gl_saved_LIBS=$LIBS AC_SEARCH_LIBS([inet_ntop], [nsl resolv network], [], [AC_CHECK_FUNCS([inet_ntop]) if test $ac_cv_func_inet_ntop = no; then HAVE_INET_NTOP=0 fi ]) - LIBS=$gl_save_LIBS + LIBS=$gl_saved_LIBS if test "$ac_cv_search_inet_ntop" != "no" \ && test "$ac_cv_search_inet_ntop" != "none required"; then diff --git a/m4/inline.m4 b/m4/inline.m4 index dbbb811..208f742 100644 --- a/m4/inline.m4 +++ b/m4/inline.m4 @@ -1,5 +1,5 @@ # inline.m4 serial 4 -dnl Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index ecc88d6..3141bf8 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ -# intlmacosx.m4 serial 8 (gettext-0.20.2) -dnl Copyright (C) 2004-2014, 2016, 2019-2022 Free Software Foundation, Inc. +# intlmacosx.m4 serial 9 (gettext-0.22.3) +dnl Copyright (C) 2004-2014, 2016, 2019-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -59,7 +59,11 @@ AC_DEFUN([gt_INTL_MACOSX], INTL_MACOSX_LIBS= if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + dnl Starting with macOS version 14, CoreFoundation relies on CoreServices, + dnl and we have to link it in explicitly, otherwise an exception + dnl NSInvalidArgumentException "unrecognized selector sent to instance" + dnl occurs. + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices" fi AC_SUBST([INTL_MACOSX_LIBS]) ]) diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4 index ef32e1b..d3d2120 100644 --- a/m4/intmax_t.m4 +++ b/m4/intmax_t.m4 @@ -1,5 +1,5 @@ # intmax_t.m4 serial 9 -dnl Copyright (C) 1997-2004, 2006-2007, 2009-2023 Free Software Foundation, +dnl Copyright (C) 1997-2004, 2006-2007, 2009-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index e7efbe9..6abf9db 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ # inttypes.m4 serial 37 -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index 68c60e9..ae0a00f 100644 --- a/m4/inttypes_h.m4 +++ b/m4/inttypes_h.m4 @@ -1,5 +1,5 @@ # inttypes_h.m4 serial 10 -dnl Copyright (C) 1997-2004, 2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ioctl.m4 b/m4/ioctl.m4 index 83036c3..4278883 100644 --- a/m4/ioctl.m4 +++ b/m4/ioctl.m4 @@ -1,5 +1,5 @@ # ioctl.m4 serial 6 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/isblank.m4 b/m4/isblank.m4 index 809eab4..d07472c 100644 --- a/m4/isblank.m4 +++ b/m4/isblank.m4 @@ -1,5 +1,5 @@ # isblank.m4 serial 3 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/iswblank.m4 b/m4/iswblank.m4 index b1220b1..e450f0b 100644 --- a/m4/iswblank.m4 +++ b/m4/iswblank.m4 @@ -1,5 +1,5 @@ # iswblank.m4 serial 7 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/iswctype.m4 b/m4/iswctype.m4 new file mode 100644 index 0000000..775f222 --- /dev/null +++ b/m4/iswctype.m4 @@ -0,0 +1,13 @@ +# iswctype.m4 serial 3 +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_ISWCTYPE], +[ + AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) + AC_REQUIRE([gl_WCTYPE_H]) + dnl Determine REPLACE_WCTYPE. + AC_REQUIRE([gl_FUNC_WCTYPE]) +]) diff --git a/m4/iswdigit.m4 b/m4/iswdigit.m4 index 0df7b30..d13c1ae 100644 --- a/m4/iswdigit.m4 +++ b/m4/iswdigit.m4 @@ -1,5 +1,5 @@ -# iswdigit.m4 serial 3 -dnl Copyright (C) 2020-2023 Free Software Foundation, Inc. +# iswdigit.m4 serial 6 +dnl Copyright (C) 2020-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,6 +12,7 @@ AC_DEFUN([gl_FUNC_ISWDIGIT], AC_REQUIRE([gt_LOCALE_JA]) AC_REQUIRE([gt_LOCALE_FR_UTF8]) AC_REQUIRE([gt_LOCALE_ZH_CN]) + AC_REQUIRE([AC_CANONICAL_HOST]) if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then dnl <wctype.h> redefines iswdigit already. @@ -25,7 +26,7 @@ AC_DEFUN([gl_FUNC_ISWDIGIT], changequote(,)dnl case "$host_os" in # Guess no on FreeBSD, NetBSD, Solaris, native Windows. - freebsd* | dragonfly* | netbsd* | solaris* | mingw*) + freebsd* | dragonfly* | netbsd* | solaris* | mingw* | windows*) gl_cv_func_iswdigit_works="guessing no" ;; # Guess yes otherwise. *) gl_cv_func_iswdigit_works="guessing yes" ;; @@ -63,7 +64,8 @@ main (int argc, char *argv[]) int is; int result = 0; - if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) + if (strcmp ("$LOCALE_FR", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR") != NULL) { /* This fails on mingw, MSVC 14. */ /* U+00B2 SUPERSCRIPT TWO */ @@ -71,7 +73,8 @@ main (int argc, char *argv[]) if (!(is == 0)) result |= 1; } - if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + if (strcmp ("$LOCALE_JA", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_JA") != NULL) { /* This fails on NetBSD 8.0. */ /* U+FF11 FULLWIDTH DIGIT ONE */ @@ -79,7 +82,8 @@ main (int argc, char *argv[]) if (!(is == 0)) result |= 2; } - if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + if (strcmp ("$LOCALE_FR_UTF8", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { /* This fails on FreeBSD 13.0, NetBSD 8.0, MSVC 14. */ /* U+0663 ARABIC-INDIC DIGIT THREE */ @@ -92,7 +96,8 @@ main (int argc, char *argv[]) if (!(is == 0)) result |= 8; } - if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + if (strcmp ("$LOCALE_ZH_CN", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) { /* This fails on NetBSD 8.0, Solaris 10, Solaris 11.4. */ /* U+FF11 FULLWIDTH DIGIT ONE */ diff --git a/m4/iswpunct.m4 b/m4/iswpunct.m4 new file mode 100644 index 0000000..2be15ab --- /dev/null +++ b/m4/iswpunct.m4 @@ -0,0 +1,48 @@ +# iswpunct.m4 serial 2 +dnl Copyright (C) 2023-2024 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_ISWPUNCT], +[ + AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) + AC_REQUIRE([gl_WCTYPE_H]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + + if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then + dnl <wctype.h> redefines iswpunct already. + REPLACE_ISWPUNCT="$REPLACE_ISWCNTRL" + else + AC_CACHE_CHECK([whether iswpunct is consistent with ispunct], + [gl_cv_func_iswpunct_works], + [AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include <ctype.h> +#include <wchar.h> +#include <wctype.h> +int +main (int argc, char *argv[]) +{ + int result = 0; + /* This fails on Android 11. */ + if ((! iswpunct ('\`')) != (! ispunct ('\`'))) + result |= 1; + return result; +}]])], + [gl_cv_func_iswpunct_works=yes], + [gl_cv_func_iswpunct_works=no], + [case "$host_os" in + # Guess no on Android. + android*) gl_cv_func_iswpunct_works="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_iswpunct_works="guessing yes" ;; + esac + ]) + ]) + case "$gl_cv_func_iswpunct_works" in + *yes) ;; + *) REPLACE_ISWPUNCT=1 ;; + esac + fi +]) diff --git a/m4/iswxdigit.m4 b/m4/iswxdigit.m4 index 3f952f0..d42f0d1 100644 --- a/m4/iswxdigit.m4 +++ b/m4/iswxdigit.m4 @@ -1,5 +1,5 @@ -# iswxdigit.m4 serial 3 -dnl Copyright (C) 2020-2023 Free Software Foundation, Inc. +# iswxdigit.m4 serial 6 +dnl Copyright (C) 2020-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,6 +11,7 @@ AC_DEFUN([gl_FUNC_ISWXDIGIT], AC_REQUIRE([gt_LOCALE_JA]) AC_REQUIRE([gt_LOCALE_FR_UTF8]) AC_REQUIRE([gt_LOCALE_ZH_CN]) + AC_REQUIRE([AC_CANONICAL_HOST]) if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then dnl <wctype.h> redefines iswxdigit already. @@ -24,7 +25,7 @@ AC_DEFUN([gl_FUNC_ISWXDIGIT], changequote(,)dnl case "$host_os" in # Guess no on FreeBSD, NetBSD, Solaris, native Windows. - freebsd* | dragonfly* | netbsd* | solaris* | mingw*) + freebsd* | dragonfly* | netbsd* | solaris* | mingw* | windows*) gl_cv_func_iswxdigit_works="guessing no" ;; # Guess yes otherwise. *) gl_cv_func_iswxdigit_works="guessing yes" ;; @@ -62,7 +63,8 @@ main (int argc, char *argv[]) int is; int result = 0; - if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + if (strcmp ("$LOCALE_JA", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_JA") != NULL) { /* This fails on NetBSD 8.0. */ /* U+FF21 FULLWIDTH LATIN CAPITAL LETTER A */ @@ -70,7 +72,8 @@ main (int argc, char *argv[]) if (!(is == 0)) result |= 1; } - if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + if (strcmp ("$LOCALE_FR_UTF8", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { /* This fails on FreeBSD 13.0. */ /* U+0663 ARABIC-INDIC DIGIT THREE */ @@ -83,7 +86,8 @@ main (int argc, char *argv[]) if (!(is == 0)) result |= 4; } - if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + if (strcmp ("$LOCALE_ZH_CN", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) { /* This fails on Solaris 10, Solaris 11.4. */ /* U+FF11 FULLWIDTH DIGIT ONE */ diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4 index b17a526..888b161 100644 --- a/m4/langinfo_h.m4 +++ b/m4/langinfo_h.m4 @@ -1,5 +1,5 @@ # langinfo_h.m4 serial 12 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/largefile.m4 b/m4/largefile.m4 index 8d4bb7c..cbe9bc1 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -1,7 +1,7 @@ # Enable large files on systems where this is not the default. # Enable support for files on Linux file systems with 64-bit inode numbers. -# Copyright 1992-1996, 1998-2023 Free Software Foundation, Inc. +# Copyright 1992-1996, 1998-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -171,8 +171,9 @@ AC_DEFUN([AC_SYS_YEAR2038_RECOMMENDED], AS_IF([test "$enable_year2038,$ac_have_year2038" = yes,no], [AC_MSG_FAILURE(m4_text_wrap( [could not enable timestamps after mid-January 2038. - Did you mean to build a 64-bit binary? (E.g., 'CC="${CC} -m64"'.) - To proceed with 32-bit time_t, configure with '--disable-year2038'.], + This package recommends support for these later timestamps. + However, to proceed with signed 32-bit time_t even though it + will fail then, configure with '--disable-year2038'.], [], [], [55]))])]) # _AC_SYS_LARGEFILE_TEST_CODE @@ -180,13 +181,16 @@ AS_IF([test "$enable_year2038,$ac_have_year2038" = yes,no], # C code used to probe for large file support. m4_define([_AC_SYS_LARGEFILE_TEST_CODE], [@%:@include <sys/types.h> - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, +@%:@ifndef FTYPE +@%:@ define FTYPE off_t +@%:@endif + /* Check that FTYPE can represent 2**63 - 1 correctly. + We can't simply define LARGE_FTYPE to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) +@%:@define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31)) + int FTYPE_is_large[[(LARGE_FTYPE % 2147483629 == 721 + && LARGE_FTYPE % 2147483647 == 1) ? 1 : -1]];[]dnl ]) # Defined by Autoconf 2.71 and circa 2022 Gnulib unwisely depended on it. @@ -226,7 +230,13 @@ AC_DEFUN([_AC_SYS_LARGEFILE_PROBE], AS_IF([test x"$ac_opt" != x"none needed"], [CC="$ac_save_CC $ac_opt"]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_CODE])], - [ac_cv_sys_largefile_opts="$ac_opt" + [AS_IF([test x"$ac_opt" = x"none needed"], + [# GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t. + CC="$CC -DFTYPE=ino_t" + AC_COMPILE_IFELSE([], [], + [CC="$CC -D_FILE_OFFSET_BITS=64" + AC_COMPILE_IFELSE([], [ac_opt='-D_FILE_OFFSET_BITS=64'])])]) + ac_cv_sys_largefile_opts=$ac_opt ac_opt_found=yes]) test $ac_opt_found = no || break done @@ -237,7 +247,7 @@ AC_DEFUN([_AC_SYS_LARGEFILE_PROBE], AC_REQUIRE([AC_CANONICAL_HOST]) if test $ac_opt_found != yes; then AS_CASE([$host_os], - [mingw*], + [mingw* | windows*], [ac_cv_sys_largefile_opts="supported through gnulib" ac_opt_found=yes] ) @@ -295,7 +305,7 @@ AC_DEFUN([gl_LARGEFILE], [ AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in - mingw*) + mingw* | windows*) dnl Native Windows. dnl mingw64 defines off_t to a 64-bit type already, if dnl _FILE_OFFSET_BITS=64, which is ensured by AC_SYS_LARGEFILE. diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index acc6127..b17e0fd 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 11 -dnl Copyright (C) 1996-2003, 2009-2023 Free Software Foundation, Inc. +# lib-ld.m4 serial 13 +dnl Copyright (C) 1996-2003, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -67,7 +67,7 @@ else if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. case $host in - *-*-mingw*) + *-*-mingw* | windows*) # gcc leaves a trailing carriage return which upsets mingw acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) @@ -97,9 +97,9 @@ else fi if test -n "$ac_prog"; then # Search for $ac_prog in $PATH. - acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$acl_save_ifs" + IFS="$acl_saved_IFS" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" @@ -116,7 +116,7 @@ else esac fi done - IFS="$acl_save_ifs" + IFS="$acl_saved_IFS" fi case $host in *-*-aix*) diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index 653e34f..1a7c127 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,5 +1,5 @@ -# lib-link.m4 serial 33 -dnl Copyright (C) 2001-2023 Free Software Foundation, Inc. +# lib-link.m4 serial 34 +dnl Copyright (C) 2001-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -69,11 +69,11 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, dnl because if the user has installed lib[]Name and not disabled its use dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" + acl_saved_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" + acl_saved_LIBS="$LIBS" dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, dnl because these -l options might require -L options that are present in dnl LIBS. -l options benefit only from the -L options listed before it. @@ -89,7 +89,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], [AC_LANG_PROGRAM([[$3]], [[$4]])], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) - LIBS="$ac_save_LIBS" + LIBS="$acl_saved_LIBS" ]) if test "$ac_cv_lib[]Name" = yes; then HAVE_LIB[]NAME=yes @@ -100,7 +100,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], HAVE_LIB[]NAME=no dnl If $LIB[]NAME didn't lead to a usable library, we don't need dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" + CPPFLAGS="$acl_saved_CPPFLAGS" LIB[]NAME= LTLIB[]NAME= LIB[]NAME[]_PREFIX= @@ -224,7 +224,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], additional_libdir3= fi dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. + dnl $LDFLAGS. Use breadth-first search. LIB[]NAME= LTLIB[]NAME= INC[]NAME= @@ -537,12 +537,12 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], dnl Read the .la file. It defines the variables dnl dlname, library_names, old_library, dependency_libs, current, dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" + saved_libdir="$libdir" case "$found_la" in */* | *\\*) . "$found_la" ;; *) . "./$found_la" ;; esac - libdir="$save_libdir" + libdir="$saved_libdir" dnl We use only dependency_libs. for dep in $dependency_libs; do case "$dep" in @@ -682,18 +682,18 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" else dnl The -rpath options are cumulative. for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$found_dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" done fi @@ -790,18 +790,18 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], for dir in $rpathdirs; do alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" done - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" $1="$flag" else dnl The -rpath options are cumulative. for dir in $rpathdirs; do - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" $1="${$1}${$1:+ }$flag" done fi diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index aefe7f7..f327c6e 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 20 -dnl Copyright (C) 2001-2005, 2008-2023 Free Software Foundation, Inc. +# lib-prefix.m4 serial 22 +dnl Copyright (C) 2001-2005, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -126,10 +126,10 @@ AC_DEFUN([AC_LIB_PREPARE_PREFIX], else acl_final_exec_prefix="$exec_prefix" fi - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" + prefix="$acl_saved_prefix" ]) dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the @@ -137,13 +137,13 @@ dnl variables prefix and exec_prefix bound to the values they will have dnl at the end of the configure script. AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], [ - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" ]) dnl AC_LIB_PREPARE_MULTILIB creates @@ -256,6 +256,15 @@ changequote([,])dnl esac fi ;; + netbsd*) + dnl On NetBSD/sparc64, there is a 'sparc' subdirectory that contains + dnl 32-bit libraries. + if test $HOST_CPU_C_ABI_32BIT != no; then + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparc ;; + esac + fi + ;; *) dnl If $CC generates code for a 32-bit ABI, the libraries are dnl surely under $prefix/lib or $prefix/lib32, not $prefix/lib64. @@ -280,7 +289,7 @@ changequote([,])dnl fi fi if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" + acl_saved_IFS="${IFS= }"; IFS=":" for searchdir in $searchpath; do if test -d "$searchdir"; then case "$searchdir" in @@ -297,7 +306,7 @@ changequote([,])dnl esac fi done - IFS="$acl_save_IFS" + IFS="$acl_saved_IFS" if test $HOST_CPU_C_ABI_32BIT = yes; then # 32-bit ABI. acl_libdirstem3= diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4 index 6dd184a..7c3f65e 100644 --- a/m4/libunistring-base.m4 +++ b/m4/libunistring-base.m4 @@ -1,5 +1,5 @@ # libunistring-base.m4 serial 8 -dnl Copyright (C) 2010-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/libunistring-optional.m4 b/m4/libunistring-optional.m4 index 4ad0c7f..9807b61 100644 --- a/m4/libunistring-optional.m4 +++ b/m4/libunistring-optional.m4 @@ -1,5 +1,5 @@ # libunistring-optional.m4 serial 1 -dnl Copyright (C) 2010-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/libunistring.m4 b/m4/libunistring.m4 index 1570281..1d35b33 100644 --- a/m4/libunistring.m4 +++ b/m4/libunistring.m4 @@ -1,5 +1,5 @@ -# libunistring.m4 serial 12 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +# libunistring.m4 serial 13 +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -73,7 +73,7 @@ AC_DEFUN([gl_LIBUNISTRING_CORE], dnl We have to erase the cached result of the first AC_LIB_HAVE_LINKFLAGS dnl invocation, otherwise the second one will not be run. unset ac_cv_libunistring - glus_save_LIBS="$LIBS" + glus_saved_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" AC_LIB_HAVE_LINKFLAGS([unistring], [], [#include <uniconv.h>], [u8_strconv_from_locale((char*)0);], @@ -82,7 +82,7 @@ AC_DEFUN([gl_LIBUNISTRING_CORE], LIBUNISTRING="$LIBUNISTRING $LIBICONV" LTLIBUNISTRING="$LTLIBUNISTRING $LTLIBICONV" fi - LIBS="$glus_save_LIBS" + LIBS="$glus_saved_LIBS" fi else AC_LIB_HAVE_LINKFLAGS([unistring], [], diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 index ca0294e..1825328 100644 --- a/m4/limits-h.m4 +++ b/m4/limits-h.m4 @@ -1,6 +1,6 @@ dnl Check whether limits.h has needed features. -dnl Copyright 2016-2023 Free Software Foundation, Inc. +dnl Copyright 2016-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -28,11 +28,22 @@ AC_DEFUN_ONCE([gl_LIMITS_H], ]])], [gl_cv_header_limits_width=yes], [gl_cv_header_limits_width=no])]) - if test "$gl_cv_header_limits_width" = yes; then - GL_GENERATE_LIMITS_H=false - else - GL_GENERATE_LIMITS_H=true - fi + GL_GENERATE_LIMITS_H=true + AS_IF([test "$gl_cv_header_limits_width" = yes], + [AC_CACHE_CHECK([whether limits.h has SSIZE_MAX], + [gl_cv_header_limits_ssize_max], + [AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#include <limits.h> + #ifndef SSIZE_MAX + #error "SSIZE_MAX is not defined" + #endif + ]])], + [gl_cv_header_limits_ssize_max=yes], + [gl_cv_header_limits_ssize_max=no])]) + if test "$gl_cv_header_limits_ssize_max" = yes; then + GL_GENERATE_LIMITS_H=false + fi]) ]) dnl Unconditionally enables the replacement of <limits.h>. @@ -1,5 +1,5 @@ # link.m4 serial 12 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/localcharset.m4 b/m4/localcharset.m4 index 15b6b2a..abf07dc 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,5 +1,5 @@ # localcharset.m4 serial 8 -dnl Copyright (C) 2002, 2004, 2006, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index 5e13f39..53750b5 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,5 +1,5 @@ -# locale-fr.m4 serial 21 -dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc. +# locale-fr.m4 serial 23 +dnl Copyright (C) 2003, 2005-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -86,7 +86,7 @@ int main () { # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", # "ja" as "Japanese" or "Japanese_Japan.932", # and similar. - mingw*) + mingw* | windows*) # Test for the native Windows locale name. if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_fr=French_France.1252 @@ -116,7 +116,7 @@ int main () { if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_fr=fr_FR.iso88591 else - # Test for the Solaris 7 locale name. + # Test for the Solaris 10 locale name. if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_fr=fr else @@ -133,15 +133,31 @@ int main () { rm -fr conftest* ]) LOCALE_FR=$gt_cv_locale_fr + case $LOCALE_FR in #( + '' | *[[[:space:]\"\$\'*@<:@]]*) + dnl This locale name might cause trouble with sh or make. + AC_MSG_WARN([invalid locale "$LOCALE_FR"; assuming "none"]) + LOCALE_FR=none;; + esac AC_SUBST([LOCALE_FR]) ]) dnl Determine the name of a french locale with UTF-8 encoding. AC_DEFUN_ONCE([gt_LOCALE_FR_UTF8], [ + AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AM_LANGINFO_CODESET]) AC_CACHE_CHECK([for a french Unicode locale], [gt_cv_locale_fr_utf8], [ - AC_LANG_CONFTEST([AC_LANG_SOURCE([[ + case "$host_os" in + *-musl* | midipix*) + dnl On musl libc, all kinds of ll_CC.UTF-8 locales exist, even without + dnl any locale file on disk. But they are effectively equivalent to the + dnl C.UTF-8 locale, except for locale categories (such as LC_MESSSAGES) + dnl for which localizations (.mo files) have been installed. + gt_cv_locale_fr_utf8=fr_FR.UTF-8 + ;; + *) + AC_LANG_CONFTEST([AC_LANG_SOURCE([[ #include <locale.h> #include <time.h> #if HAVE_LANGINFO_CODESET @@ -203,51 +219,82 @@ int main () { #endif return 0; } - ]])]) - if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then - case "$host_os" in - # Handle native Windows specially, because there setlocale() interprets - # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", - # "fr" or "fra" as "French" or "French_France.1252", - # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", - # "ja" as "Japanese" or "Japanese_Japan.932", - # and similar. - mingw*) - # Test for the hypothetical native Windows locale name. - if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=French_France.65001 - else - # None found. - gt_cv_locale_fr_utf8=none - fi - ;; - *) - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the usual locale name. - if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR.UTF-8 - else - # Test for the Solaris 7 locale name. - if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr.UTF-8 + ]])]) + if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then + case "$host_os" in + # Handle native Windows specially, because there setlocale() interprets + # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", + # "fr" or "fra" as "French" or "French_France.1252", + # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", + # "ja" as "Japanese" or "Japanese_Japan.932", + # and similar. + mingw* | windows*) + # Test for the hypothetical native Windows locale name. + if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=French_France.65001 else # None found. gt_cv_locale_fr_utf8=none fi - fi - fi - ;; - esac - fi - rm -fr conftest* + ;; + *) + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the usual locale name. + if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR.UTF-8 + else + # Test for the Solaris 10 locale name. + if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr.UTF-8 + else + # None found. + gt_cv_locale_fr_utf8=none + fi + fi + fi + ;; + esac + fi + rm -fr conftest* + ;; + esac ]) LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8 + case $LOCALE_FR_UTF8 in #( + '' | *[[[:space:]\"\$\'*@<:@]]*) + dnl This locale name might cause trouble with sh or make. + AC_MSG_WARN([invalid locale "$LOCALE_FR_UTF8"; assuming "none"]) + LOCALE_FR_UTF8=none;; + esac AC_SUBST([LOCALE_FR_UTF8]) + + dnl Users of $LOCALE_FR_UTF8 need to know which of the locale categories they + dnl can rely on. + case "$host_os" in + *-musl* | midipix*) + dnl On musl libc, locale categories other than LC_CTYPE and LC_MESSAGES + dnl are effectively unimplemented. + LC_COLLATE_IMPLEMENTED=false + LC_NUMERIC_IMPLEMENTED=false + LC_TIME_IMPLEMENTED=false + LC_MONETARY_IMPLEMENTED=false + ;; + *) + LC_COLLATE_IMPLEMENTED=true + LC_NUMERIC_IMPLEMENTED=true + LC_TIME_IMPLEMENTED=true + LC_MONETARY_IMPLEMENTED=true + ;; + esac + AC_SUBST([LC_COLLATE_IMPLEMENTED]) + AC_SUBST([LC_NUMERIC_IMPLEMENTED]) + AC_SUBST([LC_TIME_IMPLEMENTED]) + AC_SUBST([LC_MONETARY_IMPLEMENTED]) ]) diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4 index f6ca327..852ce94 100644 --- a/m4/locale-ja.m4 +++ b/m4/locale-ja.m4 @@ -1,5 +1,5 @@ -# locale-ja.m4 serial 16 -dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc. +# locale-ja.m4 serial 18 +dnl Copyright (C) 2003, 2005-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -90,7 +90,7 @@ int main () # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", # "ja" as "Japanese" or "Japanese_Japan.932", # and similar. - mingw*) + mingw* | windows*) # Note that on native Windows, the Japanese locale is # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we # cannot use it here. @@ -117,7 +117,7 @@ int main () if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_ja=ja_JP.EUC else - # Test for the Solaris 7 locale name. + # Test for the Solaris 10 locale name. if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_ja=ja else @@ -139,5 +139,11 @@ int main () rm -fr conftest* ]) LOCALE_JA=$gt_cv_locale_ja + case $LOCALE_JA in #( + '' | *[[[:space:]\"\$\'*@<:@]]*) + dnl This locale name might cause trouble with sh or make. + AC_MSG_WARN([invalid locale "$LOCALE_JA"; assuming "none"]) + LOCALE_JA=none;; + esac AC_SUBST([LOCALE_JA]) ]) diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index 94c5459..f1a58c6 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,5 +1,5 @@ -# locale-zh.m4 serial 16 -dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc. +# locale-zh.m4 serial 18 +dnl Copyright (C) 2003, 2005-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -91,7 +91,7 @@ int main () # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", # "ja" as "Japanese" or "Japanese_Japan.932", # and similar. - mingw*) + mingw* | windows*) # Test for the hypothetical native Windows locale name. if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_zh_CN=Chinese_China.54936 @@ -133,5 +133,11 @@ int main () rm -fr conftest* ]) LOCALE_ZH_CN=$gt_cv_locale_zh_CN + case $LOCALE_ZH_CN in #( + '' | *[[[:space:]\"\$\'*@<:@]]*) + dnl This locale name might cause trouble with sh or make. + AC_MSG_WARN([invalid locale "$LOCALE_ZH_CN"; assuming "none"]) + LOCALE_ZH_CN=none;; + esac AC_SUBST([LOCALE_ZH_CN]) ]) diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 index a33a0a4..c47e3f6 100644 --- a/m4/locale_h.m4 +++ b/m4/locale_h.m4 @@ -1,5 +1,5 @@ -# locale_h.m4 serial 28 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +# locale_h.m4 serial 31 +dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -59,7 +59,9 @@ AC_DEFUN_ONCE([gl_LOCALE_H], dnl On native Windows with MSVC, merely define these member names as macros. dnl This avoids trouble in C++ mode. case "$host_os" in - mingw*) + windows*-msvc*) + ;; + mingw* | windows*) AC_EGREP_CPP([Special], [ #ifdef _MSC_VER Special @@ -152,7 +154,7 @@ AC_DEFUN([gl_LOCALE_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE_NULL]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUPLOCALE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME_UNSAFE]) ]) m4_require(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS]) AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) diff --git a/m4/localeconv.m4 b/m4/localeconv.m4 index 374dcbf..351b4e1 100644 --- a/m4/localeconv.m4 +++ b/m4/localeconv.m4 @@ -1,5 +1,5 @@ -# localeconv.m4 serial 2 -dnl Copyright (C) 2012-2023 Free Software Foundation, Inc. +# localeconv.m4 serial 3 +dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -36,7 +36,7 @@ AC_DEFUN([gl_FUNC_LOCALECONV], # Guess yes on musl systems. *-musl* | midipix*) gl_cv_func_localeconv_works="guessing yes" ;; # Guess no on native Windows. - mingw*) gl_cv_func_localeconv_works="guessing no" ;; + mingw* | windows*) gl_cv_func_localeconv_works="guessing no" ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_localeconv_works="$gl_cross_guess_normal" ;; esac @@ -1,5 +1,5 @@ # lock.m4 serial 14 -dnl Copyright (C) 2005-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lseek.m4 b/m4/lseek.m4 index 0da4588..bb30a47 100644 --- a/m4/lseek.m4 +++ b/m4/lseek.m4 @@ -1,5 +1,5 @@ -# lseek.m4 serial 14 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +# lseek.m4 serial 15 +dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_LSEEK], AC_CHECK_HEADERS_ONCE([unistd.h]) AC_CACHE_CHECK([whether lseek detects pipes], [gl_cv_func_lseek_pipe], [case "$host_os" in - mingw*) + mingw* | windows*) dnl Native Windows. dnl The result of lseek (fd, (off_t)0, SEEK_CUR) or dnl SetFilePointer(handle, 0, NULL, FILE_CURRENT) diff --git a/m4/lstat.m4 b/m4/lstat.m4 index 2bc4669..48cc865 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,6 +1,6 @@ -# serial 34 +# serial 36 -# Copyright (C) 1997-2001, 2003-2023 Free Software Foundation, Inc. +# Copyright (C) 1997-2001, 2003-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_LSTAT], if test $ac_cv_func_lstat = yes; then AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) case $host_os,$gl_cv_func_lstat_dereferences_slashed_symlink in - solaris* | *no) + darwin* | solaris* | *no) REPLACE_LSTAT=1 ;; esac @@ -62,7 +62,7 @@ AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], *-gnu* | gnu*) # Guess yes on glibc systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; - mingw*) + mingw* | windows*) # Guess no on native Windows. gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; *) diff --git a/m4/malloc.m4 b/m4/malloc.m4 index bc58017..635d672 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,5 +1,5 @@ -# malloc.m4 serial 29 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +# malloc.m4 serial 31 +dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,7 +16,8 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], [[#include <stdlib.h> ]], [[void *p = malloc (0); - int result = !p; + void * volatile vp = p; + int result = !vp; free (p); return result;]]) ], @@ -26,7 +27,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], # Guess yes on platforms where we know the result. *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ | gnu* | *-musl* | midipix* | midnightbsd* \ - | hpux* | solaris* | cygwin* | mingw* | msys* ) + | hpux* | solaris* | cygwin* | mingw* | windows* | msys* ) ac_cv_func_malloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; @@ -128,7 +129,7 @@ AC_DEFUN([gl_CHECK_MALLOC_POSIX], dnl except on those platforms where we have seen 'test-malloc-gnu', dnl 'test-realloc-gnu', 'test-calloc-gnu' fail. case "$host_os" in - mingw*) + mingw* | windows*) gl_cv_func_malloc_posix=no ;; irix* | solaris*) dnl On IRIX 6.5, the three functions return NULL with errno unset diff --git a/m4/malloca.m4 b/m4/malloca.m4 index 1d777eb..77e1595 100644 --- a/m4/malloca.m4 +++ b/m4/malloca.m4 @@ -1,5 +1,5 @@ # malloca.m4 serial 2 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2023 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/mbchar.m4 b/m4/mbchar.m4 index aed40a5..471e8c4 100644 --- a/m4/mbchar.m4 +++ b/m4/mbchar.m4 @@ -1,5 +1,5 @@ # mbchar.m4 serial 9 -dnl Copyright (C) 2005-2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbiter.m4 b/m4/mbiter.m4 index 8e879dc..2f7e788 100644 --- a/m4/mbiter.m4 +++ b/m4/mbiter.m4 @@ -1,5 +1,5 @@ # mbiter.m4 serial 7 -dnl Copyright (C) 2005, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbrtoc32.m4 b/m4/mbrtoc32.m4 new file mode 100644 index 0000000..c1eb126 --- /dev/null +++ b/m4/mbrtoc32.m4 @@ -0,0 +1,266 @@ +# mbrtoc32.m4 serial 18 +dnl Copyright (C) 2014-2024 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_MBRTOC32], +[ + AC_REQUIRE([gl_UCHAR_H_DEFAULTS]) + + AC_REQUIRE([AC_TYPE_MBSTATE_T]) + dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is + dnl determined. It describes how our overridden mbrtowc is implemented. + dnl We then implement mbrtoc32 accordingly. + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) + + AC_REQUIRE([gl_TYPE_CHAR32_T]) + AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) + + AC_REQUIRE([gl_CHECK_FUNC_MBRTOC32]) + if test $gl_cv_func_mbrtoc32 = no; then + HAVE_MBRTOC32=0 + else + if test $GNULIBHEADERS_OVERRIDE_CHAR32_T = 1 || test $REPLACE_MBSTATE_T = 1; then + REPLACE_MBRTOC32=1 + else + gl_MBRTOC32_EMPTY_INPUT + gl_MBRTOC32_C_LOCALE + case "$gl_cv_func_mbrtoc32_empty_input" in + *yes) ;; + *) AC_DEFINE([MBRTOC32_EMPTY_INPUT_BUG], [1], + [Define if the mbrtoc32 function does not return (size_t) -2 for empty input.]) + REPLACE_MBRTOC32=1 + ;; + esac + case "$gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ" in + *yes) ;; + *) AC_DEFINE([MBRTOC32_IN_C_LOCALE_MAYBE_EILSEQ], [1], + [Define if the mbrtoc32 function may signal encoding errors in the C locale.]) + REPLACE_MBRTOC32=1 + ;; + esac + fi + if test $HAVE_WORKING_MBRTOC32 = 0; then + REPLACE_MBRTOC32=1 + fi + fi +]) + +AC_DEFUN([gl_CHECK_FUNC_MBRTOC32], +[ + dnl Cf. gl_CHECK_FUNCS_ANDROID + AC_CHECK_DECL([mbrtoc32], , , + [[#ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + ]]) + if test $ac_cv_have_decl_mbrtoc32 = yes; then + dnl We can't use AC_CHECK_FUNC here, because mbrtoc32() is defined as a + dnl static inline function on Haiku 2020. + AC_CACHE_CHECK([for mbrtoc32], [gl_cv_func_mbrtoc32], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <stdlib.h> + #ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + ]], + [[char32_t c; + return mbrtoc32 (&c, "", 1, NULL) == 0; + ]]) + ], + [gl_cv_func_mbrtoc32=yes], + [gl_cv_func_mbrtoc32=no]) + ]) + else + gl_cv_func_mbrtoc32=no + fi +]) + +dnl Test whether mbrtoc32 returns the correct value on empty input. + +AC_DEFUN([gl_MBRTOC32_EMPTY_INPUT], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether mbrtoc32 works on empty input], + [gl_cv_func_mbrtoc32_empty_input], + [ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ + #ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + static char32_t wc; + static mbstate_t mbs; + int + main (void) + { + return mbrtoc32 (&wc, "", 0, &mbs) != (size_t) -2; + }]])], + [gl_cv_func_mbrtoc32_empty_input=yes], + [gl_cv_func_mbrtoc32_empty_input=no], + [case "$host_os" in + # Guess no on glibc systems. + *-gnu* | gnu*) gl_cv_func_mbrtoc32_empty_input="guessing no" ;; + # Guess no on Android. + linux*-android*) gl_cv_func_mbrtoc32_empty_input="guessing no" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_mbrtoc32_empty_input="guessing no" ;; + *) gl_cv_func_mbrtoc32_empty_input="guessing yes" ;; + esac + ]) + ]) +]) + +dnl <https://pubs.opengroup.org/onlinepubs/9699919799/functions/mbrtowc.html> +dnl POSIX:2018 says regarding mbrtowc: "In the POSIX locale an [EILSEQ] error +dnl cannot occur since all byte values are valid characters." It is reasonable +dnl to expect mbrtoc32 to behave in the same way. + +AC_DEFUN([gl_MBRTOC32_C_LOCALE], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether the C locale is free of encoding errors], + [gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include <limits.h> + #include <locale.h> + #ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + ]], [[ + int i; + char *locale = setlocale (LC_ALL, "C"); + if (! locale) + return 2; + for (i = CHAR_MIN; i <= CHAR_MAX; i++) + { + char c = i; + char32_t wc; + mbstate_t mbs = { 0, }; + size_t ss = mbrtoc32 (&wc, &c, 1, &mbs); + if (1 < ss) + return 3; + } + return 0; + ]])], + [gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ=yes], + [gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ=no], + [case "$host_os" in + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ="guessing yes" ;; + *) gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;; + esac + ]) + ]) +]) + +dnl Test whether mbrtoc32 works not worse than mbrtowc. +dnl Result is HAVE_WORKING_MBRTOC32. + +AC_DEFUN([gl_MBRTOC32_SANITYCHECK], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([gl_TYPE_CHAR32_T]) + AC_REQUIRE([gl_CHECK_FUNC_MBRTOC32]) + AC_REQUIRE([gt_LOCALE_FR]) + AC_REQUIRE([gt_LOCALE_ZH_CN]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + if test $GNULIBHEADERS_OVERRIDE_CHAR32_T = 1 || test $gl_cv_func_mbrtoc32 = no; then + HAVE_WORKING_MBRTOC32=0 + else + AC_CACHE_CHECK([whether mbrtoc32 works as well as mbrtowc], + [gl_cv_func_mbrtoc32_sanitycheck], + [ + dnl Initial guess, used when cross-compiling or when no suitable locale + dnl is present. +changequote(,)dnl + case "$host_os" in + # Guess no on FreeBSD, Solaris, native Windows. + freebsd* | midnightbsd* | solaris* | mingw* | windows*) + gl_cv_func_mbrtoc32_sanitycheck="guessing no" + ;; + # Guess yes otherwise. + *) + gl_cv_func_mbrtoc32_sanitycheck="guessing yes" + ;; + esac +changequote([,])dnl + if test $LOCALE_FR != none || test $LOCALE_ZH_CN != none; then + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include <locale.h> +#include <stdlib.h> +#include <string.h> +#include <wchar.h> +#ifdef __HAIKU__ + #include <stdint.h> +#endif +#include <uchar.h> +int main () +{ + int result = 0; + /* This fails on native Windows: + mbrtoc32 returns (size_t)-1. + mbrtowc returns 1 (correct). */ + if (strcmp ("$LOCALE_FR", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR") != NULL) + { + mbstate_t state; + wchar_t wc = (wchar_t) 0xBADFACE; + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\374", 1, &state) == 1) + { + char32_t c32 = (wchar_t) 0xBADFACE; + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtoc32 (&c32, "\374", 1, &state) != 1) + result |= 1; + } + } + /* This fails on FreeBSD 13.0 and Solaris 11.4: + mbrtoc32 returns (size_t)-2 or (size_t)-1. + mbrtowc returns 4 (correct). */ + if (strcmp ("$LOCALE_ZH_CN", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + { + mbstate_t state; + wchar_t wc = (wchar_t) 0xBADFACE; + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\224\071\375\067", 4, &state) == 4) + { + char32_t c32 = (wchar_t) 0xBADFACE; + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtoc32 (&c32, "\224\071\375\067", 4, &state) != 4) + result |= 2; + } + } + return result; +}]])], + [gl_cv_func_mbrtoc32_sanitycheck=yes], + [gl_cv_func_mbrtoc32_sanitycheck=no], + [:]) + fi + ]) + case "$gl_cv_func_mbrtoc32_sanitycheck" in + *yes) + HAVE_WORKING_MBRTOC32=1 + AC_DEFINE([HAVE_WORKING_MBRTOC32], [1], + [Define if the mbrtoc32 function basically works.]) + ;; + *) HAVE_WORKING_MBRTOC32=0 ;; + esac + fi + AC_SUBST([HAVE_WORKING_MBRTOC32]) +]) + +# Prerequisites of lib/mbrtoc32.c and lib/lc-charset-dispatch.c. +AC_DEFUN([gl_PREREQ_MBRTOC32], [ + : +]) diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index 893faff..6ff5182 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ -# mbrtowc.m4 serial 40 -*- coding: utf-8 -*- -dnl Copyright (C) 2001-2002, 2004-2005, 2008-2023 Free Software Foundation, +# mbrtowc.m4 serial 44 -*- coding: utf-8 -*- +dnl Copyright (C) 2001-2002, 2004-2005, 2008-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -91,7 +91,9 @@ AC_DEFUN([gl_FUNC_MBRTOWC], fi if test $REPLACE_MBSTATE_T = 1; then case "$host_os" in - mingw*) MBRTOWC_LIB= ;; + mingw* | windows*) + MBRTOWC_LIB= + ;; *) gl_WEAK_SYMBOLS case "$gl_cv_have_weak" in @@ -129,7 +131,7 @@ AC_DEFUN_ONCE([gl_MBSTATE_T_BROKEN], dnl to override it, even if - like on MSVC - mbsinit() is only defined as dnl an inline function, not as a global function. if case "$host_os" in - mingw*) true ;; + mingw* | windows*) true ;; *) test $ac_cv_func_mbsinit = yes ;; esac \ && test $ac_cv_func_mbrtowc = yes; then @@ -411,14 +413,16 @@ AC_DEFUN([gl_MBRTOWC_RETVAL], dnl is present. changequote(,)dnl case "$host_os" in - # Guess no on HP-UX, Solaris, native Windows. - hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_mbrtowc_retval="guessing yes" ;; + # Guess no on HP-UX, Solaris, native Windows. + hpux* | solaris* | mingw* | windows*) + gl_cv_func_mbrtowc_retval="guessing no" ;; + # Guess yes otherwise. + *) + gl_cv_func_mbrtowc_retval="guessing yes" ;; esac changequote([,])dnl if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \ - || { case "$host_os" in mingw*) true;; *) false;; esac; }; then + || { case "$host_os" in mingw* | windows*) true;; *) false;; esac; }; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include <locale.h> @@ -429,7 +433,8 @@ int main () int result = 0; int found_some_locale = 0; /* This fails on Solaris. */ - if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + if (strcmp ("$LOCALE_FR_UTF8", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { char input[] = "B\303\274\303\237er"; /* "Büßer" */ mbstate_t state; @@ -445,7 +450,8 @@ int main () found_some_locale = 1; } /* This fails on HP-UX 11.11. */ - if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + if (strcmp ("$LOCALE_JA", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_JA") != NULL) { char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */ mbstate_t state; @@ -580,13 +586,13 @@ AC_DEFUN([gl_MBRTOWC_STORES_INCOMPLETE], dnl is present. changequote(,)dnl case "$host_os" in - # Guess yes on native Windows. - mingw*) gl_cv_func_mbrtowc_stores_incomplete="guessing yes" ;; - *) gl_cv_func_mbrtowc_stores_incomplete="guessing no" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_mbrtowc_stores_incomplete="guessing yes" ;; + *) gl_cv_func_mbrtowc_stores_incomplete="guessing no" ;; esac changequote([,])dnl case "$host_os" in - mingw*) + mingw* | windows*) AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include <locale.h> @@ -680,31 +686,28 @@ AC_DEFUN([gl_MBRTOWC_EMPTY_INPUT], AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether mbrtowc works on empty input], [gl_cv_func_mbrtowc_empty_input], - [ - dnl Initial guess, used when cross-compiling or when no suitable locale - dnl is present. -changequote(,)dnl - case "$host_os" in - # Guess no on AIX and glibc systems. - aix* | *-gnu* | gnu*) gl_cv_func_mbrtowc_empty_input="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; - *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; - esac -changequote([,])dnl - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ - #include <wchar.h> - static wchar_t wc; - static mbstate_t mbs; - int - main (void) - { - return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2; - }]])], - [gl_cv_func_mbrtowc_empty_input=yes], - [gl_cv_func_mbrtowc_empty_input=no], - [:]) + [AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ + #include <wchar.h> + static wchar_t wc; + static mbstate_t mbs; + int + main (void) + { + return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2; + }]])], + [gl_cv_func_mbrtowc_empty_input=yes], + [gl_cv_func_mbrtowc_empty_input=no], + [case "$host_os" in + # Guess no on AIX and glibc systems. + aix* | *-gnu* | gnu*) gl_cv_func_mbrtowc_empty_input="guessing no" ;; + # Guess no on Android. + linux*-android*) gl_cv_func_mbrtowc_empty_input="guessing no" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_mbrtowc_empty_input="guessing no" ;; + *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; + esac + ]) ]) ]) @@ -722,12 +725,7 @@ AC_DEFUN([gl_MBRTOWC_C_LOCALE], AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether the C locale is free of encoding errors], [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ], - [ - dnl Initial guess, used when cross-compiling or when no suitable locale - dnl is present. - gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" - - AC_RUN_IFELSE( + [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#include <limits.h> #include <locale.h> @@ -748,13 +746,14 @@ AC_DEFUN([gl_MBRTOWC_C_LOCALE], } return 0; ]])], - [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=yes], - [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no], - [case "$host_os" in - # Guess yes on native Windows. - mingw*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;; - esac - ]) + [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=yes], + [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no], + [case "$host_os" in + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;; + *) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;; + esac + ]) ]) ]) diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4 index c388a8b..10a5b61 100644 --- a/m4/mbsinit.m4 +++ b/m4/mbsinit.m4 @@ -1,5 +1,5 @@ -# mbsinit.m4 serial 9 -dnl Copyright (C) 2008, 2010-2023 Free Software Foundation, Inc. +# mbsinit.m4 serial 10 +dnl Copyright (C) 2008, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,7 +32,7 @@ AC_DEFUN([gl_FUNC_MBSINIT], dnl states produced by mbrtowc() for an incomplete multibyte character dnl in multibyte locales. case "$host_os" in - mingw*) REPLACE_MBSINIT=1 ;; + mingw* | windows*) REPLACE_MBSINIT=1 ;; esac fi fi diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4 index 4f2e88c..84ac0b7 100644 --- a/m4/mbsrtowcs.m4 +++ b/m4/mbsrtowcs.m4 @@ -1,5 +1,5 @@ -# mbsrtowcs.m4 serial 15 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +# mbsrtowcs.m4 serial 17 +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -61,10 +61,12 @@ AC_DEFUN([gl_MBSRTOWCS_WORKS], dnl is present. changequote(,)dnl case "$host_os" in - # Guess no on HP-UX, Solaris, mingw. - hpux* | solaris* | mingw*) gl_cv_func_mbsrtowcs_works="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_mbsrtowcs_works="guessing yes" ;; + # Guess no on HP-UX, Solaris, mingw. + hpux* | solaris* | mingw* | windows*) + gl_cv_func_mbsrtowcs_works="guessing no" ;; + # Guess yes otherwise. + *) + gl_cv_func_mbsrtowcs_works="guessing yes" ;; esac changequote([,])dnl if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then @@ -78,7 +80,8 @@ int main () int result = 0; /* Test whether the function supports a NULL destination argument. This fails on native Windows. */ - if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) + if (strcmp ("$LOCALE_FR", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR") != NULL) { const char input[] = "\337er"; const char *src = input; @@ -91,7 +94,8 @@ int main () } /* Test whether the function works when started with a conversion state in non-initial state. This fails on HP-UX 11.11 and Solaris 10. */ - if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + if (strcmp ("$LOCALE_FR_UTF8", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { const char input[] = "B\303\274\303\237er"; mbstate_t state; @@ -105,7 +109,8 @@ int main () result |= 2; } } - if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + if (strcmp ("$LOCALE_JA", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_JA") != NULL) { const char input[] = "<\306\374\313\334\270\354>"; mbstate_t state; @@ -119,7 +124,8 @@ int main () result |= 4; } } - if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + if (strcmp ("$LOCALE_ZH_CN", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) { const char input[] = "B\250\271\201\060\211\070er"; mbstate_t state; diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index dcd66b9..b2bcba4 100644 --- a/m4/mbstate_t.m4 +++ b/m4/mbstate_t.m4 @@ -1,5 +1,5 @@ # mbstate_t.m4 serial 14 -dnl Copyright (C) 2000-2002, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4 index 02ed6eb..2bdc879 100644 --- a/m4/mbtowc.m4 +++ b/m4/mbtowc.m4 @@ -1,5 +1,5 @@ # mbtowc.m4 serial 5 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ # md4.m4 serial 7 -dnl Copyright (C) 2002-2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ # md5.m4 serial 14 -dnl Copyright (C) 2002-2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/memchr.m4 b/m4/memchr.m4 index 4f1aed0..6184ddc 100644 --- a/m4/memchr.m4 +++ b/m4/memchr.m4 @@ -1,5 +1,5 @@ -# memchr.m4 serial 18 -dnl Copyright (C) 2002-2004, 2009-2023 Free Software Foundation, Inc. +# memchr.m4 serial 19 +dnl Copyright (C) 2002-2004, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -85,12 +85,12 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], [gl_cv_func_memchr_works=yes], [gl_cv_func_memchr_works=no], [case "$host_os" in - # Guess no on Android. - linux*-android*) gl_cv_func_memchr_works="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_memchr_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_memchr_works="$gl_cross_guess_normal" ;; + # Guess no on Android. + linux*-android*) gl_cv_func_memchr_works="guessing no" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_memchr_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_memchr_works="$gl_cross_guess_normal" ;; esac ]) ]) diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 index 612b77b..94ce05d 100644 --- a/m4/mempcpy.m4 +++ b/m4/mempcpy.m4 @@ -1,5 +1,5 @@ # mempcpy.m4 serial 14 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2023 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/memrchr.m4 b/m4/memrchr.m4 index 7611ac7..b4ccdfa 100644 --- a/m4/memrchr.m4 +++ b/m4/memrchr.m4 @@ -1,5 +1,5 @@ # memrchr.m4 serial 11 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2023 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/minmax.m4 b/m4/minmax.m4 index fd09846..5c0a927 100644 --- a/m4/minmax.m4 +++ b/m4/minmax.m4 @@ -1,5 +1,5 @@ # minmax.m4 serial 4 -dnl Copyright (C) 2005, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mkdir.m4 b/m4/mkdir.m4 index c2bc4da..48297f9 100644 --- a/m4/mkdir.m4 +++ b/m4/mkdir.m4 @@ -1,6 +1,6 @@ -# serial 18 +# serial 20 -# Copyright (C) 2001, 2003-2004, 2006, 2008-2023 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2004, 2006, 2008-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -25,23 +25,24 @@ AC_DEFUN([gl_FUNC_MKDIR], [gl_cv_func_mkdir_trailing_slash_works=yes], [gl_cv_func_mkdir_trailing_slash_works=no], [case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; - # Guess yes on MSVC, no on mingw. - mingw*) AC_EGREP_CPP([Known], [ + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on MSVC, no on mingw. + windows*-msvc*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER Known #endif - ], - [gl_cv_func_mkdir_trailing_slash_works="guessing yes"], - [gl_cv_func_mkdir_trailing_slash_works="guessing no"]) - ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_mkdir_trailing_slash_works="$gl_cross_guess_normal" ;; + ], + [gl_cv_func_mkdir_trailing_slash_works="guessing yes"], + [gl_cv_func_mkdir_trailing_slash_works="guessing no"]) + ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_mkdir_trailing_slash_works="$gl_cross_guess_normal" ;; esac ]) rm -rf conftest.dir @@ -65,16 +66,16 @@ AC_DEFUN([gl_FUNC_MKDIR], [gl_cv_func_mkdir_trailing_dot_works=yes], [gl_cv_func_mkdir_trailing_dot_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_mkdir_trailing_dot_works="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; + # Guess yes on musl systems. + *-musl*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_mkdir_trailing_dot_works="$gl_cross_guess_normal" ;; esac ]) rm -rf conftest.dir diff --git a/m4/mkostemp.m4 b/m4/mkostemp.m4 index 1b0d0d5..1c22b8d 100644 --- a/m4/mkostemp.m4 +++ b/m4/mkostemp.m4 @@ -1,5 +1,5 @@ # mkostemp.m4 serial 4 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4 index d4a15ea..106a6b8 100644 --- a/m4/mkstemp.m4 +++ b/m4/mkstemp.m4 @@ -1,6 +1,6 @@ -#serial 29 +#serial 30 -# Copyright (C) 2001, 2003-2007, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ AC_DEFUN([gl_FUNC_MKSTEMP], # Guess yes on musl systems. *-musl* | midipix*) gl_cv_func_working_mkstemp="guessing yes" ;; # Guess no on native Windows. - mingw*) gl_cv_func_working_mkstemp="guessing no" ;; + mingw* | windows*) gl_cv_func_working_mkstemp="guessing no" ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_working_mkstemp="$gl_cross_guess_normal" ;; esac diff --git a/m4/mktime.m4 b/m4/mktime.m4 index e9d31f3..0565e5e 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,5 +1,5 @@ -# serial 37 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2023 Free Software Foundation, +# serial 39 +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -264,9 +264,9 @@ main () [gl_cv_func_working_mktime=yes], [gl_cv_func_working_mktime=no], [case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_working_mktime="guessing no" ;; - *) gl_cv_func_working_mktime="$gl_cross_guess_normal" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_working_mktime="guessing no" ;; + *) gl_cv_func_working_mktime="$gl_cross_guess_normal" ;; esac ]) fi @@ -280,7 +280,6 @@ AC_DEFUN([gl_FUNC_MKTIME], AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) - REPLACE_MKTIME=0 if test "$gl_cv_func_working_mktime" != yes; then REPLACE_MKTIME=1 AC_DEFINE([NEED_MKTIME_WORKING], [1], @@ -288,7 +287,7 @@ AC_DEFUN([gl_FUNC_MKTIME], with the algorithmic workarounds.]) fi case "$host_os" in - mingw*) + mingw* | windows*) REPLACE_MKTIME=1 AC_DEFINE([NEED_MKTIME_WINDOWS], [1], [Define if the compilation of mktime.c should define 'mktime' diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4 index d07d26e..642f07d 100644 --- a/m4/mmap-anon.m4 +++ b/m4/mmap-anon.m4 @@ -1,5 +1,5 @@ # mmap-anon.m4 serial 12 -dnl Copyright (C) 2005, 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mode_t.m4 b/m4/mode_t.m4 index 82197c0..af88da5 100644 --- a/m4/mode_t.m4 +++ b/m4/mode_t.m4 @@ -1,5 +1,5 @@ # mode_t.m4 serial 2 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/msvc-inval.m4 b/m4/msvc-inval.m4 index 8d9d21b..b8ba598 100644 --- a/m4/msvc-inval.m4 +++ b/m4/msvc-inval.m4 @@ -1,5 +1,5 @@ # msvc-inval.m4 serial 1 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/msvc-nothrow.m4 b/m4/msvc-nothrow.m4 index 0263e49..3e332a0 100644 --- a/m4/msvc-nothrow.m4 +++ b/m4/msvc-nothrow.m4 @@ -1,5 +1,5 @@ # msvc-nothrow.m4 serial 1 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 index 3ba5b0f..5f8339f 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,5 +1,5 @@ # multiarch.m4 serial 9 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ # musl.m4 serial 4 -dnl Copyright (C) 2019-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2019-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4 index e21a3e3..ff730b6 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -1,11 +1,11 @@ -# serial 43 +# serial 47 dnl From Jim Meyering. dnl Check for the nanosleep function. dnl If not found, use the supplied replacement. dnl -# Copyright (C) 1999-2001, 2003-2023 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], AC_CHECK_DECLS_ONCE([alarm]) - nanosleep_save_libs=$LIBS + gl_saved_LIBS=$LIBS # Solaris 2.5.1 needs -lposix4 to get the nanosleep function. # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. @@ -116,19 +116,24 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], *) gl_cv_func_nanosleep=no ;; esac], [case "$host_os" in - linux*) # Guess it halfway works when the kernel is Linux. + # Guess it halfway works when the kernel is Linux. + linux*) gl_cv_func_nanosleep='guessing no (mishandles large arguments)' ;; - mingw*) # Guess no on native Windows. + # Midipix generally emulates the Linux system calls, + # but here it handles large arguments correctly. + midipix*) + gl_cv_func_nanosleep='guessing yes' ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_nanosleep='guessing no' ;; - *) # If we don't know, obey --enable-cross-guesses. + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_nanosleep="$gl_cross_guess_normal" ;; esac ]) ]) case "$gl_cv_func_nanosleep" in - *yes) - REPLACE_NANOSLEEP=0 - ;; + *yes) ;; *) REPLACE_NANOSLEEP=1 case "$gl_cv_func_nanosleep" in @@ -142,7 +147,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], else HAVE_NANOSLEEP=0 fi - LIBS=$nanosleep_save_libs + LIBS=$gl_saved_LIBS # For backward compatibility. LIB_NANOSLEEP="$NANOSLEEP_LIB" diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4 index e6aa892..dc65398 100644 --- a/m4/netdb_h.m4 +++ b/m4/netdb_h.m4 @@ -1,5 +1,5 @@ # netdb_h.m4 serial 15 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/netinet_in_h.m4 b/m4/netinet_in_h.m4 index 7115419..9618c0c 100644 --- a/m4/netinet_in_h.m4 +++ b/m4/netinet_in_h.m4 @@ -1,5 +1,5 @@ # netinet_in_h.m4 serial 6 -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4 index 7648d52..3ffefe3 100644 --- a/m4/nl_langinfo.m4 +++ b/m4/nl_langinfo.m4 @@ -1,5 +1,5 @@ # nl_langinfo.m4 serial 11 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ # nls.m4 serial 6 (gettext-0.20.2) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2022 Free +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2023 Free dnl Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/nocrash.m4 b/m4/nocrash.m4 index 6a76638..9730fc0 100644 --- a/m4/nocrash.m4 +++ b/m4/nocrash.m4 @@ -1,5 +1,5 @@ # nocrash.m4 serial 5 -dnl Copyright (C) 2005, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/off_t.m4 b/m4/off_t.m4 index 880f347..f3259f9 100644 --- a/m4/off_t.m4 +++ b/m4/off_t.m4 @@ -1,5 +1,5 @@ # off_t.m4 serial 1 -dnl Copyright (C) 2012-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/open-cloexec.m4 b/m4/open-cloexec.m4 index fd572fc..a2d5032 100644 --- a/m4/open-cloexec.m4 +++ b/m4/open-cloexec.m4 @@ -1,6 +1,6 @@ # Test whether O_CLOEXEC is defined. -dnl Copyright 2017-2023 Free Software Foundation, Inc. +dnl Copyright 2017-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/open-slash.m4 b/m4/open-slash.m4 index 1f731f8..45310c0 100644 --- a/m4/open-slash.m4 +++ b/m4/open-slash.m4 @@ -1,5 +1,5 @@ # open-slash.m4 serial 2 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ -# open.m4 serial 15 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# open.m4 serial 16 +dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_OPEN], AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_PREPROC_O_CLOEXEC]) case "$host_os" in - mingw* | pw*) + mingw* | windows* | pw*) REPLACE_OPEN=1 ;; *) diff --git a/m4/openat.m4 b/m4/openat.m4 index bbbcad8..47cd93c 100644 --- a/m4/openat.m4 +++ b/m4/openat.m4 @@ -1,7 +1,7 @@ # serial 46 # See if we need to use our replacement for Solaris' openat et al functions. -dnl Copyright (C) 2004-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/opendir.m4 b/m4/opendir.m4 index 2e9be76..7cc8632 100644 --- a/m4/opendir.m4 +++ b/m4/opendir.m4 @@ -1,5 +1,5 @@ -# opendir.m4 serial 6 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +# opendir.m4 serial 7 +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,16 +13,12 @@ AC_DEFUN([gl_FUNC_OPENDIR], if test $ac_cv_func_opendir = no; then HAVE_OPENDIR=0 else - dnl Replace opendir() on native Windows, to support fdopendir(). + dnl Replace opendir() on native Windows and OS/2 kLIBC, + dnl to support fdopendir(). AC_REQUIRE([gl_DIRENT_DIR]) if test $DIR_HAS_FD_MEMBER = 0; then REPLACE_OPENDIR=1 fi - dnl Replace opendir() on OS/2 kLIBC to support dirfd() function replaced - dnl by gnulib. - case $host_os in - os2*) REPLACE_OPENDIR=1 ;; - esac dnl Replace opendir() for supporting the gnulib-defined fchdir() function, dnl to keep fchdir's bookkeeping up-to-date. m4_ifdef([gl_FUNC_FCHDIR], [ diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 index 6d47d2c..a0fc296 100644 --- a/m4/pathmax.m4 +++ b/m4/pathmax.m4 @@ -1,5 +1,5 @@ # pathmax.m4 serial 11 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2023 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -1,5 +1,5 @@ # pipe.m4 serial 2 -dnl Copyright (C) 2010-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/pipe2.m4 b/m4/pipe2.m4 index 79de69c..74b7b28 100644 --- a/m4/pipe2.m4 +++ b/m4/pipe2.m4 @@ -1,5 +1,5 @@ # pipe2.m4 serial 4 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/posix_spawn.m4 b/m4/posix_spawn.m4 index 0a0dfe7..0066a45 100644 --- a/m4/posix_spawn.m4 +++ b/m4/posix_spawn.m4 @@ -1,5 +1,5 @@ -# posix_spawn.m4 serial 23 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +# posix_spawn.m4 serial 25 +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -36,7 +36,8 @@ AC_DEFUN([gl_POSIX_SPAWN_BODY], if test $ac_cv_func_posix_spawn = yes; then m4_ifdef([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR], [dnl Module 'posix_spawn_file_actions_addchdir' is present. - AC_CHECK_FUNCS_ONCE([posix_spawn_file_actions_addchdir_np]) + gl_CHECK_FUNCS_ANDROID([posix_spawn_file_actions_addchdir_np], + [[#include <spawn.h>]]) if test $ac_cv_func_posix_spawn_file_actions_addchdir_np = no; then dnl In order to implement the posix_spawn_file_actions_addchdir dnl function, we need to replace the entire posix_spawn facility. @@ -45,7 +46,8 @@ AC_DEFUN([gl_POSIX_SPAWN_BODY], ]) m4_ifdef([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR], [dnl Module 'posix_spawn_file_actions_addfchdir' is present. - AC_CHECK_FUNCS_ONCE([posix_spawn_file_actions_addfchdir_np]) + gl_CHECK_FUNCS_ANDROID([posix_spawn_file_actions_addfchdir_np], + [[#include <spawn.h>]]) if test $ac_cv_func_posix_spawn_file_actions_addfchdir_np = no; then dnl In order to implement the posix_spawn_file_actions_addfchdir dnl function, we need to replace the entire posix_spawn facility. @@ -588,7 +590,7 @@ int main () *-musl* | midipix*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;; solaris*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;; # Guess no on native Windows. - mingw*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;; + mingw* | windows*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;; *) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing yes" ;; esac ]) @@ -632,7 +634,7 @@ int main () *-musl* | midipix*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no";; solaris*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no";; # Guess no on native Windows. - mingw*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no" ;; + mingw* | windows*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no" ;; *) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing yes";; esac ]) @@ -678,7 +680,7 @@ int main () *-musl* | midipix*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no";; solaris*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no";; # Guess no on native Windows. - mingw*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no" ;; + mingw* | windows*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no" ;; *) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing yes";; esac ]) diff --git a/m4/posix_spawn_faction_addchdir.m4 b/m4/posix_spawn_faction_addchdir.m4 index 6116a8e..a22e3a5 100644 --- a/m4/posix_spawn_faction_addchdir.m4 +++ b/m4/posix_spawn_faction_addchdir.m4 @@ -1,5 +1,5 @@ -# posix_spawn_faction_addchdir.m4 serial 1 -dnl Copyright (C) 2018-2023 Free Software Foundation, Inc. +# posix_spawn_faction_addchdir.m4 serial 2 +dnl Copyright (C) 2018-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,7 +9,9 @@ AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR], AC_REQUIRE([gl_SPAWN_H_DEFAULTS]) AC_REQUIRE([AC_PROG_CC]) gl_POSIX_SPAWN - AC_CHECK_FUNCS_ONCE([posix_spawn_file_actions_addchdir posix_spawn_file_actions_addchdir_np]) + AC_CHECK_FUNCS_ONCE([posix_spawn_file_actions_addchdir]) + gl_CHECK_FUNCS_ANDROID([posix_spawn_file_actions_addchdir_np], + [[#include <spawn.h>]]) if test $ac_cv_func_posix_spawn_file_actions_addchdir = yes; then dnl This function is not yet standardized. Therefore override the dnl system's implementation always. diff --git a/m4/printf.m4 b/m4/printf.m4 index efb85a5..6f91777 100644 --- a/m4/printf.m4 +++ b/m4/printf.m4 @@ -1,5 +1,5 @@ -# printf.m4 serial 82 -dnl Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc. +# printf.m4 serial 90 +dnl Copyright (C) 2003, 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -86,7 +86,8 @@ changequote(,)dnl linux*-android*) gl_cv_func_printf_sizes_c99="guessing yes";; changequote([,])dnl # Guess yes on MSVC, no on mingw. - mingw*) AC_EGREP_CPP([Known], [ + windows*-msvc*) gl_cv_func_printf_sizes_c99="guessing yes" ;; + mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER Known #endif @@ -179,7 +180,7 @@ int main () # Guess no on Android. linux*-android*) gl_cv_func_printf_sizes_c23="guessing no";; # Guess no on native Windows. - mingw*) gl_cv_func_printf_sizes_c23="guessing no";; + mingw* | windows*) gl_cv_func_printf_sizes_c23="guessing no";; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_printf_sizes_c23="$gl_cross_guess_normal";; esac @@ -223,20 +224,21 @@ int main () [gl_cv_func_printf_long_double=yes], [gl_cv_func_printf_long_double=no], [case "$host_os" in - # Guess no on BeOS. - beos*) gl_cv_func_printf_long_double="guessing no";; - # Guess yes on Android. - linux*-android*) gl_cv_func_printf_long_double="guessing yes";; - # Guess yes on MSVC, no on mingw. - mingw*) AC_EGREP_CPP([Known], [ + # Guess no on BeOS. + beos*) gl_cv_func_printf_long_double="guessing no";; + # Guess yes on Android. + linux*-android*) gl_cv_func_printf_long_double="guessing yes";; + # Guess yes on MSVC, no on mingw. + windows*-msvc*) gl_cv_func_printf_long_double="guessing yes" ;; + mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER Known #endif - ], - [gl_cv_func_printf_long_double="guessing yes"], - [gl_cv_func_printf_long_double="guessing no"]) - ;; - *) gl_cv_func_printf_long_double="guessing yes";; + ], + [gl_cv_func_printf_long_double="guessing yes"], + [gl_cv_func_printf_long_double="guessing no"]) + ;; + *) gl_cv_func_printf_long_double="guessing yes";; esac ]) ]) @@ -354,7 +356,8 @@ changequote(,)dnl linux*-android*) gl_cv_func_printf_infinite="guessing no";; changequote([,])dnl # Guess yes on MSVC, no on mingw. - mingw*) AC_EGREP_CPP([Known], [ + windows*-msvc*) gl_cv_func_printf_infinite="guessing yes" ;; + mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER Known #endif @@ -568,7 +571,8 @@ changequote(,)dnl linux*-android*) gl_cv_func_printf_infinite_long_double="guessing no";; changequote([,])dnl # Guess yes on MSVC, no on mingw. - mingw*) AC_EGREP_CPP([Known], [ + windows*-msvc*) gl_cv_func_printf_infinite_long_double="guessing yes" ;; + mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER Known #endif @@ -681,7 +685,7 @@ int main () # Guess no on Android. linux*-android*) gl_cv_func_printf_directive_a="guessing no";; # Guess no on native Windows. - mingw*) gl_cv_func_printf_directive_a="guessing no";; + mingw* | windows*) gl_cv_func_printf_directive_a="guessing no";; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_printf_directive_a="$gl_cross_guess_normal";; esac @@ -736,7 +740,7 @@ int main () # Guess no on Android. linux*-android*) gl_cv_func_printf_directive_b="guessing no";; # Guess no on native Windows. - mingw*) gl_cv_func_printf_directive_b="guessing no";; + mingw* | windows*) gl_cv_func_printf_directive_b="guessing no";; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_printf_directive_b="$gl_cross_guess_normal";; esac @@ -791,7 +795,7 @@ int main () # Guess no on Android. linux*-android*) gl_cv_func_printf_directive_uppercase_b="guessing no";; # Guess no on native Windows. - mingw*) gl_cv_func_printf_directive_uppercase_b="guessing no";; + mingw* | windows*) gl_cv_func_printf_directive_uppercase_b="guessing no";; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_printf_directive_uppercase_b="$gl_cross_guess_normal";; esac @@ -857,7 +861,8 @@ changequote(,)dnl linux*-android*) gl_cv_func_printf_directive_f="guessing no";; changequote([,])dnl # Guess yes on MSVC, no on mingw. - mingw*) AC_EGREP_CPP([Known], [ + windows*-msvc*) gl_cv_func_printf_directive_f="guessing yes" ;; + mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER Known #endif @@ -885,6 +890,7 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_N], [ AC_RUN_IFELSE( [AC_LANG_SOURCE([[ +#include <signal.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -902,6 +908,12 @@ invalid_parameter_handler (const wchar_t *expression, exit (1); } #endif +static void +abort_handler (int sig) +{ + (void) sig; + _exit (1); +} static char fmtstring[10]; static char buf[100]; int main () @@ -910,6 +922,7 @@ int main () #ifdef _MSC_VER _set_invalid_parameter_handler (invalid_parameter_handler); #endif + signal (SIGABRT, abort_handler); /* Copy the format string. Some systems (glibc with _FORTIFY_SOURCE=2) support %n in format strings in read-only memory but not in writable memory. */ @@ -923,21 +936,21 @@ int main () [gl_cv_func_printf_directive_n=yes], [gl_cv_func_printf_directive_n=no], [case "$host_os" in - # Guess no on glibc when _FORTIFY_SOURCE >= 2. - *-gnu* | gnu*) AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if _FORTIFY_SOURCE >= 2 - error fail - #endif - ]])], - [gl_cv_func_printf_directive_n="guessing yes"], - [gl_cv_func_printf_directive_n="guessing no"]) - ;; - # Guess no on Android. - linux*-android*) gl_cv_func_printf_directive_n="guessing no";; - # Guess no on native Windows. - mingw*) gl_cv_func_printf_directive_n="guessing no";; - *) gl_cv_func_printf_directive_n="guessing yes";; + # Guess no on glibc when _FORTIFY_SOURCE >= 2. + *-gnu* | gnu*) AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if _FORTIFY_SOURCE >= 2 + error fail + #endif + ]])], + [gl_cv_func_printf_directive_n="guessing yes"], + [gl_cv_func_printf_directive_n="guessing no"]) + ;; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_directive_n="guessing no";; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_printf_directive_n="guessing no";; + *) gl_cv_func_printf_directive_n="guessing yes";; esac ]) ]) @@ -1007,18 +1020,18 @@ int main () [ changequote(,)dnl case "$host_os" in - # Guess yes on OpenBSD >= 6.0. - openbsd[1-5].*) gl_cv_func_printf_directive_ls="guessing no";; - openbsd*) gl_cv_func_printf_directive_ls="guessing yes";; - irix*) gl_cv_func_printf_directive_ls="guessing no";; - solaris*) gl_cv_func_printf_directive_ls="guessing no";; - cygwin*) gl_cv_func_printf_directive_ls="guessing no";; - beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; - # Guess no on Android. - linux*-android*) gl_cv_func_printf_directive_ls="guessing no";; - # Guess yes on native Windows. - mingw*) gl_cv_func_printf_directive_ls="guessing yes";; - *) gl_cv_func_printf_directive_ls="guessing yes";; + # Guess yes on OpenBSD >= 6.0. + openbsd[1-5].*) gl_cv_func_printf_directive_ls="guessing no";; + openbsd*) gl_cv_func_printf_directive_ls="guessing yes";; + irix*) gl_cv_func_printf_directive_ls="guessing no";; + solaris*) gl_cv_func_printf_directive_ls="guessing no";; + cygwin*) gl_cv_func_printf_directive_ls="guessing no";; + beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_directive_ls="guessing no";; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_printf_directive_ls="guessing yes";; + *) gl_cv_func_printf_directive_ls="guessing yes";; esac changequote([,])dnl ]) @@ -1027,7 +1040,8 @@ changequote([,])dnl dnl Test whether the *printf family of functions supports the %lc format dnl directive and in particular, when the argument is a null wide character, -dnl whether the functions don't produce a NUL byte. +dnl whether the functions produce a NUL byte, as specified in ISO C 23 +dnl after the issue GB-141 was fixed. dnl Result is gl_cv_func_printf_directive_lc. AC_DEFUN([gl_PRINTF_DIRECTIVE_LC], @@ -1046,13 +1060,11 @@ int main () { int result = 0; char buf[100]; - /* This test fails on glibc 2.35, FreeBSD 13.1, NetBSD 9.0, OpenBSD 7.2, - macOS 12.5, AIX 7.2, Solaris 11.4. - glibc 2.35 bug: <https://sourceware.org/bugzilla/show_bug.cgi?id=30257> */ + /* This test fails on musl libc 1.2.4. */ { buf[0] = '\0'; if (sprintf (buf, "%lc%lc%lc", (wint_t) 'a', (wint_t) 0, (wint_t) 'z') < 0 - || strcmp (buf, "az") != 0) + || memcmp (buf, "a\0z", 4) != 0) result |= 1; } return result; @@ -1062,10 +1074,10 @@ int main () [ changequote(,)dnl case "$host_os" in - # Guess yes on musl libc. - *-musl* | midipix*) gl_cv_func_printf_directive_lc="guessing yes";; - # Guess no otherwise. - *) gl_cv_func_printf_directive_lc="guessing no";; + # Guess no on musl libc. + *-musl* | midipix*) gl_cv_func_printf_directive_lc="guessing no";; + # Guess yes otherwise. + *) gl_cv_func_printf_directive_lc="guessing yes";; esac changequote([,])dnl ]) @@ -1102,13 +1114,17 @@ int main () changequote(,)dnl case "$host_os" in netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*) - gl_cv_func_printf_positions="guessing no";; - beos*) gl_cv_func_printf_positions="guessing no";; - # Guess yes on Android. - linux*-android*) gl_cv_func_printf_positions="guessing yes";; - # Guess no on native Windows. - mingw* | pw*) gl_cv_func_printf_positions="guessing no";; - *) gl_cv_func_printf_positions="guessing yes";; + gl_cv_func_printf_positions="guessing no";; + beos*) + gl_cv_func_printf_positions="guessing no";; + # Guess yes on Android. + linux*-android*) + gl_cv_func_printf_positions="guessing yes";; + # Guess no on native Windows. + mingw* | windows* | pw*) + gl_cv_func_printf_positions="guessing no";; + *) + gl_cv_func_printf_positions="guessing yes";; esac changequote([,])dnl ]) @@ -1143,13 +1159,13 @@ int main () [ changequote(,)dnl case "$host_os" in - cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; - netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; - # Guess no on Android. - linux*-android*) gl_cv_func_printf_flag_grouping="guessing no";; - # Guess no on native Windows. - mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";; - *) gl_cv_func_printf_flag_grouping="guessing yes";; + cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; + netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_flag_grouping="guessing no";; + # Guess no on native Windows. + mingw* | windows* | pw*) gl_cv_func_printf_flag_grouping="guessing no";; + *) gl_cv_func_printf_flag_grouping="guessing yes";; esac changequote([,])dnl ]) @@ -1186,16 +1202,16 @@ int main () [ changequote(,)dnl case "$host_os" in - # Guess yes on HP-UX 11. - hpux11*) gl_cv_func_printf_flag_leftadjust="guessing yes";; - # Guess no on HP-UX 10 and older. - hpux*) gl_cv_func_printf_flag_leftadjust="guessing no";; - # Guess yes on Android. - linux*-android*) gl_cv_func_printf_flag_leftadjust="guessing yes";; - # Guess yes on native Windows. - mingw*) gl_cv_func_printf_flag_leftadjust="guessing yes";; - # Guess yes otherwise. - *) gl_cv_func_printf_flag_leftadjust="guessing yes";; + # Guess yes on HP-UX 11. + hpux11*) gl_cv_func_printf_flag_leftadjust="guessing yes";; + # Guess no on HP-UX 10 and older. + hpux*) gl_cv_func_printf_flag_leftadjust="guessing no";; + # Guess yes on Android. + linux*-android*) gl_cv_func_printf_flag_leftadjust="guessing yes";; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_printf_flag_leftadjust="guessing yes";; + # Guess yes otherwise. + *) gl_cv_func_printf_flag_leftadjust="guessing yes";; esac changequote([,])dnl ]) @@ -1242,7 +1258,7 @@ changequote(,)dnl # Guess no on Android. linux*-android*) gl_cv_func_printf_flag_zero="guessing no";; # Guess no on native Windows. - mingw*) gl_cv_func_printf_flag_zero="guessing no";; + mingw* | windows*) gl_cv_func_printf_flag_zero="guessing no";; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_printf_flag_zero="$gl_cross_guess_normal";; esac @@ -1251,6 +1267,50 @@ changequote([,])dnl ]) ]) +dnl Test whether the *printf family of functions supports the # flag with a +dnl zero precision and a zero value in the 'x' and 'X' directives correctly. +dnl ISO C and POSIX specify that for the 'd', 'i', 'b', 'o', 'u', 'x', 'X' +dnl directives: "The result of converting a zero value with a precision of +dnl zero is no characters." But on Mac OS X 10.5, for the 'x', 'X' directives, +dnl when a # flag is present, the output is "0" instead of "". +dnl Result is gl_cv_func_printf_flag_alt_precision_zero. + +AC_DEFUN([gl_PRINTF_FLAG_ALT_PRECISION_ZERO], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports the alternative flag with a zero precision], + [gl_cv_func_printf_flag_alt_precision_zero], + [ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include <stdio.h> +static char buf[10]; +int main () +{ + int result = 0; + if (sprintf (buf, "%#.0x %d", 0, 33, 44) > 0 + 3) + result |= 1; + return result; +}]])], + [gl_cv_func_printf_flag_alt_precision_zero=yes], + [gl_cv_func_printf_flag_alt_precision_zero=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess no only on macOS 10..12 systems. + darwin[0-9] | darwin[0-9].* | \ + darwin1[0-9] | darwin1[0-9].* | \ + darwin2[0-1] | darwin2[0-1].*) + gl_cv_func_printf_flag_alt_precision_zero="guessing no" ;; + darwin*) gl_cv_func_printf_flag_alt_precision_zero="guessing yes" ;; + *) gl_cv_func_printf_flag_alt_precision_zero="guessing yes" ;; + esac +changequote([,])dnl + ]) + ]) +]) + dnl Test whether the *printf family of functions supports large precisions. dnl On mingw, precisions larger than 512 are treated like 512, in integer, dnl floating-point or pointer output. On Solaris 10/x86, precisions larger @@ -1297,12 +1357,12 @@ int main () changequote(,)dnl case "$host_os" in # Guess no only on Solaris, native Windows, and BeOS systems. - solaris*) gl_cv_func_printf_precision="guessing no" ;; - mingw* | pw*) gl_cv_func_printf_precision="guessing no" ;; - beos*) gl_cv_func_printf_precision="guessing no" ;; - # Guess yes on Android. - linux*-android*) gl_cv_func_printf_precision="guessing yes" ;; - *) gl_cv_func_printf_precision="guessing yes" ;; + solaris*) gl_cv_func_printf_precision="guessing no" ;; + mingw* | windows* | pw*) gl_cv_func_printf_precision="guessing no" ;; + beos*) gl_cv_func_printf_precision="guessing no" ;; + # Guess yes on Android. + linux*-android*) gl_cv_func_printf_precision="guessing yes" ;; + *) gl_cv_func_printf_precision="guessing yes" ;; esac changequote([,])dnl ]) @@ -1518,7 +1578,7 @@ changequote(,)dnl # Guess yes on Android. linux*-android*) gl_cv_func_snprintf_truncation_c99="guessing yes";; # Guess no on native Windows. - mingw*) gl_cv_func_snprintf_truncation_c99="guessing no";; + mingw* | windows*) gl_cv_func_snprintf_truncation_c99="guessing no";; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_snprintf_truncation_c99="$gl_cross_guess_normal";; esac @@ -1615,7 +1675,8 @@ changequote(,)dnl linux*-android*) gl_cv_func_snprintf_retval_c99="guessing yes";; changequote([,])dnl # Guess yes on MSVC, no on mingw. - mingw*) AC_EGREP_CPP([Known], [ + windows*-msvc*) gl_cv_func_snprintf_retval_c99="guessing yes" ;; + mingw* | windows*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER Known #endif @@ -1644,6 +1705,7 @@ AC_DEFUN([gl_SNPRINTF_DIRECTIVE_N], [ AC_RUN_IFELSE( [AC_LANG_SOURCE([[ +#include <signal.h> #include <stdio.h> #include <string.h> #if HAVE_SNPRINTF @@ -1660,11 +1722,18 @@ static int my_snprintf (char *buf, int size, const char *format, ...) return ret; } #endif +static void +abort_handler (int sig) +{ + (void) sig; + _exit (1); +} static char fmtstring[10]; static char buf[100]; int main () { int count = -1; + signal (SIGABRT, abort_handler); /* Copy the format string. Some systems (glibc with _FORTIFY_SOURCE=2) support %n in format strings in read-only memory but not in writable memory. */ @@ -1719,7 +1788,7 @@ changequote(,)dnl # Guess no on Android. linux*-android*) gl_cv_func_snprintf_directive_n="guessing no";; # Guess no on native Windows. - mingw*) gl_cv_func_snprintf_directive_n="guessing no";; + mingw* | windows*) gl_cv_func_snprintf_directive_n="guessing no";; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_snprintf_directive_n="$gl_cross_guess_normal";; changequote([,])dnl @@ -1767,11 +1836,11 @@ int main() [gl_cv_func_snprintf_size1=yes], [gl_cv_func_snprintf_size1=no], [case "$host_os" in - # Guess yes on Android. - linux*-android*) gl_cv_func_snprintf_size1="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_snprintf_size1="guessing yes" ;; - *) gl_cv_func_snprintf_size1="guessing yes" ;; + # Guess yes on Android. + linux*-android*) gl_cv_func_snprintf_size1="guessing yes" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_snprintf_size1="guessing yes" ;; + *) gl_cv_func_snprintf_size1="guessing yes" ;; esac ]) ]) @@ -1844,40 +1913,40 @@ int main() [ changequote(,)dnl case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - midnightbsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on Mac OS X >= 10.3. - darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; - darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on Cygwin. - cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on Solaris >= 2.6. + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + midnightbsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on Mac OS X >= 10.3. + darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on Cygwin. + cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on Solaris >= 2.6. solaris2.[0-5] | solaris2.[0-5].*) - gl_cv_func_vsnprintf_zerosize_c99="guessing no";; - solaris*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on AIX >= 4. - aix[1-3]*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; - aix*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on IRIX >= 6.5. - irix6.5) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on NetBSD >= 3. + gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + solaris*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on AIX >= 4. + aix[1-3]*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + aix*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on IRIX >= 6.5. + irix6.5) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on NetBSD >= 3. netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) - gl_cv_func_vsnprintf_zerosize_c99="guessing no";; - netbsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on BeOS. - beos*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on Android. - linux*-android*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on native Windows. - mingw* | pw*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_vsnprintf_zerosize_c99="$gl_cross_guess_normal";; + gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + netbsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on Android. + linux*-android*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on native Windows. + mingw* | windows* | pw*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_vsnprintf_zerosize_c99="$gl_cross_guess_normal";; esac changequote([,])dnl ]) @@ -1906,7 +1975,7 @@ AC_DEFUN([gl_SWPRINTF_WORKS], int main() { int result = 0; - { /* This test fails on musl, FreeBSD, NetBSD, OpenBSD, macOS, AIX. */ + { /* This test fails on musl libc 1.2.3, FreeBSD, NetBSD, OpenBSD, macOS, AIX. */ wchar_t buf[5] = { 0xBEEF, 0xBEEF, 0xBEEF, 0xBEEF, 0xBEEF }; int ret = swprintf (buf, 4, L"%cz", '\0'); /* Expected result: @@ -1934,17 +2003,17 @@ int main() [gl_cv_func_swprintf_works=yes], [gl_cv_func_swprintf_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_swprintf_works="guessing yes";; - # Guess no on musl systems. - *-musl* | midipix*) gl_cv_func_swprintf_works="guessing yes";; - # Guess no on FreeBSD, NetBSD, OpenBSD, macOS, AIX. + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_swprintf_works="guessing yes";; + # Guess no on musl systems. + *-musl* | midipix*) gl_cv_func_swprintf_works="guessing no";; + # Guess no on FreeBSD, NetBSD, OpenBSD, macOS, AIX. freebsd* | midnightbsd* | netbsd* | openbsd* | darwin* | aix*) - gl_cv_func_swprintf_works="guessing no";; - # Guess no on native Windows. - mingw* | pw*) gl_cv_func_swprintf_works="guessing no";; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_swprintf_works="$gl_cross_guess_normal";; + gl_cv_func_swprintf_works="guessing no";; + # Guess no on native Windows. + mingw* | windows* | pw*) gl_cv_func_swprintf_works="guessing no";; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_swprintf_works="$gl_cross_guess_normal";; esac ]) ]) @@ -1983,7 +2052,7 @@ int main () [gl_cv_func_swprintf_directive_la=yes], [gl_cv_func_swprintf_directive_la=no], [case "$host_os" in - # Guess yes on glibc >= 2.17 systems. + # Guess yes on glibc >= 2.17 systems. *-gnu* | gnu*) AC_EGREP_CPP([Unlucky], [ #include <features.h> @@ -1996,14 +2065,60 @@ int main () [gl_cv_func_swprintf_directive_la="guessing yes"], [gl_cv_func_swprintf_directive_la="guessing no"]) ;; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_swprintf_directive_la="guessing yes";; - # Guess yes on Android. - linux*-android*) gl_cv_func_swprintf_directive_la="guessing no";; - # Guess yes on native Windows. - mingw*) gl_cv_func_swprintf_directive_la="guessing no";; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_swprintf_directive_la="$gl_cross_guess_normal";; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_swprintf_directive_la="guessing yes";; + # Guess yes on Android. + linux*-android*) gl_cv_func_swprintf_directive_la="guessing yes";; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_swprintf_directive_la="guessing no";; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_swprintf_directive_la="$gl_cross_guess_normal";; + esac + ]) + ]) +]) + +dnl Test whether the *wprintf family of functions supports the 'lc' conversion +dnl specifier for all wide characters. +dnl (ISO C11, POSIX:2001) +dnl Result is gl_cv_func_swprintf_directive_lc. + +AC_DEFUN([gl_SWPRINTF_DIRECTIVE_LC], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether swprintf supports the 'lc' directive], + [gl_cv_func_swprintf_directive_lc], + [ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include <stdio.h> +#include <wchar.h> +static wchar_t buf[100]; +static wint_t L_invalid = (wchar_t) 0x76543210; +int main () +{ + int result = 0; + /* This catches a musl libc 1.2.4, Android bug. + Reported at <https://www.openwall.com/lists/musl/2023/06/12/3>. */ + if (swprintf (buf, sizeof (buf) / sizeof (wchar_t), + L"%lc %d", L_invalid, 33, 44, 55) < 0) + result |= 1; + return result; +}]])], + [gl_cv_func_swprintf_directive_lc=yes], + [gl_cv_func_swprintf_directive_lc=no], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_swprintf_directive_lc="guessing yes";; + # Guess no on musl systems. + *-musl* | midipix*) gl_cv_func_swprintf_directive_lc="guessing no";; + # Guess no on Android. + linux*-android*) gl_cv_func_swprintf_directive_lc="guessing no";; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_swprintf_directive_lc="guessing yes";; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_swprintf_directive_lc="$gl_cross_guess_normal";; esac ]) ]) @@ -2027,16 +2142,18 @@ dnl 13 = gl_PRINTF_POSITIONS dnl 14 = gl_PRINTF_FLAG_GROUPING dnl 15 = gl_PRINTF_FLAG_LEFTADJUST dnl 16 = gl_PRINTF_FLAG_ZERO -dnl 17 = gl_PRINTF_PRECISION -dnl 18 = gl_PRINTF_ENOMEM -dnl 19 = gl_SNPRINTF_PRESENCE -dnl 20 = gl_SNPRINTF_TRUNCATION_C99 -dnl 21 = gl_SNPRINTF_RETVAL_C99 -dnl 22 = gl_SNPRINTF_DIRECTIVE_N -dnl 23 = gl_SNPRINTF_SIZE1 -dnl 24 = gl_VSNPRINTF_ZEROSIZE_C99 -dnl 25 = gl_SWPRINTF_WORKS -dnl 26 = gl_SWPRINTF_DIRECTIVE_LA +dnl 17 = gl_PRINTF_FLAG_ALT_PRECISION_ZERO +dnl 18 = gl_PRINTF_PRECISION +dnl 19 = gl_PRINTF_ENOMEM +dnl 20 = gl_SNPRINTF_PRESENCE +dnl 21 = gl_SNPRINTF_TRUNCATION_C99 +dnl 22 = gl_SNPRINTF_RETVAL_C99 +dnl 23 = gl_SNPRINTF_DIRECTIVE_N +dnl 24 = gl_SNPRINTF_SIZE1 +dnl 25 = gl_VSNPRINTF_ZEROSIZE_C99 +dnl 26 = gl_SWPRINTF_WORKS +dnl 27 = gl_SWPRINTF_DIRECTIVE_LA +dnl 28 = gl_SWPRINTF_DIRECTIVE_LC dnl dnl 1 = checking whether printf supports size specifiers as in C99... dnl 2 = checking whether printf supports size specifiers as in C23... @@ -2054,57 +2171,60 @@ dnl 13 = checking whether printf supports POSIX/XSI format strings with position dnl 14 = checking whether printf supports the grouping flag... dnl 15 = checking whether printf supports the left-adjust flag correctly... dnl 16 = checking whether printf supports the zero flag correctly... -dnl 17 = checking whether printf supports large precisions... -dnl 18 = checking whether printf survives out-of-memory conditions... -dnl 19 = checking for snprintf... -dnl 20 = checking whether snprintf truncates the result as in C99... -dnl 21 = checking whether snprintf returns a byte count as in C99... -dnl 22 = checking whether snprintf fully supports the 'n' directive... -dnl 23 = checking whether snprintf respects a size of 1... -dnl 24 = checking whether vsnprintf respects a zero size as in C99... -dnl 25 = checking whether swprintf works... -dnl 26 = checking whether swprintf supports the 'La' and 'LA' directives... +dnl 17 = checking whether printf supports the alternative flag with a zero precision... +dnl 18 = checking whether printf supports large precisions... +dnl 19 = checking whether printf survives out-of-memory conditions... +dnl 20 = checking for snprintf... +dnl 21 = checking whether snprintf truncates the result as in C99... +dnl 22 = checking whether snprintf returns a byte count as in C99... +dnl 23 = checking whether snprintf fully supports the 'n' directive... +dnl 24 = checking whether snprintf respects a size of 1... +dnl 25 = checking whether vsnprintf respects a zero size as in C99... +dnl 26 = checking whether swprintf works... +dnl 27 = checking whether swprintf supports the 'La' and 'LA' directives... +dnl 28 = checking whether swprintf supports the 'lc' directive... dnl dnl . = yes, # = no. dnl -dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 -dnl musl libc 1.2.3 . # . . . . # # . . . . . . . . . . . . . . . . # . -dnl glibc 2.35 . # . . . . . . . . . # . . . . . . . . . . . . . . -dnl glibc 2.5 . # . . . . # # . . . # . . . . . . . . . . . . . # -dnl glibc 2.3.6 . # . . . # # # . . . # . . . . . . . . . . . . . # -dnl FreeBSD 13.0 . # . . . # # # . . . # . . . . . # . . . . . . # . -dnl FreeBSD 5.4, 6.1 . # . . . # # # . . . # . . . # . # . . . . . . # ? -dnl Mac OS X 10.13.5 . # . . # # # # . # . # . . . . . . . . . # . . # ? -dnl Mac OS X 10.5.8 . # . . # # # # . . . # . . . # . . . . . . . . # ? -dnl Mac OS X 10.3.9 . # . . . # # # . . . # . . . # . # . . . . . . # ? -dnl OpenBSD 6.0, 6.7 . # . . . # # # . . . # . . . . . # . . . . . . # . -dnl OpenBSD 3.9, 4.0 . # . # # # # # # . # # . # . # . # . . . . . . # ? -dnl Cygwin 1.7.0 (2009) . # . . # . # # . . ? ? . . . . . ? . . . . . . ? ? -dnl Cygwin 1.5.25 (2008) . # . . # # # # . . # ? . . . . . # . . . . . . ? ? -dnl Cygwin 1.5.19 (2006) # # . . # # # # # . # ? . # . # # # . . . . . . ? ? -dnl Solaris 11.4 . # . # # # # # . . # # . . . # . . . . . . . . . ? -dnl Solaris 11.3 . # . . . # # # . . # # . . . . . . . . . . . . . ? -dnl Solaris 11.0 . # . # # # # # . . # # . . . # . . . . . . . . ? ? -dnl Solaris 10 . # . # # # # # . . # # . . . # # . . . . . . . ? ? -dnl Solaris 2.6 ... 9 # # . # # # # # # . # # . . . # # . . . # . . . ? ? -dnl Solaris 2.5.1 # # . # # # # # # . # # . . . # . . # # # # # # ? ? -dnl AIX 7.1 . # . # # # # # . . . # . . . # # . . . . . . . # . -dnl AIX 5.2 . # . # # # # # . . . # . . . # . . . . . . . . # ? -dnl AIX 4.3.2, 5.1 # # . # # # # # # . . # . . . # . . . . # . . . # ? -dnl HP-UX 11.31 . # . . . # # # . . . ? . . . # . . . . # # . . ? ? -dnl HP-UX 11.{00,11,23} # # . . . # # # # . . ? . . . # . . . . # # . # ? ? -dnl HP-UX 10.20 # # . # . # # # # . ? ? . . # # . . . . # # ? # ? ? -dnl IRIX 6.5 # # . # # # # # # . # # . . . # . . . . # . . . # ? -dnl OSF/1 5.1 # # . # # # # # # . . ? . . . # . . . . # . . # ? ? -dnl OSF/1 4.0d # # . # # # # # # . . ? . . . # . . # # # # # # ? ? -dnl NetBSD 9.0 . # . . . # # # . . . # . . . . . . . . . . . . # . -dnl NetBSD 5.0 . # . . # # # # . . . # . . . # . # . . . . . . # ? -dnl NetBSD 4.0 . # ? ? ? ? # # ? . ? # . ? ? ? ? ? . . . ? ? ? # ? -dnl NetBSD 3.0 . # . . . # # # # . ? # # # ? # . # . . . . . . # ? -dnl Haiku . # . . # # # # # . # ? . . . . . ? . . ? . . . . # -dnl BeOS # # # . # # # # # . ? ? # . ? . # ? . . ? . . . ? ? -dnl Android 4.3 . # . # # # # # # # # ? . # . # . # . . . # . . ? ? -dnl old mingw / msvcrt # # # # # # # # # . . ? # # . # # ? . # # # . . # ? -dnl MSVC 9 # # # # # # # # # # . ? # # . # # ? # # # # . . # ? -dnl mingw 2009-2011 . # # . # . # # . . . ? # # . . . ? . . . . . . # ? -dnl mingw-w64 2011 # # # # # # # # # . . ? # # . # # ? . # # # . . # ? +dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 +dnl musl libc 1.2.3 . # . . . . # # . . . # . . . . ? . . . . . . . . # . # +dnl glibc 2.35 . # . . . . . . . . . . . . . . . . . . . . . . . . . . +dnl glibc 2.5 . # . . . . # # . . . . . . . . . . . . . . . . . . # . +dnl glibc 2.3.6 . # . . . # # # . . . . . . . . . . . . . . . . . . # . +dnl FreeBSD 14.0 . . . . . # . . . . . . . . . . . . # . . . . . . # . # +dnl FreeBSD 13.0 . # . . . # # # . . . . . . . . . . # . . . . . . # . # +dnl FreeBSD 5.4, 6.1 . # . . . # # # . . . . . . . # ? . # . . . . . . # ? ? +dnl Mac OS X 10.13.5 . # . . # # # # . # . . . . . . . . . . . . # . . # ? ? +dnl Mac OS X 10.5.8 . # . . # # # # . . . . . . . # # . . . . . . . . # ? ? +dnl Mac OS X 10.3.9 . # . . . # # # . . . . . . . # # . # . . . . . . # ? ? +dnl OpenBSD 6.0, 6.7 . # . . . # # # . . . . . . . . . . # . . . . . . # . # +dnl OpenBSD 3.9, 4.0 . # . # # # # # # . # . . # . # ? . # . . . . . . # ? ? +dnl Cygwin 1.7.0 (2009) . # . . # . # # . . ? ? . . . . ? . ? . . . . . . ? ? ? +dnl Cygwin 1.5.25 (2008) . # . . # # # # . . # ? . . . . ? . # . . . . . . ? ? ? +dnl Cygwin 1.5.19 (2006) # # . . # # # # # . # ? . # . # ? # # . . . . . . ? ? ? +dnl Solaris 11.4 . # . # # # # # . . # . . . . # . . . . . . . . . . # . +dnl Solaris 11.3 . # . . . # # # . . # . . . . . . . . . . . . . . . # . +dnl Solaris 11.0 . # . # # # # # . . # . . . . # . . . . . . . . . ? ? ? +dnl Solaris 10 . # . # # # # # . . # . . . . # . # . . . . . . . . # . +dnl Solaris 2.6 ... 9 # # . # # # # # # . # . . . . # ? # . . . # . . . ? ? ? +dnl Solaris 2.5.1 # # . # # # # # # . # . . . . # ? . . # # # # # # ? ? ? +dnl AIX 7.1 . # . # # # # # . . . . . . . # . # . . . . . . . # . . +dnl AIX 5.2 . # . # # # # # . . . . . . . # ? . . . . . . . . # ? ? +dnl AIX 4.3.2, 5.1 # # . # # # # # # . . . . . . # ? . . . . # . . . # ? ? +dnl HP-UX 11.31 . # . . . # # # . . . ? . . . # ? . . . . # # . . ? ? ? +dnl HP-UX 11.{00,11,23} # # . . . # # # # . . ? . . . # ? . . . . # # . # ? ? ? +dnl HP-UX 10.20 # # . # . # # # # . ? ? . . # # ? . . . . # # ? # ? ? ? +dnl IRIX 6.5 # # . # # # # # # . # . . . . # ? . . . . # . . . # ? ? +dnl OSF/1 5.1 # # . # # # # # # . . ? . . . # ? . . . . # . . # ? ? ? +dnl OSF/1 4.0d # # . # # # # # # . . ? . . . # ? . . # # # # # # ? ? ? +dnl NetBSD 9.0 . # . . . # # # . . . . . . . . . . . . . . . . . # . # +dnl NetBSD 5.0 . # . . # # # # . . . . . . . # ? . # . . . . . . # ? ? +dnl NetBSD 4.0 . # ? ? ? ? # # ? . ? . . ? ? ? ? ? ? . . . ? ? ? # ? ? +dnl NetBSD 3.0 . # . . . # # # # . ? . # # ? # ? . # . . . . . . # ? ? +dnl Haiku . # . . # # # # # . # ? . . . . ? . ? . . ? . . . . # . +dnl BeOS # # # . # # # # # . ? ? # . ? . ? # ? . . ? . . . ? ? ? +dnl Android 4.3 . # . # # # # # # # # ? . # . # ? . # . . . # . . ? ? ? +dnl old mingw / msvcrt # # # # # # # # # . . ? # # . # ? # ? . # # # . . # ? ? +dnl MSVC 9 # # # # # # # # # # . ? # # . # ? # ? # # # # . . # ? ? +dnl mingw 2009-2011 . # # . # . # # . . . ? # # . . ? . ? . . . . . . # ? ? +dnl mingw-w64 2011 # # # # # # # # # . . ? # # . # ? # ? . # # # . . # ? ? diff --git a/m4/pselect.m4 b/m4/pselect.m4 index 6c3d1b8..005b722 100644 --- a/m4/pselect.m4 +++ b/m4/pselect.m4 @@ -1,5 +1,5 @@ # pselect.m4 serial 11 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/pthread_rwlock_rdlock.m4 b/m4/pthread_rwlock_rdlock.m4 index 66b29f8..ddb5831 100644 --- a/m4/pthread_rwlock_rdlock.m4 +++ b/m4/pthread_rwlock_rdlock.m4 @@ -1,5 +1,5 @@ -# pthread_rwlock_rdlock.m4 serial 5 -dnl Copyright (C) 2017-2023 Free Software Foundation, Inc. +# pthread_rwlock_rdlock.m4 serial 8 +dnl Copyright (C) 2017-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -34,11 +34,11 @@ dnl https://sourceware.org/bugzilla/show_bug.cgi?id=13701 dnl https://bugzilla.redhat.com/show_bug.cgi?id=1410052 AC_DEFUN([gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER], [ - AC_REQUIRE([gl_THREADLIB_EARLY]) + AC_REQUIRE([gl_THREADLIB]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether pthread_rwlock_rdlock prefers a writer to a reader], [gl_cv_pthread_rwlock_rdlock_prefer_writer], - [save_LIBS="$LIBS" + [saved_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -164,7 +164,7 @@ main () *-android*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; # Guess yes on native Windows with the mingw-w64 winpthreads library. # Guess no on native Windows with the gnulib windows-rwlock module. - mingw*) if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then + mingw* | windows*) if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes" else gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" @@ -174,7 +174,7 @@ main () *) gl_cv_pthread_rwlock_rdlock_prefer_writer="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_pthread_rwlock_rdlock_prefer_writer" in *yes) diff --git a/m4/pthread_sigmask.m4 b/m4/pthread_sigmask.m4 index 2779528..cb2ee90 100644 --- a/m4/pthread_sigmask.m4 +++ b/m4/pthread_sigmask.m4 @@ -1,5 +1,5 @@ -# pthread_sigmask.m4 serial 22 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +# pthread_sigmask.m4 serial 23 +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK], if test -n "$LIBMULTITHREAD"; then AC_CACHE_CHECK([for pthread_sigmask in $LIBMULTITHREAD], [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD], - [gl_save_LIBS="$LIBS" + [gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -58,7 +58,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK], ], [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=yes], [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then dnl pthread_sigmask is available with -pthread or -lpthread. @@ -164,7 +164,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK], AC_CACHE_CHECK([whether pthread_sigmask returns error numbers], [gl_cv_func_pthread_sigmask_return_works], [ - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $PTHREAD_SIGMASK_LIB" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -188,7 +188,7 @@ int main () gl_cv_func_pthread_sigmask_return_works="guessing yes";; esac ]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) case "$gl_cv_func_pthread_sigmask_return_works" in *no) @@ -214,7 +214,7 @@ int main () [dnl Link against $LIBMULTITHREAD, not only $PTHREAD_SIGMASK_LIB. dnl Otherwise we get a false positive on those platforms where dnl $gl_cv_func_pthread_sigmask_in_libc_works is "no". - gl_save_LIBS=$LIBS + gl_saved_LIBS=$LIBS LIBS="$LIBS $LIBMULTITHREAD"]) AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -258,7 +258,7 @@ int main () [:], [gl_cv_func_pthread_sigmask_unblock_works=no], [:]) - m4_ifdef([gl_][THREADLIB], [LIBS=$gl_save_LIBS]) + m4_ifdef([gl_][THREADLIB], [LIBS=$gl_saved_LIBS]) ]) case "$gl_cv_func_pthread_sigmask_unblock_works" in *no) diff --git a/m4/quote.m4 b/m4/quote.m4 index 551437f..e44c674 100644 --- a/m4/quote.m4 +++ b/m4/quote.m4 @@ -1,5 +1,5 @@ # quote.m4 serial 6 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2023 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/quotearg.m4 b/m4/quotearg.m4 index 15e4aa6..3ea7eb5 100644 --- a/m4/quotearg.m4 +++ b/m4/quotearg.m4 @@ -1,5 +1,5 @@ # quotearg.m4 serial 10 -dnl Copyright (C) 2002, 2004-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/raise.m4 b/m4/raise.m4 index f20c439..08b9545 100644 --- a/m4/raise.m4 +++ b/m4/raise.m4 @@ -1,5 +1,5 @@ # raise.m4 serial 4 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 index a48d829..57d1c29 100644 --- a/m4/rawmemchr.m4 +++ b/m4/rawmemchr.m4 @@ -1,5 +1,5 @@ # rawmemchr.m4 serial 3 -dnl Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/readdir.m4 b/m4/readdir.m4 index 81337e2..2205f13 100644 --- a/m4/readdir.m4 +++ b/m4/readdir.m4 @@ -1,5 +1,5 @@ -# readdir.m4 serial 2 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +# readdir.m4 serial 3 +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,7 +12,8 @@ AC_DEFUN([gl_FUNC_READDIR], if test $ac_cv_func_readdir = no; then HAVE_READDIR=0 else - dnl Replace readdir() on native Windows, to support fdopendir(). + dnl Replace readdir() on native Windows and OS/2 kLIBC, + dnl to support fdopendir(). AC_REQUIRE([gl_DIRENT_DIR]) if test $DIR_HAS_FD_MEMBER = 0; then REPLACE_READDIR=1 diff --git a/m4/readlink.m4 b/m4/readlink.m4 index f1d41d2..6d78ec8 100644 --- a/m4/readlink.m4 +++ b/m4/readlink.m4 @@ -1,5 +1,5 @@ # readlink.m4 serial 17 -dnl Copyright (C) 2003, 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/realloc.m4 b/m4/realloc.m4 index 2605391..a59af28 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,5 +1,5 @@ -# realloc.m4 serial 27 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +# realloc.m4 serial 29 +dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,7 +16,8 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], [[#include <stdlib.h> ]], [[void *p = realloc (0, 0); - int result = !p; + void * volatile vp = p; + int result = !vp; free (p); return result;]]) ], @@ -26,7 +27,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], # Guess yes on platforms where we know the result. *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ | gnu* | *-musl* | midipix* | midnightbsd* \ - | hpux* | solaris* | cygwin* | mingw* | msys* ) + | hpux* | solaris* | cygwin* | mingw* | windows* | msys* ) ac_cv_func_realloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; diff --git a/m4/reallocarray.m4 b/m4/reallocarray.m4 index 6a5b5ab..20c4601 100644 --- a/m4/reallocarray.m4 +++ b/m4/reallocarray.m4 @@ -1,5 +1,5 @@ # reallocarray.m4 serial 5 -dnl Copyright (C) 2017-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2017-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/regex.m4 b/m4/regex.m4 index 7acadc4..3dfeabe 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,6 +1,6 @@ -# serial 74 +# serial 75 -# Copyright (C) 1996-2001, 2003-2023 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -327,10 +327,10 @@ AC_DEFUN([gl_REGEX], [gl_cv_func_re_compile_pattern_working=yes], [gl_cv_func_re_compile_pattern_working=no], [case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_re_compile_pattern_working="guessing no" ;; - # Otherwise obey --enable-cross-guesses. - *) gl_cv_func_re_compile_pattern_working="$gl_cross_guess_normal" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_re_compile_pattern_working="guessing no" ;; + # Otherwise obey --enable-cross-guesses. + *) gl_cv_func_re_compile_pattern_working="$gl_cross_guess_normal" ;; esac ]) ]) diff --git a/m4/rename.m4 b/m4/rename.m4 index efabf1a..757cc27 100644 --- a/m4/rename.m4 +++ b/m4/rename.m4 @@ -1,6 +1,6 @@ -# serial 34 +# serial 37 -# Copyright (C) 2001, 2003, 2005-2006, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005-2006, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -9,8 +9,8 @@ dnl From Volker Borchert. dnl Determine whether rename works for source file names with a trailing slash. dnl The rename from SunOS 4.1.1_U1 doesn't. dnl -dnl If it doesn't, then define RENAME_TRAILING_SLASH_BUG and arrange -dnl to compile the wrapper function. +dnl If it doesn't, arrange to compile the wrapper function and define +dnl macros for use by that function. dnl AC_DEFUN([gl_FUNC_RENAME], @@ -55,16 +55,15 @@ AC_DEFUN([gl_FUNC_RENAME], [gl_cv_func_rename_slash_dst_works=no], dnl When crosscompiling, assume rename is broken. [case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_rename_slash_dst_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rename_slash_dst_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_rename_slash_dst_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_rename_slash_dst_works="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_rename_slash_dst_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems + # and on systems that emulate the Linux system calls. + linux* | midipix*) gl_cv_func_rename_slash_dst_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_rename_slash_dst_works="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_rename_slash_dst_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_rename_slash_dst_works="$gl_cross_guess_normal" ;; esac ]) rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 conftest.lnk @@ -113,16 +112,15 @@ AC_DEFUN([gl_FUNC_RENAME], [gl_cv_func_rename_slash_src_works=no], dnl When crosscompiling, assume rename is broken. [case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_rename_slash_src_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rename_slash_src_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_rename_slash_src_works="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_rename_slash_src_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_rename_slash_src_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems + # and on systems that emulate the Linux system calls. + linux* | midipix*) gl_cv_func_rename_slash_src_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_rename_slash_src_works="guessing yes" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_rename_slash_src_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_rename_slash_src_works="$gl_cross_guess_normal" ;; esac ]) rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 conftest.lnk @@ -186,16 +184,15 @@ AC_DEFUN([gl_FUNC_RENAME], else dnl When crosscompiling, assume rename is broken. case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_rename_link_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rename_link_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_rename_link_works="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_rename_link_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_rename_link_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems + # and on systems that emulate the Linux system calls. + linux* | midipix*) gl_cv_func_rename_link_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_rename_link_works="guessing yes" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_rename_link_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_rename_link_works="$gl_cross_guess_normal" ;; esac fi else @@ -237,14 +234,15 @@ AC_DEFUN([gl_FUNC_RENAME], [gl_cv_func_rename_dest_works=no], dnl When crosscompiling, assume rename is broken. [case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_rename_dest_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_rename_dest_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_rename_dest_works="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_rename_dest_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems + # and on systems that emulate the Linux system calls. + linux* | midipix*) gl_cv_func_rename_dest_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_rename_dest_works="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_rename_dest_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_rename_dest_works="$gl_cross_guess_normal" ;; esac ]) rm -rf conftest.f conftest.d1 conftest.d2 diff --git a/m4/rewinddir.m4 b/m4/rewinddir.m4 index d0d24de..a5ee4e1 100644 --- a/m4/rewinddir.m4 +++ b/m4/rewinddir.m4 @@ -1,5 +1,5 @@ -# rewinddir.m4 serial 2 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +# rewinddir.m4 serial 3 +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,7 +12,8 @@ AC_DEFUN([gl_FUNC_REWINDDIR], if test $ac_cv_func_rewinddir = no; then HAVE_REWINDDIR=0 else - dnl Replace rewinddir() on native Windows, to support fdopendir(). + dnl Replace rewinddir() on native Windows and OS/2 kLIBC, + dnl to support fdopendir(). AC_REQUIRE([gl_DIRENT_DIR]) if test $DIR_HAS_FD_MEMBER = 0; then REPLACE_REWINDDIR=1 diff --git a/m4/rmdir.m4 b/m4/rmdir.m4 index b19c890..50156e0 100644 --- a/m4/rmdir.m4 +++ b/m4/rmdir.m4 @@ -1,5 +1,5 @@ -# rmdir.m4 serial 18 -dnl Copyright (C) 2002, 2005, 2009-2023 Free Software Foundation, Inc. +# rmdir.m4 serial 19 +dnl Copyright (C) 2002, 2005, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -34,16 +34,16 @@ AC_DEFUN([gl_FUNC_RMDIR], ]])], [gl_cv_func_rmdir_works=yes], [gl_cv_func_rmdir_works=no], [case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_rmdir_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rmdir_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_rmdir_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_rmdir_works="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_rmdir_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_rmdir_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_rmdir_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_rmdir_works="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_rmdir_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_rmdir_works="$gl_cross_guess_normal" ;; esac ]) rm -rf conftest.dir conftest.file]) diff --git a/m4/save-cwd.m4 b/m4/save-cwd.m4 index 2e6cf58..f1ac345 100644 --- a/m4/save-cwd.m4 +++ b/m4/save-cwd.m4 @@ -1,5 +1,5 @@ # serial 10 -dnl Copyright (C) 2002-2006, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sched_h.m4 b/m4/sched_h.m4 index 980d256..2ff821e 100644 --- a/m4/sched_h.m4 +++ b/m4/sched_h.m4 @@ -1,5 +1,5 @@ # sched_h.m4 serial 15 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/secure_getenv.m4 b/m4/secure_getenv.m4 index acb0650..ce06595 100644 --- a/m4/secure_getenv.m4 +++ b/m4/secure_getenv.m4 @@ -1,5 +1,5 @@ # secure_getenv.m4 serial 2 -dnl Copyright 2013-2023 Free Software Foundation, Inc. +dnl Copyright 2013-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/select.m4 b/m4/select.m4 index 88861af..f3f9dcc 100644 --- a/m4/select.m4 +++ b/m4/select.m4 @@ -1,5 +1,5 @@ -# select.m4 serial 15 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +# select.m4 serial 16 +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -96,7 +96,7 @@ changequote([,])dnl SELECT_LIB="$LIBSOCKET" if test $REPLACE_SELECT = 1; then case "$host_os" in - mingw*) + mingw* | windows*) dnl On the MSVC platform, the function MsgWaitForMultipleObjects dnl (used in lib/select.c) requires linking with -luser32. On mingw, dnl it is implicit. diff --git a/m4/servent.m4 b/m4/servent.m4 index 0f35b8b..fffb951 100644 --- a/m4/servent.m4 +++ b/m4/servent.m4 @@ -1,5 +1,5 @@ -# servent.m4 serial 4 -dnl Copyright (C) 2008, 2010-2023 Free Software Foundation, Inc. +# servent.m4 serial 5 +dnl Copyright (C) 2008, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -28,7 +28,7 @@ AC_DEFUN([gl_SERVENT], AC_CACHE_CHECK([for getservbyname in winsock2.h and -lws2_32], [gl_cv_w32_getservbyname], [gl_cv_w32_getservbyname=no - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -40,7 +40,7 @@ AC_DEFUN([gl_SERVENT], ]], [[getservbyname(NULL,NULL);]])], [gl_cv_w32_getservbyname=yes]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test "$gl_cv_w32_getservbyname" = "yes"; then SERVENT_LIB="-lws2_32" diff --git a/m4/setlocale_null.m4 b/m4/setlocale_null.m4 index 1105d69..54d3d46 100644 --- a/m4/setlocale_null.m4 +++ b/m4/setlocale_null.m4 @@ -1,5 +1,5 @@ -# setlocale_null.m4 serial 8 -dnl Copyright (C) 2019-2023 Free Software Foundation, Inc. +# setlocale_null.m4 serial 9 +dnl Copyright (C) 2019-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL], [gl_cv_func_setlocale_null_all_mtsafe=no]) ;; # Guess yes on glibc, HP-UX, IRIX, Solaris, native Windows. - *-gnu* | gnu* | hpux* | irix* | solaris* | mingw*) + *-gnu* | gnu* | hpux* | irix* | solaris* | mingw* | windows*) gl_cv_func_setlocale_null_all_mtsafe=yes ;; # If we don't know, obey --enable-cross-guesses. *) @@ -40,7 +40,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL], ]) dnl On platforms without multithreading, there is no issue. case "$host_os" in - mingw*) ;; + mingw* | windows*) ;; *) if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then gl_cv_func_setlocale_null_all_mtsafe="trivially yes" @@ -62,7 +62,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL], openbsd* | aix*) gl_cv_func_setlocale_null_one_mtsafe=no ;; # Guess yes on glibc, musl libc, macOS, FreeBSD, NetBSD, HP-UX, IRIX, Solaris, Haiku, Cygwin, native Windows. - *-gnu* | gnu* | *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*) + *-gnu* | gnu* | *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw* | windows*) gl_cv_func_setlocale_null_one_mtsafe=yes ;; # If we don't know, obey --enable-cross-guesses. *) @@ -71,7 +71,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL], ]) dnl On platforms without multithreading, there is no issue. case "$host_os" in - mingw*) ;; + mingw* | windows*) ;; *) if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then gl_cv_func_setlocale_null_one_mtsafe="trivially yes" @@ -88,7 +88,9 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL], dnl Determine link dependencies of lib/setlocale_null.c and lib/setlocale-lock.c. if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then case "$host_os" in - mingw*) SETLOCALE_NULL_LIB= ;; + mingw* | windows*) + SETLOCALE_NULL_LIB= + ;; *) gl_WEAK_SYMBOLS case "$gl_cv_have_weak" in diff --git a/m4/sh-filename.m4 b/m4/sh-filename.m4 index f30a620..c0d3937 100644 --- a/m4/sh-filename.m4 +++ b/m4/sh-filename.m4 @@ -1,5 +1,5 @@ # sh-filename.m4 serial 3 -dnl Copyright (C) 2018-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2018-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ # sha1.m4 serial 12 -dnl Copyright (C) 2002-2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sha256.m4 b/m4/sha256.m4 index 4d1d1dd..2dd754c 100644 --- a/m4/sha256.m4 +++ b/m4/sha256.m4 @@ -1,5 +1,5 @@ # sha256.m4 serial 8 -dnl Copyright (C) 2005, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sha512.m4 b/m4/sha512.m4 index b66dc72..19d03b5 100644 --- a/m4/sha512.m4 +++ b/m4/sha512.m4 @@ -1,5 +1,5 @@ # sha512.m4 serial 9 -dnl Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sig_atomic_t.m4 b/m4/sig_atomic_t.m4 index 268f131..ad62134 100644 --- a/m4/sig_atomic_t.m4 +++ b/m4/sig_atomic_t.m4 @@ -1,5 +1,5 @@ # sig_atomic_t.m4 serial 3 -dnl Copyright (C) 2003, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sigaction.m4 b/m4/sigaction.m4 index e981a74..926bb9c 100644 --- a/m4/sigaction.m4 +++ b/m4/sigaction.m4 @@ -1,5 +1,5 @@ # sigaction.m4 serial 7 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 index cdd6812..6f7dcc7 100644 --- a/m4/signal_h.m4 +++ b/m4/signal_h.m4 @@ -1,5 +1,5 @@ # signal_h.m4 serial 22 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4 index 81cc91a..f818d5d 100644 --- a/m4/signalblocking.m4 +++ b/m4/signalblocking.m4 @@ -1,5 +1,5 @@ # signalblocking.m4 serial 17 -dnl Copyright (C) 2001-2002, 2006-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2002, 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sigpipe.m4 b/m4/sigpipe.m4 index 1b6ec42..da8f03b 100644 --- a/m4/sigpipe.m4 +++ b/m4/sigpipe.m4 @@ -1,5 +1,5 @@ # sigpipe.m4 serial 3 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/size_max.m4 b/m4/size_max.m4 index 0763366..b3f7624 100644 --- a/m4/size_max.m4 +++ b/m4/size_max.m4 @@ -1,5 +1,5 @@ # size_max.m4 serial 12 -dnl Copyright (C) 2003, 2005-2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/snprintf.m4 b/m4/snprintf.m4 index 4b5fbdb..96f9c4e 100644 --- a/m4/snprintf.m4 +++ b/m4/snprintf.m4 @@ -1,5 +1,5 @@ # snprintf.m4 serial 7 -dnl Copyright (C) 2002-2004, 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/socketlib.m4 b/m4/socketlib.m4 index a556af1..0633969 100644 --- a/m4/socketlib.m4 +++ b/m4/socketlib.m4 @@ -1,5 +1,5 @@ -# socketlib.m4 serial 3 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +# socketlib.m4 serial 4 +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -18,7 +18,7 @@ AC_DEFUN([gl_SOCKETLIB], dnl defined through -lws2_32), we need to call it. AC_CACHE_CHECK([for WSAStartup], [gl_cv_func_wsastartup], [ - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_LINK_IFELSE( [AC_LANG_PROGRAM([[ @@ -33,7 +33,7 @@ AC_DEFUN([gl_SOCKETLIB], ], [gl_cv_func_wsastartup=yes], [gl_cv_func_wsastartup=no]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test "$gl_cv_func_wsastartup" = "yes"; then AC_DEFINE([WINDOWS_SOCKETS], [1], [Define if WSAStartup is needed.]) @@ -56,8 +56,8 @@ AC_DEFUN([gl_SOCKETLIB], #endif char setsockopt();]], [[setsockopt();]])], [], - [gl_save_LIBS="$LIBS" - LIBS="$gl_save_LIBS -lsocket" + [gl_saved_LIBS="$LIBS" + LIBS="$gl_saved_LIBS -lsocket" AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern #ifdef __cplusplus "C" @@ -65,7 +65,7 @@ char setsockopt();]], [[setsockopt();]])], char setsockopt();]], [[setsockopt();]])], [gl_cv_lib_socket="-lsocket"]) if test -z "$gl_cv_lib_socket"; then - LIBS="$gl_save_LIBS -lnetwork" + LIBS="$gl_saved_LIBS -lnetwork" AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern #ifdef __cplusplus "C" @@ -73,7 +73,7 @@ char setsockopt();]], [[setsockopt();]])], char setsockopt();]], [[setsockopt();]])], [gl_cv_lib_socket="-lnetwork"]) if test -z "$gl_cv_lib_socket"; then - LIBS="$gl_save_LIBS -lnet" + LIBS="$gl_saved_LIBS -lnet" AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern #ifdef __cplusplus "C" @@ -82,7 +82,7 @@ char setsockopt();]], [[setsockopt();]])], [gl_cv_lib_socket="-lnet"]) fi fi - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test -z "$gl_cv_lib_socket"; then gl_cv_lib_socket="none needed" diff --git a/m4/sockets.m4 b/m4/sockets.m4 index ed9cb87..7be4dc9 100644 --- a/m4/sockets.m4 +++ b/m4/sockets.m4 @@ -1,5 +1,5 @@ # sockets.m4 serial 7 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/socklen.m4 b/m4/socklen.m4 index 1c63a85..9c46db1 100644 --- a/m4/socklen.m4 +++ b/m4/socklen.m4 @@ -1,5 +1,5 @@ # socklen.m4 serial 11 -dnl Copyright (C) 2005-2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 index 6c6dc2f..390abfe 100644 --- a/m4/sockpfaf.m4 +++ b/m4/sockpfaf.m4 @@ -1,5 +1,5 @@ # sockpfaf.m4 serial 10 -dnl Copyright (C) 2004, 2006, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/spawn-pipe.m4 b/m4/spawn-pipe.m4 index bf69078..54706ce 100644 --- a/m4/spawn-pipe.m4 +++ b/m4/spawn-pipe.m4 @@ -1,5 +1,5 @@ # spawn-pipe.m4 serial 2 -dnl Copyright (C) 2004, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4 index b7b9a61..226a683 100644 --- a/m4/spawn_h.m4 +++ b/m4/spawn_h.m4 @@ -1,5 +1,5 @@ # spawn_h.m4 serial 24 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4 index 1c12c33..25b28d7 100644 --- a/m4/ssize_t.m4 +++ b/m4/ssize_t.m4 @@ -1,23 +1,37 @@ -# ssize_t.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2001-2003, 2006, 2010-2023 Free Software Foundation, Inc. +# ssize_t.m4 serial 6 +dnl Copyright (C) 2001-2003, 2006, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -dnl Test whether ssize_t is defined. +dnl Define ssize_t if it does not already exist. AC_DEFUN([gt_TYPE_SSIZE_T], [ - AC_CACHE_CHECK([for ssize_t], [gt_cv_ssize_t], + AC_CACHE_CHECK([for ssize_t], [gl_cv_ssize_t], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[#include <sys/types.h>]], [[int x = sizeof (ssize_t *) + sizeof (ssize_t); return !x;]])], - [gt_cv_ssize_t=yes], [gt_cv_ssize_t=no])]) - if test $gt_cv_ssize_t = no; then - AC_DEFINE([ssize_t], [int], - [Define as a signed type of the same size as size_t.]) + [gl_cv_ssize_t=yes], [gl_cv_ssize_t=no])]) + if test $gl_cv_ssize_t = no; then + dnl On 64-bit native Windows, ssize_t needs to be defined as 'long long', + dnl for consistency with the 64-bit size_t. + AC_CACHE_CHECK([whether size_t is wider than 'long'], [gl_cv_size_t_large], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include <sys/types.h> + typedef int array [2 * (sizeof (size_t) > sizeof (long)) - 1]; + ]])], + [gl_cv_size_t_large=yes], [gl_cv_size_t_large=no])]) + if test $gl_cv_size_t_large = yes; then + gl_def_ssize_t='long long' + else + gl_def_ssize_t='long' + fi + AC_DEFINE_UNQUOTED([ssize_t], [$gl_def_ssize_t], + [Define as a signed type of the same size as size_t.]) fi ]) diff --git a/m4/stat-time.m4 b/m4/stat-time.m4 index 40993d5..8bec2f5 100644 --- a/m4/stat-time.m4 +++ b/m4/stat-time.m4 @@ -1,6 +1,6 @@ # Checks for stat-related time functions. -# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2023 Free Software +# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2024 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation @@ -1,6 +1,6 @@ -# serial 19 +# serial 21 -# Copyright (C) 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2009-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -12,7 +12,7 @@ AC_DEFUN([gl_FUNC_STAT], AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) AC_CHECK_FUNCS_ONCE([lstat]) case "$host_os" in - mingw*) + mingw* | windows*) dnl On this platform, the original stat() returns st_atime, st_mtime, dnl st_ctime values that are affected by the time zone. REPLACE_STAT=1 @@ -61,8 +61,8 @@ AC_DEFUN([gl_FUNC_STAT], help when passed a file name with a trailing slash]);; esac case $host_os in - dnl Solaris stat can return a negative tv_nsec. - solaris*) + dnl macOS and Solaris stat can return a negative tv_nsec. + darwin* | solaris*) REPLACE_FSTAT=1 ;; esac ;; @@ -80,7 +80,7 @@ AC_DEFUN([gl_PREREQ_STAT], [ AC_DEFUN([gl_PREREQ_STAT_W32], [ AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in - mingw*) + mingw* | windows*) AC_CHECK_HEADERS([sdkddkver.h]) ;; esac diff --git a/m4/stdalign.m4 b/m4/stdalign.m4 index 1a236d6..e3c1e60 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 @@ -1,6 +1,6 @@ # Check for alignas and alignof that conform to C23. -dnl Copyright 2011-2023 Free Software Foundation, Inc. +dnl Copyright 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,10 +13,10 @@ AC_DEFUN([gl_ALIGNASOF], [ AC_CACHE_CHECK([for alignas and alignof], [gl_cv_header_working_stdalign_h], - [gl_save_CFLAGS=$CFLAGS + [gl_saved_CFLAGS=$CFLAGS for gl_working in "yes, keywords" "yes, <stdalign.h> macros"; do AS_CASE([$gl_working], - [*stdalign.h*], [CFLAGS="$gl_save_CFLAGS -DINCLUDE_STDALIGN_H"]) + [*stdalign.h*], [CFLAGS="$gl_saved_CFLAGS -DINCLUDE_STDALIGN_H"]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[#include <stdint.h> @@ -56,7 +56,7 @@ AC_DEFUN([gl_ALIGNASOF], [gl_cv_header_working_stdalign_h=$gl_working], [gl_cv_header_working_stdalign_h=no]) - CFLAGS=$gl_save_CFLAGS + CFLAGS=$gl_saved_CFLAGS test "$gl_cv_header_working_stdalign_h" != no && break done]) @@ -68,8 +68,10 @@ AC_DEFUN([gl_ALIGNASOF], dnl The "zz" puts this toward config.h's end, to avoid potential dnl collisions with other definitions. AH_VERBATIM([zzalignas], -[#if !defined HAVE_C_ALIGNASOF && __cplusplus < 201103 && !defined alignof -# if HAVE_STDALIGN_H +[#if !defined HAVE_C_ALIGNASOF \ + && !(defined __cplusplus && 201103 <= __cplusplus) \ + && !defined alignof +# if defined HAVE_STDALIGN_H # include <stdalign.h> # endif @@ -110,7 +112,11 @@ AC_DEFUN([gl_ALIGNASOF], # define _Alignof(type) alignof (type) # else template <class __t> struct __alignof_helper { char __a; __t __b; }; -# define _Alignof(type) offsetof (__alignof_helper<type>, __b) +# if (defined __GNUC__ && 4 <= __GNUC__) || defined __clang__ +# define _Alignof(type) __builtin_offsetof (__alignof_helper<type>, __b) +# else +# define _Alignof(type) offsetof (__alignof_helper<type>, __b) +# endif # define _GL_STDALIGN_NEEDS_STDDEF 1 # endif # else @@ -166,7 +172,7 @@ AC_DEFUN([gl_ALIGNASOF], # define _Alignas(a) __declspec (align (a)) # endif # endif -# if !HAVE_STDALIGN_H +# if !defined HAVE_STDALIGN_H # if ((defined _Alignas \ && !(defined __cplusplus \ && (201103 <= __cplusplus || defined _MSC_VER))) \ @@ -175,7 +181,7 @@ AC_DEFUN([gl_ALIGNASOF], # endif # endif -# if _GL_STDALIGN_NEEDS_STDDEF +# if defined _GL_STDALIGN_NEEDS_STDDEF # include <stddef.h> # endif #endif]) diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 index aa01221..1bf9eb3 100644 --- a/m4/stddef_h.m4 +++ b/m4/stddef_h.m4 @@ -1,5 +1,5 @@ # stddef_h.m4 serial 14 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdint.m4 b/m4/stdint.m4 index d6961b0..4aa2508 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ -# stdint.m4 serial 61 -dnl Copyright (C) 2001-2023 Free Software Foundation, Inc. +# stdint.m4 serial 63 +dnl Copyright (C) 2001-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -150,7 +150,10 @@ intmax_t i = INTMAX_MAX; uintmax_t j = UINTMAX_MAX; /* Check that SIZE_MAX has the correct type, if possible. */ -#if 201112 <= __STDC_VERSION__ +/* ISO C 11 mandates _Generic, but GCC versions < 4.9 lack it. */ +#if 201112 <= __STDC_VERSION__ \ + && (!defined __GNUC__ || 4 < __GNUC__ + (9 <= __GNUC_MINOR__) \ + || defined __clang__) int k = _Generic (SIZE_MAX, size_t: 0); #elif (2 <= __GNUC__ || 4 <= __clang_major__ || defined __IBM__TYPEOF__ \ || (0x5110 <= __SUNPRO_C && !__STDC__)) @@ -283,10 +286,10 @@ static const char *macro_values[] = [gl_cv_header_working_stdint_h=yes], [], [case "$host_os" in - # Guess yes on native Windows. - mingw*) gl_cv_header_working_stdint_h="guessing yes" ;; - # In general, assume it works. - *) gl_cv_header_working_stdint_h="guessing yes" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_header_working_stdint_h="guessing yes" ;; + # In general, assume it works. + *) gl_cv_header_working_stdint_h="guessing yes" ;; esac ]) ]) diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 index 70349f6..ee9773a 100644 --- a/m4/stdint_h.m4 +++ b/m4/stdint_h.m4 @@ -1,5 +1,5 @@ # stdint_h.m4 serial 9 -dnl Copyright (C) 1997-2004, 2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index dbfa0d5..c19feef 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,5 +1,5 @@ # stdio_h.m4 serial 63 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index f47c1eb..88ccd14 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ -# stdlib_h.m4 serial 75 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# stdlib_h.m4 serial 77 +dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -134,6 +134,7 @@ AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME_R]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTENV]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_QSORT_R]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAND]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM_R]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOCARRAY]) @@ -144,6 +145,7 @@ AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SECURE_GETENV]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETENV]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOD]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOF]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOL]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLD]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLL]) @@ -204,6 +206,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], HAVE_SETSTATE=1; AC_SUBST([HAVE_SETSTATE]) HAVE_DECL_SETSTATE=1; AC_SUBST([HAVE_DECL_SETSTATE]) HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD]) + HAVE_STRTOF=1; AC_SUBST([HAVE_STRTOF]) HAVE_STRTOL=1; AC_SUBST([HAVE_STRTOL]) HAVE_STRTOLD=1; AC_SUBST([HAVE_STRTOLD]) HAVE_STRTOLL=1; AC_SUBST([HAVE_STRTOLL]) @@ -237,6 +240,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], REPLACE_PTSNAME_R=0; AC_SUBST([REPLACE_PTSNAME_R]) REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) REPLACE_QSORT_R=0; AC_SUBST([REPLACE_QSORT_R]) + REPLACE_RAND=0; AC_SUBST([REPLACE_RAND]) REPLACE_RANDOM=0; AC_SUBST([REPLACE_RANDOM]) REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) REPLACE_REALLOC_FOR_REALLOC_GNU=0; AC_SUBST([REPLACE_REALLOC_FOR_REALLOC_GNU]) @@ -246,6 +250,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], REPLACE_SETENV=0; AC_SUBST([REPLACE_SETENV]) REPLACE_SETSTATE=0; AC_SUBST([REPLACE_SETSTATE]) REPLACE_STRTOD=0; AC_SUBST([REPLACE_STRTOD]) + REPLACE_STRTOF=0; AC_SUBST([REPLACE_STRTOF]) REPLACE_STRTOL=0; AC_SUBST([REPLACE_STRTOL]) REPLACE_STRTOLD=0; AC_SUBST([REPLACE_STRTOLD]) REPLACE_STRTOLL=0; AC_SUBST([REPLACE_STRTOLL]) diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4 index f3acbee..04c8bbe 100644 --- a/m4/stpcpy.m4 +++ b/m4/stpcpy.m4 @@ -1,5 +1,5 @@ # stpcpy.m4 serial 11 -dnl Copyright (C) 2002, 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strcase.m4 b/m4/strcase.m4 index 3cf740d..3252a62 100644 --- a/m4/strcase.m4 +++ b/m4/strcase.m4 @@ -1,5 +1,5 @@ # strcase.m4 serial 12 -dnl Copyright (C) 2002, 2005-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4 index 9b9ab11..7840d2e 100644 --- a/m4/strchrnul.m4 +++ b/m4/strchrnul.m4 @@ -1,5 +1,5 @@ # strchrnul.m4 serial 12 -dnl Copyright (C) 2003, 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strdup.m4 b/m4/strdup.m4 index ecfcdd0..491f760 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,6 +1,6 @@ # strdup.m4 serial 15 -dnl Copyright (C) 2002-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/strerror.m4 b/m4/strerror.m4 index 9f1dddd..a1d1261 100644 --- a/m4/strerror.m4 +++ b/m4/strerror.m4 @@ -1,5 +1,5 @@ -# strerror.m4 serial 24 -dnl Copyright (C) 2002, 2007-2023 Free Software Foundation, Inc. +# strerror.m4 serial 25 +dnl Copyright (C) 2002, 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -85,7 +85,7 @@ AC_DEFUN([gl_FUNC_STRERROR_0], # Guess yes on musl systems. *-musl* | midipix*) gl_cv_func_strerror_0_works="guessing yes" ;; # Guess yes on native Windows. - mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; + mingw* | windows*) gl_cv_func_strerror_0_works="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;; esac diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4 index d790ba8..903d03c 100644 --- a/m4/strerror_r.m4 +++ b/m4/strerror_r.m4 @@ -1,5 +1,5 @@ # strerror_r.m4 serial 26 -dnl Copyright (C) 2002, 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 7f51391..9ea748c 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -1,11 +1,11 @@ # Configure a GNU-like replacement for <string.h>. -# Copyright (C) 2007-2023 Free Software Foundation, Inc. +# Copyright (C) 2007-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 37 +# serial 39 # Written by Paul Eggert. @@ -132,6 +132,7 @@ AC_DEFUN([gl_STRING_H_DEFAULTS], REPLACE_MEMCHR=0; AC_SUBST([REPLACE_MEMCHR]) REPLACE_MEMMEM=0; AC_SUBST([REPLACE_MEMMEM]) REPLACE_MEMPCPY=0; AC_SUBST([REPLACE_MEMPCPY]) + REPLACE_MEMSET_EXPLICIT=0; AC_SUBST([REPLACE_MEMSET_EXPLICIT]) REPLACE_STPCPY=0; AC_SUBST([REPLACE_STPCPY]) REPLACE_STPNCPY=0; AC_SUBST([REPLACE_STPNCPY]) REPLACE_STRCHRNUL=0; AC_SUBST([REPLACE_STRCHRNUL]) @@ -146,5 +147,6 @@ AC_DEFUN([gl_STRING_H_DEFAULTS], REPLACE_STRERROR_R=0; AC_SUBST([REPLACE_STRERROR_R]) REPLACE_STRERRORNAME_NP=0; AC_SUBST([REPLACE_STRERRORNAME_NP]) REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL]) + REPLACE_STRVERSCMP=0; AC_SUBST([REPLACE_STRVERSCMP]) UNDEFINE_STRTOK_R=0; AC_SUBST([UNDEFINE_STRTOK_R]) ]) diff --git a/m4/strings_h.m4 b/m4/strings_h.m4 index 4c41221..37b6ca9 100644 --- a/m4/strings_h.m4 +++ b/m4/strings_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for <strings.h>. # serial 9 -# Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/strndup.m4 b/m4/strndup.m4 index 9ec9715..2218919 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,5 +1,5 @@ # strndup.m4 serial 23 -dnl Copyright (C) 2002-2003, 2005-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index d2cac59..3eac8e6 100644 --- a/m4/strnlen.m4 +++ b/m4/strnlen.m4 @@ -1,5 +1,5 @@ # strnlen.m4 serial 14 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2023 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/strpbrk.m4 b/m4/strpbrk.m4 index e966a81..c8d6128 100644 --- a/m4/strpbrk.m4 +++ b/m4/strpbrk.m4 @@ -1,5 +1,5 @@ # strpbrk.m4 serial 7 -dnl Copyright (C) 2002-2003, 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strptime.m4 b/m4/strptime.m4 index e5d995e..778c275 100644 --- a/m4/strptime.m4 +++ b/m4/strptime.m4 @@ -1,5 +1,5 @@ # strptime.m4 serial 8 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4 index 4c701cc..ee9872c 100644 --- a/m4/strtok_r.m4 +++ b/m4/strtok_r.m4 @@ -1,5 +1,5 @@ -# strtok_r.m4 serial 16 -dnl Copyright (C) 2002-2004, 2006-2007, 2009-2023 Free Software Foundation, +# strtok_r.m4 serial 17 +dnl Copyright (C) 2002-2004, 2006-2007, 2009-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -42,11 +42,11 @@ AC_DEFUN([gl_FUNC_STRTOK_R], [gl_cv_func_strtok_r_works=yes], [gl_cv_func_strtok_r_works=no], [case "$host_os" in - # Guess no on glibc systems. - *-gnu* | gnu*) gl_cv_func_strtok_r_works="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_strtok_r_works="guessing yes" ;; - *) gl_cv_func_strtok_r_works="guessing yes" ;; + # Guess no on glibc systems. + *-gnu* | gnu*) gl_cv_func_strtok_r_works="guessing no" ;; + # Guess yes on native Windows. + mingw* | windows*) gl_cv_func_strtok_r_works="guessing yes" ;; + *) gl_cv_func_strtok_r_works="guessing yes" ;; esac ]) ]) diff --git a/m4/strtol.m4 b/m4/strtol.m4 index 5cdd86a..d5c6079 100644 --- a/m4/strtol.m4 +++ b/m4/strtol.m4 @@ -1,5 +1,5 @@ -# strtol.m4 serial 8 -dnl Copyright (C) 2002-2003, 2006, 2009-2023 Free Software Foundation, Inc. +# strtol.m4 serial 10 +dnl Copyright (C) 2002-2003, 2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,10 +19,16 @@ AC_DEFUN([gl_FUNC_STRTOL], char *term; /* This test fails on Minix and native Windows. */ { - const char input[] = "0x"; - (void) strtol (input, &term, 16); - if (term != input + 1) - result |= 1; + static char const input[2][3] = {"0x", "0b"}; + static int const base[] = {0, 2, 10}; + int i, j; + for (i = 0; i < 2; i++) + for (j = 0; j < 3; j++) + { + (void) strtol (input[i], &term, base[j]); + if (term != input[i] + 1) + result |= 1; + } } /* This test fails on pre-C23 platforms. */ { @@ -38,7 +44,7 @@ AC_DEFUN([gl_FUNC_STRTOL], [gl_cv_func_strtol_works=no], [case "$host_os" in # Guess no on native Windows. - mingw*) gl_cv_func_strtol_works="guessing no" ;; + mingw* | windows*) gl_cv_func_strtol_works="guessing no" ;; # Guess no on glibc systems. *-gnu* | gnu*) gl_cv_func_strtol_works="guessing no" ;; # Guess no on musl systems. diff --git a/m4/strtoll.m4 b/m4/strtoll.m4 index ec09609..130b909 100644 --- a/m4/strtoll.m4 +++ b/m4/strtoll.m4 @@ -1,5 +1,5 @@ -# strtoll.m4 serial 10 -dnl Copyright (C) 2002, 2004, 2006, 2008-2023 Free Software Foundation, Inc. +# strtoll.m4 serial 12 +dnl Copyright (C) 2002, 2004, 2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,10 +19,16 @@ AC_DEFUN([gl_FUNC_STRTOLL], char *term; /* This test fails on Minix and native Windows. */ { - const char input[] = "0x"; - (void) strtoll (input, &term, 16); - if (term != input + 1) - result |= 1; + static char const input[2][3] = {"0x", "0b"}; + static int const base[] = {0, 2, 10}; + int i, j; + for (i = 0; i < 2; i++) + for (j = 0; j < 3; j++) + { + (void) strtoll (input[i], &term, base[j]); + if (term != input[i] + 1) + result |= 1; + } } /* This test fails on pre-C23 platforms. */ { @@ -38,7 +44,7 @@ AC_DEFUN([gl_FUNC_STRTOLL], [gl_cv_func_strtoll_works=no], [case "$host_os" in # Guess no on native Windows. - mingw*) gl_cv_func_strtoll_works="guessing no" ;; + mingw* | windows*) gl_cv_func_strtoll_works="guessing no" ;; # Guess no on glibc systems. *-gnu* | gnu*) gl_cv_func_strtoll_works="guessing no" ;; # Guess no on musl systems. diff --git a/m4/symlink.m4 b/m4/symlink.m4 index 52d6c11..62062cf 100644 --- a/m4/symlink.m4 +++ b/m4/symlink.m4 @@ -1,7 +1,7 @@ # serial 10 # See if we need to provide symlink replacement. -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_file_h.m4 b/m4/sys_file_h.m4 index 60d4e30..f56a133 100644 --- a/m4/sys_file_h.m4 +++ b/m4/sys_file_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for <sys/file.h>. # serial 9 -# Copyright (C) 2008-2023 Free Software Foundation, Inc. +# Copyright (C) 2008-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4 index 80f0510..3e789f3 100644 --- a/m4/sys_ioctl_h.m4 +++ b/m4/sys_ioctl_h.m4 @@ -1,5 +1,5 @@ # sys_ioctl_h.m4 serial 15 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_random_h.m4 b/m4/sys_random_h.m4 index 01d5fee..b050d07 100644 --- a/m4/sys_random_h.m4 +++ b/m4/sys_random_h.m4 @@ -1,5 +1,5 @@ # sys_random_h.m4 serial 8 -dnl Copyright (C) 2020-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2020-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 index 4ec5ed7..9e279fb 100644 --- a/m4/sys_select_h.m4 +++ b/m4/sys_select_h.m4 @@ -1,5 +1,5 @@ # sys_select_h.m4 serial 23 -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index 98a1041..af52484 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,5 +1,5 @@ # sys_socket_h.m4 serial 29 -dnl Copyright (C) 2005-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index ca57398..7501853 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,5 +1,5 @@ # sys_stat_h.m4 serial 42 -*- Autoconf -*- -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 index 45a1f8b..dc5353f 100644 --- a/m4/sys_time_h.m4 +++ b/m4/sys_time_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for <sys/time.h>. # serial 12 -# Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 index 627671f..37d0cca 100644 --- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,5 +1,5 @@ # sys_types_h.m4 serial 13 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_uio_h.m4 b/m4/sys_uio_h.m4 index 93a65d2..ce252ed 100644 --- a/m4/sys_uio_h.m4 +++ b/m4/sys_uio_h.m4 @@ -1,5 +1,5 @@ # sys_uio_h.m4 serial 3 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_wait_h.m4 b/m4/sys_wait_h.m4 index 36b4293..6759b08 100644 --- a/m4/sys_wait_h.m4 +++ b/m4/sys_wait_h.m4 @@ -1,5 +1,5 @@ # sys_wait_h.m4 serial 9 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/tcgetattr.m4 b/m4/tcgetattr.m4 index 2d55805..7091ab5 100644 --- a/m4/tcgetattr.m4 +++ b/m4/tcgetattr.m4 @@ -1,5 +1,5 @@ # tcgetattr.m4 serial 1 -dnl Copyright (C) 2002-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/tempname.m4 b/m4/tempname.m4 index abed799..31d35c8 100644 --- a/m4/tempname.m4 +++ b/m4/tempname.m4 @@ -1,6 +1,6 @@ #serial 5 -# Copyright (C) 2006-2007, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 index 1fc5777..6dee893 100644 --- a/m4/threadlib.m4 +++ b/m4/threadlib.m4 @@ -1,5 +1,5 @@ -# threadlib.m4 serial 38 -dnl Copyright (C) 2005-2023 Free Software Foundation, Inc. +# threadlib.m4 serial 42 +dnl Copyright (C) 2005-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -85,7 +85,7 @@ AC_DEFUN([gl_WEAK_SYMBOLS], AC_CACHE_CHECK([whether imported symbols can be declared weak], [gl_cv_have_weak], [case "$host_os" in - cygwin* | mingw*) + cygwin* | mingw* | windows*) dnl On Cygwin 3.2.0 with gcc 10.2, and likewise on mingw 10.0.0 with dnl gcc 11.3, the test below would succeed, but programs that use dnl pthread_in_use() with weak symbol references crash miserably at @@ -206,7 +206,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY], # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 # needs -pthread for some reason. See: # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html - save_LIBS=$LIBS + saved_LIBS="$LIBS" for gl_pthread in '' '-pthread'; do LIBS="$LIBS $gl_pthread" AC_LINK_IFELSE( @@ -220,7 +220,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY], [gl_pthread_api=yes LIBPTHREAD=$gl_pthread LIBPMULTITHREAD=$gl_pthread]) - LIBS=$save_LIBS + LIBS="$saved_LIBS" test $gl_pthread_api = yes && break done echo "$as_me:__oline__: gl_pthread_api=$gl_pthread_api" >&AS_MESSAGE_LOG_FD @@ -269,6 +269,15 @@ changequote([,])dnl [Define if the pthread_in_use() detection is hard.]) esac fi + ], + [dnl This is needed on FreeBSD 5.2.1. + AC_CHECK_LIB([thr], [pthread_kill], + [if test $gl_pthread_in_glibc = yes; then + LIBPMULTITHREAD= + else + LIBPMULTITHREAD=-lthr + fi + ]) ]) elif test $gl_pthread_api != yes; then # Some library is needed. Try libpthread and libc_r. @@ -344,7 +353,7 @@ AC_DEFUN([gl_STDTHREADLIB_BODY], AC_CHECK_HEADERS_ONCE([threads.h]) case "$host_os" in - mingw*) + mingw* | windows*) LIBSTDTHREAD= ;; *) @@ -465,7 +474,7 @@ changequote(,)dnl esac ;; dnl Obey gl_AVOID_WINPTHREAD on mingw. - mingw*) + mingw* | windows*) case "$gl_use_winpthreads_default" in yes) gl_use_threads=posix ;; no) gl_use_threads=windows ;; @@ -564,7 +573,7 @@ AC_DEFUN([gl_THREADLIB_BODY], case "$gl_use_threads" in yes | windows | win32) # The 'win32' is for backward compatibility. if { case "$host_os" in - mingw*) true;; + mingw* | windows*) true;; *) false;; esac }; then @@ -575,6 +584,10 @@ AC_DEFUN([gl_THREADLIB_BODY], ;; esac fi + else + dnl "$gl_use_threads" is "no". + AC_DEFINE([AVOID_ANY_THREADS], [1], + [Define if no multithread safety and no multithreading is desired.]) fi AC_MSG_CHECKING([for multithread API to use]) AC_MSG_RESULT([$gl_threads_api]) diff --git a/m4/time_h.m4 b/m4/time_h.m4 index 51d553a..32fade0 100644 --- a/m4/time_h.m4 +++ b/m4/time_h.m4 @@ -1,8 +1,8 @@ # Configure a more-standard replacement for <time.h>. -# Copyright (C) 2000-2001, 2003-2007, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2024 Free Software Foundation, Inc. -# serial 22 +# serial 25 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -23,7 +23,10 @@ AC_DEFUN_ONCE([gl_TIME_H], dnl corresponding gnulib module is not in use. gl_WARN_ON_USE_PREPARE([[ #include <time.h> - ]], [asctime_r ctime_r]) + ]], [ + asctime asctime_r ctime ctime_r gmtime_r localtime localtime_r mktime + nanosleep strftime strptime time timegm timespec_get timespec_getres tzset + ]) AC_REQUIRE([AC_C_RESTRICT]) @@ -162,25 +165,16 @@ AC_DEFUN([gl_TIME_H_DEFAULTS], HAVE_TIMESPEC_GETRES=1; AC_SUBST([HAVE_TIMESPEC_GETRES]) dnl Even GNU libc does not have timezone_t yet. HAVE_TIMEZONE_T=0; AC_SUBST([HAVE_TIMEZONE_T]) - dnl If another module says to replace or to not replace, do that. - dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK; - dnl this lets maintainers check for portability. - REPLACE_CTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_CTIME]) - REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; AC_SUBST([REPLACE_LOCALTIME_R]) - REPLACE_MKTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_MKTIME]) - REPLACE_NANOSLEEP=GNULIB_PORTCHECK; AC_SUBST([REPLACE_NANOSLEEP]) - REPLACE_STRFTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_STRFTIME]) - REPLACE_TIME=0; AC_SUBST([REPLACE_TIME]) - REPLACE_TIMEGM=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TIMEGM]) - REPLACE_TIMESPEC_GET=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TIMESPEC_GET]) - REPLACE_TZSET=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TZSET]) - - dnl Hack so that the time module doesn't depend on the sys_time module. - dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent. - : ${GNULIB_GETTIMEOFDAY=0}; AC_SUBST([GNULIB_GETTIMEOFDAY]) - dnl Second, it's OK to not use GNULIB_PORTCHECK for REPLACE_GMTIME - dnl and REPLACE_LOCALTIME, as portability to Solaris 2.6 and earlier - dnl is no longer a big deal. + REPLACE_CTIME=0; AC_SUBST([REPLACE_CTIME]) REPLACE_GMTIME=0; AC_SUBST([REPLACE_GMTIME]) REPLACE_LOCALTIME=0; AC_SUBST([REPLACE_LOCALTIME]) + REPLACE_LOCALTIME_R=0; AC_SUBST([REPLACE_LOCALTIME_R]) + REPLACE_MKTIME=0; AC_SUBST([REPLACE_MKTIME]) + REPLACE_NANOSLEEP=0; AC_SUBST([REPLACE_NANOSLEEP]) + REPLACE_STRFTIME=0; AC_SUBST([REPLACE_STRFTIME]) + REPLACE_TIME=0; AC_SUBST([REPLACE_TIME]) + REPLACE_TIMEGM=0; AC_SUBST([REPLACE_TIMEGM]) + REPLACE_TIMESPEC_GET=0; AC_SUBST([REPLACE_TIMESPEC_GET]) + REPLACE_TIMESPEC_GETRES=0; AC_SUBST([REPLACE_TIMESPEC_GETRES]) + REPLACE_TZSET=0; AC_SUBST([REPLACE_TZSET]) ]) diff --git a/m4/time_r.m4 b/m4/time_r.m4 index adce438..4ee2175 100644 --- a/m4/time_r.m4 +++ b/m4/time_r.m4 @@ -1,6 +1,6 @@ dnl Reentrant time functions: localtime_r, gmtime_r. -dnl Copyright (C) 2003, 2006-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -57,9 +57,7 @@ AC_DEFUN([gl_TIME_R], [gl_cv_time_r_posix=yes], [gl_cv_time_r_posix=no]) ]) - if test $gl_cv_time_r_posix = yes; then - REPLACE_LOCALTIME_R=0 - else + if test $gl_cv_time_r_posix != yes; then REPLACE_LOCALTIME_R=1 fi else diff --git a/m4/timegm.m4 b/m4/timegm.m4 index 8ab265e..8433604 100644 --- a/m4/timegm.m4 +++ b/m4/timegm.m4 @@ -1,5 +1,5 @@ -# timegm.m4 serial 15 -dnl Copyright (C) 2003, 2007, 2009-2023 Free Software Foundation, Inc. +# timegm.m4 serial 16 +dnl Copyright (C) 2003, 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,7 +8,6 @@ AC_DEFUN([gl_FUNC_TIMEGM], [ AC_REQUIRE([gl_TIME_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) - REPLACE_TIMEGM=0 gl_CHECK_FUNCS_ANDROID([timegm], [[#include <time.h>]]) if test $ac_cv_func_timegm = yes; then if test "$gl_cv_func_working_mktime" != yes; then diff --git a/m4/timespec.m4 b/m4/timespec.m4 index 95f475f..59a0db9 100644 --- a/m4/timespec.m4 +++ b/m4/timespec.m4 @@ -1,6 +1,6 @@ #serial 15 -# Copyright (C) 2000-2001, 2003-2007, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/tm_gmtoff.m4 b/m4/tm_gmtoff.m4 index bc41de3..f2e5159 100644 --- a/m4/tm_gmtoff.m4 +++ b/m4/tm_gmtoff.m4 @@ -1,5 +1,5 @@ # tm_gmtoff.m4 serial 3 -dnl Copyright (C) 2002, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/tmpdir.m4 b/m4/tmpdir.m4 index cf89497..89bece6 100644 --- a/m4/tmpdir.m4 +++ b/m4/tmpdir.m4 @@ -1,5 +1,5 @@ # tmpdir.m4 serial 4 -dnl Copyright (C) 2001-2002, 2006, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2002, 2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/uchar_h.m4 b/m4/uchar_h.m4 new file mode 100644 index 0000000..abd4f51 --- /dev/null +++ b/m4/uchar_h.m4 @@ -0,0 +1,249 @@ +# uchar_h.m4 serial 31 +dnl Copyright (C) 2019-2024 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. +dnl Prepare the overridden <uchar.h>. + +AC_DEFUN_ONCE([gl_UCHAR_H], +[ + AC_REQUIRE([gl_UCHAR_H_DEFAULTS]) + + gl_CHECK_NEXT_HEADERS([uchar.h]) + if test $ac_cv_header_uchar_h = yes; then + HAVE_UCHAR_H=1 + else + HAVE_UCHAR_H=0 + fi + AC_SUBST([HAVE_UCHAR_H]) + + gl_TYPE_CHAR8_T + gl_TYPE_CHAR16_T + gl_TYPE_CHAR32_T + + dnl In C++ mode, clang defines 'char16_t' and 'char32_t' as built-in types + dnl on some platforms (e.g. OpenBSD 6.7), and as types defined by many + dnl header files (<limits.h>, <stddef.h>, <stdint.h>, <stdio.h>, <stdlib.h> + dnl and others) on some platforms (e.g. Mac OS X 10.13). + dnl The same thing may also happen for 'char8_t'; so, be prepared for it. + m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])]) + CXX_HAS_UCHAR_TYPES=0 + if test $HAVE_UCHAR_H = 0; then + if test "$CXX" != no; then + AC_CACHE_CHECK([whether the C++ compiler predefines the <uchar.h> types], + [gl_cv_cxx_has_uchar_types], + [dnl We can't use AC_LANG_PUSH([C++]) and AC_LANG_POP([C++]) here, due to + dnl an autoconf bug <https://savannah.gnu.org/support/?110294>. + cat > conftest.cpp <<\EOF +#include <stddef.h> +char16_t a; +char32_t b; +EOF + gl_command="$CXX $CXXFLAGS $CPPFLAGS -c conftest.cpp" + if AC_TRY_EVAL([gl_command]); then + gl_cv_cxx_has_uchar_types=yes + else + gl_cv_cxx_has_uchar_types=no + fi + rm -fr conftest* + ]) + if test $gl_cv_cxx_has_uchar_types = yes; then + CXX_HAS_UCHAR_TYPES=1 + fi + fi + fi + AC_SUBST([CXX_HAS_UCHAR_TYPES]) + CXX_HAS_CHAR8_TYPE=0 + if test $HAVE_UCHAR_H = 0; then + if test "$CXX" != no; then + AC_CACHE_CHECK([whether the C++ compiler predefines the char8_t types], + [gl_cv_cxx_has_char8_type], + [dnl We can't use AC_LANG_PUSH([C++]) and AC_LANG_POP([C++]) here, due to + dnl an autoconf bug <https://savannah.gnu.org/support/?110294>. + cat > conftest.cpp <<\EOF +#include <stddef.h> +char8_t a; +EOF + gl_command="$CXX $CXXFLAGS $CPPFLAGS -c conftest.cpp" + if AC_TRY_EVAL([gl_command]); then + gl_cv_cxx_has_char8_type=yes + else + gl_cv_cxx_has_char8_type=no + fi + rm -fr conftest* + ]) + if test $gl_cv_cxx_has_char8_type = yes; then + CXX_HAS_CHAR8_TYPE=1 + fi + fi + fi + AC_SUBST([CXX_HAS_CHAR8_TYPE]) + + dnl Test whether a 'char32_t' can hold more characters than a 'wchar_t'. + gl_STDINT_BITSIZEOF([wchar_t], [gl_STDINT_INCLUDES]) + if test $BITSIZEOF_WCHAR_T -lt 32; then + SMALL_WCHAR_T=1 + else + SMALL_WCHAR_T=0 + fi + dnl SMALL_WCHAR_T is expected to be 1 on 32-bit AIX, Cygwin, native Windows. + AC_SUBST([SMALL_WCHAR_T]) + + dnl Check for declarations of anything we want to poison if the + dnl corresponding gnulib module is not in use, and which is not + dnl guaranteed by C11. + gl_WARN_ON_USE_PREPARE([[ + #ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + ]], [c32rtomb mbrtoc16 mbrtoc32]) +]) + +AC_DEFUN_ONCE([gl_TYPE_CHAR8_T], +[ + dnl Determine whether gnulib's <uchar.h> would, if present, override char8_t. + AC_CACHE_CHECK([whether char8_t is correctly defined], + [gl_cv_type_char8_t_works], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + int verify[(char8_t)(-1) >= 0 && sizeof (char8_t) == sizeof (unsigned char) ? 1 : -1]; + ]]) + ], + [gl_cv_type_char8_t_works=yes], + [gl_cv_type_char8_t_works=no]) + ]) + if test $gl_cv_type_char8_t_works = no; then + GNULIBHEADERS_OVERRIDE_CHAR8_T=1 + else + GNULIBHEADERS_OVERRIDE_CHAR8_T=0 + fi + AC_SUBST([GNULIBHEADERS_OVERRIDE_CHAR8_T]) +]) + +dnl On Haiku 2020, char16_t and char32_t are incorrectly defined. +dnl See <https://dev.haiku-os.org/ticket/15990>. +AC_DEFUN_ONCE([gl_TYPE_CHAR16_T], +[ + dnl Determine whether gnulib's <uchar.h> would, if present, override char16_t. + AC_CACHE_CHECK([whether char16_t is correctly defined], + [gl_cv_type_char16_t_works], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + /* For simplicity, assume that uint16_least_t is equivalent to + 'unsigned short'. */ + int verify[(char16_t)(-1) >= 0 && sizeof (char16_t) == sizeof (unsigned short) ? 1 : -1]; + ]]) + ], + [gl_cv_type_char16_t_works=yes], + [gl_cv_type_char16_t_works=no]) + ]) + if test $gl_cv_type_char16_t_works = no; then + GNULIBHEADERS_OVERRIDE_CHAR16_T=1 + else + GNULIBHEADERS_OVERRIDE_CHAR16_T=0 + fi + AC_SUBST([GNULIBHEADERS_OVERRIDE_CHAR16_T]) +]) +AC_DEFUN_ONCE([gl_TYPE_CHAR32_T], +[ + dnl Determine whether gnulib's <uchar.h> would, if present, override char32_t. + AC_CACHE_CHECK([whether char32_t is correctly defined], + [gl_cv_type_char32_t_works], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #ifdef __HAIKU__ + #include <stdint.h> + #endif + #include <uchar.h> + /* For simplicity, assume that uint32_least_t is equivalent to + 'unsigned int'. */ + int verify[(char32_t)(-1) >= 0 && sizeof (char32_t) == sizeof (unsigned int) ? 1 : -1]; + ]]) + ], + [gl_cv_type_char32_t_works=yes], + [gl_cv_type_char32_t_works=no]) + ]) + if test $gl_cv_type_char32_t_works = no; then + GNULIBHEADERS_OVERRIDE_CHAR32_T=1 + else + GNULIBHEADERS_OVERRIDE_CHAR32_T=0 + fi + AC_SUBST([GNULIBHEADERS_OVERRIDE_CHAR32_T]) +]) + +# gl_UCHAR_MODULE_INDICATOR([modulename]) +# sets the shell variable that indicates the presence of the given module +# to a C preprocessor expression that will evaluate to 1. +# This macro invocation must not occur in macros that are AC_REQUIREd. +AC_DEFUN([gl_UCHAR_MODULE_INDICATOR], +[ + dnl Ensure to expand the default settings once only. + gl_UCHAR_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) +]) + +# Initializes the default values for AC_SUBSTed shell variables. +# This macro must not be AC_REQUIREd. It must only be invoked, and only +# outside of macros or in macros that are not AC_REQUIREd. +AC_DEFUN([gl_UCHAR_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_UCHAR_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOC32]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISALNUM]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISALPHA]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISBLANK]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISCNTRL]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISDIGIT]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISGRAPH]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISLOWER]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISPRINT]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISPUNCT]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISSPACE]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISUPPER]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISXDIGIT]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32TOLOWER]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32TOUPPER]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32WIDTH]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32RTOMB]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32SNRTOMBS]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32SRTOMBS]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32STOMBS]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32SWIDTH]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32TOB]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32_APPLY_MAPPING]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32_APPLY_TYPE_TEST]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32_GET_MAPPING]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32_GET_TYPE_TEST]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOC16]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOC32]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNRTOC32S]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOC32S]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOC32S]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_UCHAR_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_UCHAR_H_DEFAULTS]) +]) + +AC_DEFUN([gl_UCHAR_H_DEFAULTS], +[ + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_C32RTOMB=1; AC_SUBST([HAVE_C32RTOMB]) + HAVE_MBRTOC16=1; AC_SUBST([HAVE_MBRTOC16]) + HAVE_MBRTOC32=1; AC_SUBST([HAVE_MBRTOC32]) + REPLACE_C32RTOMB=0; AC_SUBST([REPLACE_C32RTOMB]) + REPLACE_MBRTOC16=0; AC_SUBST([REPLACE_MBRTOC16]) + REPLACE_MBRTOC32=0; AC_SUBST([REPLACE_MBRTOC32]) +]) diff --git a/m4/ungetc.m4 b/m4/ungetc.m4 index 7727477..aab83e1 100644 --- a/m4/ungetc.m4 +++ b/m4/ungetc.m4 @@ -1,5 +1,5 @@ -# ungetc.m4 serial 11 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +# ungetc.m4 serial 12 +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -49,7 +49,7 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS], # Guess yes on bionic systems. *-android*) gl_cv_func_ungetc_works="guessing yes" ;; # Guess yes on native Windows. - mingw*) gl_cv_func_ungetc_works="guessing yes" ;; + mingw* | windows*) gl_cv_func_ungetc_works="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_ungetc_works="$gl_cross_guess_normal" ;; esac diff --git a/m4/unicase_h.m4 b/m4/unicase_h.m4 index 86a1b7c..ad2f621 100644 --- a/m4/unicase_h.m4 +++ b/m4/unicase_h.m4 @@ -1,5 +1,5 @@ # unicase_h.m4 serial 1 -dnl Copyright (C) 2023 Free Software Foundation, Inc. +dnl Copyright (C) 2023-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/unictype_h.m4 b/m4/unictype_h.m4 index bab4635..68b864b 100644 --- a/m4/unictype_h.m4 +++ b/m4/unictype_h.m4 @@ -1,5 +1,5 @@ -# unictype_h.m4 serial 1 -dnl Copyright (C) 2023 Free Software Foundation, Inc. +# unictype_h.m4 serial 3 +dnl Copyright (C) 2023-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -98,6 +98,8 @@ AC_DEFUN([gl_UNICTYPE_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) @@ -127,6 +129,7 @@ AC_DEFUN([gl_UNICTYPE_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) @@ -140,6 +143,7 @@ AC_DEFUN([gl_UNICTYPE_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) diff --git a/m4/uninorm_h.m4 b/m4/uninorm_h.m4 index b6b342d..aadf559 100644 --- a/m4/uninorm_h.m4 +++ b/m4/uninorm_h.m4 @@ -1,5 +1,5 @@ # uninorm_h.m4 serial 1 -dnl Copyright (C) 2023 Free Software Foundation, Inc. +dnl Copyright (C) 2023-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/unistd-safer.m4 b/m4/unistd-safer.m4 index ced03b0..9d50964 100644 --- a/m4/unistd-safer.m4 +++ b/m4/unistd-safer.m4 @@ -1,5 +1,5 @@ #serial 9 -dnl Copyright (C) 2002, 2005-2006, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index 1c96158..e078bd6 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,5 +1,5 @@ -# unistd_h.m4 serial 94 -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +# unistd_h.m4 serial 95 +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -234,6 +234,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_EXECVP=0; AC_SUBST([REPLACE_EXECVP]) REPLACE_EXECVPE=0; AC_SUBST([REPLACE_EXECVPE]) REPLACE_FACCESSAT=0; AC_SUBST([REPLACE_FACCESSAT]) + REPLACE_FCHDIR=0; AC_SUBST([REPLACE_FCHDIR]) REPLACE_FCHOWNAT=0; AC_SUBST([REPLACE_FCHOWNAT]) REPLACE_FDATASYNC=0; AC_SUBST([REPLACE_FDATASYNC]) REPLACE_FTRUNCATE=0; AC_SUBST([REPLACE_FTRUNCATE]) diff --git a/m4/unlink.m4 b/m4/unlink.m4 index 1fecaac..19982a0 100644 --- a/m4/unlink.m4 +++ b/m4/unlink.m4 @@ -1,5 +1,5 @@ -# unlink.m4 serial 16 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +# unlink.m4 serial 17 +dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -43,16 +43,16 @@ AC_DEFUN([gl_FUNC_UNLINK], [gl_cv_func_unlink_honors_slashes=yes], [gl_cv_func_unlink_honors_slashes=no], [case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_unlink_honors_slashes="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_unlink_honors_slashes="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_unlink_honors_slashes="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_unlink_honors_slashes="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_unlink_honors_slashes="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_unlink_honors_slashes="$gl_cross_guess_normal" ;; esac ]) rm -f conftest.file conftest.lnk]) diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4 index 407c0ba..558f57d 100644 --- a/m4/unlocked-io.m4 +++ b/m4/unlocked-io.m4 @@ -1,6 +1,6 @@ # unlocked-io.m4 serial 16 -# Copyright (C) 1998-2006, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 1998-2006, 2009-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/utime.m4 b/m4/utime.m4 index 4c0443a..b738e1c 100644 --- a/m4/utime.m4 +++ b/m4/utime.m4 @@ -1,5 +1,5 @@ -# utime.m4 serial 4 -dnl Copyright (C) 2017-2023 Free Software Foundation, Inc. +# utime.m4 serial 6 +dnl Copyright (C) 2017-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_UTIME], AC_REQUIRE([AC_CANONICAL_HOST]) AC_CHECK_FUNCS_ONCE([lstat]) case "$host_os" in - mingw*) + mingw* | windows*) dnl On this platform, the original utime() or _utime() produces dnl timestamps that are affected by the time zone. dnl Use the function name 'rpl_utime' always, in order to avoid a @@ -48,14 +48,15 @@ AC_DEFUN([gl_FUNC_UTIME], [gl_cv_func_utime_file_slash=yes], [gl_cv_func_utime_file_slash=no], [case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_utime_file_slash="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_utime_file_slash="guessing yes" ;; - # Guess no on macOS. - darwin*) gl_cv_func_utime_file_slash="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_utime_file_slash="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems + # and on systems that emulate the Linux system calls. + linux* | midipix*) gl_cv_func_utime_file_slash="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_utime_file_slash="guessing yes" ;; + # Guess no on macOS. + darwin*) gl_cv_func_utime_file_slash="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_utime_file_slash="$gl_cross_guess_normal" ;; esac ]) rm -f conftest.tmp conftest.lnk diff --git a/m4/utime_h.m4 b/m4/utime_h.m4 index 6b6403e..7b224ee 100644 --- a/m4/utime_h.m4 +++ b/m4/utime_h.m4 @@ -1,5 +1,5 @@ # utime_h.m4 serial 8 -dnl Copyright (C) 2017-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2017-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/utimens.m4 b/m4/utimens.m4 index 5f86061..0f5bfd4 100644 --- a/m4/utimens.m4 +++ b/m4/utimens.m4 @@ -1,9 +1,9 @@ -dnl Copyright (C) 2003-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -dnl serial 15 +dnl serial 16 AC_DEFUN([gl_UTIMENS], [ @@ -36,12 +36,13 @@ AC_DEFUN([gl_UTIMENS], [gl_cv_func_futimesat_works=yes], [gl_cv_func_futimesat_works=no], [case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_futimesat_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_futimesat_works="$gl_cross_guess_normal" ;; + # Guess yes on Linux systems + # and on systems that emulate the Linux system calls. + linux* | midipix*) gl_cv_func_futimesat_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_futimesat_works="$gl_cross_guess_normal" ;; esac ]) rm -f conftest.file]) diff --git a/m4/utimes.m4 b/m4/utimes.m4 index 73b9a2d..05b23cb 100644 --- a/m4/utimes.m4 +++ b/m4/utimes.m4 @@ -1,7 +1,7 @@ # Detect some bugs in glibc's implementation of utimes. -# serial 8 +# serial 9 -dnl Copyright (C) 2003-2005, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2005, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -144,11 +144,11 @@ main () [gl_cv_func_working_utimes=yes], [gl_cv_func_working_utimes=no], [case "$host_os" in - # Guess yes on musl systems. - *-musl*) gl_cv_func_working_utimes="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_working_utimes="guessing no" ;; - *) gl_cv_func_working_utimes="$gl_cross_guess_normal" ;; + # Guess yes on musl systems. + *-musl*) gl_cv_func_working_utimes="guessing yes" ;; + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_working_utimes="guessing no" ;; + *) gl_cv_func_working_utimes="$gl_cross_guess_normal" ;; esac ]) ]) diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4 index 639b29a..21a85bb 100644 --- a/m4/vasnprintf.m4 +++ b/m4/vasnprintf.m4 @@ -1,5 +1,5 @@ -# vasnprintf.m4 serial 49 -dnl Copyright (C) 2002-2004, 2006-2023 Free Software Foundation, Inc. +# vasnprintf.m4 serial 52 +dnl Copyright (C) 2002-2004, 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -94,6 +94,7 @@ AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF], # Prerequisites of lib/vasnwprintf.c. AC_DEFUN_ONCE([gl_PREREQ_VASNWPRINTF], [ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CHECK_FUNCS_ONCE([swprintf wcsnlen mbrtowc]) AC_CHECK_DECLS([_snwprintf], , , [[#include <stdio.h>]]) AC_CHECK_DECLS([wcsnlen], , , [[#include <wchar.h>]]) @@ -107,13 +108,56 @@ AC_DEFUN_ONCE([gl_PREREQ_VASNWPRINTF], esac gl_MBRTOWC_C_LOCALE case "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" in - *yes) ;; - *) - AC_DEFINE([NEED_WPRINTF_DIRECTIVE_C], [1], - [Define if the vasnwprintf implementation needs special code for - the 'c' directive.]) + *yes) + AC_CACHE_CHECK([whether swprintf in the C locale is free of encoding errors], + [gl_cv_func_swprintf_C_locale_sans_EILSEQ], + [ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#ifndef __USE_MINGW_ANSI_STDIO +# define __USE_MINGW_ANSI_STDIO 1 +#endif +#include <stdio.h> +#include <wchar.h> +int main() +{ + int result = 0; + { /* This test fails on glibc 2.35, musl libc 1.2.4, FreeBSD 13.2, NetBSD 9.3, + OpenBSD 7.2, Cygwin 2.9.0. + Reported at <https://www.openwall.com/lists/musl/2023/06/12/2>. */ + wchar_t buf[12]; + int ret = swprintf (buf, 12, L"%c", '\377'); + if (ret < 0) + result |= 1; + } + return result; +}]])], + [gl_cv_func_swprintf_C_locale_sans_EILSEQ=yes], + [gl_cv_func_swprintf_C_locale_sans_EILSEQ=no], + [case "$host_os" in + # Guess no on glibc systems. + *-gnu* | gnu*) gl_cv_func_swprintf_C_locale_sans_EILSEQ="guessing yes";; + # Guess no on musl systems. + *-musl* | midipix*) gl_cv_func_swprintf_C_locale_sans_EILSEQ="guessing no";; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_swprintf_C_locale_sans_EILSEQ="$gl_cross_guess_normal";; + esac + ]) + ]) ;; esac + if case "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" in + *yes) false ;; + *) true ;; + esac \ + || case "$gl_cv_func_swprintf_C_locale_sans_EILSEQ" in + *yes) false ;; + *) true ;; + esac; then + AC_DEFINE([NEED_WPRINTF_DIRECTIVE_C], [1], + [Define if the vasnwprintf implementation needs special code for + the 'c' directive.]) + fi gl_SWPRINTF_DIRECTIVE_LA case "$gl_cv_func_swprintf_directive_la" in *yes) ;; @@ -123,6 +167,15 @@ AC_DEFUN_ONCE([gl_PREREQ_VASNWPRINTF], the 'a' directive with 'long double' arguments.]) ;; esac + gl_SWPRINTF_DIRECTIVE_LC + case "$gl_cv_func_swprintf_directive_lc" in + *yes) ;; + *) + AC_DEFINE([NEED_WPRINTF_DIRECTIVE_LC], [1], + [Define if the vasnwprintf implementation needs special code for + the 'lc' directive.]) + ;; + esac gl_MUSL_LIBC gl_PREREQ_VASNXPRINTF ]) @@ -315,6 +368,22 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_ZERO], esac ]) +# Extra prerequisites of lib/vasnprintf.c for supporting the # flag with a +# zero precision and a zero value in the 'x' and 'X' directives. +AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_ALT_PRECISION_ZERO], +[ + AC_REQUIRE([gl_PRINTF_FLAG_ALT_PRECISION_ZERO]) + case "$gl_cv_func_printf_flag_alt_precision_zero" in + *yes) + ;; + *) + AC_DEFINE([NEED_PRINTF_FLAG_ALT_PRECISION_ZERO], [1], + [Define if the vasnprintf implementation needs special code for the + # flag with a zero precision and a zero value in the 'x' and 'X' directives.]) + ;; + esac +]) + # Extra prerequisites of lib/vasnprintf.c for supporting large precisions. AC_DEFUN([gl_PREREQ_VASNPRINTF_PRECISION], [ @@ -373,6 +442,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS], gl_PREREQ_VASNPRINTF_FLAG_GROUPING gl_PREREQ_VASNPRINTF_FLAG_LEFTADJUST gl_PREREQ_VASNPRINTF_FLAG_ZERO + gl_PREREQ_VASNPRINTF_FLAG_ALT_PRECISION_ZERO gl_PREREQ_VASNPRINTF_PRECISION gl_PREREQ_VASNPRINTF_ENOMEM ]) diff --git a/m4/vasprintf.m4 b/m4/vasprintf.m4 index 6e6156a..ea0a8dc 100644 --- a/m4/vasprintf.m4 +++ b/m4/vasprintf.m4 @@ -1,5 +1,5 @@ # vasprintf.m4 serial 6 -dnl Copyright (C) 2002-2003, 2006-2007, 2009-2023 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2006-2007, 2009-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/visibility.m4 b/m4/visibility.m4 index f0468e8..e091f02 100644 --- a/m4/visibility.m4 +++ b/m4/visibility.m4 @@ -1,5 +1,5 @@ -# visibility.m4 serial 8 -dnl Copyright (C) 2005, 2008, 2010-2023 Free Software Foundation, Inc. +# visibility.m4 serial 9 +dnl Copyright (C) 2005, 2008, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -31,18 +31,18 @@ AC_DEFUN([gl_VISIBILITY], dnl user has put into $CC $CFLAGS $CPPFLAGS. AC_CACHE_CHECK([whether the -Werror option is usable], [gl_cv_cc_vis_werror], - [gl_save_CFLAGS="$CFLAGS" + [gl_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[]], [[]])], [gl_cv_cc_vis_werror=yes], [gl_cv_cc_vis_werror=no]) - CFLAGS="$gl_save_CFLAGS" + CFLAGS="$gl_saved_CFLAGS" ]) dnl Now check whether visibility declarations are supported. AC_CACHE_CHECK([for simple visibility declarations], [gl_cv_cc_visibility], - [gl_save_CFLAGS="$CFLAGS" + [gl_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" dnl We use the option -Werror and a function dummyfunc, because on some dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning @@ -68,7 +68,7 @@ AC_DEFUN([gl_VISIBILITY], [[]])], [gl_cv_cc_visibility=yes], [gl_cv_cc_visibility=no]) - CFLAGS="$gl_save_CFLAGS" + CFLAGS="$gl_saved_CFLAGS" ]) if test $gl_cv_cc_visibility = yes; then CFLAG_VISIBILITY="-fvisibility=hidden" diff --git a/m4/vsnprintf.m4 b/m4/vsnprintf.m4 index 7fbb11c..19524cf 100644 --- a/m4/vsnprintf.m4 +++ b/m4/vsnprintf.m4 @@ -1,5 +1,5 @@ # vsnprintf.m4 serial 7 -dnl Copyright (C) 2002-2004, 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wait-process.m4 b/m4/wait-process.m4 index a70a592..dc519a1 100644 --- a/m4/wait-process.m4 +++ b/m4/wait-process.m4 @@ -1,5 +1,5 @@ # wait-process.m4 serial 6 -dnl Copyright (C) 2003, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/waitpid.m4 b/m4/waitpid.m4 index b001062..8dc538e 100644 --- a/m4/waitpid.m4 +++ b/m4/waitpid.m4 @@ -1,5 +1,5 @@ -# waitpid.m4 serial 2 -dnl Copyright (C) 2010-2023 Free Software Foundation, Inc. +# waitpid.m4 serial 3 +dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,6 +9,6 @@ AC_DEFUN([gl_FUNC_WAITPID], AC_REQUIRE([AC_CANONICAL_HOST]) HAVE_WAITPID=1 case $host_os in - mingw*) HAVE_WAITPID=0 ;; + mingw* | windows*) HAVE_WAITPID=0 ;; esac ]) diff --git a/m4/warn-on-use.m4 b/m4/warn-on-use.m4 index 10649c5..eef3a84 100644 --- a/m4/warn-on-use.m4 +++ b/m4/warn-on-use.m4 @@ -1,5 +1,5 @@ -# warn-on-use.m4 serial 10 -dnl Copyright (C) 2010-2023 Free Software Foundation, Inc. +# warn-on-use.m4 serial 11 +dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -36,7 +36,7 @@ AC_DEFUN([gl_WARN_ON_USE_PREPARE], dnl clang (e.g. strndup), reference ac_compile_for_check_decl instead dnl of ac_compile. If, for whatever reason, the override of AC_PROG_CC dnl in zzgnulib.m4 is inactive, use the original ac_compile. - ac_save_ac_compile="$ac_compile" + ac_saved_ac_compile="$ac_compile" if test -n "$ac_compile_for_check_decl"; then ac_compile="$ac_compile_for_check_decl" fi @@ -46,7 +46,7 @@ AC_DEFUN([gl_WARN_ON_USE_PREPARE], [[#undef $gl_func (void) $gl_func;]])], [AS_VAR_SET([gl_Symbol], [yes])], [AS_VAR_SET([gl_Symbol], [no])])]) - ac_compile="$ac_save_ac_compile" + ac_compile="$ac_saved_ac_compile" AS_VAR_IF([gl_Symbol], [yes], [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1]) dnl Shortcut for an AC_CHECK_DECL invocation that may come later: diff --git a/m4/warnings.m4 b/m4/warnings.m4 index 063bc5c..d487636 100644 --- a/m4/warnings.m4 +++ b/m4/warnings.m4 @@ -1,19 +1,12 @@ -# warnings.m4 serial 16 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +# warnings.m4 serial 20 +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Simon Josefsson -# gl_AS_VAR_APPEND(VAR, VALUE) -# ---------------------------- -# Provide the functionality of AS_VAR_APPEND if Autoconf does not have it. -m4_ifdef([AS_VAR_APPEND], -[m4_copy([AS_VAR_APPEND], [gl_AS_VAR_APPEND])], -[m4_define([gl_AS_VAR_APPEND], -[AS_VAR_SET([$1], [AS_VAR_GET([$1])$2])])]) - +AC_PREREQ([2.64]) # gl_COMPILER_OPTION_IF(OPTION, [IF-SUPPORTED], [IF-NOT-SUPPORTED], # [PROGRAM = AC_LANG_PROGRAM()]) @@ -33,13 +26,13 @@ case $gl_positive in esac m4_pushdef([gl_Positive], [$gl_positive])])dnl AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], [gl_Warn], [ - gl_save_compiler_FLAGS="$gl_Flags" - gl_AS_VAR_APPEND(m4_defn([gl_Flags]), + gl_saved_compiler_FLAGS="$gl_Flags" + AS_VAR_APPEND(m4_defn([gl_Flags]), [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["]) AC_LINK_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([[]])])], [AS_VAR_SET([gl_Warn], [yes])], [AS_VAR_SET([gl_Warn], [no])]) - gl_Flags="$gl_save_compiler_FLAGS" + gl_Flags="$gl_saved_compiler_FLAGS" ]) AS_VAR_IF(gl_Warn, [yes], [$2], [$3]) m4_popdef([gl_Positive])dnl @@ -88,16 +81,18 @@ AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL], # gl_WARN_ADD(OPTION, [VARIABLE = WARN_CFLAGS/WARN_CXXFLAGS], # [PROGRAM = AC_LANG_PROGRAM()]) # ----------------------------------------------------------- -# Adds parameter to WARN_CFLAGS/WARN_CXXFLAGS if the compiler supports it -# when compiling PROGRAM. For example, gl_WARN_ADD([-Wparentheses]). +# Adds OPTION to VARIABLE (which defaults to WARN_CFLAGS or WARN_CXXFLAGS) +# if the compiler supports it when compiling PROGRAM. # # If VARIABLE is a variable name, AC_SUBST it. # # The effects of this macro depend on the current language (_AC_LANG). +# +# Example: gl_WARN_ADD([-Wparentheses]). AC_DEFUN([gl_WARN_ADD], [AC_REQUIRE([gl_UNKNOWN_WARNINGS_ARE_ERRORS(]_AC_LANG[)]) gl_COMPILER_OPTION_IF([$1], - [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_]_AC_LANG_PREFIX[FLAGS]], [[$2]]), [" $1"])], + [AS_VAR_APPEND(m4_if([$2], [], [[WARN_]_AC_LANG_PREFIX[FLAGS]], [[$2]]), [" $1"])], [], [$3]) m4_ifval([$2], @@ -105,6 +100,77 @@ m4_ifval([$2], [AC_SUBST([WARN_]_AC_LANG_PREFIX[FLAGS])])dnl ]) + +# gl_CC_INHIBIT_WARNINGS +# sets and substitutes a variable GL_CFLAG_INHIBIT_WARNINGS, to a $(CC) option +# that reverts all preceding -W* options, if available. +# This is expected to be '-w' at least on gcc, clang, AIX xlc, xlclang, Sun cc, +# "compile cl" (MSVC), "compile clang-cl" (MSVC-compatible clang). Or it can be +# empty. +AC_DEFUN([gl_CC_INHIBIT_WARNINGS], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_CACHE_CHECK([for C compiler option to inhibit all warnings], + [gl_cv_cc_winhibit], + [rm -f conftest* + echo 'int dummy;' > conftest.c + AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err]) >/dev/null + AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -w -c conftest.c 2>conftest2.err]) >/dev/null + if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then + gl_cv_cc_winhibit='-w' + else + gl_cv_cc_winhibit=none + fi + rm -f conftest* + ]) + case "$gl_cv_cc_winhibit" in + none) GL_CFLAG_INHIBIT_WARNINGS='' ;; + *) + GL_CFLAG_INHIBIT_WARNINGS="$gl_cv_cc_winhibit" + dnl If all warnings are inhibited, there's no point in having the GCC + dnl analyzer enabled. This saves RAM requirements and CPU consumption. + gl_WARN_ADD([-fno-analyzer], [GL_CFLAG_INHIBIT_WARNINGS]) + ;; + esac + AC_SUBST([GL_CFLAG_INHIBIT_WARNINGS]) +]) + +# gl_CXX_INHIBIT_WARNINGS +# sets and substitutes a variable GL_CXXFLAG_INHIBIT_WARNINGS, to a $(CC) option +# that reverts all preceding -W* options, if available. +AC_DEFUN([gl_CXX_INHIBIT_WARNINGS], +[ + dnl Requires AC_PROG_CXX or gl_PROG_ANSI_CXX. + if test -n "$CXX" && test "$CXX" != no; then + AC_CACHE_CHECK([for C++ compiler option to inhibit all warnings], + [gl_cv_cxx_winhibit], + [rm -f conftest* + echo 'int dummy;' > conftest.cc + AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>conftest1.err]) >/dev/null + AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -w -c conftest.cc 2>conftest2.err]) >/dev/null + if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then + gl_cv_cxx_winhibit='-w' + else + gl_cv_cxx_winhibit=none + fi + rm -f conftest* + ]) + case "$gl_cv_cxx_winhibit" in + none) GL_CXXFLAG_INHIBIT_WARNINGS='' ;; + *) + GL_CXXFLAG_INHIBIT_WARNINGS="$gl_cv_cxx_winhibit" + dnl If all warnings are inhibited, there's no point in having the GCC + dnl analyzer enabled. This saves RAM requirements and CPU consumption. + gl_WARN_ADD([-fno-analyzer], [GL_CXXFLAG_INHIBIT_WARNINGS]) + ;; + esac + else + GL_CXXFLAG_INHIBIT_WARNINGS='' + fi + AC_SUBST([GL_CXXFLAG_INHIBIT_WARNINGS]) +]) + + # Local Variables: # mode: autoconf # End: diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index 442932b..173f42a 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -1,13 +1,13 @@ dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues. -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 60 +# wchar_h.m4 serial 63 AC_DEFUN_ONCE([gl_WCHAR_H], [ @@ -86,8 +86,8 @@ AC_DEFUN([gl_WCHAR_H_INLINE_OK], dnl z/OS when using the XPLINK object format (due to duplicate dnl CSECT names). Instead, temporarily redefine $ac_compile so dnl that the object file has the latter name from the start. - save_ac_compile="$ac_compile" - ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/` + saved_ac_compile="$ac_compile" + ac_compile=`echo "$saved_ac_compile" | sed s/conftest/conftest1/` if echo '#include "conftest.c"' >conftest1.c \ && AC_TRY_EVAL([ac_compile]); then AC_LANG_CONFTEST([ @@ -97,7 +97,7 @@ AC_DEFUN([gl_WCHAR_H_INLINE_OK], int zero (void) { return 0; } ]])]) dnl See note above about renaming object files. - ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` + ac_compile=`echo "$saved_ac_compile" | sed s/conftest/conftest2/` if echo '#include "conftest.c"' >conftest2.c \ && AC_TRY_EVAL([ac_compile]); then if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then @@ -107,7 +107,7 @@ AC_DEFUN([gl_WCHAR_H_INLINE_OK], fi fi fi - ac_compile="$save_ac_compile" + ac_compile="$saved_ac_compile" rm -f conftest[12].c conftest[12].$ac_objext conftest$ac_exeext ;; esac @@ -147,6 +147,7 @@ AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOWC]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOB]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSINIT]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSZERO]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOWC]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRLEN]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOWCS]) @@ -185,6 +186,7 @@ AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSTOK]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSWIDTH]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSFTIME]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WGETCWD]) dnl Support Microsoft deprecated alias function names by default. gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1]) ]) diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 index 50bde08..9435357 100644 --- a/m4/wchar_t.m4 +++ b/m4/wchar_t.m4 @@ -1,5 +1,5 @@ # wchar_t.m4 serial 4 (gettext-0.18.2) -dnl Copyright (C) 2002-2003, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 index d51b36e..f00f645 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,5 +1,5 @@ -# wcrtomb.m4 serial 17 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +# wcrtomb.m4 serial 19 +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -82,9 +82,11 @@ int main () changequote(,)dnl case "$host_os" in # Guess no on AIX 4, OSF/1, Solaris, native Windows. - aix4* | osf* | solaris* | mingw*) gl_cv_func_wcrtomb_retval="guessing no" ;; + aix4* | osf* | solaris* | mingw* | windows*) + gl_cv_func_wcrtomb_retval="guessing no" ;; # Guess yes otherwise. - *) gl_cv_func_wcrtomb_retval="guessing yes" ;; + *) + gl_cv_func_wcrtomb_retval="guessing yes" ;; esac changequote([,])dnl if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then @@ -97,12 +99,14 @@ changequote([,])dnl int main () { int result = 0; - if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) + if (strcmp ("$LOCALE_FR", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) result |= 1; } - if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + if (strcmp ("$LOCALE_FR_UTF8", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) result |= 2; @@ -113,12 +117,14 @@ int main () result |= 2; } } - if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + if (strcmp ("$LOCALE_JA", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_JA") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) result |= 4; } - if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + if (strcmp ("$LOCALE_ZH_CN", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) result |= 8; diff --git a/m4/wctype.m4 b/m4/wctype.m4 new file mode 100644 index 0000000..3660d7d --- /dev/null +++ b/m4/wctype.m4 @@ -0,0 +1,51 @@ +# wctype.m4 serial 6 +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN_ONCE([gl_FUNC_WCTYPE], +[ + AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) + AC_REQUIRE([gl_WCTYPE_H]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + HAVE_WCTYPE=$HAVE_WCTYPE_T + if test $HAVE_WCTYPE = 1; then + AC_CACHE_CHECK([whether wctype supports the "blank" and "punct" character classes], + [gl_cv_func_wctype_works], + [AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ + #include <ctype.h> + #include <wchar.h> + #include <wctype.h> + int main () + { + /* This test fails on mingw. */ + if (wctype ("blank") == (wctype_t)0) + return 1; + /* This test fails on MSVC 14. */ + if ((! iswctype ('\t', wctype ("blank"))) != (! iswblank ('\t'))) + return 2; + /* This test fails on Android 11. */ + if ((! iswctype ('\`', wctype ("punct"))) != (! ispunct ('\`'))) + return 4; + return 0; + } + ]])], + [gl_cv_func_wctype_works=yes], [gl_cv_func_wctype_works=no], + [case "$host_os" in + # Guess no on native Windows. + mingw* | windows*) gl_cv_func_wctype_works="guessing no" ;; + # Guess no on Android. + android*) gl_cv_func_wctype_works="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_wctype_works="guessing yes" ;; + esac + ]) + ]) + case "$gl_cv_func_wctype_works" in + *yes) ;; + *) REPLACE_WCTYPE=1 ;; + esac + fi +]) diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 index 6856a73..c899394 100644 --- a/m4/wctype_h.m4 +++ b/m4/wctype_h.m4 @@ -1,8 +1,8 @@ -# wctype_h.m4 serial 30 +# wctype_h.m4 serial 33 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it. -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -178,6 +178,7 @@ AC_DEFUN([gl_WCTYPE_H_REQUIRE_DEFAULTS], m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS], [ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWBLANK]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWDIGIT]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWPUNCT]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWXDIGIT]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTYPE]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWCTYPE]) @@ -196,5 +197,8 @@ AC_DEFUN([gl_WCTYPE_H_DEFAULTS], HAVE_WCTRANS_T=1; AC_SUBST([HAVE_WCTRANS_T]) REPLACE_ISWBLANK=0; AC_SUBST([REPLACE_ISWBLANK]) REPLACE_ISWDIGIT=0; AC_SUBST([REPLACE_ISWDIGIT]) + REPLACE_ISWPUNCT=0; AC_SUBST([REPLACE_ISWPUNCT]) REPLACE_ISWXDIGIT=0; AC_SUBST([REPLACE_ISWXDIGIT]) + REPLACE_WCTRANS=0; AC_SUBST([REPLACE_WCTRANS]) + REPLACE_WCTYPE=0; AC_SUBST([REPLACE_WCTYPE]) ]) diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index e7829e9..53a26c7 100644 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -1,5 +1,5 @@ # wcwidth.m4 serial 36 -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ dnl Wget-specific Autoconf macros. -dnl Copyright (C) 1995-2011, 2018-2023 Free Software Foundation, Inc. +dnl Copyright (C) 1995-2011, 2018-2024 Free Software Foundation, Inc. dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by diff --git a/m4/wget_manywarnings.m4 b/m4/wget_manywarnings.m4 index b977bd2..9a2390d 100644 --- a/m4/wget_manywarnings.m4 +++ b/m4/wget_manywarnings.m4 @@ -1,5 +1,5 @@ # wget_manywarnings.m4 serial 1 -dnl Copyright (C) 2016-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2016-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 index dfd743b..21350f5 100644 --- a/m4/wint_t.m4 +++ b/m4/wint_t.m4 @@ -1,5 +1,5 @@ # wint_t.m4 serial 11 -dnl Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wmemchr.m4 b/m4/wmemchr.m4 index ac414fb..54f1c83 100644 --- a/m4/wmemchr.m4 +++ b/m4/wmemchr.m4 @@ -1,5 +1,5 @@ # wmemchr.m4 serial 5 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wmempcpy.m4 b/m4/wmempcpy.m4 index abf1df3..6c08d55 100644 --- a/m4/wmempcpy.m4 +++ b/m4/wmempcpy.m4 @@ -1,5 +1,5 @@ # wmempcpy.m4 serial 3 -dnl Copyright (C) 2020-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2020-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/write.m4 b/m4/write.m4 index fc691f0..c50efc4 100644 --- a/m4/write.m4 +++ b/m4/write.m4 @@ -1,5 +1,5 @@ # write.m4 serial 6 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xalloc.m4 b/m4/xalloc.m4 index fc56f59..f60ea3d 100644 --- a/m4/xalloc.m4 +++ b/m4/xalloc.m4 @@ -1,5 +1,5 @@ # xalloc.m4 serial 18 -dnl Copyright (C) 2002-2006, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xsize.m4 b/m4/xsize.m4 index 649db9c..6125f9c 100644 --- a/m4/xsize.m4 +++ b/m4/xsize.m4 @@ -1,5 +1,5 @@ # xsize.m4 serial 5 -dnl Copyright (C) 2003-2004, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2004, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xstrndup.m4 b/m4/xstrndup.m4 index 1fb6a7d..d544650 100644 --- a/m4/xstrndup.m4 +++ b/m4/xstrndup.m4 @@ -1,5 +1,5 @@ # xstrndup.m4 serial 2 -dnl Copyright (C) 2003, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/zzgnulib.m4 b/m4/zzgnulib.m4 index 362102b..eed5ecb 100644 --- a/m4/zzgnulib.m4 +++ b/m4/zzgnulib.m4 @@ -1,5 +1,5 @@ # zzgnulib.m4 serial 1 -dnl Copyright (C) 2020-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2020-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -2,7 +2,7 @@ # This Makefile fragment tries to be general-purpose enough to be # used by many projects via the gnulib maintainer-makefile module. -## Copyright (C) 2001-2023 Free Software Foundation, Inc. +## Copyright (C) 2001-2024 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -180,7 +180,7 @@ no-vc-detected: endif .PHONY: $(local-checks-available) -# Arrange to print the name of each syntax-checking rule just before running it. +# Arrange to prine the name of each syntax-checking rule just before running it. $(syntax-check-rules): %: %.m sc_m_rules_ = $(patsubst %, %.m, $(syntax-check-rules)) .PHONY: $(sc_m_rules_) @@ -503,6 +503,7 @@ sc_prohibit_have_config_h: # Nearly all .c files must include <config.h>. However, we also permit this # via inclusion of a package-specific header, if cfg.mk specified one. # config_h_header must be suitable for grep -E. +# Rationale: The Gnulib documentation, node 'Include <config.h>'. config_h_header ?= <config\.h> sc_require_config_h: @require='^# *include $(config_h_header)' \ @@ -526,6 +527,7 @@ perl_config_h_first_ = \ # You must include <config.h> before including any other header file. # This can possibly be via a package-specific header, if given by cfg.mk. +# Rationale: The Gnulib documentation, node 'Include <config.h>'. sc_require_config_h_first: @if $(VC_LIST_EXCEPT) | $(GREP) '\.c$$' > /dev/null; then \ files=$$($(VC_LIST_EXCEPT) | $(GREP) '\.c$$') && \ @@ -535,6 +537,89 @@ sc_require_config_h_first: else :; \ fi +# Generated headers that override system headers. +# Keep sorted. +gl_prefer_angle_bracket_headers_ ?= \ + alloca.h \ + arpa/inet.h \ + assert.h \ + ctype.h \ + dirent.h \ + errno.h \ + error.h \ + fcntl.h \ + fenv.h \ + float.h \ + fnmatch.h \ + getopt.h \ + glob.h \ + iconv.h \ + inttypes.h \ + langinfo.h \ + limits.h \ + locale.h \ + malloc.h \ + math.h \ + monetary.h \ + netdb.h \ + net/if.h \ + netinet/in.h \ + omp.h \ + poll.h \ + pthread.h \ + pty.h \ + sched.h \ + search.h \ + selinux/selinux.h \ + signal.h \ + spawn.h \ + stdalign.h \ + stdarg.h \ + stddef.h \ + stdint.h \ + stdio.h \ + stdlib.h \ + string.h \ + strings.h \ + sysexits.h \ + sys/file.h \ + sys/ioctl.h \ + sys/msg.h \ + sys/random.h \ + sys/resource.h \ + sys/select.h \ + sys/sem.h \ + sys/shm.h \ + sys/socket.h \ + sys/stat.h \ + sys/time.h \ + sys/times.h \ + sys/types.h \ + sys/uio.h \ + sys/utsname.h \ + sys/wait.h \ + termios.h \ + threads.h \ + time.h \ + uchar.h \ + unistd.h \ + utime.h \ + utmp.h \ + wchar.h \ + wctype.h + +# Remove each .h suffix and change each space to "|". +angle_bracket_header_re = \ + $(subst $(_sp),|,$(patsubst %.h,%,$(gl_prefer_angle_bracket_headers_))) + +# Suggest using '#include <header.h>' instead of '#include "header.h"' for +# headers that override system headers. +# Rationale: The Gnulib documentation, node 'Style of #include statements'. +sc_prefer_angle_bracket_headers: + @prohibit='^ *# *include "($(angle_bracket_header_re))\.h"' \ + halt='Use #include <hdr.h>, not #include "hdr.h" for the above' \ + $(_sc_search_regexp) + sc_prohibit_HAVE_MBRTOWC: @prohibit='\bHAVE_MBRTOWC\b' \ halt="do not use $$prohibit; it is always defined" \ @@ -598,23 +683,14 @@ sc_prohibit_error_without_use: re='\<error(_at_line|_print_progname|_one_per_line|_message_count)? *\('\ $(_sc_header_without_use) -# Don't include xalloc.h unless you use one of its functions. +# Don't include xalloc.h unless you use one of its symbols. # Consider these symbols: # perl -lne '/^# *define (\w+)\(/ and print $1' lib/xalloc.h|grep -v '^__'; -# perl -lne '/^(?:extern )?(?:void|char) \*?(\w+) *\(/ and print $1' lib/xalloc.h +# perl -lne 'm{^(?:_Noreturn )?(?:void|char) \*?(\w+) *\(} and print $1' lib/xalloc.h # Divide into two sets on case, and filter each through this: # | sort | perl -MRegexp::Assemble -le \ # 'print Regexp::Assemble->new(file => "/dev/stdin")->as_string'|sed 's/\?://g' -# Note this was produced by the above: -# _xa1 = \ -#x(((2n?)?re|c(har)?|n(re|m)|z)alloc|alloc_(oversized|die)|m(alloc|emdup)|strdup) -# But we can do better, in at least two ways: -# 1) take advantage of two "dup"-suffixed strings: -# x(((2n?)?re|c(har)?|n(re|m)|[mz])alloc|alloc_(oversized|die)|(mem|str)dup) -# 2) notice that "c(har)?|[mz]" is equivalent to the shorter and more readable -# "char|[cmz]" -# x(((2n?)?re|char|n(re|m)|[cmz])alloc|alloc_(oversized|die)|(mem|str)dup) -_xa1 = x(((2n?)?re|char|n(re|m)|[cmz])alloc|alloc_(oversized|die)|(mem|str)dup) +_xa1 = x(i(m(emdup0?|alloc)|realloc(array)?|([cz]|nm)alloc)|([pz]|c(har)?|2n?re|nm)alloc|realloc(array)?|m(alloc|emdup)|alloc_die|strdup) _xa2 = X([CZ]|N?M)ALLOC sc_prohibit_xalloc_without_use: @h='xalloc.h' \ @@ -745,7 +821,8 @@ sc_prohibit_intprops_without_use: re='\<($(_intprops_syms_re)) *\(' \ $(_sc_header_without_use) -_stddef_syms_re = NULL|offsetof|ptrdiff_t|size_t|wchar_t +_stddef_syms_re = \ + NULL|max_align_t|nullptr_t|offsetof|ptrdiff_t|size_t|unreachable|wchar_t # Prohibit the inclusion of stddef.h without an actual use. sc_prohibit_stddef_without_use: @h='stddef.h' \ @@ -922,6 +999,7 @@ sc_prohibit_always-defined_macros: exit 1; } \ || :; \ fi + # ================================================================== # Prohibit checked in backup files. @@ -1006,12 +1084,12 @@ sc_prohibit_empty_lines_at_EOF: exit 1; } \ || : -# Make sure we don't use st_blocks. Use ST_NBLOCKS instead. +# Make sure we don't use st_blocks. Use ST_NBLOCKS or STP_NBLOCKS instead. # This is a bit of a kludge, since it prevents use of the string # even in comments, but for now it does the job with no false positives. sc_prohibit_stat_st_blocks: @prohibit='[.>]st_blocks' \ - halt='do not use st_blocks; use ST_NBLOCKS' \ + halt='do not use st_blocks; use ST_NBLOCKS or STP_NBLOCKS' \ $(_sc_search_regexp) # Make sure we don't define any S_IS* macros in src/*.c files. @@ -1377,6 +1455,22 @@ sc_unportable_grep_q: @prohibit='grep -q' halt="unportable 'grep -q', use >/dev/null instead" \ $(_sc_search_regexp) +# The GNU Coding standards say that README should refer to both +# INSTALL and the file that contains the copying conditions. This +# shall be COPYING for GPL and COPYING.LESSER for LGPL. + +sc_readme_link_install: + @require='INSTALL' \ + in_vc_files='^README$$' \ + halt='The README file should refer to INSTALL' \ + $(_sc_search_regexp) + +sc_readme_link_copying: + @require='COPYING' \ + in_vc_files='^README$$' \ + halt='The README file should refer to COPYING[.LESSER]' \ + $(_sc_search_regexp) + vc-diff-check: $(AM_V_GEN)(unset CDPATH; cd $(srcdir) && $(VC) diff) > vc-diffs || : $(AM_V_at)if test -s vc-diffs; then \ diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 6b25f0d..2b36b11 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,13 +1,13 @@ # Makefile for PO directory in any package using GNU gettext. # Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu> -# Copyright (C) 2000-2020 Free Software Foundation, Inc. +# Copyright (C) 2000-2023 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright # notice and this notice are preserved. This file is offered as-is, # without any warranty. # -# Origin: gettext-0.21 +# Origin: gettext-0.22 GETTEXT_MACRO_VERSION = 0.20 PACKAGE = @PACKAGE@ @@ -248,15 +248,17 @@ $(POFILES): $(POFILESDEPS) @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.10 | 0.10.*) \ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + 0.1[1-5] | 0.1[1-5].*) \ + $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ esac; \ }; \ else \ @@ -464,15 +466,17 @@ update-po: Makefile tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.10 | 0.10.*) \ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + 0.1[1-5] | 0.1[1-5].*) \ + $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ esac; \ }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 39fe9a7..41cbcc6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,5 @@ # List of files which containing translatable strings. -# Copyright (C) 1995-2011, 2018-2023 Free Software Foundation, Inc. +# Copyright (C) 1995-2011, 2018-2024 Free Software Foundation, Inc. # Package source files src/connect.c Binary files differ@@ -8,10 +8,10 @@ # msgid "" msgstr "" -"Project-Id-Version: GNU wget 1.21.3\n" +"Project-Id-Version: GNU wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2023-03-20 00:32+0300\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-12-30 04:06+0300\n" "Last-Translator: Viachaslau Khalikin <viachaslau.vinegret@outlook.com>\n" "Language-Team: Belarusian <debian-l10n-belarusian@lists.debian.org>\n" "Language: be\n" @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Emacs 28.2, po mode 2.27\n" +"X-Generator: Emacs 29.1, po mode 2.28\n" #: src/connect.c:201 #, c-format @@ -390,12 +390,12 @@ msgstr "Перадача даных Ñпынена.\n" msgid "File %s already there; not retrieving.\n" msgstr "Файл %s ужо тут; абмінаем.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(Ñпроба:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -404,7 +404,7 @@ msgstr "" "%s (%s) - запіÑаны Ñž stdout %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -414,7 +414,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Выдаленьне %s.\n" @@ -437,7 +437,7 @@ msgstr "ЗначÑньне Ñ€ÑкурÑіўнай глыбіні %d больша #: src/ftp.c:2291 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" -msgstr "Ðддалены файл не навейшы за мÑÑцовы файл %s -- абмінаем.\n" +msgstr "Ðддалены файл не навейшы за лÑкальны файл %s -- абмінаем.\n" #: src/ftp.c:2299 #, c-format @@ -445,7 +445,7 @@ msgid "" "Remote file is newer than local file %s -- retrieving.\n" "\n" msgstr "" -"Ðддалены файл навейшы за мÑÑцовы файл %s -- выцÑгваем.\n" +"Ðддалены файл навейшы за лÑкальны файл %s -- выцÑгваем.\n" "\n" #: src/ftp.c:2306 @@ -454,7 +454,7 @@ msgid "" "The sizes do not match (local %s) -- retrieving.\n" "\n" msgstr "" -"Памеры не Ñупадаюць (мÑÑцовы %s) -- выцÑгваецца.\n" +"Памеры не Ñупадаюць (лÑкальны %s) -- выцÑгваецца.\n" "\n" #: src/ftp.c:2324 @@ -585,7 +585,7 @@ msgstr "GnuTLS: значÑньне %u опцыі «secure-protocol» не Ñ€Ñа #: src/gnutls.c:791 src/gnutls.c:847 src/host.c:158 src/openssl.c:289 msgid "Please report this issue to bug-wget@gnu.org\n" -msgstr "Калі лаÑка, паведаміце аб гÑтай праблеме на bug-wget@gnu.org\n" +msgstr "Калі лаÑка, паведаміце пра гÑтую праблему на bug-wget@gnu.org\n" #: src/gnutls.c:846 #, c-format @@ -773,7 +773,7 @@ msgstr "Паўторнае выкарыÑтаньне Ñ–Ñнуючага Ð·Ð»ÑƒÑ msgid "Failed reading proxy response: %s\n" msgstr "Памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ð°Ð´ÐºÐ°Ð·Ñƒ прокÑÑ–: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ПÐМЫЛКР%d: %s.\n" @@ -904,51 +904,51 @@ msgstr "ДаўжынÑ: " msgid "ignored" msgstr "ігнаруецца" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "" "ПапÑÑ€Ñджаньне! У HTTP не падтрымліваюцца ÑˆÐ°Ð±Ð»Ñ‘Ð½Ð½Ñ‹Ñ Ð²Ñ‹Ñ€Ð°Ð·Ñ‹ (wildcards).\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Уключаны Ñ€Ñжым «павука». Праверка наÑўнаÑьці аддаленага файла.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ðемагчыма запіÑаць у %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "ÐбавÑзковы атрыбут адÑутнічае у атрыманым Загалоўку.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Памылка аўтÑнтыфікацыі карыÑтальніка/паролÑ.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Ðемагчыма запіÑаць у файл WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Ðемагчыма запіÑаць у чаÑовы файл WARC.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Ðемагчыма ÑžÑталÑваць SSL злучÑньне.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ðемагчыма выдаліць %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ПÐМЫЛКÐ: Перанакіраваньне (%d) без Ð¿Ð°ÐºÐ°Ð·Ð²Ð°Ð½ÑŒÐ½Ñ Ð·Ð½Ð°Ñ…Ð¾Ð´Ð¶Ð°Ð½ÑŒÐ½Ñ.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -956,42 +956,42 @@ msgstr "" "Ðемагчыма знайÑьці Ð´Ð°Ð½Ñ‹Ñ Metalink у адказе HTTP. Спампоўваньне файла з " "дапамогай HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Знойдзены загалоўкі Metalink. Пераход у Ñ€Ñжым Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Ðддалены файл не Ñ–Ñнуе -- Ð·Ð»Ð°Ð¼Ð°Ð½Ð°Ñ ÑпаÑылка!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Загаловак Last-Modified адÑутнічае -- адбіткі чаÑу адключаныÑ.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Загаловак Last-Modified нерÑчаіÑны -- адбітак чаÑу будзе ігнаравацца.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" "\n" msgstr "" -"Файл на ÑÑрвÑры не навейшы за мÑÑцовы файл %s -- абмінаем.\n" +"Файл на ÑÑрвÑры не навейшы за лÑкальны файл %s -- абмінаем.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" -msgstr "Памеры не Ñупадаюць (мÑÑцовы %s) -- выцÑгваем.\n" +msgstr "Памеры не Ñупадаюць (лÑкальны %s) -- выцÑгваем.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Ðддалены файл навейшы, выцÑгваем.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1001,7 +1001,7 @@ msgstr "" "выцÑгваем.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1009,7 +1009,7 @@ msgstr "" "Ðддалены файл Ñ–Ñнуе, але не зьмÑшчае ніÑкіх ÑпаÑылак -- абмінаем.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1019,7 +1019,7 @@ msgstr "" "але Ñ€ÑкурÑÑ–Ñ Ð°Ð´ÐºÐ»ÑŽÑ‡Ð°Ð½Ð°Ñ - абмінаем.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1027,12 +1027,12 @@ msgstr "" "Ðддалены файл Ñ–Ñнуе.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1041,7 +1041,7 @@ msgstr "" "%s (%s) - запіÑаны Ñž stdout %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1050,27 +1050,27 @@ msgstr "" "%s (%s) - %s захаваны [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - ЗлучÑньне закрыта на байце %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ð½Ð° байце %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ð½Ð° байце %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "ЯкаÑьць абароны «%s» не падтрымліваецца.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Ðльгарытм «%s» не падтрымліваецца.\n" @@ -1081,7 +1081,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC ÑпаÑылаецца на %s, Ñкі не даÑтупны з-за памылкі: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðемагчыма прачытаць %s (%s).\n" @@ -1267,8 +1267,7 @@ msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" msgstr "" -"ÐбавÑÐ·ÐºÐ¾Ð²Ñ‹Ñ Ð°Ñ€Ð³ÑƒÐ¼Ñнты да доўгіх опцыÑÑž зьÑўлÑюцца абавÑзковымі й Ð´Ð»Ñ " -"кароткіх.\n" +"ÐбавÑÐ·ÐºÐ¾Ð²Ñ‹Ñ Ð°Ñ€Ð³ÑƒÐ¼Ñнты аднолькава належаць да доўгіх Ñ– да кароткі опцыÑÑž.\n" "\n" #: src/main.c:592 @@ -1286,7 +1285,7 @@ msgstr " -h, --help надрукаваць гÑтую дР#: src/main.c:598 msgid " -b, --background go to background after startup\n" -msgstr " -b, --background Ñ„Ð¾Ð½Ð°Ð²Ð°Ñ Ð¿Ñ€Ð°Ñ†Ð° паÑÑŒÐ»Ñ Ð·Ð°Ð¿ÑƒÑку\n" +msgstr " -b, --background праца Ñž фоне паÑÑŒÐ»Ñ Ð·Ð°Ð¿ÑƒÑку\n" #: src/main.c:600 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" @@ -1345,15 +1344,15 @@ msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -" -i, --input-file=ФÐЙЛ Ñпампоўваць URL, Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹Ñ Ñž мÑÑцовым ці " -"Ñž зьнешнім ФÐЙЛе\n" +" -i, --input-file=ФÐЙЛ Ñпампоўваць URL, Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹Ñ Ñž лÑкальным " +"ці Ñž зьнешнім ФÐЙЛе\n" #: src/main.c:629 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -" --input-metalink=ФÐЙЛ Ñпампоўваць файлы, ÑƒÐºÐ»ÑŽÑ‡Ð°Ð½Ñ‹Ñ Ñž мÑÑцовы " +" --input-metalink=ФÐЙЛ Ñпампоўваць файлы, ÑƒÐºÐ»ÑŽÑ‡Ð°Ð½Ñ‹Ñ Ñž лÑкальны " "Metalink ФÐЙЛ\n" #: src/main.c:632 @@ -1405,16 +1404,12 @@ msgstr "" "адмоўлена\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=ПÐМЫЛКІ ÑÑŒÐ¿Ñ–Ñ (праз коÑку) памылак HTTP пры " -"паўторных Ñпробах\n" +" --retry-on-host-error лічыць памылкі вузла некрытычнымі, " +"кароткачаÑовымі памылкамі\n" #: src/main.c:653 msgid "" @@ -1470,8 +1465,8 @@ msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -" --show-progress адлюÑтраваць прагрÑÑбар у любым Ñ€Ñжыме " -"падрабÑзнаÑьці\n" +" --show-progress адлюÑтроўваць прагрÑÑбар незалежна ад " +"Ñ€Ñжыму падрабÑзнаÑьці\n" #: src/main.c:670 msgid "" @@ -1480,7 +1475,7 @@ msgid "" " local\n" msgstr "" " -N, --timestamping не выцÑгваць паўторна Ñ‚Ñ‹Ñ Ñ„Ð°Ð¹Ð»Ñ‹,\n" -" ÑÐºÑ–Ñ ÑтарÑÐ¹ÑˆÑ‹Ñ Ð·Ð° мÑÑцовыÑ\n" +" ÑÐºÑ–Ñ ÑтарÑÐ¹ÑˆÑ‹Ñ Ð·Ð° лÑкальныÑ\n" #: src/main.c:673 msgid "" @@ -1488,18 +1483,18 @@ msgid "" "get\n" " requests in timestamping mode\n" msgstr "" -" --no-if-modified-since не выкарыÑтоўваць ÑƒÐ¼Ð¾ÑžÐ½Ñ‹Ñ Ð·Ð°Ð¿Ñ‹Ñ‚Ñ‹ if-" +" --no-if-modified-since не выкарыÑтоўваць ÑƒÐ¼Ð¾ÑžÐ½Ñ‹Ñ get-запыты if-" "modified-since\n" -" у Ñ€Ñжыме адбітка чаÑу\n" +" у Ñ€Ñжыме адбіткаў чаÑу\n" #: src/main.c:676 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -" --no-use-server-timestamps не ÑžÑтанаўліваць мÑÑцоваму файлу той жа " +" --no-use-server-timestamps не ÑžÑтанаўліваць лÑкальнаму файлу той жа " "адбітак чаÑу,\n" -" Ñкі на ÑÑрвÑры\n" +" Ñкі зададзены на ÑÑрвÑры\n" #: src/main.c:679 msgid " -S, --server-response print server response\n" @@ -1595,7 +1590,7 @@ msgid "" "host\n" msgstr "" " --bind-address=ÐДРÐС прывÑзаць ÐДРÐС (назва вузла або IP) " -"мÑÑцовага вузла\n" +"лÑкальнага вузла\n" #: src/main.c:712 msgid " --limit-rate=RATE limit download rate to RATE\n" @@ -1682,7 +1677,7 @@ msgstr " --no-iri адключыць падтрымку msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -" --local-encoding=КÐД выкарыÑтоўваць мÑÑцовую кадоўку КÐД Ð´Ð»Ñ " +" --local-encoding=КÐД выкарыÑтоўваць лÑкальную кадоўку КÐД Ð´Ð»Ñ " "IRI\n" #: src/main.c:746 @@ -1943,7 +1938,7 @@ msgid "" msgstr "" " --content-disposition улічваць загаловак Content-Disposition " "пры\n" -" выбары імён мÑÑцовых файлаў " +" выбары імён лÑкальных файлаў " "(ÐКСПÐРЫМÐÐТÐЛЬÐÐ)\n" #: src/main.c:838 @@ -1961,7 +1956,7 @@ msgid "" " without first waiting for the server's\n" " challenge\n" msgstr "" -" --auth-no-challenge адпраўлÑць інфармацыю аб Ñпраўджаньні " +" --auth-no-challenge адпраўлÑць інфармацыю пра Ñпраўджаньне " "Basic HTTP\n" " без папÑÑ€ÑднÑга Ñ‡Ð°ÐºÐ°Ð½ÑŒÐ½Ñ Ð·Ð°Ð¿Ñ‹Ñ‚Ñƒ " "ÑÑрвÑра\n" @@ -2272,7 +2267,7 @@ msgid "" msgstr "" " -k, --convert-links Ñтвараць ÑпаÑылкі Ñž Ñпампаваных HTML ці " "CSS на\n" -" мÑÑÑ†Ð¾Ð²Ñ‹Ñ Ñ„Ð°Ð¹Ð»Ñ‹\n" +" лÑÐºÐ°Ð»ÑŒÐ½Ñ‹Ñ Ñ„Ð°Ð¹Ð»Ñ‹\n" #: src/main.c:972 msgid "" @@ -2442,7 +2437,7 @@ msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -"Паведамленьні аб памылках, пытаньні, абмеркаваньні даÑылайце на <bug-" +"Паведамленьні пра памылкі, пытаньні, абмеркаваньні даÑылайце на <bug-" "wget@gnu.org>\n" "Ñ–/або Ð´Ð»Ñ Ð°Ð´ÐºÑ€Ñ‹Ñ†ÑŒÑ†Ñ Ð¿Ñ€Ð°Ð±Ð»ÐµÐ¼ ÑкарыÑтайце https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" @@ -2567,7 +2562,7 @@ msgstr "" #: src/main.c:1348 msgid "Please send bug reports and questions to <bug-wget@gnu.org>.\n" msgstr "" -"ÐдпраўлÑйце Ñправаздачы аб памылках Ñ– пытаньні на <bug-wget@gnu.org>.\n" +"ÐдпраўлÑйце Ñправаздачы пра памылкі ды пытаньні на <bug-wget@gnu.org>.\n" #: src/main.c:1400 #, c-format @@ -3023,17 +3018,17 @@ msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: папÑÑ€Ñджаньне: токен %s ÑуÑтракаецца перад кожнай назвай машыны\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: невÑдомы токен «%s»\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "ВыкарыÑтаньне: %s NETRC [ÐÐЗВÐ_ВУЗЛÐ]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: немагчыма выканаць stat %s: %s\n" @@ -3064,14 +3059,13 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: нерÑалізаванае значÑньне опцыі «secure-protocol» %d\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "Ваша вÑÑ€ÑÑ–Ñ OpenSSL занадта ÑÑ‚Ð°Ñ€Ð°Ñ Ð´Ð° падтрымкі TLS 1.3\n" +msgstr "Ваша вÑÑ€ÑÑ–Ñ OpenSSL не падтрымлівае опцыю «%s».\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "Перазборка Wget ды/ці OpenSSL можа дапамагчы Ñž гÑтым выпадку.\n" #: src/openssl.c:341 #, c-format @@ -3201,22 +3195,22 @@ msgstr "Ðемагчыма адкрыць %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Загружаецца robots.txt; калі лаÑка, не зьвÑртайце ўвагі на памылкі.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Памылка разбору URL прокÑÑ– %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Памылка Ñž URL прокÑÑ– %s: муÑіць быць HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "перавышÑньне колькаÑьці перанакіраваньнÑÑž (%d).\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3224,7 +3218,7 @@ msgstr "" "ЗдаемÑÑ.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3263,20 +3257,16 @@ msgid "No error" msgstr "ÐÑма памылак" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Схема %s не падтрымліваецца" +msgstr "Схема не падтрымліваецца" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "Падтрымка HTTPS не ўбудавана" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "Падтрымка HTTPS не ўбудавана" +msgstr "Падтрымка FTPS не ўбудавана" #: src/url.c:692 msgid "Scheme missing" @@ -3394,7 +3384,7 @@ msgstr "Памылка пры ÑупаÑтаўленьні %s: %d\n" #: src/utils.c:2852 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "Ðбмінаем ключ нÑправільнага памеру (%d/%d): %s\n" +msgstr "Ðбмінаем ключ памылковага памеру (%d/%d): %s\n" #: src/warc.c:217 msgid "Error setting WARC file position.\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.8.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2002-03-18 03:11\n" "Last-Translator: Yassen Roussev <slona@bulgaria.com>\n" "Language-Team: Bulgarian <bg@bulgaria.com>\n" @@ -409,19 +409,19 @@ msgstr "ТранÑферът бе прекъÑнат.\n" msgid "File %s already there; not retrieving.\n" msgstr "Файлът `%s' е вече тук, нÑма да го теглÑ.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(опит:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, fuzzy, c-format #| msgid "" #| "%s (%s) - `%s' saved [%ld]\n" @@ -434,7 +434,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Премахвам %s.\n" @@ -813,7 +813,7 @@ msgstr "Използване на вече уÑтановена връзка ÐºÑ msgid "Failed reading proxy response: %s\n" msgstr "ÐеуÑпех при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° HTTP иÑкане: %s.\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ГРЕШКÐ: %d: %s.\n" @@ -938,80 +938,80 @@ msgstr "Дължина: " msgid "ignored" msgstr "игнориран" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Внимание: ÑƒÐ°Ð¹Ð»Ð´ÐºÐ°Ñ€Ð´Ñ Ð½Ðµ Ñе поддържат в HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4443 +#: src/http.c:4447 #, fuzzy, c-format #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot write to %s (%s).\n" msgstr "Ðемога да запиша върху `%s' (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4476 +#: src/http.c:4480 #, fuzzy #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot write to WARC file.\n" msgstr "Ðемога да запиша върху `%s' (%s).\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Ðемога да уÑÑ‚Ð°Ð½Ð¾Ð²Ñ SSL връзка.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, fuzzy, c-format #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot unlink %s (%s).\n" msgstr "Ðемога да запиша върху `%s' (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ГРЕШКÐ: Пре-адреÑÐ°Ñ†Ð¸Ñ (%d) без уÑтановен адреÑ.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Заглавката Ñъдържаща Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñно поÑледна промÑна липÑва -- полето за " "дата Ñе изключва.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Заглавката Ñъдържаща Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñно поÑледна промÑна е невалиднa -- " "полето за дата Ñе игнорира.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, fuzzy, c-format #| msgid "" #| "Server file no newer than local file `%s' -- not retrieving.\n" @@ -1021,17 +1021,17 @@ msgid "" "\n" msgstr "Файлът на Ñървъра не е по-нов от този на диÑка `%s' -- Ñпирам.\n" -#: src/http.c:4649 +#: src/http.c:4653 #, fuzzy, c-format #| msgid "The sizes do not match (local %ld) -- retrieving.\n" msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Големините не Ñъвпадат (меÑтен %ld) -- продължавам.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Файлът на Ñървъра е по-нов, продължавам.\n" -#: src/http.c:4676 +#: src/http.c:4680 #, fuzzy #| msgid "" #| "Remote file is newer than local file `%s' -- retrieving.\n" @@ -1042,7 +1042,7 @@ msgid "" "\n" msgstr "Файлът на Ñървъра е по-нов от меÑÑ‚Ð½Ð¸Ñ `%s' -- започвам да Ñ‚eглÑ.\n" -#: src/http.c:4682 +#: src/http.c:4686 #, fuzzy #| msgid "Remote file no newer than local file `%s' -- not retrieving.\n" msgid "" @@ -1050,14 +1050,14 @@ msgid "" "\n" msgstr "Файлът от Ñървъра не е по-нов от меÑÑ‚Ð½Ð¸Ñ `%s' -- не продължавам.\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4697 +#: src/http.c:4701 #, fuzzy #| msgid "Remote file is newer, retrieving.\n" msgid "" @@ -1065,20 +1065,20 @@ msgid "" "\n" msgstr "Файлът на Ñървъра е по-нов, продължавам.\n" -#: src/http.c:4706 +#: src/http.c:4710 #, fuzzy, c-format #| msgid "%s ERROR %d: %s.\n" msgid "%s URL: %s %2d %s\n" msgstr "%s ГРЕШКÐ: %d: %s.\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4755 +#: src/http.c:4759 #, fuzzy, c-format #| msgid "" #| "%s (%s) - `%s' saved [%ld/%ld]\n" @@ -1090,30 +1090,30 @@ msgstr "" "%s (%s) - `%s' запиÑан [%ld/%ld]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, fuzzy, c-format #| msgid "%s (%s) - Connection closed at byte %ld. " msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Връзката бе преуÑтановена при байт %ld. " -#: src/http.c:4844 +#: src/http.c:4848 #, fuzzy, c-format #| msgid "%s (%s) - Read error at byte %ld (%s)." msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Грешка при четене, байт %ld (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, fuzzy, c-format #| msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Грешка при четене, байт %ld/%ld (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "" @@ -1124,7 +1124,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðемога да прочета %s (%s).\n" @@ -2800,17 +2800,17 @@ msgstr "" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: внимание: \"%s\" има Ñимвол преди името на машината\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: непознат Ñимвол \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Употреба: %s NETRC [ИМЕ ÐРХОСТ]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: непълен формат %s: %s\n" @@ -2976,22 +2976,22 @@ msgstr "Ðемога да преобразувам линковете в %s: %s\ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Зареждам robots.txt; Ð¼Ð¾Ð»Ñ Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð°Ð¹Ñ‚Ðµ грешките.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Грешка при транÑлирането на прокÑи УРЛ %s: %s\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Грешка при прокÑи УРЛ %s: ТрÑбва да е HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d пре-адреÑациите бÑха твърде много.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -2999,7 +2999,7 @@ msgstr "" "Отказвам Ñе.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.16.1.46\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2015-08-04 09:23+0200\n" "Last-Translator: Jordi Mallach <jordi@gnu.org>\n" "Language-Team: Catalan <ca@dodds.net>\n" @@ -397,12 +397,12 @@ msgstr "S'ha avortat la transferència de dades.\n" msgid "File %s already there; not retrieving.\n" msgstr "El fitxer %s ja existeix, no es baixa.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(intent:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -411,7 +411,7 @@ msgstr "" "%s (%s) - imprimit per la sortida està ndard %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -421,7 +421,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "S'està suprimint %s.\n" @@ -791,7 +791,7 @@ msgid "Failed reading proxy response: %s\n" msgstr "" "S'ha produït un error en llegir la resposta del servidor intermediari: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR: %d %s.\n" @@ -915,73 +915,73 @@ msgstr "Mida: " msgid "ignored" msgstr "s'ignora" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "AvÃs: En HTTP no es suporten patrons.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Mode aranya habilitat. Comprova si el fitxer remot existeix.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "No s'ha pogut escriure a %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "S'ha rebut l'atribut requerit que mancava a Header.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "L'autenticació amb nom d'usuari/contrasenya ha fallat.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "No s'ha pogut escriure al fitxer WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "No s'ha pogut escriure al fitxer temporal WARC.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "No s'ha pogut establir la connexió SSL.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "No s'ha pogut desenllaçar %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: Redirecció (%d) sense ubicació.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "El fitxer remot no existeix -- enllaç trencat!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Falta la capçalera Last-modified -- s'han inhabilitat les marques de temps.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Capçalera Last-modified no và lida -- s'omet la marca de temps.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -990,16 +990,16 @@ msgstr "" "El fitxer remot no és més nou que el local %s -- no es baixa.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Les mides dels fitxers no coincideixen (local %s) -- s'està baixant.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "El fitxer remot és més nou, s'està baixant.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1009,7 +1009,7 @@ msgstr "" "obtenint.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1017,7 +1017,7 @@ msgstr "" "El fitxer remot existeix però no conté cap enllaç -- no s'obté.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1027,7 +1027,7 @@ msgstr "" "però la recursió és inhabilitada -- no es baixa.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1035,12 +1035,12 @@ msgstr "" "El fitxer remot existeix.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "URL %s: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1049,7 +1049,7 @@ msgstr "" "%s (%s) - escrit a la sortida està ndard %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1058,27 +1058,27 @@ msgstr "" "%s (%s) - s'ha desat %s [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - S'ha tancat la connexió a l'octet %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - S'ha produït un error de lectura a l'octet %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - S'ha produït un error de lectura a l'octet %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "La qualitat de la protecció «%s» no és implementada.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, fuzzy, c-format #| msgid "Unsupported quality of protection '%s'.\n" msgid "Unsupported algorithm '%s'.\n" @@ -1091,7 +1091,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: La variable WGETRC apunta a %s, que no existeix.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: No s'ha pogut llegir %s (%s).\n" @@ -3464,17 +3464,17 @@ msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: avÃs: el testimoni %s apareix abans que cap nom de mà quina.\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: component desconegut \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Forma d'ús: %s NETRC [HOST]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: no s'ha pogut determinar l'estat de %s: %s\n" @@ -3652,24 +3652,24 @@ msgstr "No es pot obrir %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "S'està llegint el robots.txt; si us plau, ignoreu els errors.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "" "S'ha produït un error en analitzar la URL del servidor intermediari %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "" "Hi ha un error a la URL del servidor intermediari %s: Ha de ser HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "S'ha excedit el mà xim de redireccions (%d).\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3677,7 +3677,7 @@ msgstr "" "S'està abandonant.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" Binary files differ@@ -3,7 +3,7 @@ # This file is distributed under the same license as the wget package. # Jan Prikryl <prikryl@acm.org>, 1998, 2000, 2001 # Petr Pisar <petr.pisar@atlas.cz>, 2007, 2008, 2009, 2010, 2012, 2013, 2015. -# Petr Pisar <petr.pisar@atlas.cz>, 2016, 2017, 2018, 2020, 2021, 2022. +# Petr Pisar <petr.pisar@atlas.cz>, 2016, 2017, 2018, 2020, 2021, 2022, 2023. # # Translations from bundled gnulib: # @@ -14,10 +14,10 @@ # msgid "" msgstr "" -"Project-Id-Version: wget 1.21.3\n" +"Project-Id-Version: wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-02-27 20:38+01:00\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-11 22:19+02:00\n" "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" "Language: cs\n" @@ -400,12 +400,12 @@ msgstr "PÅ™enos dat byl pÅ™edÄasnÄ› ukonÄen.\n" msgid "File %s already there; not retrieving.\n" msgstr "Soubor %s je již pÅ™Ãtomen, nebude pÅ™enášen.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(pokus:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -414,7 +414,7 @@ msgstr "" "%s (%s) – zapsáno na standardnà výstup %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -424,7 +424,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Maže se %s.\n" @@ -789,7 +789,7 @@ msgstr "Využije se existujÃcà spojenà s %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Chyba pÅ™i Ätenà odpovÄ›di od proxy: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s CHYBA %d: %s.\n" @@ -920,51 +920,51 @@ msgstr "Délka: " msgid "ignored" msgstr "je ignorována" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "VarovánÃ: HTTP nepodporuje žolÃkové znaky.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Aktivován režim pavouka. Kontroluje, zda vzdálený soubor existuje.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nelze zapsat do %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "V pÅ™ijaté hlaviÄce chybà požadovaný atribut.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Autentizace jménem a heslem se nezdaÅ™ila.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Nelze zapsat do souboru WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Nelze zapsat do doÄasného souboru WARC.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Nebylo možné navázat SSL spojenÃ.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "%s nelze smazat (%s).\n" # , c-format -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "CHYBA: PÅ™esmÄ›rovánà (%d) bez udané nové adresy.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -972,27 +972,27 @@ msgstr "" "V odpovÄ›di HTTP nebylo možné najÃt metalinková data. Soubor se stahuje\n" "pomocà HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Nalezeny hlaviÄky metalinku. PÅ™epÃná se do režimu metalinku.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Vzdálený soubor neexistuje – slepý odkaz!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Nelze použÃt Äasová razÃtka, protože v odpovÄ›di serveru \n" "scházà hlaviÄka „Last-modified“.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "ÄŒasové razÃtko souboru bude ignorováno, protože hlaviÄka \n" "„Last-modified“ obsahuje neplatné údaje.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1001,16 +1001,16 @@ msgstr "" "Soubor na serveru nenà novÄ›jÅ¡Ã než lokálnà soubor %s – nebude pÅ™enášen.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Velikosti se neshodujà (lokálnà %s), stahuji.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Lokálnà soubor je starÅ¡Ã a vzdálený soubor se proto bude pÅ™enášet.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1020,7 +1020,7 @@ msgstr "" "stahuji.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1028,7 +1028,7 @@ msgstr "" "Vzdálený soubor existuje, ale neobsahuje žádné odkazy – nestahuji.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1037,7 +1037,7 @@ msgstr "" "Vzdálený soubor existuje a možná obsahuje dalÅ¡Ã odkazy,\n" "avÅ¡ak rekurze je vypnuta – nestahuji.\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1045,12 +1045,12 @@ msgstr "" "Vzdálený soubor existuje.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1059,7 +1059,7 @@ msgstr "" "%s (%s) – zapsáno na standardnà výstup %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1068,27 +1068,27 @@ msgstr "" "%s (%s) – %s uloženo [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) – Spojenà ukonÄeno na bajtu %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) – Chyba pÅ™i Ätenà dat na bajtu %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) – Chyba pÅ™i Ätenà dat na bajtu %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nepodporovaná kvalita ochrany „%s“.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nepodporovaný algoritmus „%s“.\n" @@ -1100,7 +1100,7 @@ msgid "" msgstr "" "%s: WGETRC ukazuje na %s, kam nebylo možné pÅ™istoupit kvůli chybÄ›: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nelze pÅ™eÄÃst %s (%s).\n" @@ -1422,17 +1422,13 @@ msgstr "" " --retry-connrefused opakuje, i když spojenà je odmÃtnuto\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=CHYBY     Äárkou oddÄ›lený seznam chyb HTTP,\n" -" po kterých se má staženà zkusit " -"znovu\n" +" --retry-on-host-error     považuje chyby pÅ™i pÅ™ekladu jmen za " +"doÄasné,\n" +" hodné nového pokusu\n" #: src/main.c:653 msgid "" @@ -3050,17 +3046,17 @@ msgstr "" "poÄÃtaÄe\n" # TODO: msgid bug: explicit quotation -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: neznámý token „%s“\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "PoužitÃ: %s NETRC [NÃZEV POÄŒÃTAÄŒE]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: volánà „stat %s“ skonÄilo chybou: %s\n" @@ -3091,14 +3087,13 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: neimplementovaná hodnota %d volby „secure-protocol“\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "VaÅ¡e verze OpenSSL je pÅ™ÃliÅ¡ stará, aby podporovala TLSv1.3\n" +msgstr "VaÅ¡e verze OpenSSL nepodporuje volbu „%s“.\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "Nové sestavenà Wgetu a/nebo OpenSSL může pomoci.\n" #: src/openssl.c:341 #, c-format @@ -3230,22 +3225,22 @@ msgstr "%s nelze otevÅ™Ãt: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "NaÄÃtá se „robots.txt“. Chybová hlášenà ignorujte, prosÃm.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Chyba rozebÃránà URL proxy serveru %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Chyba v URL Proxy %s: Musà být HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "PÅ™ekroÄeno %d pÅ™esmÄ›rovánÃ.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3253,7 +3248,7 @@ msgstr "" "Ani poslednà pokus nebyl úspěšný.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3292,20 +3287,16 @@ msgid "No error" msgstr "Bez chyby" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Nepodporované schéma %s" +msgstr "Nepodporované schéma" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "Podpora HTTPS nebyla zakompilována do programu" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "Podpora HTTPS nebyla zakompilována do programu" +msgstr "Podpora FTPS nebyla zakompilována do programu" #: src/url.c:692 msgid "Scheme missing" Binary files differ@@ -1,23 +1,23 @@ # Danish messages for GNU wget # This file is distributed under the same license as the wget package. -# Copyright (C) 1998 Free Software Foundation, Inc. +# Copyright (C) 1998, 2023 Free Software Foundation, Inc. # -# Keld Jørn Simonsen <keld@dkuug.dk>, 2000-2002,2011. -# Ask Hjorth Larsen <asklarsen@gmail.com>, 2010. +# Keld Jørn Simonsen <keld@dkuug.dk>, 2000-2002,2011. +# Ask Hjorth Larsen <asklarsen@gmail.com>, 2010, 2023. # # Reviewed: 2001-10-20 Thorbjoern Ravn Andersen <ravn@unixsnedkeren.dk> # msgid "" msgstr "" -"Project-Id-Version: wget 1.12-pre7\n" +"Project-Id-Version: wget-1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2011-01-09 07:03+0100\n" -"Last-Translator: Keld Simonsen <keld@keldix.com>\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-10-29 19:27+0100\n" +"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" "Language: da\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -30,23 +30,22 @@ msgstr "%s: kan ikke evaluere bindingsadressen %s; deaktiverer binding.\n" #: src/connect.c:282 #, c-format msgid "Connecting to %s|%s|:%d... " -msgstr "Tilslutter %s|%s|:%d... " +msgstr "Tilslutter %s|%s|:%d … " #: src/connect.c:290 #, c-format msgid "Connecting to %s:%d... " -msgstr "Tilslutter %s:%d... " +msgstr "Tilslutter %s:%d … " #: src/connect.c:293 -#, fuzzy, c-format -#| msgid "Connecting to %s:%d... " +#, c-format msgid "Connecting to [%s]:%d... " -msgstr "Tilslutter %s:%d... " +msgstr "Tilslutter [%s]:%d … " #: src/connect.c:329 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" -msgstr "" +msgstr "setsockopt SO_RCVBUF mislykkedes: %s\n" #: src/connect.c:357 msgid "connected.\n" @@ -60,43 +59,42 @@ msgstr "mislykkedes: %s.\n" #: src/connect.c:400 src/http.c:2111 #, c-format msgid "%s: unable to resolve host address %s\n" -msgstr "%s: kan ikke evaluere værtsadresse %s\n" +msgstr "%s: kan ikke evaluere værtsadresse %s\n" #: src/connect.c:470 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" -msgstr "" +msgstr "setsockopt SO_REUSEADDR mislykkedes: %s\n" #: src/connect.c:694 src/connect.c:756 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" +"Der er for mange Ã¥bne fildeskriptorer. Kan ikke bruge select pÃ¥ fd >= %d\n" #: src/convert.c:201 -#, fuzzy, c-format -#| msgid "Converted %d files in %s seconds.\n" +#, c-format msgid "Converted links in %d files in %s seconds.\n" -msgstr "Konverterede %d filer på %s sekunder.\n" +msgstr "Konverterede links i %d filer pÃ¥ %s sekunder.\n" #: src/convert.c:230 -#, fuzzy, c-format -#| msgid "Converting %s... " +#, c-format msgid "Converting links in %s... " -msgstr "Konverterer %s... " +msgstr "Konverterer links i %s … " #: src/convert.c:243 msgid "nothing to do.\n" -msgstr "ingenting at gøre.\n" +msgstr "ingenting at gøre.\n" #: src/convert.c:246 #, c-format msgid "%d.\n" -msgstr "" +msgstr "%d.\n" #: src/convert.c:252 src/convert.c:276 #, c-format msgid "Cannot convert links in %s: %s\n" -msgstr "Kan ikke konvertere lænker i %s: %s\n" +msgstr "Kan ikke konvertere lænker i %s: %s\n" #: src/convert.c:267 #, c-format @@ -109,21 +107,19 @@ msgid "Cannot back up %s as %s: %s\n" msgstr "Kan ikke sikkerhedskopiere %s som %s: %s\n" #: src/cookies.c:311 -#, fuzzy, c-format -#| msgid "Unable to delete %s: %s\n" +#, c-format msgid "Unable to get cookie for %s\n" -msgstr "Kan ikke slette %s: %s\n" +msgstr "Kan ikke hente cookie for %s\n" #: src/cookies.c:464 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" -msgstr "Syntaksfejl i Set-Cookie: %s på position %d.\n" +msgstr "Syntaksfejl i Set-Cookie: %s pÃ¥ position %d.\n" #: src/cookies.c:777 -#, fuzzy, c-format -#| msgid "Cookie coming from %s attempted to set domain to %s\n" +#, c-format msgid "Cookie coming from %s attempted to set domain to " -msgstr "Cookie, der kommer fra %s, forsøgte at sætte domæne til %s\n" +msgstr "Cookie, der kommer fra %s, forsøgte at sætte domæne til " #: src/cookies.c:780 src/spider.c:94 #, c-format @@ -133,7 +129,7 @@ msgstr "%s\n" #: src/cookies.c:1259 src/cookies.c:1380 #, c-format msgid "Cannot open cookies file %s: %s\n" -msgstr "Kan ikke åbne cookiefil %s: %s\n" +msgstr "Kan ikke Ã¥bne cookiefil %s: %s\n" #: src/cookies.c:1417 #, c-format @@ -147,12 +143,12 @@ msgstr "Fejl ved lukning af %s: %s\n" #: src/ftp-ls.c:1045 msgid "Unsupported listing type, trying Unix listing parser.\n" -msgstr "Ikke-understøttet listningstype, prøver Unix-listningsfortolker.\n" +msgstr "Ikke-understøttet listningstype, prøver Unix-listningsfortolker.\n" #: src/ftp-ls.c:1096 src/ftp-ls.c:1098 #, c-format msgid "Index of /%s on %s:%d" -msgstr "Indeks for /%s på %s:%d" +msgstr "Indeks for /%s pÃ¥ %s:%d" #: src/ftp-ls.c:1123 #, c-format @@ -187,7 +183,7 @@ msgstr " (%s byte)" #: src/ftp.c:225 #, c-format msgid "Length: %s" -msgstr "Længde: %s" +msgstr "Længde: %s" #: src/ftp.c:231 src/http.c:4090 #, c-format @@ -205,12 +201,12 @@ msgstr " (ikke endegyldigt)\n" #: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled.\n" -msgstr "" +msgstr "Kunne ikke initialisere SSL. SSL deaktiveres.\n" #: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " -msgstr "Logger ind som %s ... " +msgstr "Logger ind som %s … " #: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:963 #: src/ftp.c:1016 src/ftp.c:1063 src/ftp.c:1126 src/ftp.c:1187 src/ftp.c:1285 @@ -241,12 +237,12 @@ msgstr "Logget ind!\n" #: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" -msgstr "" +msgstr "Serveren accepterede ikke kommandoen “PBSZ 0â€.\n" #: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" -msgstr "" +msgstr "Serveren accepterede ikke kommandoen “PROT %câ€.\n" #: src/ftp.c:598 msgid "Server error, can't determine system type.\n" @@ -254,28 +250,28 @@ msgstr "Serverfejl, kan ikke bestemme systemtype.\n" #: src/ftp.c:607 src/ftp.c:1106 src/ftp.c:1170 src/ftp.c:1213 msgid "done. " -msgstr "færdig. " +msgstr "færdig. " #: src/ftp.c:710 src/ftp.c:989 src/ftp.c:1033 src/ftp.c:1315 src/ftp.c:1364 msgid "done.\n" -msgstr "O.k.\n" +msgstr "OK.\n" #: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" -msgstr "Ukendt type '%c', lukker kontrolforbindelsen.\n" +msgstr "Ukendt type “%câ€, lukker kontrolforbindelsen.\n" #: src/ftp.c:749 msgid "done. " -msgstr "O.k. " +msgstr "OK. " #: src/ftp.c:755 msgid "==> CWD not needed.\n" -msgstr "==> CWD ikke nødvendig.\n" +msgstr "==> CWD ikke nødvendig.\n" #: src/ftp.c:946 msgid "Logically impossible section reached in getftp()" -msgstr "" +msgstr "getftp() er kommet til et logisk umuligt afsnit" #: src/ftp.c:947 #, c-format @@ -284,6 +280,9 @@ msgid "" "cwd_start: %d\n" "cwd_end: %d\n" msgstr "" +"cwd_count: %d\n" +"cwd_start: %d\n" +"cwd_end: %d\n" #: src/ftp.c:977 #, c-format @@ -296,7 +295,7 @@ msgstr "" #: src/ftp.c:998 msgid "==> CWD not required.\n" -msgstr "==> CWD ikke nødvendig.\n" +msgstr "==> CWD ikke nødvendig.\n" #: src/ftp.c:1041 msgid "File has already been retrieved.\n" @@ -304,7 +303,7 @@ msgstr "Fil er allerede blevet hentet.\n" #: src/ftp.c:1077 msgid "Cannot initiate PASV transfer.\n" -msgstr "Kan ikke opsætte PASV-overførsel.\n" +msgstr "Kan ikke opsætte PASV-overførsel.\n" #: src/ftp.c:1081 msgid "Cannot parse PASV response.\n" @@ -363,7 +362,7 @@ msgstr "" #: src/ftp.c:1512 src/http.c:2597 #, c-format msgid "%s has sprung into existence.\n" -msgstr "%s er opstået.\n" +msgstr "%s er opstÃ¥et.\n" #: src/ftp.c:1601 #, c-format @@ -373,7 +372,7 @@ msgstr "%s: %s, lukker kontrolforbindelsen.\n" #: src/ftp.c:1613 #, c-format msgid "%s (%s) - Data connection: %s; " -msgstr "%s (%s) - dataforbindelse: %s; " +msgstr "%s (%s) — dataforbindelse: %s; " #: src/ftp.c:1628 msgid "Control connection closed.\n" @@ -381,38 +380,38 @@ msgstr "Forbindelsen lukket.\n" #: src/ftp.c:1646 msgid "Data transfer aborted.\n" -msgstr "Dataoverførsel afbrudt.\n" +msgstr "Dataoverførsel afbrudt.\n" #: src/ftp.c:1870 src/main.c:1691 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Filen %s findes allerede, hentes ikke.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" -msgstr "(forsøg:%2d)" +msgstr "(forsøg:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -"%s (%s) - skrevet til standard-udata %s[%s]\n" +"%s (%s) — skrevet til standard-uddata %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" "\n" msgstr "" -"%s (%s) - %s gemt [%s]\n" +"%s (%s) — %s gemt [%s]\n" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Fjerner %s.\n" @@ -436,7 +435,7 @@ msgstr "Rekursionsdybde %d overskred maksimal dybde %d.\n" #: src/ftp.c:2291 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" -msgstr "Fjernfil ikke nyere end lokal fil %s -- hentes ikke.\n" +msgstr "Fjernfil ikke nyere end lokal fil %s — hentes ikke.\n" #: src/ftp.c:2299 #, c-format @@ -444,7 +443,7 @@ msgid "" "Remote file is newer than local file %s -- retrieving.\n" "\n" msgstr "" -"Fjernfil er nyere end lokal fil %s -- hentes.\n" +"Fjernfil er nyere end lokal fil %s — hentes.\n" "\n" #: src/ftp.c:2306 @@ -452,11 +451,13 @@ msgstr "" msgid "" "The sizes do not match (local %s) -- retrieving.\n" "\n" -msgstr "Størrelserne er forskellige (lokal %s) -- hentes.\n" +msgstr "" +"Størrelserne er forskellige (lokal %s) — hentes.\n" +"\n" #: src/ftp.c:2324 msgid "Invalid name of the symlink, skipping.\n" -msgstr "Ugyldigt navn for symbolsk lænke, ignoreres.\n" +msgstr "Ugyldigt navn for symbolsk lænke, ignoreres.\n" #: src/ftp.c:2353 #, c-format @@ -464,19 +465,19 @@ msgid "" "Already have correct symlink %s -> %s\n" "\n" msgstr "" -"Har allerede gyldig symbolsk lænke %s -> %s\n" +"Har allerede gyldig symbolsk lænke %s -> %s\n" "\n" #: src/ftp.c:2362 #, c-format msgid "Creating symlink %s -> %s\n" -msgstr "Laver symbolsk lænke %s -> %s\n" +msgstr "Laver symbolsk lænke %s -> %s\n" #: src/ftp.c:2372 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "" -"Symbolske lænker understøttes ikke, ignorerer den symbolske lænke %s.\n" +"Symbolske lænker understøttes ikke, ignorerer den symbolske lænke %s.\n" #: src/ftp.c:2387 #, c-format @@ -486,13 +487,12 @@ msgstr "Ignorerer katalog %s.\n" #: src/ftp.c:2400 #, c-format msgid "%s: unknown/unsupported file type.\n" -msgstr "%s: filtypen er ukendt/ikke understøttet.\n" +msgstr "%s: filtypen er ukendt/ikke understøttet.\n" #: src/ftp.c:2424 -#, fuzzy, c-format -#| msgid "Failed to get certificate key from %s\n" +#, c-format msgid "Failed to set permissions for %s.\n" -msgstr "Kunne ikke få certifikatnøgle fra %s\n" +msgstr "Kunne ikke angive rettigheder til %s.\n" #: src/ftp.c:2445 #, c-format @@ -515,16 +515,14 @@ msgid "Rejecting %s.\n" msgstr "Afviser %s.\n" #: src/ftp.c:2654 -#, fuzzy, c-format -#| msgid "Rejecting %s.\n" +#, c-format msgid "Rejecting %s (Invalid Entry).\n" -msgstr "Afviser %s.\n" +msgstr "Afviser %s (ugyldig indgang).\n" #: src/ftp.c:2675 -#, fuzzy, c-format -#| msgid "Not descending to %s as it is excluded/not-included.\n" +#, c-format msgid "%s is excluded/not-included through regex.\n" -msgstr "Behandler ikke %s, da det er ekskluderet/ikke inkluderet.\n" +msgstr "%s ekskluderet/fravalgt med regex.\n" #: src/ftp.c:2695 #, c-format @@ -534,7 +532,7 @@ msgstr "Fejl ved sammenligning af %s med %s: %s\n" #: src/ftp.c:2735 #, c-format msgid "No matches on pattern %s.\n" -msgstr "Ingen træffere med mønsteret %s.\n" +msgstr "Ingen træffere med mønsteret %s.\n" #: src/ftp.c:2807 #, c-format @@ -549,58 +547,58 @@ msgstr "Skrev HTML-formateret indeks til %s.\n" #: src/gnutls.c:133 #, c-format msgid "ERROR: Cannot open directory %s.\n" -msgstr "FEJL: Kan ikke åbne katalog %s.\n" +msgstr "FEJL: Kan ikke Ã¥bne katalog %s.\n" #: src/gnutls.c:179 -#, fuzzy, c-format -#| msgid "ERROR: Cannot open directory %s.\n" +#, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" -msgstr "FEJL: Kan ikke åbne katalog %s.\n" +msgstr "FEJL: Kan ikke Ã¥bne certifikat %s: (%d).\n" #: src/gnutls.c:184 -#, fuzzy, c-format -#| msgid "Failed to load certificates from %s\n" +#, c-format msgid "Loaded CA certificate '%s'\n" -msgstr "Kunne ikke indlæse certifikater fra %s\n" +msgstr "CA-certifkatet “%s†indlæst\n" #: src/gnutls.c:192 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" -msgstr "" +msgstr "FEJL: Kunne ikke indlæse CRL-filen “%sâ€: (%d)\n" #: src/gnutls.c:196 #, c-format msgid "Loaded CRL file '%s'\n" -msgstr "" +msgstr "CRL-filen “%s†indlæst\n" #: src/gnutls.c:220 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" -msgstr "" +msgstr "FEJL: GnuTLS kræver, at nøgle og certifikat er af samme type.\n" #: src/gnutls.c:777 src/gnutls.c:841 msgid "Your GnuTLS version is too old to support TLS 1.3\n" -msgstr "" +msgstr "Din GnuTLS-version er for gammel til at understøtte TLS 1.3\n" #: src/gnutls.c:789 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" +"GnuTLS: Værdien %u for tilvalget “secure-protocol†er ikke implementeret\n" #: src/gnutls.c:791 src/gnutls.c:847 src/host.c:158 src/openssl.c:289 -#, fuzzy -#| msgid "Please send bug reports and questions to <bug-wget@gnu.org>.\n" msgid "Please report this issue to bug-wget@gnu.org\n" -msgstr "Rapportér venligst fejl og send spørgsmål til <bug-wget@gnu.org>.\n" +msgstr "Rapportér venligst denne fejl til bug-wget@gnu.org\n" #: src/gnutls.c:846 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" +"GnuTLS: Værdien %d for tilvalget “secure-protocol†er ikke implementeret\n" #: src/gnutls.c:899 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" +"GnuTLS: Kan ikke angive prio-streng direkte. Bruger standardprioriteten i " +"stedet.\n" #: src/gnutls.c:1027 src/openssl.c:1037 msgid "ERROR" @@ -613,7 +611,7 @@ msgstr "ADVARSEL" #: src/gnutls.c:1038 src/openssl.c:1050 #, c-format msgid "%s: No certificate presented by %s.\n" -msgstr "%s: Intet certifikat præsenteret af %s.\n" +msgstr "%s: Intet certifikat præsenteret af %s.\n" #: src/gnutls.c:1044 #, c-format @@ -621,8 +619,7 @@ msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Certifikatet for %s er ikke betroet.\n" #: src/gnutls.c:1045 -#, fuzzy, c-format -#| msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#, c-format msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: Certifikatet for %s har ingen kendt udsteder.\n" @@ -632,28 +629,25 @@ msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Certifikatet for %s er blevet tilbagekaldt.\n" #: src/gnutls.c:1047 -#, fuzzy, c-format -#| msgid "%s: The certificate of %s is not trusted.\n" +#, c-format msgid "%s: The certificate signer of %s was not a CA.\n" -msgstr "%s: Certifikatet for %s er ikke betroet.\n" +msgstr "" +"%s: Certifikatunderskriveren af %s var ikke en certifikatautoritet (CA).\n" #: src/gnutls.c:1048 -#, fuzzy, c-format -#| msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" -msgstr "%s: Certifikatet for %s har ingen kendt udsteder.\n" +msgstr "%s: Certifikatet for %s er underskrevet med en usikker algoritme.\n" #: src/gnutls.c:1049 -#, fuzzy, c-format -#| msgid "%s: The certificate of %s is not trusted.\n" +#, c-format msgid "%s: The certificate of %s is not yet activated.\n" -msgstr "%s: Certifikatet for %s er ikke betroet.\n" +msgstr "%s: Certifikatet for %s er endnu ikke aktiveret.\n" #: src/gnutls.c:1050 -#, fuzzy, c-format -#| msgid "%s: The certificate of %s has been revoked.\n" +#, c-format msgid "%s: The certificate of %s has expired.\n" -msgstr "%s: Certifikatet for %s er blevet tilbagekaldt.\n" +msgstr "%s: Certifikatet for %s er udløbet.\n" #: src/gnutls.c:1062 #, c-format @@ -675,28 +669,29 @@ msgstr "Certifikatet er endnu ikke blevet aktiveret\n" #: src/gnutls.c:1090 msgid "The certificate has expired\n" -msgstr "Certifikatet er udløbet\n" +msgstr "Certifikatet er udløbet\n" #: src/gnutls.c:1097 #, c-format msgid "The certificate's owner does not match hostname %s\n" -msgstr "Certifikatets ejer svarer ikke til værtsnavnet %s\n" +msgstr "Certifikatets ejer svarer ikke til værtsnavnet %s\n" #: src/gnutls.c:1106 src/openssl.c:1246 msgid "The public key does not match pinned public key!\n" msgstr "" +"Den offentlige nøgle stemmer ikke med den fastholdte offentlige nøgle!\n" #: src/gnutls.c:1115 msgid "Certificate must be X.509\n" -msgstr "" +msgstr "Certifikat skal være X.509\n" #: src/host.c:157 msgid "Error in handling the address list.\n" -msgstr "" +msgstr "Fejl i behandling af adresselisten.\n" #: src/host.c:368 msgid "Unknown host" -msgstr "Ukendt vært" +msgstr "Ukendt vært" #: src/host.c:372 msgid "Temporary failure in name resolution" @@ -709,20 +704,20 @@ msgstr "Ukendt fejl" #: src/host.c:850 #, c-format msgid "Resolving %s... " -msgstr "Løser %s... " +msgstr "Løser %s … " #: src/host.c:926 msgid "failed: No IPv4/IPv6 addresses for host.\n" -msgstr "mislykkedes: Ingen IPv4/IPv6-adresser for vært.\n" +msgstr "mislykkedes: Ingen IPv4/IPv6-adresser for vært.\n" #: src/host.c:956 msgid "failed: timed out.\n" -msgstr "mislykkedes: tiden udløb.\n" +msgstr "mislykkedes: tiden udløb.\n" #: src/html-url.c:306 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" -msgstr "%s: kan ikke løse ukomplet lænke %s.\n" +msgstr "%s: kan ikke løse ukomplet lænke %s.\n" #: src/html-url.c:944 #, c-format @@ -732,7 +727,7 @@ msgstr "%s: Ugyldig URL %s: %s\n" #: src/http.c:380 #, c-format msgid "Failed writing HTTP request: %s.\n" -msgstr "Fejl ved skrivning af HTTP-forespørgsel: %s.\n" +msgstr "Fejl ved skrivning af HTTP-forespørgsel: %s.\n" #: src/http.c:795 msgid "No headers, assuming HTTP/0.9" @@ -743,29 +738,31 @@ msgstr "Ingen toptekster, antager HTTP/0.9" msgid "" "File %s already there; not retrieving.\n" "\n" -msgstr "Filen %s findes allerede, hentes ikke.\n" +msgstr "" +"Filen %s findes allerede, hentes ikke.\n" +"\n" #: src/http.c:1834 msgid "gmtime failed. This is probably a bug.\n" -msgstr "" +msgstr "gmtime mislykkedes. Dette er sandsynligvis en programfejl.\n" #: src/http.c:1918 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" +"Kan ikke konvertere tidsstempel til http-format. Bruger derfor 0 som sidste " +"modifikationstidspunkt.\n" #: src/http.c:2001 -#, fuzzy, c-format -#| msgid "POST data file %s missing: %s\n" +#, c-format msgid "BODY data file %s missing: %s\n" -msgstr "POST-datafil %s mangler: %s\n" +msgstr "BODY-datafilen %s mangler: %s\n" #: src/http.c:2093 -#, fuzzy, c-format -#| msgid "Reusing existing connection to %s:%d.\n" +#, c-format msgid "Reusing existing connection to [%s]:%d.\n" -msgstr "Genbruger eksisterende forbindelse til %s:%d.\n" +msgstr "Genbruger eksisterende forbindelse til [%s]:%d.\n" #: src/http.c:2098 #, c-format @@ -775,9 +772,9 @@ msgstr "Genbruger eksisterende forbindelse til %s:%d.\n" #: src/http.c:2164 #, c-format msgid "Failed reading proxy response: %s\n" -msgstr "Fejl ved læsning af svar fra proxy: %s\n" +msgstr "Fejl ved læsning af svar fra proxy: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s FEJL %d: %s.\n" @@ -796,10 +793,9 @@ msgid "Unknown authentication scheme.\n" msgstr "Ukendt autorisations-protokol.\n" #: src/http.c:2478 -#, fuzzy, c-format -#| msgid "Unknown authentication scheme.\n" +#, c-format msgid "Authentication selected: %s\n" -msgstr "Ukendt autorisations-protokol.\n" +msgstr "Valgt autorisering: %s\n" #: src/http.c:2612 #, c-format @@ -812,25 +808,29 @@ msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" +"Ved download af signatur:\n" +"%s: %s.\n" #: src/http.c:2865 msgid "Unable to read signature content from temporary file. Skipping.\n" -msgstr "" +msgstr "Kan ikke læse signaturindhold fra midlertidig fil. Springer over.\n" #: src/http.c:2888 msgid "Could not create temporary file. Skipping signature download.\n" -msgstr "" +msgstr "Kunne ikke oprette midlertidig fil. Springer signaturdownload over.\n" #: src/http.c:2922 src/http.c:3004 #, c-format msgid "Invalid pri value. Assuming %d.\n" -msgstr "" +msgstr "Ugyldig pri-værdi. Antager %d.\n" #: src/http.c:3118 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" +"Kunne ikke finde acceptabel hash til Metalink-ressourcer.\n" +"Ignorerer dem.\n" #: src/http.c:3252 msgid "Disabling SSL due to encountered errors.\n" @@ -839,16 +839,16 @@ msgstr "Deaktiverer SSL, da der opstod fejl.\n" #: src/http.c:3396 #, c-format msgid "%s request sent, awaiting response... " -msgstr "%s forespørgsel sendt, afventer svar... " +msgstr "%s forespørgsel sendt, afventer svar … " #: src/http.c:3436 msgid "No data received.\n" -msgstr "Ingen data modtaget\n" +msgstr "Ingen data modtaget.\n" #: src/http.c:3442 #, c-format msgid "Read error (%s) in headers.\n" -msgstr "Læsefejl (%s) i toptekster.\n" +msgstr "Læsefejl (%s) i toptekster.\n" #: src/http.c:3665 msgid "(no description)" @@ -873,6 +873,8 @@ msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" +"Filen %s er ikke ændret pÃ¥ serveren. Henter ikke.\n" +"\n" #: src/http.c:4016 #, c-format @@ -881,6 +883,9 @@ msgid "" "You might want to add --no-if-modified-since option.\n" "\n" msgstr "" +"Serveren ignorerede If-Modified-Since-topteksten fra filen %s.\n" +"Du kan mÃ¥ske benytte tilvaget --no-if-modified-since.\n" +"\n" #: src/http.c:4036 msgid "" @@ -889,134 +894,130 @@ msgid "" "\n" msgstr "" "\n" -" Filen er allerede fuldt overført; ingen handling nødvendig.\n" +" Filen er allerede fuldt overført; ingen handling nødvendig.\n" "\n" #: src/http.c:4080 msgid "Length: " -msgstr "Længde: " +msgstr "Længde: " #: src/http.c:4100 msgid "ignored" msgstr "ignoreret" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" -msgstr "Advarsel: jokertegn ikke understøttet i HTTP.\n" +msgstr "Advarsel: jokertegn ikke understøttet i HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" -msgstr "Edderkoptilstand aktiveret. Kontrollér om fjernfilen findes.\n" +msgstr "Edderkoptilstand aktiveret. Kontrollér om fjernfilen findes.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Kan ikke skrive til %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" -msgstr "" +msgstr "Der mangler en nødvendig attribut fra modtagne toptekst.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" -msgstr "" +msgstr "Godkendelse via brugernavn/adgangskode mislykkedes.\n" -#: src/http.c:4476 -#, fuzzy -#| msgid "Cannot write to %s (%s).\n" +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" -msgstr "Kan ikke skrive til %s (%s).\n" +msgstr "Kan ikke skrive til WARC-fil.\n" -#: src/http.c:4482 -#, fuzzy -#| msgid "Cannot write to %s (%s).\n" +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" -msgstr "Kan ikke skrive til %s (%s).\n" +msgstr "Kan ikke skrive til midlertidig WARC-fil.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Kunne ikke etablere SSL-forbindelse.\n" -#: src/http.c:4493 -#, fuzzy, c-format -#| msgid "Cannot write to %s (%s).\n" +#: src/http.c:4497 +#, c-format msgid "Cannot unlink %s (%s).\n" -msgstr "Kan ikke skrive til %s (%s).\n" +msgstr "Kan ikke aflinke %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "FEJL: Omdirigering (%d) uden nyt sted.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" +"Kunne ikke finde Metalink-data i HTTP-svar. Henter filen med HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" -msgstr "" +msgstr "Fandt Metalink-toptekster. Skifter til Metalink-tilstand.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" -msgstr "Fjernfilen findes ikke -- ødelagt henvisning!!!\n" +msgstr "Fjernfilen findes ikke — ødelagt henvisning!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" -msgstr "Last-modified toptekst mangler -- tidsstempling slås fra.\n" +msgstr "Last-modified toptekst mangler — tidsstempling slÃ¥s fra.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" -msgstr "Last-modified toptekst ugyldig -- tidsstempel ignoreret.\n" +msgstr "Last-modified toptekst ugyldig — tidsstempel ignoreret.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" "\n" msgstr "" -"Serverfil ikke nyere end lokal fil %s -- hentes ikke.\n" +"Serverfil ikke nyere end lokal fil %s — hentes ikke.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" -msgstr "Størrelserne er forskellige (lokal %s) -- hentes.\n" +msgstr "Størrelserne er forskellige (lokal %s) — hentes.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" -msgstr "Fil på server er nyere - hentes.\n" +msgstr "Fil pÃ¥ server er nyere — hentes.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" "\n" msgstr "" -"Fjernfil findes og kan indeholde henvisninger til andre ressourcer -- " +"Fjernfil findes og kan indeholde henvisninger til andre ressourcer — " "henter.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "" -"Fjernfil findes, men indeholder ingen henvisninger -- henter ikke.\n" +"Fjernfil findes, men indeholder ingen henvisninger — henter ikke.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -"Fjernfilen findes og indeholder måske yderligere henvisninger,\n" -"men rekursion er deaktiveret - henter ikke.\n" +"Fjernfilen findes og indeholder mÃ¥ske yderligere henvisninger,\n" +"men rekursion er deaktiveret — henter ikke.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1024,82 +1025,80 @@ msgstr "" "Fjernfilen findes.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -"%s (%s) - skrevet til standard-uddata %s[%s/%s]\n" +"%s (%s) — skrevet til standard-uddata %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" "\n" msgstr "" -"%s (%s) - %s gemt [%s/%s]\n" +"%s (%s) — %s gemt [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " -msgstr "%s (%s) - Forbindelse lukket ved byte %s. " +msgstr "%s (%s) — Forbindelse lukket ved byte %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." -msgstr "%s (%s) - Læsefejl ved byte %s (%s)." +msgstr "%s (%s) — Læsefejl ved byte %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " -msgstr "%s (%s) - Læsefejl ved byte %s/%s (%s). " +msgstr "%s (%s) — Læsefejl ved byte %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" -msgstr "" +msgstr "Beskyttelseskvalitet “%s†er ikke understøttet.\n" -# scheme? -#: src/http.c:5115 -#, fuzzy, c-format -#| msgid "Unsupported scheme %s" +#: src/http.c:5119 +#, c-format msgid "Unsupported algorithm '%s'.\n" -msgstr "Ikke-understøttet skema %s" +msgstr "Algoritmen “%s†er ikke understøttet.\n" #: src/init.c:583 -#, fuzzy, c-format -#| msgid "%s: WGETRC points to %s, which doesn't exist.\n" +#, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" -msgstr "%s: WGETRC peger på %s, som ikke findes.\n" +msgstr "" +"%s: WGETRC peger pÃ¥ %s, som ikke kunne tilgÃ¥s pÃ¥ grund af fejlen: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" -msgstr "%s: Kan ikke læse %s (%s).\n" +msgstr "%s: Kan ikke læse %s (%s).\n" #: src/init.c:712 #, c-format msgid "%s: Error in %s at line %d.\n" -msgstr "%s: Fejl i %s på linje %d.\n" +msgstr "%s: Fejl i %s pÃ¥ linje %d.\n" #: src/init.c:718 #, c-format msgid "%s: Syntax error in %s at line %d.\n" -msgstr "%s: Syntaksfejl i %s på linje %d.\n" +msgstr "%s: Syntaksfejl i %s pÃ¥ linje %d.\n" #: src/init.c:723 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" -msgstr "%s: Ukendt kommando %s i %s på linje %d.\n" +msgstr "%s: Ukendt kommando %s i %s pÃ¥ linje %d.\n" #: src/init.c:762 #, c-format @@ -1108,6 +1107,10 @@ msgid "" "'%s',\n" "or specify a different file using --config.\n" msgstr "" +"Fortolkning af systemets wgetrc-fil (env SYSTEM_WGETRC) mislykkedes. " +"Kontrollér\n" +"“%sâ€\n" +"eller angiv en anden fil ved hjælp af --config.\n" #: src/init.c:777 #, c-format @@ -1116,11 +1119,14 @@ msgid "" "'%s',\n" "or specify a different file using --config.\n" msgstr "" +"Fortolkning af systemets wgetrc-fil mislykkedes. Kontrollér\n" +"“%sâ€\n" +"eller angiv en anden fil ved hjælp af --config.\n" #: src/init.c:793 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" -msgstr "%s: Advarsel: Både systemets og brugerens wgetrc peger på %s.\n" +msgstr "%s: Advarsel: BÃ¥de systemets og brugerens wgetrc peger pÃ¥ %s.\n" #: src/init.c:1006 #, c-format @@ -1130,13 +1136,12 @@ msgstr "%s: Ugyldig kommando %s til --execute\n" #: src/init.c:1066 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" -msgstr "%s: %s: Ugyldig boolesk variabel %s; brug 'on' eller 'off'.\n" +msgstr "%s: %s: Ugyldig boolesk variabel %s; brug “on†eller “offâ€.\n" #: src/init.c:1099 -#, fuzzy, c-format -#| msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" +#, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" -msgstr "%s: %s: Ugyldig boolesk variabel %s; brug 'on' eller 'off'.\n" +msgstr "%s: %s: Ugyldig %s; brug “onâ€, “off†eller “quietâ€.\n" #: src/init.c:1119 #, c-format @@ -1146,12 +1151,12 @@ msgstr "%s: %s: Ugyldigt tal %s.\n" #: src/init.c:1201 #, c-format msgid "%s: %s must only be used once\n" -msgstr "" +msgstr "%s: %s mÃ¥ kun bruges én gang\n" #: src/init.c:1356 src/init.c:1377 #, c-format msgid "%s: %s: Invalid byte value %s\n" -msgstr "%s: %s: Ugyldig byteværdi %s\n" +msgstr "%s: %s: Ugyldig byteværdi %s\n" #: src/init.c:1402 #, c-format @@ -1159,10 +1164,9 @@ msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ugyldig tidsperiode %s\n" #: src/init.c:1443 -#, fuzzy, c-format -#| msgid "%s: %s: Invalid time period %s\n" +#, c-format msgid "%s: %s: Negative time period %s\n" -msgstr "%s: %s: Ugyldig tidsperiode %s\n" +msgstr "%s: %s: Negativ tidsperiode %s\n" #: src/init.c:1471 src/main.c:1927 #, c-format @@ -1170,12 +1174,14 @@ msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" +"use-askpass kræver angivelse af en streng eller en af de to miljøvariable " +"WGET_ASKPASS og SSH_ASKPASS.\n" #: src/init.c:1489 src/init.c:1511 src/init.c:1619 src/init.c:1675 #: src/init.c:1741 src/init.c:1762 src/init.c:1787 #, c-format msgid "%s: %s: Invalid value %s.\n" -msgstr "%s: %s: Ugyldig værdi %s.\n" +msgstr "%s: %s: Ugyldig værdi %s.\n" #: src/init.c:1545 #, c-format @@ -1183,27 +1189,23 @@ msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ugyldig toptekst %s.\n" #: src/init.c:1566 -#, fuzzy, c-format -#| msgid "%s: %s: Invalid header %s.\n" +#, c-format msgid "%s: %s: Invalid WARC header %s.\n" -msgstr "%s: %s: Ugyldig toptekst %s.\n" +msgstr "%s: %s: Ugyldig WARC-toptekst %s.\n" #: src/init.c:1632 #, c-format msgid "%s: %s: Invalid progress type %s.\n" -msgstr "%s: %s: Ugyldig fremskridtstype %s\n" +msgstr "%s: %s: Ugyldig fremskridtstype %s.\n" #: src/init.c:1714 -#, fuzzy, c-format -#| msgid "" -#| "%s: %s: Invalid restriction %s,\n" -#| " use [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" +#, c-format msgid "" "%s: %s: Invalid restriction %s,\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" msgstr "" -"%s: %s: Ugyldig restriktion %s,\n" -" brug [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" +"%s: %s: Ugyldig begrænsning %s,\n" +" brug [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" #: src/iri.c:114 #, c-format @@ -1213,11 +1215,11 @@ msgstr "Kodningen %s er ikke gyldig\n" #: src/iri.c:140 src/url.c:1612 #, c-format msgid "Conversion from %s to %s isn't supported\n" -msgstr "Konvertering fra %s til %s understøttes ikke\n" +msgstr "Konvertering fra %s til %s understøttes ikke\n" #: src/iri.c:180 src/url.c:1642 msgid "Incomplete or invalid multibyte sequence encountered\n" -msgstr "Ufuldstændig eller ugyldig flerbytesekvens fundet\n" +msgstr "Ufuldstændig eller ugyldig flerbytesekvens fundet\n" #: src/iri.c:200 src/url.c:1659 #, c-format @@ -1233,23 +1235,20 @@ msgstr "locale_to_utf8: regionsinformation (locale) er ikke angivet\n" msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode mislykkedes (%d): %s\n" +# lower case ~ smÃ¥ bogstaver velsagtens? Det er en meningsfuld fejl i forbindelse med unicode-kodning #: src/iri.c:290 -#, fuzzy, c-format -#| msgid "couldn't connect to %s port %d: %s\n" +#, c-format msgid "Failed to convert to lower: %d: %s\n" -msgstr "kunne ikke forbinde til %s port %d: %s\n" +msgstr "Kunne ikke konvertere til smÃ¥: %d: %s\n" #: src/log.c:938 src/log.c:957 -#, fuzzy, c-format -#| msgid "" -#| "\n" -#| "%s received, redirecting output to %s.\n" +#, c-format msgid "" "\n" "Redirecting output to %s.\n" msgstr "" "\n" -"%s modtaget, omdirigerer udskrift til %s.\n" +"Omdirigerer udskrift til %s.\n" #: src/log.c:950 #, c-format @@ -1259,14 +1258,14 @@ msgstr "%s: %s; deaktiverer logning.\n" #: src/main.c:574 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" -msgstr "Brug: %s [FLAG]... [URL]...\n" +msgstr "Brug: %s [FLAG] … [URL] …\n" #: src/main.c:590 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" msgstr "" -"Obligatoriske argumenter til lange flag er obligatoriske også for korte.\n" +"Obligatoriske argumenter til lange flag er obligatoriske ogsÃ¥ for korte.\n" "\n" #: src/main.c:592 @@ -1274,263 +1273,207 @@ msgid "Startup:\n" msgstr "Opstart:\n" #: src/main.c:594 -#, fuzzy -#| msgid " -V, --version display the version of Wget and exit.\n" msgid "" " -V, --version display the version of Wget and exit\n" -msgstr " -V, --version vis versionen af Wget og afslut.\n" +msgstr " -V, --version vis versionen af Wget og afslut\n" #: src/main.c:596 -#, fuzzy -#| msgid " -h, --help print this help.\n" msgid " -h, --help print this help\n" -msgstr " -h, --help udskriv denne hjælp.\n" +msgstr " -h, --help udskriv denne hjælp\n" #: src/main.c:598 -#, fuzzy -#| msgid " -b, --background go to background after startup.\n" msgid " -b, --background go to background after startup\n" -msgstr " -b, --background gå i baggrunden efter opstart.\n" +msgstr " -b, --background gÃ¥ i baggrunden efter opstart\n" #: src/main.c:600 -#, fuzzy -#| msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command.\n" msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" -msgstr " -e, --execute=KOMMANDO kør en kommando i stil med '.wgetrc'.\n" +msgstr "" +" -e, --execute=KOMMANDO kør en kommando i stil med “.wgetrcâ€\n" #: src/main.c:604 msgid "Logging and input file:\n" msgstr "Logning og inddatafil:\n" #: src/main.c:606 -#, fuzzy -#| msgid " -o, --output-file=FILE log messages to FILE.\n" msgid " -o, --output-file=FILE log messages to FILE\n" -msgstr " -o, --output-file=FIL log meddelelser til FIL.\n" +msgstr " -o, --output-file=FIL log meddelelser til FIL\n" #: src/main.c:608 -#, fuzzy -#| msgid " -a, --append-output=FILE append messages to FILE.\n" msgid " -a, --append-output=FILE append messages to FILE\n" -msgstr " -a, --append-output=FIL tilføj meddelelser til FIL.\n" +msgstr " -a, --append-output=FIL tilføj meddelelser til FIL\n" #: src/main.c:611 -#, fuzzy -#| msgid " -d, --debug print lots of debugging information.\n" msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -" -d, --debug udskriv masser af fejlsøgningsinformation.\n" +" -d, --debug udskriv masser af " +"fejlsøgningsinformation\n" #: src/main.c:615 -#, fuzzy -#| msgid " --wdebug print Watt-32 debug output.\n" msgid " --wdebug print Watt-32 debug output\n" msgstr "" -" --wdebug udskriv Watt-32-fejlsøgningsinformation.\n" +" --wdebug udskriv Watt-32-fejlsøgningsinformation\n" #: src/main.c:618 -#, fuzzy -#| msgid " -q, --quiet quiet (no output).\n" msgid " -q, --quiet quiet (no output)\n" -msgstr " -q, --quiet stilhed (ingen udskrift).\n" +msgstr " -q, --quiet stilhed (ingen udskrift)\n" #: src/main.c:620 -#, fuzzy -#| msgid " -v, --verbose be verbose (this is the default).\n" msgid " -v, --verbose be verbose (this is the default)\n" -msgstr "" -" -v, --verbose uddybende udskrift (dette er standardvalget).\n" +msgstr " -v, --verbose uddybende udskrift (standard)\n" #: src/main.c:622 -#, fuzzy -#| msgid "" -#| " -nv, --no-verbose turn off verboseness, without being quiet.\n" msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -" -nv, --no-verbose være mindre uddybende, men ikke helt stille.\n" +" -nv, --no-verbose vær mindre uddybende, men ikke helt " +"stille\n" #: src/main.c:624 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" +" --report-speed=TYPE vis bÃ¥ndbredde som TYPE. TYPE kan være " +"bits\n" #: src/main.c:626 -#, fuzzy -#| msgid "" -#| " -i, --input-file=FILE download URLs found in local or external " -#| "FILE.\n" msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -" -i, --input-file=FILE hent URL'er fra den lokale eller eksterne FIL.\n" +" -i, --input-file=FIL hent URL'er fra den lokale eller eksterne " +"FIL\n" #: src/main.c:629 -#, fuzzy -#| msgid "" -#| " -i, --input-file=FILE download URLs found in local or external " -#| "FILE.\n" msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -" -i, --input-file=FILE hent URL'er fra den lokale eller eksterne FIL.\n" +" --input-metalink=FIL hent filer dækket af lokal Metalink-FIL\n" #: src/main.c:632 -#, fuzzy -#| msgid " -F, --force-html treat input file as HTML.\n" msgid " -F, --force-html treat input file as HTML\n" -msgstr " -F, --force-html behandl inddatafilen som HTML.\n" +msgstr " -F, --force-html behandl inddatafilen som HTML\n" #: src/main.c:634 -#, fuzzy -#| msgid "" -#| " -B, --base=URL resolves HTML input-file links (-i -F)\n" -#| " relative to URL.\n" msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -" -B, --base=URL evaluerer henvisninger i HTML-inddatafil (-i -" -"F)\n" -" relativt til URL.\n" +" -B, --base=URL evaluerer henvisninger i HTML-inddatafil\n" +" (-i -F) relativt til URL\n" #: src/main.c:637 -#, fuzzy -#| msgid " --no-cookies don't use cookies.\n" msgid " --config=FILE specify config file to use\n" -msgstr " --no-cookies brug ikke cookies.\n" +msgstr "" +" --config=FIL angiv konfigurationsfilen, der skal " +"bruges\n" #: src/main.c:639 -#, fuzzy -#| msgid " --no-cookies don't use cookies.\n" msgid " --no-config do not read any config file\n" -msgstr " --no-cookies brug ikke cookies.\n" +msgstr " --no-config læs ikke nogen konfigurationsfil\n" #: src/main.c:641 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" +" --rejected-log=FIL log Ã¥rsager til afvisning af URL'er i " +"FIL\n" #: src/main.c:645 msgid "Download:\n" msgstr "Download:\n" #: src/main.c:647 -#, fuzzy -#| msgid "" -#| " -t, --tries=NUMBER set number of retries to NUMBER (0 " -#| "unlimits).\n" msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -" -t, --tries=ANTAL sæt antal forsøg til ANTAL (0 for " -"ubegrænset)\n" +" -t, --tries=ANTAL sæt antal forsøg til ANTAL (0 er " +"ubegrænset)\n" #: src/main.c:649 -#, fuzzy -#| msgid "" -#| " --retry-connrefused retry even if connection is refused.\n" msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -" --retry-connrefused forsøg igen selv hvis forbindelse nægtes.\n" +" --retry-connrefused forsøg igen selv hvis forbindelse nægtes\n" #: src/main.c:651 msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" +" --retry-on-host-error betragt værtsfejl som ikke-fatale " +"forbigÃ¥ende fejl\n" #: src/main.c:653 -#, fuzzy -#| msgid "" -#| " --ignore-tags=LIST comma-separated list of ignored HTML " -#| "tags.\n" msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=LISTE kommaadskilt liste af HTML-mærker, der\n" -" ignoreres.\n" +" --retry-on-http-error=FEJL kommaadskilt liste over HTTP-fejl som " +"skal prøves igen\n" #: src/main.c:655 -#, fuzzy -#| msgid " -O, --output-document=FILE write documents to FILE.\n" msgid " -O, --output-document=FILE write documents to FILE\n" -msgstr " -O, --output-document=FIL skriv dokumenter til FIL.\n" +msgstr " -O, --output-document=FIL skriv dokumenter til FIL\n" #: src/main.c:657 -#, fuzzy -#| msgid "" -#| " -nc, --no-clobber skip downloads that would download to\n" -#| " existing files.\n" msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -" -nc, --no-clobber hent ikke filer, der ville blive lagret på\n" -" eksisterende filer.\n" +" -nc, --no-clobber hent ikke filer, der ville blive lagret " +"pÃ¥\n" +" (og overskrive) eksisterende filer\n" #: src/main.c:660 -#, fuzzy -#| msgid "" -#| " -np, --no-parent don't ascend to the parent directory.\n" msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " -np, --no-parent gå ikke op til ophavskataloget.\n" +msgstr "" +" --no-netrc hent ikke legitimationsoplysninger fra ." +"netrc\n" #: src/main.c:662 -#, fuzzy -#| msgid "" -#| " -c, --continue resume getting a partially-downloaded " -#| "file.\n" msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -" -c, --continue genoptag hentning af en delvis hentet fil.\n" +" -c, --continue genoptag hentning af en delvis hentet " +"fil\n" #: src/main.c:664 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" +" --start-pos=POSITION start med at hente fra POSITION talt fra " +"nul\n" #: src/main.c:666 -#, fuzzy -#| msgid " --progress=TYPE select progress gauge type.\n" msgid " --progress=TYPE select progress gauge type\n" -msgstr " --progress=TYPE vælg angivelsesmåde af fremgang.\n" +msgstr " --progress=TYPE vælg angivelsesmÃ¥de af fremgang\n" #: src/main.c:668 -#, fuzzy -#| msgid " --progress=TYPE select progress gauge type.\n" msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" -msgstr " --progress=TYPE vælg angivelsesmåde af fremgang.\n" +msgstr "" +" --show-progress vis fremgang uanset øvrig " +"uddybningstilstand\n" #: src/main.c:670 -#, fuzzy -#| msgid "" -#| " -N, --timestamping don't re-retrieve files unless newer " -#| "than\n" -#| " local.\n" msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -" -N, --timestamping hent ikke filer igen, med mindre de er " +" -N, --timestamping hent ikke filer igen, med mindre de er " "nyere\n" -" end den lokale.\n" +" end lokale\n" #: src/main.c:673 msgid "" @@ -1538,81 +1481,65 @@ msgid "" "get\n" " requests in timestamping mode\n" msgstr "" +" --no-if-modified-since brug ikke get-anmodninger med “hvis " +"ændret\n" +" sidenâ€-betingelser i " +"tidsstempeltilstand\n" #: src/main.c:676 -#, fuzzy -#| msgid "" -#| " --no-use-server-timestamps don't set the local file's timestamp by\n" -#| " the one on the server.\n" msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -" --no-use-server-timestamps sæt ikke den lokale fils tidsstempel til\n" -" den på serveren.\n" +" --no-use-server-timestamps sæt ikke den lokale fils tidsstempel til\n" +" det pÃ¥ serveren\n" #: src/main.c:679 -#, fuzzy -#| msgid " -S, --server-response print server response.\n" msgid " -S, --server-response print server response\n" -msgstr " -S, --server-response udskriv svar fra server.\n" +msgstr " -S, --server-response udskriv svar fra server\n" #: src/main.c:681 -#, fuzzy -#| msgid " --spider don't download anything.\n" msgid " --spider don't download anything\n" -msgstr " --spider hent intet.\n" +msgstr " --spider hent intet\n" #: src/main.c:683 -#, fuzzy -#| msgid "" -#| " -T, --timeout=SECONDS set all timeout values to SECONDS.\n" msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -" -T, --timeout=SEKUNDER sæt alle værdier for tidsudløb til " -"SEKUNDER.\n" +" -T, --timeout=SEKUNDER sæt alle værdier for tidsudløb til " +"SEKUNDER\n" #: src/main.c:686 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" +" --dns-servers=ADRESSER liste over DNS-servere til forespørgsler " +"(kommaadskilt)\n" #: src/main.c:688 -#, fuzzy -#| msgid "" -#| " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on " -#| "local host.\n" msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -" --bind-address=ADRESSE bind til ADRESSE (værtsnavn eller IP) på " -"lokal\n" -" vært.\n" +" --bind-dns-address=ADRESSE bind DNS til ADRESSE (værtsnavn eller IP) " +"pÃ¥ lokal vært\n" #: src/main.c:691 -#, fuzzy -#| msgid "" -#| " --dns-timeout=SECS set the DNS lookup timeout to SECS.\n" msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -" --dns-timeout=SEKUNDER sæt tidsudløb for DNS-opslag til SEKUNDER\n" +" --dns-timeout=SEKUNDER sæt tidsudløb for DNS-opslag til " +"SEKUNDER\n" #: src/main.c:693 -#, fuzzy -#| msgid " --connect-timeout=SECS set the connect timeout to SECS.\n" msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -" --connect-timeout=SEKUNDER sæt tidsudløb for forbindelse til " -"SEKUNDER.\n" +" --connect-timeout=SEKUNDER sæt tidsudløb for forbindelse til " +"SEKUNDER\n" #: src/main.c:695 -#, fuzzy -#| msgid " --read-timeout=SECS set the read timeout to SECS.\n" msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -" --read-timeout=SEKUNDER sæt tidsudløb for læsning til SEKUNDER.\n" +" --read-timeout=SEKUNDER sæt tidsudløb for læsning til SEKUNDER\n" #: src/main.c:697 msgid "" @@ -1620,148 +1547,109 @@ msgid "" " (applies if more then 1 URL is to be " "retrieved)\n" msgstr "" +" -w, --wait=SEKUNDER vent SEKUNDER mellem henteforespørgsler\n" +" (gælder hvis mere end én URL skal " +"hentes)\n" #: src/main.c:700 -#, fuzzy -#| msgid "" -#| " --waitretry=SECONDS wait 1..SECONDS between retries of a " -#| "retrieval.\n" msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" " (applies if more then 1 URL is to be " "retrieved)\n" msgstr "" -" --waitretry=SEKUNDER vent 1..SEKUNDER mellem gentagelsesforsøg " -"på\n" -" at hente.\n" +" --waitretry=SEKUNDER vent 1..SEKUNDER mellem gentagelsesforsøg " +"pÃ¥\n" +" at hente (gælder, hvis der skal hentes " +"mere\n" +" end én URL)\n" #: src/main.c:703 -#, fuzzy -#| msgid "" -#| " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " -#| "between retrievals.\n" msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" " (applies if more then 1 URL is to be " "retrieved)\n" msgstr "" -" --random-wait vent fra 0,5*VENT til 1,5*VENT sekunder " -"mellem hentninger.\n" +" --random-wait vent fra 0,5*VENT til 1,5*VENT sekunder\n" +" mellem overførsler (gælder, hvis der " +"skal\n" +" hentes mere end én URL)\n" #: src/main.c:706 -#, fuzzy -#| msgid " --no-proxy explicitly turn off proxy.\n" msgid " --no-proxy explicitly turn off proxy\n" -msgstr " --no-proxy slå proxy fra eksplicit.\n" +msgstr " --no-proxy slÃ¥ proxy fra eksplicit\n" #: src/main.c:708 -#, fuzzy -#| msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER.\n" msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" -msgstr " -Q, --quota=ANTAL sæt hentningskvote til ANTAL.\n" +msgstr " -Q, --quota=ANTAL sæt hentekvote til ANTAL\n" #: src/main.c:710 -#, fuzzy -#| msgid "" -#| " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on " -#| "local host.\n" msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -" --bind-address=ADRESSE bind til ADRESSE (værtsnavn eller IP) på " -"lokal\n" -" vært.\n" +" --bind-address=ADRESSE bind til ADRESSE (værtsnavn eller IP) pÃ¥\n" +" lokal vært\n" #: src/main.c:712 -#, fuzzy -#| msgid " --limit-rate=RATE limit download rate to RATE.\n" msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -" --limit-rate=HASTIGHED begræns downloadhastighed til HASTIGHED.\n" +" --limit-rate=HASTIGHED begræns downloadhastighed til HASTIGHED\n" #: src/main.c:714 -#, fuzzy -#| msgid " --no-dns-cache disable caching DNS lookups.\n" msgid " --no-dns-cache disable caching DNS lookups\n" -msgstr " --no-dns-cache deaktivér cache for DNS-opslag.\n" +msgstr " --no-dns-cache deaktivér cache for DNS-opslag\n" #: src/main.c:716 -#, fuzzy -#| msgid "" -#| " --restrict-file-names=OS restrict chars in file names to ones OS " -#| "allows.\n" msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -" --restrict-file-names=OS begrænser tegn i filnavne til de, som " +" --restrict-file-names=OS begræns tegn i filnavne til de, som " "tillades\n" -" af operativsystemet.\n" +" af operativsystemet\n" #: src/main.c:718 -#, fuzzy -#| msgid "" -#| " --ignore-case ignore case when matching files/" -#| "directories.\n" msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -" --ignore-case ingen forskel på store/små bogstaver ved\n" -" matching af filer/kataloger\n" +" --ignore-case ingen forskel pÃ¥ store/smÃ¥ bogstaver ved\n" +" match af filer/kataloger\n" #: src/main.c:721 -#, fuzzy -#| msgid " -4, --inet4-only connect only to IPv4 addresses.\n" msgid " -4, --inet4-only connect only to IPv4 addresses\n" -msgstr " -4, --inet4-only forbind kun til IPv4-adresser.\n" +msgstr " -4, --inet4-only forbind kun til IPv4-adresser\n" #: src/main.c:723 -#, fuzzy -#| msgid " -6, --inet6-only connect only to IPv6 addresses.\n" msgid " -6, --inet6-only connect only to IPv6 addresses\n" -msgstr " -6, --inet6-only forbind kun til IPv6-adresser.\n" +msgstr " -6, --inet6-only forbind kun til IPv6-adresser\n" #: src/main.c:725 -#, fuzzy -#| msgid "" -#| " --prefer-family=FAMILY connect first to addresses of specified " -#| "family,\n" -#| " one of IPv6, IPv4, or none.\n" msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -" --prefer-family=FAMILIE forbind først til adresser i den angivne\n" -" familie, enten IPv6, IPv4, eller none.\n" +" --prefer-family=FAMILIE forbind først til adresser i den angivne\n" +" familie; enten IPv6, IPv4 eller none\n" #: src/main.c:729 -#, fuzzy -#| msgid "" -#| " --user=USER set both ftp and http user to USER.\n" msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -" --user=BRUGER angiv både ftp- og http-bruger til BRUGER.\n" +" --user=BRUGER angiv bÃ¥de ftp- og http-bruger til " +"BRUGER\n" #: src/main.c:731 -#, fuzzy -#| msgid "" -#| " --password=PASS set both ftp and http password to PASS.\n" msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -" --password=KODE angiv både ftp- og http-adgangskode til " -"KODE.\n" +" --password=KODE angiv adgangs-KODE til bÃ¥de ftp og http\n" #: src/main.c:733 -#, fuzzy -#| msgid " --ask-password prompt for passwords.\n" msgid " --ask-password prompt for passwords\n" -msgstr " --ask-password bed om adgangskoder.\n" +msgstr " --ask-password bed om adgangskoder\n" #: src/main.c:736 msgid "" @@ -1773,113 +1661,104 @@ msgid "" "SSH_ASKPASS \n" " environment variable is used.\n" msgstr "" +" --use-askpass=KOMMANDO angiv mekanisme til hÃ¥ndtering af " +"brugernavn\n" +" og adgangskode. Uden KOMMANDO bruges\n" +" miljøvariablen WGET_ASKPASS eller\n" +" SSH_ASKPASS.\n" #: src/main.c:742 -#, fuzzy -#| msgid " --no-iri turn off IRI support.\n" msgid " --no-iri turn off IRI support\n" -msgstr " --no-iri slå understøttelse af IRI fra.\n" +msgstr " --no-iri slÃ¥ understøttelse af IRI fra\n" #: src/main.c:744 -#, fuzzy -#| msgid "" -#| " --local-encoding=ENC use ENC as the local encoding for IRIs.\n" msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -" --local-encoding=KODNING brug KODNING som lokal kodning for IRI'er\n" +" --local-encoding=KODNING brug KODNING som lokal kodning for " +"IRI'er\n" #: src/main.c:746 -#, fuzzy -#| msgid "" -#| " --remote-encoding=ENC use ENC as the default remote encoding.\n" msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -" --remote-encoding=KODNING brug KODNING som standardfjernkodning.\n" +" --remote-encoding=KODNING brug KODNING som standardfjernkodning\n" -# glob er f.eks. når man skriver *.txt, og skallen svarer med fil1.txt, fil2.txt, ... #: src/main.c:748 -#, fuzzy -#| msgid " --no-glob turn off FTP file name globbing.\n" msgid " --unlink remove file before clobber\n" -msgstr " --no-glob slå globning af FTP-filnavne fra.\n" +msgstr " --unlink fjern fil før overskrivning\n" #: src/main.c:751 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" +" --keep-badhash behold filer med forkert kontrolsum " +"(tilføj .badhash)\n" +# ? #: src/main.c:753 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" +" --metalink-index=TAL Metalink application/metalink4+xml " +"metaurl ordinal-TAL\n" #: src/main.c:755 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" +" --metalink-over-http brug Metalink-metadata fra HTTP-" +"svartoptekster\n" #: src/main.c:757 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" +" --preferred-location foretrukken placering af Metalink-" +"ressourcer\n" #: src/main.c:761 msgid "" " --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" +" --xattr slÃ¥ lagring af metadata i udvidede " +"filattributter til\n" #: src/main.c:766 msgid "Directories:\n" msgstr "Kataloger:\n" #: src/main.c:768 -#, fuzzy -#| msgid " -nd, --no-directories don't create directories.\n" msgid " -nd, --no-directories don't create directories\n" -msgstr " -nd, --no-directories opret ikke kataloger.\n" +msgstr " -nd, --no-directories opret ikke kataloger\n" #: src/main.c:770 -#, fuzzy -#| msgid " -x, --force-directories force creation of directories.\n" msgid " -x, --force-directories force creation of directories\n" -msgstr " -x, --force-directories tving oprettelse af kataloger.\n" +msgstr " -x, --force-directories tving oprettelse af kataloger\n" #: src/main.c:772 -#, fuzzy -#| msgid " -nH, --no-host-directories don't create host directories.\n" msgid " -nH, --no-host-directories don't create host directories\n" -msgstr " -nH, --no-host-directories opret ikke værtskataloger.\n" +msgstr " -nH, --no-host-directories opret ikke værtskataloger\n" #: src/main.c:774 -#, fuzzy -#| msgid "" -#| " --protocol-directories use protocol name in directories.\n" msgid " --protocol-directories use protocol name in directories\n" -msgstr " --protocol-directories brug protokolnavn i kataloger.\n" +msgstr " --protocol-directories brug protokolnavn i kataloger\n" #: src/main.c:776 -#, fuzzy -#| msgid " -P, --directory-prefix=PREFIX save files to PREFIX/...\n" msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" -msgstr " -P, --directory-prefix=PRÆFIKS gem filer til PRÆFIKS/...\n" +msgstr " -P, --directory-prefix=PRÆFIKS gem filer til PRÆFIKS/..\n" #: src/main.c:778 -#, fuzzy -#| msgid "" -#| " --cut-dirs=NUMBER ignore NUMBER remote directory " -#| "components.\n" msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -" --cut-dirs=ANTAL ignorér ANTAL komponenter for " +" --cut-dirs=ANTAL ignorér ANTAL komponenter for " "fjernkataloger\n" #: src/main.c:782 @@ -1887,330 +1766,240 @@ msgid "HTTP options:\n" msgstr "HTTP-flag:\n" #: src/main.c:784 -#, fuzzy -#| msgid " --http-user=USER set http user to USER.\n" msgid " --http-user=USER set http user to USER\n" -msgstr " --http-user=BRUGER sæt http-brugeren til BRUGER.\n" +msgstr " --http-user=BRUGER sæt http-brugeren til BRUGER\n" #: src/main.c:786 -#, fuzzy -#| msgid " --http-password=PASS set http password to PASS.\n" msgid " --http-password=PASS set http password to PASS\n" -msgstr " --http-password=KODE sæt http-adgangskoden til KODE.\n" +msgstr " --http-password=KODE sæt http-adgangskoden til KODE\n" #: src/main.c:788 -#, fuzzy -#| msgid " --no-cache disallow server-cached data.\n" msgid " --no-cache disallow server-cached data\n" -msgstr " --no-cache tillad ikke serverlagring af data.\n" +msgstr " --no-cache tillad ikke serverlagring af data\n" #: src/main.c:790 -#, fuzzy -#| msgid "" -#| " --default-page=NAME Change the default page name (normally\n" -#| " this is `index.html'.).\n" msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -" --default-page=NAVN Ændr standardsidenavnet (normalt er dette\n" -" 'index.html'.).\n" +" --default-page=NAVN Ændr standardsidenavnet (normalt er " +"dette\n" +" “index.htmlâ€.)\n" #: src/main.c:793 -#, fuzzy -#| msgid "" -#| " -E, --adjust-extension save HTML/CSS documents with proper " -#| "extensions.\n" msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -" -E, --adjust-extension gem HTML/CSS-dokumenter med passende " +" -E, --adjust-extension gem HTML/CSS-dokumenter med passende " "filendelser\n" #: src/main.c:795 -#, fuzzy -#| msgid "" -#| " --ignore-length ignore `Content-Length' header field.\n" msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -" --ignore-length ignorér `Content-Length' toptekstfeltet.\n" +" --ignore-length ignorér toptekstfeltet “Content-Lengthâ€\n" #: src/main.c:797 -#, fuzzy -#| msgid " --header=STRING insert STRING among the headers.\n" msgid " --header=STRING insert STRING among the headers\n" -msgstr " --header=STRENG indsæt STRENG blandt topteksterne.\n" +msgstr " --header=STRENG indsæt STRENG blandt topteksterne\n" #: src/main.c:800 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" +" --compression=TYPE vælg komprimering: auto, gzip eller none. " +"(Standard: none)\n" #: src/main.c:803 -#, fuzzy -#| msgid "" -#| " --max-redirect maximum redirections allowed per page.\n" msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -" --max-redirect maksimalt tilladt antal omdirigeringer pr. " -"side.\n" +" --max-redirect antal tilladte omdirigeringer pr. side\n" #: src/main.c:805 -#, fuzzy -#| msgid " --proxy-user=USER set USER as proxy username.\n" msgid " --proxy-user=USER set USER as proxy username\n" -msgstr " --proxy-user=BRUGER sæt BRUGER som proxybrugernavn.\n" +msgstr " --proxy-user=BRUGER sæt BRUGER som proxybrugernavn\n" #: src/main.c:807 -#, fuzzy -#| msgid " --proxy-password=PASS set PASS as proxy password.\n" msgid " --proxy-password=PASS set PASS as proxy password\n" -msgstr " --proxy-password=KODE brug KODE som proxyadgangskode.\n" +msgstr " --proxy-password=KODE brug KODE som proxyadgangskode\n" #: src/main.c:809 -#, fuzzy -#| msgid "" -#| " --referer=URL include `Referer: URL' header in HTTP " -#| "request.\n" msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -" --referer=URL inkludér `Referer: URL'-toptekst i \n" -" HTTP-forespørgsel\n" +" --referer=URL inkludér “Referer: URLâ€-toptekst i\n" +" HTTP-forespørgsel\n" #: src/main.c:811 -#, fuzzy -#| msgid " --save-headers save the HTTP headers to file.\n" msgid " --save-headers save the HTTP headers to file\n" -msgstr " --save-headers gem HTTP-topteksterne til en fil.\n" +msgstr " --save-headers gem HTTP-topteksterne til en fil\n" #: src/main.c:813 -#, fuzzy -#| msgid "" -#| " -U, --user-agent=AGENT identify as AGENT instead of Wget/" -#| "VERSION.\n" msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -" -U, --user-agent=AGENT identificér som AGENT frem for Wget/VERSION.\n" +" -U, --user-agent=AGENT identificér som AGENT frem for Wget/" +"VERSION\n" #: src/main.c:815 -#, fuzzy -#| msgid "" -#| " --no-http-keep-alive disable HTTP keep-alive (persistent " -#| "connections).\n" msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -" --no-http-keep-alive deaktivér HTTP-keep-alive (vedvarende \n" -" forbindelser).\n" +" --no-http-keep-alive deaktivér HTTP-keep-alive (vedvarende " +"forbindelser)\n" #: src/main.c:817 -#, fuzzy -#| msgid " --no-cookies don't use cookies.\n" msgid " --no-cookies don't use cookies\n" -msgstr " --no-cookies brug ikke cookies.\n" +msgstr " --no-cookies brug ikke cookies\n" #: src/main.c:819 -#, fuzzy -#| msgid "" -#| " --load-cookies=FILE load cookies from FILE before session.\n" msgid "" " --load-cookies=FILE load cookies from FILE before session\n" -msgstr " --load-cookies=FIL indlæs cookies fra FIL før session.\n" +msgstr "" +" --load-cookies=FIL indlæs cookies fra FIL før session\n" #: src/main.c:821 -#, fuzzy -#| msgid " --save-cookies=FILE save cookies to FILE after session.\n" msgid " --save-cookies=FILE save cookies to FILE after session\n" -msgstr " --save-cookies=FIL gem cookies til FIL efter session.\n" +msgstr " --save-cookies=FIL gem cookies til FIL efter session\n" #: src/main.c:823 -#, fuzzy -#| msgid "" -#| " --keep-session-cookies load and save session (non-permanent) " -#| "cookies.\n" msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -" --keep-session-cookies indlæs og gem (ikke-permanente) " +" --keep-session-cookies indlæs og gem (ikke-permanente) " "sessionscookies\n" #: src/main.c:825 -#, fuzzy -#| msgid "" -#| " --post-data=STRING use the POST method; send STRING as the " -#| "data.\n" msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -" --post-data=STRENG brug POST-metoden; send STRENG som data.\n" +" --post-data=STRENG brug POST-metoden; send STRENG som data\n" #: src/main.c:827 -#, fuzzy -#| msgid "" -#| " --post-file=FILE use the POST method; send contents of " -#| "FILE.\n" msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -" --post-file=FIL brug POST-metoden; send indhold af FIL.\n" +" --post-file=FIL brug POST-metoden; send indhold af FIL\n" #: src/main.c:829 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" +" --method=HTTPMetode brug metoden “HTTPMetode†i " +"forespørgslen\n" #: src/main.c:831 -#, fuzzy -#| msgid "" -#| " --post-data=STRING use the POST method; send STRING as the " -#| "data.\n" msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -" --post-data=STRENG brug POST-metoden; send STRENG som data.\n" +" --body-data=STRENG send STRENG som data. --method SKAL " +"angives\n" #: src/main.c:833 -#, fuzzy -#| msgid "" -#| " --post-file=FILE use the POST method; send contents of " -#| "FILE.\n" msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -" --post-file=FIL brug POST-metoden; send indhold af FIL.\n" +" --body-file=FIL send indhold af FIL. --method SKAL " +"angives\n" #: src/main.c:835 -#, fuzzy -#| msgid "" -#| " --content-disposition honor the Content-Disposition header when\n" -#| " choosing local file names (EXPERIMENTAL).\n" msgid "" " --content-disposition honor the Content-Disposition header " "when\n" " choosing local file names " "(EXPERIMENTAL)\n" msgstr "" -" --content-disposition respektér topteksten Content-Disposition ved\n" -" valg af lokale filnavne (EKSPERIMENTEL).\n" +" --content-disposition respektér topteksten Content-Disposition " +"ved\n" +" valg af lokale filnavne " +"(EKSPERIMENTEL)\n" #: src/main.c:838 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" +" --content-on-error udskriv modtaget indhold ved serverfejl\n" #: src/main.c:840 -#, fuzzy -#| msgid "" -#| " --auth-no-challenge send Basic HTTP authentication " -#| "information\n" -#| " without first waiting for the server's\n" -#| " challenge.\n" msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" " without first waiting for the server's\n" " challenge\n" msgstr "" -" --auth-no-challenge send basal HTTP-autentifikationsinformation\n" -" uden først at vente på serverens udfordring.\n" +" --auth-no-challenge send basal HTTP-godkendelsesinformation\n" +" uden først at vente pÃ¥ serverens " +"udfordring\n" #: src/main.c:847 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS-tilvalg (SSL/TLS):\n" #: src/main.c:849 -#, fuzzy -#| msgid "" -#| " --secure-protocol=PR choose secure protocol, one of auto, " -#| "SSLv2,\n" -#| " SSLv3, and TLSv1.\n" msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2, TLSv1_3 " "and PFS\n" msgstr "" -" --secure-protocol=PR vælg sikker protokol: en af auto, SSLv2,\n" -" SSLv3 og TLSv1.\n" +" --secure-protocol=PR vælg sikker protokol; en af auto, SSLv2,\n" +" SSLv3, TLSv1, TLSv1_1, TLSv1_2, TLSv1_3 " +"og PFS\n" #: src/main.c:852 -#, fuzzy -#| msgid " -L, --relative follow relative links only.\n" msgid " --https-only only follow secure HTTPS links\n" -msgstr " -L, --relative følg kun relative henvisninger.\n" +msgstr " --https-only følg kun sikre HTTPS-links\n" #: src/main.c:854 -#, fuzzy -#| msgid "" -#| " --no-check-certificate don't validate the server's certificate.\n" msgid "" " --no-check-certificate don't validate the server's certificate\n" -msgstr " --no-check-certificate bekræft ikke serverens certifikat.\n" +msgstr " --no-check-certificate bekræft ikke serverens certifikat\n" #: src/main.c:856 -#, fuzzy -#| msgid " --certificate=FILE client certificate file.\n" msgid " --certificate=FILE client certificate file\n" -msgstr " --certificate=FIL klientcertifikatfil.\n" +msgstr " --certificate=FIL klientcertifikatfil\n" #: src/main.c:858 -#, fuzzy -#| msgid "" -#| " --certificate-type=TYPE client certificate type, PEM or DER.\n" msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -" --certificate-type=TYPE type af klientcertifikat: PEM eller DER.\n" +" --certificate-type=TYPE type af klientcertifikat: PEM eller DER\n" #: src/main.c:860 -#, fuzzy -#| msgid " --private-key=FILE private key file.\n" msgid " --private-key=FILE private key file\n" -msgstr " --private-key=FIL privat nøglefil.\n" +msgstr " --private-key=FIL privat nøglefil\n" #: src/main.c:862 -#, fuzzy -#| msgid " --private-key-type=TYPE private key type, PEM or DER.\n" msgid " --private-key-type=TYPE private key type, PEM or DER\n" -msgstr " --private-key-type=TYPE type af privat nøgle: PEM eller DER.\n" +msgstr " --private-key-type=TYPE type af privat nøgle: PEM eller DER\n" #: src/main.c:864 -#, fuzzy -#| msgid " --ca-certificate=FILE file with the bundle of CA's.\n" msgid " --ca-certificate=FILE file with the bundle of CAs\n" -msgstr " --ca-certificate=FIL fil med samlingen af CA'er.\n" +msgstr " --ca-certificate=FIL fil med samling af CA'er\n" #: src/main.c:866 -#, fuzzy -#| msgid "" -#| " --ca-directory=DIR directory where hash list of CA's is " -#| "stored.\n" msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -" --ca-directory=KAT katalog hvor hashlisten af CA'er lagres.\n" +" --ca-directory=KAT katalog hvor hashlisten over CA'er " +"lagres\n" #: src/main.c:868 -#, fuzzy -#| msgid " --ca-certificate=FILE file with the bundle of CA's.\n" msgid " --crl-file=FILE file with bundle of CRLs\n" -msgstr " --ca-certificate=FIL fil med samlingen af CA'er.\n" +msgstr " --crl-file=FIL fil med samling af CRL'er\n" #: src/main.c:870 msgid "" @@ -2221,30 +2010,29 @@ msgid "" "verify\n" " peer against\n" msgstr "" +" --pinnedpubkey=FIL/HASH Offentlig nøglefil (PEM/DER) eller et " +"antal\n" +" base64-kodede sha256-hashværdier indledt " +"af\n" +" “sha256//†og adskilt af “;â€, som bruges " +"til\n" +" at verificere modparten\n" #: src/main.c:876 -#, fuzzy -#| msgid "" -#| " --random-file=FILE file with random data for seeding the SSL " -#| "PRNG.\n" msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -" --random-file=FIL fil med tilfældige data til at seede \n" -" SSL-talgeneratoren.\n" +" --random-file=FIL fil med tilfældige data til at seede\n" +" SSL-talgeneratoren\n" #: src/main.c:880 -#, fuzzy -#| msgid "" -#| " --egd-file=FILE file naming the EGD socket with random " -#| "data.\n" msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -" --egd-file=FIL fil, der angiver navnet på EGD-soklen med\n" -" tilfældige data\n" +" --egd-file=FIL fil der angiver navnet pÃ¥ EGD-soklen med\n" +" tilfældige data\n" #: src/main.c:884 msgid "" @@ -2255,106 +2043,88 @@ msgid "" " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=STR Angiv prioritetsstreng (GnuTLS) eller cipher-" +"listestreng (OpenSSL) direkte.\n" +" Brug med omtanke. Dette tilvalg " +"tilsidesætter --secure-protocol.\n" +" Format og syntaks for denne streng " +"afhænger af den specifikke SSL/TLS-motor.\n" #: src/main.c:891 -#, fuzzy -#| msgid "HTTP options:\n" msgid "HSTS options:\n" -msgstr "HTTP-flag:\n" +msgstr "HSTS-flag:\n" #: src/main.c:893 -#, fuzzy -#| msgid " --no-cache disallow server-cached data.\n" msgid " --no-hsts disable HSTS\n" -msgstr " --no-cache tillad ikke serverlagring af data.\n" +msgstr " --no-hsts slÃ¥ HSTS fra\n" #: src/main.c:895 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" +" --hsts-file sti til HSTS-databasen (tilsidesætter " +"standardværdi)\n" #: src/main.c:900 msgid "FTP options:\n" msgstr "FTP-flag:\n" #: src/main.c:903 -#, fuzzy -#| msgid "" -#| " --ftp-stmlf Use Stream_LF format for all binary FTP " -#| "files.\n" msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -" --ftp-stmlf Brug Stream_LF-format til alle binære FTP-" -"filer.\n" +" --ftp-stmlf brug Stream_LF-format til alle binære FTP-" +"filer\n" #: src/main.c:906 -#, fuzzy -#| msgid " --ftp-user=USER set ftp user to USER.\n" msgid " --ftp-user=USER set ftp user to USER\n" -msgstr " --ftp-user=BRUGER sæt ftp-brugeren til BRUGER.\n" +msgstr " --ftp-user=BRUGER sæt ftp-brugeren til BRUGER\n" #: src/main.c:908 -#, fuzzy -#| msgid " --ftp-password=PASS set ftp password to PASS.\n" msgid " --ftp-password=PASS set ftp password to PASS\n" -msgstr " --ftp-password=KODE sæt ftp-adgangskoden til KODE.\n" +msgstr " --ftp-password=KODE sæt ftp-adgangskoden til KODE\n" #: src/main.c:910 -#, fuzzy -#| msgid " --no-remove-listing don't remove `.listing' files.\n" msgid " --no-remove-listing don't remove '.listing' files\n" -msgstr " --no-remove-listing fjern ikke '.listing'-filer.\n" +msgstr " --no-remove-listing fjern ikke “.listingâ€-filer\n" -# glob er f.eks. når man skriver *.txt, og skallen svarer med fil1.txt, fil2.txt, ... +# glob er f.eks. nÃ¥r man skriver *.txt, og skallen svarer med fil1.txt, fil2.txt, ... #: src/main.c:912 -#, fuzzy -#| msgid " --no-glob turn off FTP file name globbing.\n" msgid " --no-glob turn off FTP file name globbing\n" -msgstr " --no-glob slå globning af FTP-filnavne fra.\n" +msgstr " --no-glob slÃ¥ globning af FTP-filnavne fra\n" #: src/main.c:914 -#, fuzzy -#| msgid "" -#| " --no-passive-ftp disable the \"passive\" transfer mode.\n" msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -" --no-passive-ftp deaktivér den \"passive\" " -"overførselstilstand.\n" +" --no-passive-ftp deaktivér “passiv†overførselstilstand\n" #: src/main.c:916 -#, fuzzy -#| msgid " -S, --server-response print server response.\n" msgid " --preserve-permissions preserve remote file permissions\n" -msgstr " -S, --server-response udskriv svar fra server.\n" +msgstr "" +" --preserve-permissions behold den fjerne fils rettigheder\n" #: src/main.c:918 -#, fuzzy -#| msgid "" -#| " --retr-symlinks when recursing, get linked-to files (not " -#| "dir).\n" msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -" --retr-symlinks hent filer der henvises til (ikke kataloger) " -"ved\n" -" rekursion\n" +" --retr-symlinks hent destinationsfiler for links\n" +" (ikke kataloger) ved rekursion\n" #: src/main.c:923 -#, fuzzy -#| msgid "FTP options:\n" msgid "FTPS options:\n" -msgstr "FTP-flag:\n" +msgstr "FTPS-flag:\n" #: src/main.c:925 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" +" --ftps-implicit brug implicit FTPS (standardport er " +"990)\n" #: src/main.c:927 msgid "" @@ -2362,83 +2132,76 @@ msgid "" "the control connection when\n" " opening a data connection\n" msgstr "" +" --ftps-resume-ssl genoptag SSL/TLS-sessionen fra " +"kontrolforbindelsen\n" +" ved Ã¥bning af en dataforbindelse\n" #: src/main.c:930 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" +" --ftps-clear-data-connection kryptér kun kontrolkanalen; alle data " +"vil være i klartekst\n" #: src/main.c:932 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" +" --ftps-fallback-to-ftp brug FTP, hvis FTPS ikke understøttes " +"pÃ¥ mÃ¥lserveren\n" #: src/main.c:936 -#, fuzzy -#| msgid "FTP options:\n" msgid "WARC options:\n" -msgstr "FTP-flag:\n" +msgstr "WARC-flag:\n" #: src/main.c:938 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" +" --warc-file=FILNAVN gem forespørgsel/svar-data i .warc.gz-" +"fil\n" #: src/main.c:940 -#, fuzzy -#| msgid " --header=STRING insert STRING among the headers.\n" msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" -msgstr " --header=STRENG indsæt STRENG blandt topteksterne.\n" +msgstr " --warc-header=STRENG indæst STRENG i warcinfo-posten\n" #: src/main.c:942 -#, fuzzy -#| msgid "" -#| " -t, --tries=NUMBER set number of retries to NUMBER (0 " -#| "unlimits).\n" msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -" -t, --tries=ANTAL sæt antal forsøg til ANTAL (0 for " -"ubegrænset)\n" +" --warc-max-size=TAL sæt maksimal størrelse af WARC-filer til " +"TAL\n" #: src/main.c:944 -#, fuzzy -#| msgid " --spider don't download anything.\n" msgid " --warc-cdx write CDX index files\n" -msgstr " --spider hent intet.\n" +msgstr " --warc-cdx skriv CDX-indexfiler\n" #: src/main.c:946 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" +" --warc-dedup=FILNAVN gem ikke poster anført i denne CDX-fil\n" #: src/main.c:949 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" +" --no-warc-compression komprimér ikke WARC-filer med GZIP\n" #: src/main.c:952 -#, fuzzy -#| msgid " --no-cookies don't use cookies.\n" msgid " --no-warc-digests do not calculate SHA1 digests\n" -msgstr " --no-cookies brug ikke cookies.\n" +msgstr " --no-warc-digests beregn ikke SHA1-hashsummer\n" #: src/main.c:954 -#, fuzzy -#| msgid "" -#| " --ignore-case ignore case when matching files/" -#| "directories.\n" msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" -msgstr "" -" --ignore-case ingen forskel på store/små bogstaver ved\n" -" matching af filer/kataloger\n" +msgstr " --no-warc-keep-log gem ikke logfilen i en WARC-post\n" #: src/main.c:956 msgid "" @@ -2446,272 +2209,208 @@ msgid "" "the\n" " WARC writer\n" msgstr "" +" --warc-tempdir=KATALOG placering til midlertidige filer dannet " +"af\n" +" WARC-skriveren\n" #: src/main.c:961 msgid "Recursive download:\n" msgstr "Rekursiv download:\n" #: src/main.c:963 -#, fuzzy -#| msgid " -r, --recursive specify recursive download.\n" msgid " -r, --recursive specify recursive download\n" -msgstr " -r, --recursive angiv rekursiv download.\n" +msgstr " -r, --recursive angiv rekursiv download\n" #: src/main.c:965 -#, fuzzy -#| msgid "" -#| " -l, --level=NUMBER maximum recursion depth (inf or 0 for " -#| "infinite).\n" msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -" -l, --level=ANTAL maksimal rekursionsdybde (inf eller 0 for\n" -" uendelig).\n" +" -l, --level=ANTAL maksimal rekursionsdybde (inf eller 0 " +"for\n" +" uendelig)\n" #: src/main.c:967 -#, fuzzy -#| msgid "" -#| " --delete-after delete files locally after downloading them.\n" msgid "" " --delete-after delete files locally after downloading " "them\n" -msgstr " --delete-after slet filer lokalt efter de er hentet.\n" +msgstr "" +" --delete-after slet filer lokalt, efter de er hentet\n" #: src/main.c:969 -#, fuzzy -#| msgid "" -#| " -k, --convert-links make links in downloaded HTML or CSS point " -#| "to\n" -#| " local files.\n" msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -" -k, --convert-links få henvisninger i hentet HTML eller CSS til at " -"pege\n" -" på lokale filer.\n" +" -k, --convert-links fÃ¥ henvisninger i hentet HTML eller CSS " +"til\n" +" at pege pÃ¥ lokale filer\n" #: src/main.c:972 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" +" --convert-file-only konvertér kun fil-delen af URL'er (ofte " +"kaldet basename/basisnavn)\n" #: src/main.c:974 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" +" --backups=N rotér op til N sikkerhedskopifiler før " +"skrivning af fil X\n" #: src/main.c:978 -#, fuzzy -#| msgid "" -#| " -K, --backup-converted before converting file X, back up as X_orig.\n" msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -" -K, --backup-converted før konvertering af fil X, så opret\n" -" sikkerhedskopien X_orig.\n" +" -K, --backup-converted før konvertering af fil X, sÃ¥ opret\n" +" sikkerhedskopien X_orig\n" #: src/main.c:981 -#, fuzzy -#| msgid "" -#| " -K, --backup-converted before converting file X, back up as X.orig.\n" msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -" -K, --backup-converted før konvertering af fil X, så opret\n" -" sikkerhedskopien X.orig.\n" +" -K, --backup-converted før konvertering af fil X, sÃ¥ opret\n" +" sikkerhedskopien X.orig\n" #: src/main.c:984 -#, fuzzy -#| msgid "" -#| " -m, --mirror shortcut for -N -r -l inf --no-remove-" -#| "listing.\n" msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -" -m, --mirror forkortelse for -N -r -l inf --no-remove-" -"listing.\n" +" -m, --mirror forkortelse for -N -r -l inf --no-remove-" +"listing\n" #: src/main.c:986 -#, fuzzy -#| msgid "" -#| " -p, --page-requisites get all images, etc. needed to display HTML " -#| "page.\n" msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -" -p, --page-requisites hent alle billeder osv., der kræves for at vise " -"en\n" -" HTML-side.\n" +" -p, --page-requisites hent alle billeder osv., der kræves for " +"at\n" +" vise en HTML-side\n" #: src/main.c:988 -#, fuzzy -#| msgid "" -#| " --strict-comments turn on strict (SGML) handling of HTML " -#| "comments.\n" msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -" --strict-comments brug strikt (SGML) håndtering af HTML-" -"kommentarer.\n" +" --strict-comments brug strikt (SGML) hÃ¥ndtering af HTML-" +"kommentarer\n" #: src/main.c:992 msgid "Recursive accept/reject:\n" msgstr "Rekursiv accept/afslag:\n" #: src/main.c:994 -#, fuzzy -#| msgid "" -#| " -A, --accept=LIST comma-separated list of accepted " -#| "extensions.\n" msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -" -A, --accept=LISTE kommaadskilt liste af accepterede " -"endelser.\n" +" -A, --accept=LISTE kommaadskilt liste over accepterede " +"endelser\n" #: src/main.c:996 -#, fuzzy -#| msgid "" -#| " -R, --reject=LIST comma-separated list of rejected " -#| "extensions.\n" msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -" -R, --reject=LISTE kommaadskilt liste af afslåede endelser.\n" +" -R, --reject=LISTE kommaadskilt liste over afslÃ¥ede " +"endelser\n" #: src/main.c:998 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" +" --accept-regex=REGEX regex som matcher accepterede URL'er\n" #: src/main.c:1000 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" +" --reject-regex=REGEX regex som matcher fravalgte URL'er\n" #: src/main.c:1003 -#, fuzzy -#| msgid " --progress=TYPE select progress gauge type.\n" msgid " --regex-type=TYPE regex type (posix|pcre)\n" -msgstr " --progress=TYPE vælg angivelsesmåde af fremgang.\n" +msgstr "" +" --regex-type=TYPE typen af regulært udtryk (posix|pcre)\n" #: src/main.c:1006 -#, fuzzy -#| msgid " --progress=TYPE select progress gauge type.\n" msgid " --regex-type=TYPE regex type (posix)\n" -msgstr " --progress=TYPE vælg angivelsesmåde af fremgang.\n" +msgstr " --regex-type=TYPE typen af regulært udtryk (posix)\n" #: src/main.c:1009 -#, fuzzy -#| msgid "" -#| " -D, --domains=LIST comma-separated list of accepted " -#| "domains.\n" msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -" -D, --domains=LISTE kommaadskilt liste af accepterede " -"domæner.\n" +" -D, --domains=LISTE kommaadskilt liste over accepterede " +"domæner\n" #: src/main.c:1011 -#, fuzzy -#| msgid "" -#| " --exclude-domains=LIST comma-separated list of rejected " -#| "domains.\n" msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -" --exclude-domains=LISTE kommaadskilt liste af afslåede domæner.\n" +" --exclude-domains=LISTE kommaadskilt liste over afslÃ¥ede domæner\n" #: src/main.c:1013 -#, fuzzy -#| msgid "" -#| " --follow-ftp follow FTP links from HTML documents.\n" msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -" --follow-ftp følg FTP-henvisninger fra HTML-" -"dokumenter.\n" +" --follow-ftp følg FTP-henvisninger fra HTML-" +"dokumenter\n" #: src/main.c:1015 -#, fuzzy -#| msgid "" -#| " --follow-tags=LIST comma-separated list of followed HTML " -#| "tags.\n" msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -" --follow-tags=LISTE kommaadskilt liste af HTML-mærker, der\n" -" følges.\n" +" --follow-tags=LISTE kommaadskilt liste over HTML-mærker, der\n" +" følges\n" #: src/main.c:1017 -#, fuzzy -#| msgid "" -#| " --ignore-tags=LIST comma-separated list of ignored HTML " -#| "tags.\n" msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -" --ignore-tags=LISTE kommaadskilt liste af HTML-mærker, der\n" -" ignoreres.\n" +" --ignore-tags=LISTE kommaadskilt liste over HTML-mærker, der\n" +" ignoreres\n" #: src/main.c:1019 -#, fuzzy -#| msgid "" -#| " -H, --span-hosts go to foreign hosts when recursive.\n" msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -" -H, --span-hosts hop til fremmede værter når rekursiv.\n" +" -H, --span-hosts hop til fremmede værter nÃ¥r rekursiv\n" #: src/main.c:1021 -#, fuzzy -#| msgid " -L, --relative follow relative links only.\n" msgid " -L, --relative follow relative links only\n" -msgstr " -L, --relative følg kun relative henvisninger.\n" +msgstr " -L, --relative følg kun relative henvisninger\n" #: src/main.c:1023 -#, fuzzy -#| msgid " -I, --include-directories=LIST list of allowed directories.\n" msgid " -I, --include-directories=LIST list of allowed directories\n" -msgstr " -I, --include-directories=LISTE liste af tillate kataloger.\n" +msgstr " -I, --include-directories=LISTE liste over tillate kataloger\n" #: src/main.c:1025 -#, fuzzy -#| msgid "" -#| " --trust-server-names use the name specified by the redirection url " -#| "last component.\n" msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -" --trust-server-names brug navnet angivet ved den sidste komponent på " -"redirektion url'en.\n" +" --trust-server-names brug navnet angivet ved den sidste " +"komponent\n" +" pÃ¥ omdirigerings-url'en\n" #: src/main.c:1028 -#, fuzzy -#| msgid " -X, --exclude-directories=LIST list of excluded directories.\n" msgid " -X, --exclude-directories=LIST list of excluded directories\n" -msgstr " -X, --exclude-directories=LISTE liste af ekskluderede kataloger.\n" +msgstr "" +" -X, --exclude-directories=LISTE liste over ekskluderede kataloger\n" #: src/main.c:1030 -#, fuzzy -#| msgid "" -#| " -np, --no-parent don't ascend to the parent directory.\n" msgid "" " -np, --no-parent don't ascend to the parent directory\n" -msgstr " -np, --no-parent gå ikke op til ophavskataloget.\n" +msgstr " -np, --no-parent gÃ¥ ikke op til ophavskataloget\n" #: src/main.c:1033 msgid "" @@ -2719,6 +2418,9 @@ msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"Send fejlrapporter, spørgsmÃ¥l og diskussioner til <bug-wget@gnu.org>\n" +"og/eller Ã¥bn en rapport pÃ¥ https://savannah.gnu.org/bugs/?" +"func=additem&group=wget.\n" #: src/main.c:1039 #, c-format @@ -2738,33 +2440,32 @@ msgstr "Adgangskode: " #: src/main.c:1108 #, c-format msgid "Cannot create pipe\n" -msgstr "" +msgstr "Kan ikke oprette datakanal\n" #: src/main.c:1116 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" -msgstr "" +msgstr "Fejl ved initialisering af spawn file-handlinger for use-askpass: %d\n" #: src/main.c:1125 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" -msgstr "" +msgstr "Fejl ved angivelse af spawn file-handlinger for use-askpass: %d\n" #: src/main.c:1149 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" -msgstr "" +msgstr "Fejl ved læsning af svar fra kommandoen “%s %sâ€: %s\n" #: src/main.c:1172 #, c-format msgid "Username for '%s%s': " -msgstr "" +msgstr "Brugernavn for “%s%sâ€: " #: src/main.c:1182 -#, fuzzy, c-format -#| msgid "Password for user %s: " +#, c-format msgid "Password for '%s%s@%s': " -msgstr "Adgangskode for brugeren %s: " +msgstr "Adgangskode for “%s%s@%sâ€: " #: src/main.c:1254 msgid "Wgetrc: " @@ -2794,7 +2495,7 @@ msgstr "" #: src/main.c:1294 #, c-format msgid " %s (env)\n" -msgstr " %s (miljø)\n" +msgstr " %s (miljø)\n" #: src/main.c:1301 #, c-format @@ -2809,10 +2510,9 @@ msgstr " %s (system)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". #: src/main.c:1334 -#, fuzzy, c-format -#| msgid "Copyright (C) 2009 Free Software Foundation, Inc.\n" +#, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" -msgstr "Ophavsret © 2009 Free Software Foundation, Inc.\n" +msgstr "Ophavsret © %s Free Software Foundation, Inc.\n" #: src/main.c:1337 msgid "" @@ -2823,7 +2523,7 @@ msgid "" msgstr "" "Licens GPLv3+: GNU GPL version 3 eller nyere\n" "<http://www.gnu.org/licenses/gpl.html>.\n" -"Dette er frit programmel: du kan frit ændre og videredistribuere det.\n" +"Dette er frit programmel: du kan frit ændre og videredistribuere det.\n" "Der gives INGEN GARANTI, i den grad som dette tillades af loven.\n" # kan ikke finde nogen en_US.po @@ -2839,32 +2539,34 @@ msgstr "" #: src/main.c:1348 msgid "Please send bug reports and questions to <bug-wget@gnu.org>.\n" -msgstr "Rapportér venligst fejl og send spørgsmål til <bug-wget@gnu.org>.\n" +msgstr "Rapportér venligst fejl og send spørgsmÃ¥l til <bug-wget@gnu.org>.\n" #: src/main.c:1400 #, c-format msgid "Memory allocation problem\n" -msgstr "" +msgstr "Problem ved hukommelsesallokering\n" #: src/main.c:1451 #, c-format msgid "Exiting due to error in %s\n" -msgstr "" +msgstr "Afslutter grundet fejl i %s\n" #: src/main.c:1481 src/main.c:1552 src/main.c:1794 #, c-format msgid "Try `%s --help' for more options.\n" -msgstr "Prøv '%s --help' for flere flag.\n" +msgstr "Prøv “%s --help†for flere flag.\n" #: src/main.c:1548 #, c-format msgid "%s: illegal option -- `-n%c'\n" -msgstr "%s: ugyldigt flag -- '-n%c'\n" +msgstr "%s: ugyldigt flag — “-n%câ€\n" #: src/main.c:1594 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" +"Programmet er ikke kompileret med fejlsøgningsfunktionalitet. Ignorerer " +"flaget --debug.\n" #: src/main.c:1607 #, c-format @@ -2872,6 +2574,8 @@ msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" +"BÃ¥de --no-clobber og --convert-links blev angivet, men kun --convert-links " +"vil blive brugt.\n" #: src/main.c:1609 #, c-format @@ -2879,39 +2583,36 @@ msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" +"BÃ¥de --no-clobber og --convert-file-only blev angivet, men kun --convert-" +"file-only vil blive brugt.\n" #: src/main.c:1642 #, c-format msgid "Can't be verbose and quiet at the same time.\n" -msgstr "Kan ikke være udførlig og stille på samme tid.\n" +msgstr "Kan ikke være udførlig og stille pÃ¥ samme tid.\n" #: src/main.c:1648 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" -"Kan ikke tidsstemple og lade være at berøre eksisterende filer på samme " +"Kan ikke tidsstemple og lade være at berøre eksisterende filer pÃ¥ samme " "tid.\n" #: src/main.c:1657 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" -msgstr "Kan ikke angive både --inet4-only og --inet6-only.\n" +msgstr "Kan ikke angive bÃ¥de --inet4-only og --inet6-only.\n" #: src/main.c:1667 -#, fuzzy -#| msgid "" -#| "Cannot specify both -k and -O if multiple URLs are given, or in " -#| "combination\n" -#| "with -p or -r. See the manual for details.\n" -#| "\n" msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" "with -p or -r. See the manual for details.\n" "\n" msgstr "" -"Kan ikke angive både -k og -O, hvis der er givet flere URL'er, eller sammen\n" -"med -p eller -r. Flere detaljer kan findes i manualen.\n" +"Kan ikke angive -k/--convert-file-only sammen med -O, hvis der er givet " +"flere\n" +"URL'er, eller sammen med -p eller -r. Flere detaljer kan findes i manualen.\n" "\n" #: src/main.c:1676 @@ -2931,7 +2632,7 @@ msgid "" "for details.\n" "\n" msgstr "" -"ADVARSEL: tidsstempling gør intet sammen med -O. Detaljer kan findes i\n" +"ADVARSEL: tidsstempling gør intet sammen med -O. Detaljer kan findes i\n" "manualen.\n" "\n" @@ -2940,17 +2641,20 @@ msgstr "" msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" +"WARC-uddata fungerer ikke sammen med --no-clobber; --no-clobber " +"deaktiveres.\n" #: src/main.c:1709 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" +"WARC-uddata fungerer ikke med tidsstempler; tidsstempler deaktiveres.\n" #: src/main.c:1716 #, c-format msgid "WARC output does not work with --spider.\n" -msgstr "" +msgstr "WARC-uddata fungerer ikke sammen med --spider.\n" #: src/main.c:1722 #, c-format @@ -2958,12 +2662,16 @@ msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" +"WARC-uddata fungerer ikke sammen med --continue eller --start-pos; disse " +"deaktiveres.\n" #: src/main.c:1730 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" +"Hashsummer er deaktiveret; WARC-deduplikering vil ikke finde duplikerede " +"poster.\n" #: src/main.c:1751 #, c-format @@ -2971,11 +2679,13 @@ msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" +"Komprimering fungerer ikke med --continue eller --start-pos; de " +"deaktiveres.\n" #: src/main.c:1762 #, c-format msgid "Cannot specify both --ask-password and --password.\n" -msgstr "Kan ikke angive både --ask-password og --password.\n" +msgstr "Kan ikke angive bÃ¥de --ask-password og --password.\n" #: src/main.c:1770 #, c-format @@ -2983,6 +2693,8 @@ msgid "" "WARNING: No username set with --ask-password. This is usually not what you " "want.\n" msgstr "" +"ADVARSEL: Intet brugernavn angivet med --ask-password. Dette er normalt ikke " +"hensigten.\n" #: src/main.c:1776 #, c-format @@ -2990,17 +2702,18 @@ msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" +"Angivelse af bÃ¥de --start-pos og --continue anbefales ikke; --continue " +"deaktiveres.\n" #: src/main.c:1789 #, c-format msgid "%s: missing URL\n" -msgstr "%s: URL mangler.\n" +msgstr "%s: URL mangler\n" #: src/main.c:1837 -#, fuzzy, c-format -#| msgid "Cannot specify both --ask-password and --password.\n" +#, c-format msgid "You cannot specify both --post-data and --post-file.\n" -msgstr "Kan ikke angive både --ask-password og --password.\n" +msgstr "Du kan ikke angive bÃ¥de --post-data og --post-file.\n" #: src/main.c:1842 #, c-format @@ -3008,6 +2721,8 @@ msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" +"Du kan ikke bruge --post-data eller --post-file sammen med --method. --" +"method forventer data gennem tilvalgene --body-data og --body-file\n" #: src/main.c:1851 #, c-format @@ -3015,58 +2730,55 @@ msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" +"Du skal angive en metode med --method=HTTPMetode, som skal bruges med --body-" +"data eller --body-file.\n" #: src/main.c:1857 -#, fuzzy, c-format -#| msgid "Cannot specify both --inet4-only and --inet6-only.\n" +#, c-format msgid "You cannot specify both --body-data and --body-file.\n" -msgstr "Kan ikke angive både --inet4-only og --inet6-only.\n" +msgstr "Du kan ikke angive bÃ¥de --body-data og --body-file.\n" #: src/main.c:1909 #, c-format msgid "This version does not have support for IRIs\n" -msgstr "Denne version understøtter ikke IRI'er.\n" +msgstr "Denne version understøtter ikke IRI'er\n" #: src/main.c:2009 -#, fuzzy, c-format -#| msgid "" -#| "-k can be used together with -O only if outputting to a regular file.\n" +#, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -"-k kan kun bruges sammen med -O hvis udskrivning er til en almindelig fil.\n" +"-k og -r kan kun bruges sammen med -O ved udskrivning til en almindelig " +"fil.\n" #: src/main.c:2015 -#, fuzzy, c-format -#| msgid "" -#| "-k can be used together with -O only if outputting to a regular file.\n" +#, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" -"-k kan kun bruges sammen med -O hvis udskrivning er til en almindelig fil.\n" +"--convert-links og --convert-file-only kan kun bruges sammen ved udskrift " +"til en almindelig fil.\n" #: src/main.c:2026 -#, fuzzy, c-format -#| msgid "Failed to unlink symlink %s: %s\n" +#, c-format msgid "Failed to init libcares\n" -msgstr "Kan ikke aflænke den symbolske lænke %s: %s\n" +msgstr "Kunne ikke initialisere libcares\n" #: src/main.c:2032 #, c-format msgid "Failed to init c-ares channel\n" -msgstr "" +msgstr "Kunne ikke initialisere c-ares-kanal\n" #: src/main.c:2055 -#, fuzzy, c-format -#| msgid "%s: unable to resolve host address %s\n" +#, c-format msgid "Failed to parse IP address '%s'\n" -msgstr "%s: kan ikke evaluere værtsadresse %s\n" +msgstr "Kunne ikke fortolke “%s†som IP-adresse\n" #: src/main.c:2066 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" -msgstr "" +msgstr "Kunne ikke angive “%s†som DNS-servere (%d)\n" #: src/main.c:2201 #, c-format @@ -3074,201 +2786,191 @@ msgid "No URLs found in %s.\n" msgstr "Fandt ingen URLer i %s.\n" #: src/main.c:2217 -#, fuzzy, c-format -#| msgid "Unable to delete %s: %s\n" +#, c-format msgid "Unable to parse metalink file %s.\n" -msgstr "Kan ikke slette %s: %s\n" +msgstr "Kan ikke fortolke metalink-filen %s.\n" #: src/main.c:2247 src/metalink.c:337 -#, fuzzy, c-format -#| msgid "Failed to load certificates from %s\n" +#, c-format msgid "Could not download all resources from %s.\n" -msgstr "Kunne ikke indlæse certifikater fra %s\n" +msgstr "Kunne ikke hente alle ressourcer fra %s.\n" #: src/main.c:2274 -#, fuzzy, c-format -#| msgid "" -#| "FINISHED --%s--\n" -#| "Downloaded: %d files, %s in %s (%s)\n" +#, c-format msgid "" "FINISHED --%s--\n" "Total wall clock time: %s\n" "Downloaded: %d files, %s in %s (%s)\n" msgstr "" -"FÆRDIG --%s--\n" -"Hentede %d filer, %s på %s (%s)\n" +"FÆRDIG --%s--\n" +"Samlet varighed: %s\n" +"Hentede: %d filer, %s pÃ¥ %s (%s)\n" #: src/main.c:2288 #, c-format msgid "Download quota of %s EXCEEDED!\n" -msgstr "Hente-kvote på %s OVERSKREDET!\n" +msgstr "Hente-kvote pÃ¥ %s OVERSKREDET!\n" #: src/metalink.c:93 msgid "-O not supported for metalink download. Ignoring.\n" -msgstr "" +msgstr "-O understøttes ikke til metalink-download. Ignorerer.\n" #: src/metalink.c:172 #, c-format msgid "[--trust-server-names %s, --directory-prefix=%s]\n" -msgstr "" +msgstr "[--trust-server-names %s, --directory-prefix=%s]\n" #: src/metalink.c:176 -#, fuzzy, c-format -#| msgid "Proxy tunneling failed: %s" +#, c-format msgid "Planned metalink file: %s\n" -msgstr "Proxytunnel slog fejl: %s" +msgstr "Planlagt metalink-fil: %s\n" #: src/metalink.c:179 #, c-format msgid "Secured metalink file: %s\n" -msgstr "" +msgstr "Sikret metalink-fil: %s\n" #: src/metalink.c:184 msgid "Rejecting metalink file. Unsafe name.\n" -msgstr "" +msgstr "Afviser metalink-fil. Usikkert navn.\n" #: src/metalink.c:238 #, c-format msgid "Processing metaurl %s...\n" -msgstr "" +msgstr "Behandler metaurl %s …\n" #: src/metalink.c:251 #, c-format msgid "Rejecting metaurl file %s. Unsafe name.\n" -msgstr "" +msgstr "Afviser metaurl-filen %s. Usikkert navn.\n" #: src/metalink.c:268 #, c-format msgid "Failed to download %s. Skipping metaurl.\n" -msgstr "" +msgstr "Kunne ikke hente %s. Springer metaurl over.\n" #: src/metalink.c:285 -#, fuzzy, c-format -#| msgid "Unable to delete %s: %s\n" +#, c-format msgid "Unable to parse metaurl file %s.\n" -msgstr "Kan ikke slette %s: %s\n" +msgstr "Kan ikke fortolke metaurl-filen %s.\n" #: src/metalink.c:354 msgid "Metaurls processing returned with error.\n" -msgstr "" +msgstr "Metaurl-behandling returnerede med fejl.\n" #: src/metalink.c:386 #, c-format msgid "Resource type %s not supported, ignoring...\n" -msgstr "" +msgstr "Ressourcetypen %s understøttes ikke; ignorerer …\n" #: src/metalink.c:507 msgid "Could not open downloaded file.\n" -msgstr "" +msgstr "Kunne ikke Ã¥bne hentet fil.\n" #: src/metalink.c:512 #, c-format msgid "Computing size for %s\n" -msgstr "" +msgstr "Beregner størrelse af %s\n" #: src/metalink.c:517 msgid "File size not declared. Skipping check.\n" -msgstr "" +msgstr "Filstørrelsen er ikke erklæret. Springer kontrol over.\n" #: src/metalink.c:525 msgid "Could not get downloaded file's size.\n" -msgstr "" +msgstr "Kunne ikke finde størrelsen af den hentede fil.\n" #: src/metalink.c:537 -#, fuzzy, c-format -#| msgid "No such file %s.\n" +#, c-format msgid "Size mismatch for file %s.\n" -msgstr "Ingen fil ved navn %s.\n" +msgstr "Størrelsen stemmer ikke for filen %s.\n" #: src/metalink.c:545 msgid "Size matches.\n" -msgstr "" +msgstr "Størrelsen stemmer.\n" #: src/metalink.c:598 #, c-format msgid "Computing checksum for %s\n" -msgstr "" +msgstr "Beregner kontrolsum for %s\n" #: src/metalink.c:676 msgid "Checksum matches.\n" -msgstr "" +msgstr "Kontrolsummen stemmer.\n" #: src/metalink.c:681 #, c-format msgid "Checksum mismatch for file %s.\n" -msgstr "" +msgstr "Kontrolsummen stemmer ikke for filen %s.\n" #: src/metalink.c:720 msgid "Could not open downloaded file for signature verification.\n" -msgstr "" +msgstr "Kunne ikke Ã¥bne hentet fil til bekræftelse af signatur.\n" #: src/metalink.c:778 #, c-format msgid "GPGME data_new_from_mem: %s\n" -msgstr "" +msgstr "GPGME data_new_from_mem: %s\n" #: src/metalink.c:790 #, c-format msgid "GPGME op_verify: %s\n" -msgstr "" +msgstr "GPGME op_verify: %s\n" #: src/metalink.c:803 msgid "GPGME op_verify_result: NULL\n" -msgstr "" +msgstr "GPGME op_verify_result: NULL\n" #: src/metalink.c:819 msgid "Signature validation succeeded.\n" -msgstr "" +msgstr "Signatur blev valideret.\n" #: src/metalink.c:827 msgid "Invalid signature. Rejecting resource.\n" -msgstr "" +msgstr "Ugyldig signatur. Afviser ressourcen.\n" #: src/metalink.c:836 msgid "Data matches signature, but signature is not trusted.\n" -msgstr "" +msgstr "Data stemmer med signatur, men der er ikke tillid til signaturen.\n" #: src/metalink.c:863 -#, fuzzy -#| msgid "No certificate found\n" msgid "No checksums found.\n" -msgstr "Intet certifikat fundet\n" +msgstr "Ingen kontrolsummer fundet.\n" #: src/metalink.c:869 #, c-format msgid "Failed to download %s. Skipping resource.\n" -msgstr "" +msgstr "Kunne ikke hente %s. Springer ressourcen over.\n" #: src/metalink.c:876 #, c-format msgid "File %s retrieved but size does not match. \n" -msgstr "" +msgstr "Filen %s blev hentet, men størrelsen stemmer ikke. \n" #: src/metalink.c:883 #, c-format msgid "File %s retrieved but checksum does not match. \n" -msgstr "" +msgstr "Filen %s blev hentet, men kontrolsummen stemmer ikke. \n" #: src/metalink.c:892 #, c-format msgid "File %s retrieved but signature does not match. \n" -msgstr "" +msgstr "Filen %s blev hentet, men signaturen stemmer ikke. \n" #: src/metalink.c:1111 -#, fuzzy, c-format -#| msgid "Removing %s.\n" +#, c-format msgid "Renaming %s to %s.\n" -msgstr "Fjerner %s.\n" +msgstr "Omdøber %s til %s.\n" #: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" -msgstr "Fortsætter i baggrunden.\n" +msgstr "Fortsætter i baggrunden.\n" #: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" -msgstr "Fortsætter i baggrunden, pid %lu.\n" +msgstr "Fortsætter i baggrunden, pid %lu.\n" #: src/mswindows.c:291 src/utils.c:502 #, c-format @@ -3278,12 +2980,12 @@ msgstr "Uddata vil blive skrevet til %s.\n" #: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" -msgstr "" +msgstr "fake_fork_child() mislykkedes\n" #: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" -msgstr "" +msgstr "fake_fork() mislykkedes\n" #: src/mswindows.c:460 src/mswindows.c:467 #, c-format @@ -3293,86 +2995,82 @@ msgstr "%s: Fandt ingen brugbar sokkel-driver.\n" #: src/mswindows.c:647 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" -msgstr "" +msgstr "ioctl() mislykkedes. Soklen kunne ikke indstilles som blokerende.\n" #: src/netrc.c:373 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" -msgstr "%s: %s:%d: advarsel: Symbolet %s fundet før noget maskinenavn\n" +msgstr "%s: %s:%d: advarsel: Symbolet %s fundet før noget maskinenavn\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" -msgstr "%s: %s:%d: ukendt symbol '%s'\n" +msgstr "%s: %s:%d: ukendt symbol “%sâ€\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" -msgstr "Brug: %s NETRC [VÆRTSNAVN]\n" +msgstr "Brug: %s NETRC [VÆRTSNAVN]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" -msgstr "%s: 'stat' fejlede for %s: %s\n" +msgstr "%s: “stat†fejlede for %s: %s\n" #: src/openssl.c:129 msgid "WARNING: using a weak random seed.\n" -msgstr "ADVARSEL: bruger en svag tilfældig seed.\n" +msgstr "ADVARSEL: bruger en svag tilfældig seed.\n" #: src/openssl.c:209 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" -"Kunne ikke seede pseudotilfældig talgenerator; prøv at bruge --random-file.\n" +"Kunne ikke seede pseudotilfældig talgenerator; prøv at bruge --random-file.\n" #: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "" +msgstr "Din OpenSSL-version er for gammel til at understøtte TLS 1.3\n" #: src/openssl.c:278 msgid "Your OpenSSL version is too old to support TLSv1.1\n" -msgstr "" +msgstr "Din OpenSSL-version er for gammel til at understøtte TLSv1.1\n" #: src/openssl.c:282 msgid "Your OpenSSL version is too old to support TLSv1.2\n" -msgstr "" +msgstr "Din OpenSSL-version er for gammel til at understøtte TLSv1.2\n" #: src/openssl.c:288 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" +"OpenSSL: Værdien %d for tilvalget “secure-protocol†er ikke implementeret\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "This version does not have support for IRIs\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "Denne version understøtter ikke IRI'er.\n" +msgstr "Din OpenSSL-version understøtter ikke tilvalget “%sâ€.\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "Det kan mÃ¥ske hjælpe at kompilere Wget og/eller OpenSSL igen.\n" #: src/openssl.c:341 -#, fuzzy, c-format -#| msgid "%s: Invalid URL %s: %s\n" +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: Ugyldig URL %s: %s\n" +msgstr "OpenSSL: Ugyldig cipher-liste: %s\n" #: src/openssl.c:368 msgid "OpenSSL: Failed set trust to partial chain\n" -msgstr "" +msgstr "OpenSSL: Mislykket angivelse af tillid til “partial chainâ€\n" #: src/openssl.c:374 -#, fuzzy -#| msgid "Failed to load certificates from %s\n" msgid "OpenSSL: Failed to allocate verification param\n" -msgstr "Kunne ikke indlæse certifikater fra %s\n" +msgstr "OpenSSL: Kunne ikke allokere verifikationsparameter\n" #: src/openssl.c:852 -#, fuzzy -#| msgid "Could not seed PRNG; consider using --random-file.\n" msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "" -"Kunne ikke seede pseudotilfældig talgenerator; prøv at bruge --random-file.\n" +"ADVARSEL: Kunne ikke seede pseudotilfældig talgenerator. Prøv --random-" +"file.\n" #: src/openssl.c:1072 #, c-format @@ -3393,9 +3091,9 @@ msgstr " De udstedte certifikat er endnu ikke gyldigt.\n" #: src/openssl.c:1094 msgid " Issued certificate has expired.\n" -msgstr " Det udstedte certifikat er udløbet.\n" +msgstr " Det udstedte certifikat er udløbet.\n" -# 'common name' kan f.eks. være et personnavn. Eksempel findes på +# 'common name' kan f.eks. være et personnavn. Eksempel findes pÃ¥ # http://tools.ietf.org/html/rfc5280 #: src/openssl.c:1182 #, c-format @@ -3404,9 +3102,9 @@ msgid "" "\trequested host name %s.\n" msgstr "" "%s: intet certifikatsubjekts alternative navn svarer til det forspurgte " -"værtsnavn %s.\n" +"værtsnavn %s.\n" -# 'common name' kan f.eks. være et personnavn. Eksempel findes på +# 'common name' kan f.eks. være et personnavn. Eksempel findes pÃ¥ # http://tools.ietf.org/html/rfc5280 #: src/openssl.c:1201 #, c-format @@ -3414,7 +3112,7 @@ msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" " %s: certifikatets trivialnavn %s svarer ikke til det forespurgte " -"værtsnavn %s.\n" +"værtsnavn %s.\n" #: src/openssl.c:1233 #, c-format @@ -3424,13 +3122,13 @@ msgid "" " (that is, it is not the real %s).\n" msgstr "" " %s: certifikatets trivialnavn er ugyldigt (indeholder et NUL-tegn).\n" -" Dette kan være et tegn på at værten ikke er den, den udgiver sig for\n" -" (altså at det ikke er den rigtige %s).\n" +" Dette kan være et tegn pÃ¥ at værten ikke er den, den udgiver sig for\n" +" (altsÃ¥ at det ikke er den rigtige %s).\n" #: src/openssl.c:1258 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" -msgstr "Brug '--no-check-certificate' for at forbinde til %s på usikker vis.\n" +msgstr "Brug “--no-check-certificate†for at forbinde til %s pÃ¥ usikker vis.\n" #: src/progress.c:260 #, c-format @@ -3444,25 +3142,22 @@ msgstr "" #: src/progress.c:545 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" -msgstr "Ugyldig punkt-stilangivelse %s; forbliver uændret.\n" +msgstr "Ugyldig punkt-stilangivelse %s; forbliver uændret.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. #: src/progress.c:1006 -#, fuzzy, c-format -#| msgid " eta %s" +#, c-format msgid " eta %s" -msgstr " tid %s" +msgstr " tid %s" #. TRANSLATORS: The meaning is "elapsed time", and it is shown #. * next to the progress bar once the download is done. #. * This should not take up more room than #. * available here (6 columns). Abbreviate if necessary. #: src/progress.c:1312 -#, fuzzy -#| msgid " in " msgid " in " -msgstr " om " +msgstr " om " #: src/ptimer.c:158 #, c-format @@ -3474,6 +3169,8 @@ msgstr "Kan ikke finde frekvens af REALTIME-ur: %s\n" msgid "" "nofollow attribute found in %s. Will not follow any links on this page\n" msgstr "" +"Attributten nofollow blev fundet i %s. Følger ikke nogen links pÃ¥ denne " +"side\n" #: src/recur.c:512 #, c-format @@ -3481,31 +3178,30 @@ msgid "Removing %s since it should be rejected.\n" msgstr "Fjerner %s fordi den skal forkastes.\n" #: src/res.c:394 -#, fuzzy, c-format -#| msgid "Cannot open %s: %s" +#, c-format msgid "Cannot open %s: %s\n" -msgstr "Kan ikke åbne %s: %s" +msgstr "Kan ikke Ã¥bne %s: %s\n" #: src/res.c:556 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Henter robots.txt; ignorer eventuelle fejlmeldinger.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Fejl ved fortolkning af proxy-URL %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" -msgstr "Fejl i proxy URL %s: Skal være HTTP.\n" +msgstr "Fejl i proxy URL %s: Skal være HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d omdirigeringer overskredet.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3513,12 +3209,12 @@ msgstr "" "Giver op.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" msgstr "" -"Prøver igen.\n" +"Prøver igen.\n" "\n" #: src/spider.c:77 @@ -3526,7 +3222,7 @@ msgid "" "Found no broken links.\n" "\n" msgstr "" -"Fandt ingen ødelagte henvisninger.\n" +"Fandt ingen ødelagte henvisninger.\n" "\n" #: src/spider.c:84 @@ -3538,10 +3234,10 @@ msgid_plural "" "Found %d broken links.\n" "\n" msgstr[0] "" -"Fandt %d ødelagt henvisning.\n" +"Fandt %d ødelagt henvisning.\n" "\n" msgstr[1] "" -"Fandt %d ødelagte henvisninger.\n" +"Fandt %d ødelagte henvisninger.\n" "\n" #: src/url.c:688 @@ -3550,20 +3246,16 @@ msgstr "Ingen fejl" # scheme? #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Ikke-understøttet skema %s" +msgstr "Skema ikke understøttet" #: src/url.c:690 msgid "HTTPS support not compiled in" -msgstr "Understøttelse af HTTPS er ikke kompileret med" +msgstr "Understøttelse af HTTPS er ikke kompileret med" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "Understøttelse af HTTPS er ikke kompileret med" +msgstr "Understøttelse af FTPS er ikke kompileret med" # scheme? #: src/url.c:692 @@ -3572,7 +3264,7 @@ msgstr "Skema mangler" #: src/url.c:693 msgid "Invalid host name" -msgstr "Værtsnavnet er ugyldigt" +msgstr "Værtsnavnet er ugyldigt" #: src/url.c:694 msgid "Bad port number" @@ -3588,17 +3280,15 @@ msgstr "Uafsluttet numerisk IPv6-adresse" #: src/url.c:697 msgid "IPv6 addresses not supported" -msgstr "IPv6-adresser understøttes ikke" +msgstr "IPv6-adresser understøttes ikke" #: src/url.c:698 msgid "Invalid IPv6 numeric address" msgstr "Ugyldig numerisk IPv6-adresse" #: src/url.c:1645 -#, fuzzy -#| msgid "Incomplete or invalid multibyte sequence encountered\n" msgid "Unconvertable multibyte sequence encountered\n" -msgstr "Ufuldstændig eller ugyldig flerbytesekvens fundet\n" +msgstr "Ukonverterbar flerbytesekvens fundet\n" #: src/utils.c:122 #, c-format @@ -3611,54 +3301,49 @@ msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Kunne ikke allokere %ld byte; hukommelsen opbrugt.\n" #: src/utils.c:348 -#, fuzzy, c-format -#| msgid "%s: aprintf: text buffer is too big (%ld bytes), aborting.\n" +#, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" -msgstr "%s: aprintf: tekstbuffer er for stor (%ld byte), afbryder.\n" +msgstr "%s: aprintf: tekstbuffer er for stor (%d byte), afbryder.\n" #: src/utils.c:500 #, c-format msgid "Continuing in background, pid %d.\n" -msgstr "Fortsætter i baggrunden, pid %d.\n" +msgstr "Fortsætter i baggrunden, pid %d.\n" #: src/utils.c:551 #, c-format msgid "Failed to unlink symlink %s: %s\n" -msgstr "Kan ikke aflænke den symbolske lænke %s: %s\n" +msgstr "Kan ikke aflænke den symbolske lænke %s: %s\n" #: src/utils.c:872 -#, fuzzy, c-format -#| msgid "Failed to load certificates from %s\n" +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "Kunne ikke indlæse certifikater fra %s\n" +msgstr "Kunne ikke Fopen filen %s\n" #: src/utils.c:878 -#, fuzzy, c-format -#| msgid "Failed to get certificate key from %s\n" +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Kunne ikke få certifikatnøgle fra %s\n" +msgstr "Kunne ikke opnÃ¥ fildeskriptor for filen %s\n" #: src/utils.c:885 #, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "" +msgstr "Kunne ikke køre stat pÃ¥ filen %s (kontrollér rettigheder)\n" #: src/utils.c:895 #, c-format msgid "File %s changed since the last check. Security check failed.\n" -msgstr "" +msgstr "Filen %s er ændret siden sidste kontrol. Sikkerhedskontrol fejlet.\n" #: src/utils.c:930 -#, fuzzy, c-format -#| msgid "Failed to load certificates from %s\n" +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Kunne ikke indlæse certifikater fra %s\n" +msgstr "Kunne ikke Ã¥bne filen %s; Ã¥rsag: %s\n" #: src/utils.c:936 -#, fuzzy, c-format -#| msgid "Failed to load certificates from %s\n" +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Kunne ikke indlæse certifikater fra %s\n" +msgstr "Kunne ikke køre stat pÃ¥ filen %s; fejl: %s\n" #: src/utils.c:946 #, c-format @@ -3666,47 +3351,48 @@ msgid "" "Trying to open file %s but it changed since last check. Security check " "failed.\n" msgstr "" +"Forsøger at finde Ã¥ben filen %s, men den er ændret siden sidste kontrol. " +"Sikkerhedskontrol fejlet.\n" #: src/utils.c:2443 #, c-format msgid "Invalid regular expression %s, PCRE2 error %d\n" -msgstr "" +msgstr "Ugyldigt regulært udtryk %s, PCRE2-fejl %d\n" #: src/utils.c:2460 src/utils.c:2483 #, c-format msgid "Invalid regular expression %s, %s\n" -msgstr "" +msgstr "Ugyldigt regulært udtryk %s, %s\n" #: src/utils.c:2513 src/utils.c:2535 src/utils.c:2559 -#, fuzzy, c-format -#| msgid "Error writing to %s: %s\n" +#, c-format msgid "Error while matching %s: %d\n" -msgstr "Fejl ved skrivning til %s: %s\n" +msgstr "Fejl ved match af %s: %d\n" #: src/utils.c:2852 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "Springer nøgle med forkert størrelse over (%d/%d): %s\n" #: src/warc.c:217 msgid "Error setting WARC file position.\n" -msgstr "" +msgstr "Fejl ved angivelse af WARC-filposition.\n" #: src/warc.c:224 msgid "Error flushing WARC file to disk.\n" -msgstr "" +msgstr "Fejl ved tømning af WARC-filbuffer til disken.\n" #: src/warc.c:234 msgid "Error duplicating WARC file file descriptor.\n" -msgstr "" +msgstr "Fejl ved duplikering af WARC-fils fildeskriptor.\n" #: src/warc.c:245 msgid "Error opening GZIP stream to WARC file.\n" -msgstr "" +msgstr "Fejl ved Ã¥bning af GZIP-strøm til WARC-filen.\n" #: src/warc.c:830 msgid "Error writing warcinfo record to WARC file.\n" -msgstr "" +msgstr "Fejl ved skrivning af warcinfo-post til WARC-fil.\n" #: src/warc.c:893 #, c-format @@ -3714,24 +3400,26 @@ msgid "" "Opening WARC file %s.\n" "\n" msgstr "" +"Ã…bner WARC-filen %s.\n" +"\n" #: src/warc.c:899 -#, fuzzy, c-format -#| msgid "Error parsing certificate: %s\n" +#, c-format msgid "Error opening WARC file %s.\n" -msgstr "Fejl ved fortolkning af certifikat: %s\n" +msgstr "Fejl ved Ã¥bning af WARC-filen %s.\n" #: src/warc.c:1095 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" +"CDX-filen indeholder ikke oprindelige URL'er. (Mangler kolonnen “aâ€.)\n" #: src/warc.c:1098 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" -msgstr "" +msgstr "CDX-filen indeholder ikke kontrolsummer. (Mangler kolonnen “kâ€.)\n" #: src/warc.c:1101 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" -msgstr "" +msgstr "CDX-filen indeholder ikke post-id'er. (Mangler kolonnen “uâ€.)\n" #: src/warc.c:1125 #, c-format @@ -3742,91 +3430,76 @@ msgid_plural "" "Loaded %d records from CDX.\n" "\n" msgstr[0] "" +"Indlæste %d post fra CDX.\n" +"\n" msgstr[1] "" +"Indlæste %d poster fra CDX.\n" +"\n" #: src/warc.c:1171 #, c-format msgid "Could not read CDX file %s for deduplication.\n" -msgstr "" +msgstr "Kunne ikke læse CDX-filen %s til deduplikering.\n" #: src/warc.c:1181 msgid "Could not open temporary WARC manifest file.\n" -msgstr "" +msgstr "Kunne ikke Ã¥bne midlertidig WARC-manifestfil.\n" #: src/warc.c:1191 msgid "Could not open temporary WARC log file.\n" -msgstr "" +msgstr "Kunne ikke Ã¥bne midlertidig WARC-logfil.\n" #: src/warc.c:1200 msgid "Could not open WARC file.\n" -msgstr "" +msgstr "Kunne ikke Ã¥bne WARC-fil.\n" #: src/warc.c:1209 -#, fuzzy -#| msgid "Could not find proxy host.\n" msgid "Could not open CDX file for output.\n" -msgstr "Fandt ikke proxy-server.\n" +msgstr "Kunne ikke Ã¥bne CDX-fil til udskrift.\n" #: src/warc.c:1239 msgid "Could not open temporary WARC file.\n" -msgstr "" +msgstr "Kunne ikke Ã¥bne midlertidig WARC-fil.\n" #: src/warc.c:1515 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" -msgstr "" +msgstr "Fandt eksakt match i CDX-fil. Gemmer “revisitâ€-post til WARC.\n" #~ msgid "Unknown system error" #~ msgstr "Ukendt systemfejl" -#, c-format #~ msgid "%s: option '%s' is ambiguous\n" #~ msgstr "%s: flaget '%s' er flertydig\n" -#, c-format #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s: flaget '--%s' tillader ikke et argument\n" -#, c-format #~ msgid "%s: option '%c%s' doesn't allow an argument\n" #~ msgstr "%s: flaget '%c%s' tillader ikke et argument\n" -#, c-format #~ msgid "%s: option '--%s' requires an argument\n" -#~ msgstr "%s: flaget '--%s' kræver et argument\n" +#~ msgstr "%s: flaget '--%s' kræver et argument\n" -#, c-format #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: ukendt flag '--%s'\n" -#, c-format #~ msgid "%s: unrecognized option '%c%s'\n" #~ msgstr "%s: ukendt flag '%c%s'\n" -#, c-format #~ msgid "%s: invalid option -- '%c'\n" #~ msgstr "%s: ugyldigt flag -- %c\n" -#, c-format #~ msgid "%s: option requires an argument -- '%c'\n" -#~ msgstr "%s: flaget kræver et argument -- %c\n" +#~ msgstr "%s: flaget kræver et argument -- %c\n" -#, c-format #~ msgid "%s: option '-W %s' is ambiguous\n" #~ msgstr "%s: flaget '-W %s' er flertydigt\n" -#, c-format #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: flaget '-W %s' tillader ikke et argument\n" -#, c-format #~ msgid "%s: option '-W %s' requires an argument\n" -#~ msgstr "%s: flaget '%s' kræver et argument\n" - -#~ msgid "`" -#~ msgstr "'" - -#~ msgid "'" -#~ msgstr "'" +#~ msgstr "%s: flaget '%s' kræver et argument\n" #~ msgid "memory exhausted" #~ msgstr "hukommelse opbrugt" @@ -3834,11 +3507,9 @@ msgstr "" #~ msgid "Authorization failed.\n" #~ msgstr "Autorisation mislykkedes\n" -#, c-format #~ msgid "idn_decode failed (%d): %s\n" #~ msgstr "idn_decode mislykkedes (%d): %s\n" -#, c-format #~ msgid "" #~ "\n" #~ "%s received.\n" @@ -3850,9 +3521,8 @@ msgstr "" #~ msgstr " -w, --wait=SEKUNDER vent SEKUNDER mellem hentninger.\n" #~ msgid "Mail bug reports and suggestions to <bug-wget@gnu.org>.\n" -#~ msgstr "Rapportér fejl og send forslag til <bug-wget@gnu.org>.\n" +#~ msgstr "Rapportér fejl og send forslag til <bug-wget@gnu.org>.\n" -#, c-format #~ msgid "File `%s' already there; not retrieving.\n" #~ msgstr "Filen '%s' findes allerede, hentes ikke.\n" @@ -3860,7 +3530,7 @@ msgstr "" #~ "WARNING: Can't reopen standard output in binary mode;\n" #~ " downloaded file may contain inappropriate line endings.\n" #~ msgstr "" -#~ "ADVARSEL: Kan ikke genåbne standard-uddata i binær tilstand;\n" +#~ "ADVARSEL: Kan ikke genÃ¥bne standard-uddata i binær tilstand;\n" #~ " den hentede fil kan indeholde forkerte linjeafslutninger.\n" #~ msgid "%s: illegal option -- %c\n" @@ -3870,11 +3540,11 @@ msgstr "" #~ "GNU Wget %s built on VMS %s %s.\n" #~ "\n" #~ msgstr "" -#~ "GNU Wget %s bygget på VMS %s %s.\n" +#~ "GNU Wget %s bygget pÃ¥ VMS %s %s.\n" #~ "\n" #~ msgid "Currently maintained by Micah Cowan <micah@cowan.name>.\n" -#~ msgstr "Vedligeholdes i øjeblikket af Micah Cowan <micah@cowan.name>.\n" +#~ msgstr "Vedligeholdes i øjeblikket af Micah Cowan <micah@cowan.name>.\n" #~ msgid "Error in Set-Cookie, field `%s'" #~ msgstr "fejl ved Set-Cookie, felt '%s'" @@ -3893,16 +3563,16 @@ msgstr "" #~ msgstr " [%s tilbage]" #~ msgid "Host not found" -#~ msgstr "Vært ikke fundet" +#~ msgstr "Vært ikke fundet" #~ msgid "Failed to set up an SSL context\n" -#~ msgstr "Kunne ikke opsætte et SSL-miljø\n" +#~ msgstr "Kunne ikke opsætte et SSL-miljø\n" #~ msgid "Trying without the specified certificate\n" -#~ msgstr "Prøver uden det angivne certifikat\n" +#~ msgstr "Prøver uden det angivne certifikat\n" #~ msgid "End of file while parsing headers.\n" -#~ msgstr "Filafslutning fundet ved læsning af toptekster.\n" +#~ msgstr "Filafslutning fundet ved læsning af toptekster.\n" #~ msgid "" #~ "\n" @@ -3911,9 +3581,9 @@ msgstr "" #~ "\n" #~ msgstr "" #~ "\n" -#~ "Fortsat hentning mislykkedes for denne fil, hvilket er i modsætning til '-" +#~ "Fortsat hentning mislykkedes for denne fil, hvilket er i modsætning til '-" #~ "c'.\n" -#~ "Nægter at afkorte eksisterende fil '%s'.\n" +#~ "Nægter at afkorte eksisterende fil '%s'.\n" #~ "\n" #~ msgid " (%s to go)" @@ -3948,9 +3618,9 @@ msgstr "" #~ msgstr "" #~ "Opstart:\n" #~ " -V, --version vis Wget's versionsnummer og afslut.\n" -#~ " -h, --help udskriv denne hjælpetekst.\n" -#~ " -b, --background kør i baggrunden efter opstart.\n" -#~ " -e, --execute=KOMMANDO udfør en '.wgetrc'-kommando.\n" +#~ " -h, --help udskriv denne hjælpetekst.\n" +#~ " -b, --background kør i baggrunden efter opstart.\n" +#~ " -e, --execute=KOMMANDO udfør en '.wgetrc'-kommando.\n" #~ "\n" #~ msgid "" @@ -3970,19 +3640,19 @@ msgstr "" #~ " --egd-file=FILE file name of the EGD socket.\n" #~ "\n" #~ msgstr "" -#~ "Logning og indlæsning:\n" +#~ "Logning og indlæsning:\n" #~ " -o, --output-file=FIL log beskeder til FIL.\n" -#~ " -a, --append-output=FIL tilføj beskeder til slutningen af FIL.\n" -#~ " -d, --debug skriv fejlsøgningsinformation.\n" +#~ " -a, --append-output=FIL tilføj beskeder til slutningen af FIL.\n" +#~ " -d, --debug skriv fejlsøgningsinformation.\n" #~ " -q, --quiet stille (ingen udskrifter).\n" -#~ " -v, --verbose vær udførlig (standard).\n" -#~ " -nv, --non-verbose mindre udførlig, men ikke stille.\n" +#~ " -v, --verbose vær udførlig (standard).\n" +#~ " -nv, --non-verbose mindre udførlig, men ikke stille.\n" #~ " -i, --input-file=FIL hent URLer fundet i FIL.\n" #~ " -F, --force-html behandl inddatafil som HTML.\n" -#~ " -B, --base=URL foranstiller URL til relative lænker i -F -" +#~ " -B, --base=URL foranstiller URL til relative lænker i -F -" #~ "i fil.\n" #~ " --sslcertfile=FIL valgbart klient-certifikat.\n" -#~ " --sslcertkey=NØGLEFIL valgbar nøglefil for dette certifikat.\n" +#~ " --sslcertkey=NØGLEFIL valgbar nøglefil for dette certifikat.\n" #~ " --egd-file=FIL filnavn for EGD-soklen.\n" #~ "\n" @@ -4014,27 +3684,27 @@ msgstr "" #~ "\n" #~ msgstr "" #~ "Hentning:\n" -#~ " --bind-address=ADRESSE bind til ADRESSE (værtsnavn eller IP) på " -#~ "lokal vært.\n" -#~ " -t, --tries=ANTAL maksimalt antal forsøg (0 for uendelig).\n" +#~ " --bind-address=ADRESSE bind til ADRESSE (værtsnavn eller IP) pÃ¥ " +#~ "lokal vært.\n" +#~ " -t, --tries=ANTAL maksimalt antal forsøg (0 for uendelig).\n" #~ " -O --output-document=FIL skriv dokumenter til FIL.\n" -#~ " -nc, --no-clobber berør ikke eksisterende filer, eller " +#~ " -nc, --no-clobber berør ikke eksisterende filer, eller " #~ "brug .#-endelser.\n" -#~ " -c, --continue fortsæt hentning af en eksisterende fil.\n" -#~ " --progress=TYPE vælg type af fremskridtsvisning.\n" -#~ " -N, --timestamping hent ikke filer igen som er ældre end " +#~ " -c, --continue fortsæt hentning af en eksisterende fil.\n" +#~ " --progress=TYPE vælg type af fremskridtsvisning.\n" +#~ " -N, --timestamping hent ikke filer igen som er ældre end " #~ "eksisterende.\n" #~ " -S, --server-response vis svar fra serveren.\n" #~ " --spider hent ikke filer.\n" -#~ " -T, --timeout=SEKUNDER sæt ventetid ved læsning til SEKUNDER.\n" -#~ " -w, --wait=SEKUNDER sæt ventetid mellem filer til SEKUNDER.\n" -#~ " --waitretry=SEKUNDER\twait 1...SEKUNDER mellem forsøg på " -#~ "gentagelse af en hentning.\n" -#~ " --random-wait vent fra 0...2*WAIT sekunder mellem " +#~ " -T, --timeout=SEKUNDER sæt ventetid ved læsning til SEKUNDER.\n" +#~ " -w, --wait=SEKUNDER sæt ventetid mellem filer til SEKUNDER.\n" +#~ " --waitretry=SEKUNDER\twait 1…SEKUNDER mellem forsøg pÃ¥ gentagelse " +#~ "af en hentning.\n" +#~ " --random-wait vent fra 0…2*WAIT sekunder mellem " #~ "modtagelse.\n" -#~ " -Y, --proxy=on/off slå brug af proxy til eller fra.\n" -#~ " -Q, --quota=ANTAL sæt hente-kvote til ANTAL.\n" -#~ " --limit-rate=RATE begræns hentingshastighed til RATE.\n" +#~ " -Y, --proxy=on/off slÃ¥ brug af proxy til eller fra.\n" +#~ " -Q, --quota=ANTAL sæt hente-kvote til ANTAL.\n" +#~ " --limit-rate=RATE begræns hentingshastighed til RATE.\n" #~ "\n" #~ msgid "" @@ -4050,9 +3720,9 @@ msgstr "" #~ "Kataloger:\n" #~ " -nd --no-directories lav ikke kataloger.\n" #~ " -x, --force-directories lav kataloger.\n" -#~ " -nH, --no-host-directories lav ikke ovenstående kataloger.\n" -#~ " -P, --directory-prefix=PRÆFIKS skriv filer til PRÆFIKS/...\n" -#~ " --cut-dirs=ANTAL ignorér ANTAL komponenter af " +#~ " -nH, --no-host-directories lav ikke ovenstÃ¥ende kataloger.\n" +#~ " -P, --directory-prefix=PRÆFIKS skriv filer til PRÆFIKS/…\n" +#~ " --cut-dirs=ANTAL ignorér ANTAL komponenter af " #~ "serverens\n" #~ " katalognavn.\n" #~ "\n" @@ -4081,25 +3751,25 @@ msgstr "" #~ "\n" #~ msgstr "" #~ "HTTP-flag:\n" -#~ " --http-user=BRUGER sæt HTTP-bruger til BRUGER.\n" -#~ " --http-passwd=PASSORD sæt HTTP-adgangskode til PASSORD.\n" -#~ " -C, --cache=on/off tillad (ikke) brug af mellemlager på " +#~ " --http-user=BRUGER sæt HTTP-bruger til BRUGER.\n" +#~ " --http-passwd=PASSORD sæt HTTP-adgangskode til PASSORD.\n" +#~ " -C, --cache=on/off tillad (ikke) brug af mellemlager pÃ¥ " #~ "server.\n" #~ " -E, --html-extension gem alle tekst/html dokumenter med .html " #~ "filkode.\n" #~ " --ignore-length ignorer 'Content-Length' felt i toptekst.\n" -#~ " --header=TEKST sæt TEKST ind som en toptekst.\n" -#~ " --proxy-user=BRUGER sæt proxy-bruger til BRUGER.\n" -#~ " --proxy-passwd=PASSORD sæt proxy-adgangskode til PASSORD.\n" +#~ " --header=TEKST sæt TEKST ind som en toptekst.\n" +#~ " --proxy-user=BRUGER sæt proxy-bruger til BRUGER.\n" +#~ " --proxy-passwd=PASSORD sæt proxy-adgangskode til PASSORD.\n" #~ " --referer=URL brug `Referer: URL' kommando i HTTP-" -#~ "forespørgsel.\n" +#~ "forespørgsel.\n" #~ " -s, --save-headers skriv HTTP-toptekster til fil.\n" #~ " -U, --user-agent=AGENT identificer som AGENT i stedet for \n" #~ " 'Wget/VERSION'.\n" -#~ " --no-http-keep-alive deaktivér HTTP keep-alive (overlevende " +#~ " --no-http-keep-alive deaktivér HTTP keep-alive (overlevende " #~ "forbindelser).\n" #~ " --cookies=off brug ikke infokager.\n" -#~ " --load-cookies=FILE indlæs infokager fra FIL før session.\n" +#~ " --load-cookies=FILE indlæs infokager fra FIL før session.\n" #~ " --save-cookies=FILE gem infokager i FIL efter session.\n" #~ "\n" @@ -4115,8 +3785,8 @@ msgstr "" #~ "FTP-flag:\n" #~ " -nr, --dont-remove-listing fjern ikke `.listing'-filer.\n" #~ " -g, --glob=on/off tolk (ikke) brug af jokertegn i filnavn.\n" -#~ " --passive-ftp brug passiv overførselsmetode.\n" -#~ " --retr-symlinks hent filer (ikke kataloger) der er lænket " +#~ " --passive-ftp brug passiv overførselsmetode.\n" +#~ " --retr-symlinks hent filer (ikke kataloger) der er lænket " #~ "til, ved rekursiv brug.\n" #~ "\n" @@ -4140,12 +3810,12 @@ msgstr "" #~ " -l, --level=ANTAL maksimalt antal rekursionsniveauer " #~ "(0=uendelig).\n" #~ " --delete-after slet hentede filer.\n" -#~ " -k, --convert-links konverter absolutte lænker til relative.\n" -#~ " -K, --backup-converted før fil X konverteres, sikkerhedskopiér " +#~ " -k, --convert-links konverter absolutte lænker til relative.\n" +#~ " -K, --backup-converted før fil X konverteres, sikkerhedskopiér " #~ "som X.orig.\n" -#~ " -m, --mirror sæt passende flag for spejling af " +#~ " -m, --mirror sæt passende flag for spejling af " #~ "servere.\n" -#~ " -p, --page-requisites hent alle billeder osv. der er nødvendige " +#~ " -p, --page-requisites hent alle billeder osv. der er nødvendige " #~ "for at vise HTML siden.\n" #~ "\n" @@ -4176,19 +3846,19 @@ msgstr "" #~ "Hvad er tilladt ved rekursion:\n" #~ " -A, --accept=LISTE liste med tilladte filtyper.\n" #~ " -R, --reject=LISTE liste med ikke-tilladte filtyper.\n" -#~ " -D, --domains=LISTE liste med tilladte domæner.\n" -#~ " --exclude-domains=LISTE liste med ikke-tilladte domæner.\n" -#~ " --follow-ftp følg FTP-lænker fra HTML-dokumenter.\n" -#~ " --follow-tags=LIST komma-separeret liste af fulgte HTML-" -#~ "mærker.\n" -#~ " -G, --ignore-tags=LIST komma-separeret liste af ignorerede " -#~ "HTML-mærker.\n" -#~ " -H, --span-hosts følg lænker til andre værter.\n" -#~ " -L, --relative følg kun relative lænker.\n" +#~ " -D, --domains=LISTE liste med tilladte domæner.\n" +#~ " --exclude-domains=LISTE liste med ikke-tilladte domæner.\n" +#~ " --follow-ftp følg FTP-lænker fra HTML-dokumenter.\n" +#~ " --follow-tags=LIST kommaadskilt liste over fulgte HTML-" +#~ "mærker.\n" +#~ " -G, --ignore-tags=LIST kommaadskilt liste over ignorerede " +#~ "HTML-mærker.\n" +#~ " -H, --span-hosts følg lænker til andre værter.\n" +#~ " -L, --relative følg kun relative lænker.\n" #~ " -I, --include-directories=LISTE liste med tilladte katalognavne.\n" #~ " -X, --exclude-directories=LISTE liste med ikke-tilladte " #~ "katalognavne.\n" -#~ " -np, --no-parent følg ikke lænke til ovenliggende " +#~ " -np, --no-parent følg ikke lænke til ovenliggende " #~ "katalog.\n" #~ "\n" @@ -4198,7 +3868,7 @@ msgstr "" #~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" #~ "GNU General Public License for more details.\n" #~ msgstr "" -#~ "Dette program distribueres i håb om at det bliver fundet nyttigt,\n" +#~ "Dette program distribueres i hÃ¥b om at det bliver fundet nyttigt,\n" #~ "men UDEN NOGEN GARANTIER; ikke engang for SALGBARHED eller\n" #~ "EGNETHED TIL NOGEN SPECIEL OPGAVE.\n" #~ "Se 'GNU General Public License' for detaljer.\n" @@ -4207,16 +3877,16 @@ msgstr "" #~ msgstr "Starter WinHelp %s\n" #~ msgid "%s: Redirection cycle detected.\n" -#~ msgstr "%s: Omdirigering løber i ring.\n" +#~ msgstr "%s: Omdirigering løber i ring.\n" #~ msgid "%s: %s: Not enough memory.\n" #~ msgstr "%s: %s: Ikke nok hukommelse.\n" #~ msgid "Connection to %s:%hu refused.\n" -#~ msgstr "Kontakt med %s:%hu nægtet.\n" +#~ msgstr "Kontakt med %s:%hu nægtet.\n" #~ msgid "Will try connecting to %s:%hu.\n" -#~ msgstr "Vil prøve at kontakte %s:%hu.\n" +#~ msgstr "Vil prøve at kontakte %s:%hu.\n" #~ msgid "" #~ "\n" @@ -4226,12 +3896,12 @@ msgstr "" #~ msgstr "" #~ "\n" #~ "CTRL+Break modtaget, omdirigerer udskrifter til `%s'.\n" -#~ "Kørsel fortsætter i baggrunden.\n" +#~ "Kørsel fortsætter i baggrunden.\n" #~ "Du kan stoppe Wget ved at trykke CTRL+ALT+DELETE.\n" #~ "\n" #~ msgid "Unknown/unsupported protocol" -#~ msgstr "Protokollen er ukendt/ikke understøttet" +#~ msgstr "Protokollen er ukendt/ikke understøttet" #~ msgid "Invalid port specification" #~ msgstr "Port-specifikationen er ugyldig" Binary files differ@@ -3,14 +3,14 @@ # This file is distributed under the same license as the wget package. # Karl Eichwalder <ke@suse.de>, 1998-1999, 2000. # Karl Eichwalder <ke@ke.Central.DE>, 1997-1998. -# Jochen Hein <jochen@jochen.org>, 2001-2022. +# Jochen Hein <jochen@jochen.org>, 2001-2023. # msgid "" msgstr "" -"Project-Id-Version: wget 1.21.3\n" +"Project-Id-Version: wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-02-27 17:59+0100\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-11 19:30+0200\n" "Last-Translator: Jochen Hein <jochen@jochen.org>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" "Language: de\n" @@ -406,12 +406,12 @@ msgstr "Daten-Ãœbertragung abgebrochen.\n" msgid "File %s already there; not retrieving.\n" msgstr "Die Datei %s ist schon vorhanden; kein erneuter Download.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(Versuch:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -421,7 +421,7 @@ msgstr "" "\n" # oder "gesichert"? -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -431,7 +431,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "»%s« wird entfernt.\n" @@ -806,7 +806,7 @@ msgstr "Wiederverwendung der bestehenden Verbindung zu %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Fehler beim Lesen der Proxy-Antwort: %s.\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s FEHLER %d: %s.\n" @@ -942,54 +942,54 @@ msgstr "Länge: " msgid "ignored" msgstr "übergangen" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Warnung: Joker-Zeichen werden bei HTTP nicht unterstützt.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "Spider-Modus eingeschaltet. Es wird geprüft, ob die Datei auf dem Server " "existiert.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Schreiben nach %s nicht möglich (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Ein notwendiges Attribut im empfangenen Header fehlt.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Authentifizierung mit Benutzername/Passwort fehlgeschlagen.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "In die WARC-Datei kann nicht geschrieben werden.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "In die temporäre WARC-Datei kann nicht geschrieben werden.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Es ist nicht möglich, eine SSL-Verbindung herzustellen.\n" # XXX -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Verweis auf %s kann nicht entfernt werden (%s).\n" # Was meint hier location? -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "FEHLER: Umleitung (%d) ohne Ziel.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -997,24 +997,24 @@ msgstr "" "Keine Metalink-Daten in der HTTP-Antwort. Datei wird mittel HTTP GET " "heruntergeladen.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Metalink Header gefunden. Metalink Modus wird verwendet.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" "Die Datei auf dem Server existiert nicht -- Verweis ist nicht gültig!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "»Last-modified«-Kopfzeile fehlt -- Zeitstempel abgeschaltet.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "»Last-modified«-Kopfzeile ungültig -- Zeitstempel übergangen.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1023,16 +1023,16 @@ msgstr "" "Datei auf dem Server nicht neuer als die lokale Datei %s -- kein Download.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Größen stimmen nicht überein (lokal %s) -- erneuter Download.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Datei der Gegenseite ist neuer, erneuter Download.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1040,7 +1040,7 @@ msgid "" msgstr "" "Datei auf dem Server existiert und enhält Verweise -- Download erfolgt.\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1048,7 +1048,7 @@ msgstr "" "Datei auf dem Server existiert, aber enhält keine Verweise -- kein " "Download.\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1058,7 +1058,7 @@ msgstr "" "aber Rekursion ist abgeschaltet -- kein Download.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1066,12 +1066,12 @@ msgstr "" "Datei auf dem Server existiert.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1080,7 +1080,7 @@ msgstr "" "%s (%s) - auf die Standardausgabe geschrieben %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1089,27 +1089,27 @@ msgstr "" "%s (%s) - %s gespeichert [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Verbindung bei Byte %s geschlossen. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Lesefehler bei Byte %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Lesefehler bei Byte %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Qualität des Schutzes »%s« wird nicht unterstützt.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nicht unterstützter Algorithmus »%s«.\n" @@ -1122,7 +1122,7 @@ msgstr "" "%s: WGETRC zeigt auf die Datei »%s«, auf die nicht zugegriffen werden kann: " "%s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: »%s« nicht lesbar (%s).\n" @@ -1450,17 +1450,12 @@ msgstr "" " Verbindung abgelehnt hat\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=FEHLER komma-unterteilte Liste von HTTP-" -"Fehlern\n" -" bei denen erneut versucht wird\n" +" --retry-on-host-error=FEHLER Betrachte Host-Fehler als nicht " +"endgültige, temporäre Fehler\n" #: src/main.c:653 msgid "" @@ -3152,18 +3147,18 @@ msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: Warnung: %s-Wortteil erscheint vor jeglichem Maschinennamen\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: unbekannter Wortteil »%s«\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Aufruf: %s NETRC [HOSTNAME]\n" # stat -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: Aufruf von »stat« für %s nicht möglich: %s\n" @@ -3199,14 +3194,15 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: Option %d zu »secure-protocol« ist nicht implementiert\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "Ihre OpenSSL-Version ist zu alt, um TLSv1.3 zu unterstützen\n" +msgstr "Ihre OpenSSL-Version unterstützt die Option »%s« nicht.\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" msgstr "" +"Neukompilieren von Wget oder OpenSSL könnte in dieser Situation\n" +"helfen.\n" #: src/openssl.c:341 #, c-format @@ -3348,22 +3344,22 @@ msgstr "»%s« kann nicht geöffnet werden: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "»robots.txt« wird geladen; bitte Fehler ignorieren.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Fehler beim Auswerten der Proxy-URL »%s«: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Fehler in der Proxy-URL »%s«: Es muss eine HTTP-URL sein.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d: Die Anzahl der Verweise ist zu groß.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3371,7 +3367,7 @@ msgstr "" "Aufgegeben.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3408,20 +3404,16 @@ msgid "No error" msgstr "Kein Fehler" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Nicht unterstütztes Schema %s" +msgstr "Nicht unterstütztes Schema" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "Keine HTTPS-Unterstützung einkompiliert" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "Keine HTTPS-Unterstützung einkompiliert" +msgstr "Keine FTPS-Unterstützung einkompiliert" #: src/url.c:692 msgid "Scheme missing" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.9.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2004-12-15 19:46+0000\n" "Last-Translator: Simos Xenitellis <simos74@gmx.net>\n" "Language-Team: Greek <nls@tux.hellug.gr>\n" @@ -405,19 +405,19 @@ msgstr "Η μεταφοÏά δεδομÎνων διακόπηκε ανώμαλα msgid "File %s already there; not retrieving.\n" msgstr "Το αÏχείο `%s' υπάÏχει ήδη, δεν επανακτάται.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(Ï€Ïοσπάθεια:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, fuzzy, c-format #| msgid "" #| "%s (%s) - `%s' saved [%ld]\n" @@ -430,7 +430,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "ΔιαγÏαφή του %s.\n" @@ -814,7 +814,7 @@ msgstr "ΧÏήση ξανά της σÏνδεσης στο %s:%hu.\n" msgid "Failed reading proxy response: %s\n" msgstr "Σφάλμα στην εγγÏαφή της αίτησης HTTP: %s.\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ΣΦΑΛΜΑ %d: %s.\n" @@ -938,79 +938,79 @@ msgstr "Μήκος: " msgid "ignored" msgstr "αγνοείται" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "" "Î Ïοειδοποίηση: μεταχαÏακτήÏες (wildcards) δεν υποστηÏίζονται στο HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4443 +#: src/http.c:4447 #, fuzzy, c-format #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot write to %s (%s).\n" msgstr "Αδυναμία στην εγγÏαφή στο `%s' (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4476 +#: src/http.c:4480 #, fuzzy #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot write to WARC file.\n" msgstr "Αδυναμία στην εγγÏαφή στο `%s' (%s).\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "ΑδÏνατη η σÏσταση σÏνδεσης SSL.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, fuzzy, c-format #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot unlink %s (%s).\n" msgstr "Αδυναμία στην εγγÏαφή στο `%s' (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ΣΦΑΛΜΑ: Μετάσταση (%d) χωÏίς τοποθεσία.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Κεφαλίδα Last-modified δεν υπάÏχει -- χÏονικÎÏ‚ αναφοÏÎÏ‚ απενεÏγοποιήθηκαν.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Κεφαλίδα Last-modified δεν είναι ÎγκυÏη -- χÏονικÎÏ‚ αναφοÏÎÏ‚ αγνοοÏνται.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, fuzzy, c-format #| msgid "" #| "Server file no newer than local file `%s' -- not retrieving.\n" @@ -1023,17 +1023,17 @@ msgstr "" "γίνεται ανάκτηση.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, fuzzy, c-format #| msgid "The sizes do not match (local %ld) -- retrieving.\n" msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Τα μεγÎθη δεν είναι ίσα (τοπικό %ld) -- γίνεται ανάκτηση ξανά.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "ΑπομακÏυσμÎνο αÏχείο είναι νεότεÏο, ÎναÏξη ανάκτησης.\n" -#: src/http.c:4676 +#: src/http.c:4680 #, fuzzy #| msgid "" #| "Remote file is newer than local file `%s' -- retrieving.\n" @@ -1047,7 +1047,7 @@ msgstr "" "ανάκτηση.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 #, fuzzy #| msgid "Remote file no newer than local file `%s' -- not retrieving.\n" msgid "" @@ -1058,14 +1058,14 @@ msgstr "" "ανάκτηση.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4697 +#: src/http.c:4701 #, fuzzy #| msgid "Remote file is newer, retrieving.\n" msgid "" @@ -1073,20 +1073,20 @@ msgid "" "\n" msgstr "ΑπομακÏυσμÎνο αÏχείο είναι νεότεÏο, ÎναÏξη ανάκτησης.\n" -#: src/http.c:4706 +#: src/http.c:4710 #, fuzzy, c-format #| msgid "%s ERROR %d: %s.\n" msgid "%s URL: %s %2d %s\n" msgstr "%s ΣΦΑΛΜΑ %d: %s.\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4755 +#: src/http.c:4759 #, fuzzy, c-format #| msgid "" #| "%s (%s) - `%s' saved [%ld/%ld]\n" @@ -1098,30 +1098,30 @@ msgstr "" "%s (%s) - `%s' αποθηκεÏτηκε [%ld/%ld]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, fuzzy, c-format #| msgid "%s (%s) - Connection closed at byte %ld. " msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Η σÏνδεση διακόπηκε στο byte %ld. " -#: src/http.c:4844 +#: src/http.c:4848 #, fuzzy, c-format #| msgid "%s (%s) - Read error at byte %ld (%s)." msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Σφάλμα ανάγνωσης στο byte %ld (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, fuzzy, c-format #| msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Σφάλμα ανάγνωσης στο byte %ld/%ld (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "" @@ -1132,7 +1132,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Αδυναμία ανάγνωσης %s (%s).\n" @@ -2810,17 +2810,17 @@ msgstr "" "%s: %s:%d: Ï€Ïοειδοποίηση: το τμήμα \"%s\" εμφανίζεται Ï€Ïιν από τα ονόματα " "των μηχανημάτων\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: άγνωστος τελεσταίος \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "ΧÏήση: %s NETRC [ΟÎΟΜΑ ΜΗΧΑÎΗΜΑΤΟΣ]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: αδυναμία Ï€Ïόσβασης στο %s: %s\n" @@ -2987,22 +2987,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "" "Ανάγνωση του robots.txt; παÏακαλώ αγνοείστε τυχόν μηνÏματα σφαλμάτων.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Σφάλμα στην ανάλυση του URL του διαμεσολαβητή %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Σφάλμα στο URL διαμεσολαβητή %s: Î ÏÎπει να είναι HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "ΥπÎÏβαση %d επανακατευθÏνσεων.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3010,7 +3010,7 @@ msgstr "" "Εγκαταλείπω.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" diff --git a/po/en_GB.po b/po/en_GB.po index b621909..c8a1f16 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.9.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2004-05-27 21:46-0400\n" "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n" "Language-Team: English (British) <en_gb@li.org>\n" @@ -405,19 +405,19 @@ msgstr "Data transfer aborted.\n" msgid "File %s already there; not retrieving.\n" msgstr "File `%s' already there, not retrieving.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(try:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, fuzzy, c-format #| msgid "" #| "%s (%s) - `%s' saved [%ld]\n" @@ -430,7 +430,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Removing %s.\n" @@ -811,7 +811,7 @@ msgstr "Reusing connection to %s:%hu.\n" msgid "Failed reading proxy response: %s\n" msgstr "Failed writing HTTP request: %s.\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR %d: %s.\n" @@ -936,76 +936,76 @@ msgstr "Length: " msgid "ignored" msgstr "ignored" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Warning: wildcards not supported in HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4443 +#: src/http.c:4447 #, fuzzy, c-format #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot write to %s (%s).\n" msgstr "Cannot write to `%s' (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4476 +#: src/http.c:4480 #, fuzzy #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot write to WARC file.\n" msgstr "Cannot write to `%s' (%s).\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Unable to establish SSL connection.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, fuzzy, c-format #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot unlink %s (%s).\n" msgstr "Cannot write to `%s' (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: Redirection (%d) without location.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified header missing -- time-stamps turned off.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified header invalid -- time-stamp ignored.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, fuzzy, c-format #| msgid "" #| "Server file no newer than local file `%s' -- not retrieving.\n" @@ -1017,17 +1017,17 @@ msgstr "" "Server file no newer than local file `%s' -- not retrieving.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, fuzzy, c-format #| msgid "The sizes do not match (local %ld) -- retrieving.\n" msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "The sizes do not match (local %ld) -- retrieving.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Remote file is newer, retrieving.\n" -#: src/http.c:4676 +#: src/http.c:4680 #, fuzzy #| msgid "" #| "Remote file is newer than local file `%s' -- retrieving.\n" @@ -1040,7 +1040,7 @@ msgstr "" "Remote file is newer than local file `%s' -- retrieving.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 #, fuzzy #| msgid "Remote file no newer than local file `%s' -- not retrieving.\n" msgid "" @@ -1048,14 +1048,14 @@ msgid "" "\n" msgstr "Remote file no newer than local file `%s' -- not retrieving.\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4697 +#: src/http.c:4701 #, fuzzy #| msgid "Remote file is newer, retrieving.\n" msgid "" @@ -1063,20 +1063,20 @@ msgid "" "\n" msgstr "Remote file is newer, retrieving.\n" -#: src/http.c:4706 +#: src/http.c:4710 #, fuzzy, c-format #| msgid "%s ERROR %d: %s.\n" msgid "%s URL: %s %2d %s\n" msgstr "%s ERROR %d: %s.\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4755 +#: src/http.c:4759 #, fuzzy, c-format #| msgid "" #| "%s (%s) - `%s' saved [%ld/%ld]\n" @@ -1088,30 +1088,30 @@ msgstr "" "%s (%s) - `%s' saved [%ld/%ld]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, fuzzy, c-format #| msgid "%s (%s) - Connection closed at byte %ld. " msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Connection closed at byte %ld. " -#: src/http.c:4844 +#: src/http.c:4848 #, fuzzy, c-format #| msgid "%s (%s) - Read error at byte %ld (%s)." msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Read error at byte %ld (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, fuzzy, c-format #| msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Read error at byte %ld/%ld (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5115 +#: src/http.c:5119 #, fuzzy, c-format #| msgid "Unsupported scheme" msgid "Unsupported algorithm '%s'.\n" @@ -1124,7 +1124,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC points to %s, which doesn't exist.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Cannot read %s (%s).\n" @@ -2799,17 +2799,17 @@ msgstr "" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: warning: \"%s\" token appears before any machine name\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: unknown token \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Usage: %s NETRC [HOSTNAME]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: cannot stat %s: %s\n" @@ -2975,22 +2975,22 @@ msgstr "Cannot convert links in %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Loading robots.txt; please ignore errors.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Error parsing proxy URL %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Error in proxy URL %s: Must be HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redirections exceeded.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -2998,7 +2998,7 @@ msgstr "" "Giving up.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU wget 1.21.3\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2023-01-08 14:53-0300\n" "Last-Translator: Felipe Castro <fefcas@gmail.com>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" @@ -384,12 +384,12 @@ msgstr "Transporto de datumoj estas ĉesigita.\n" msgid "File %s already there; not retrieving.\n" msgstr "La dosiero %s jam estas ĉi tie; Äi ne estos elÅutita.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(provo:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -398,7 +398,7 @@ msgstr "" "%s (%s) - skribita al ĉefeligo %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -408,7 +408,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Ni forviÅas %s.\n" @@ -767,7 +767,7 @@ msgstr "Ni reuzas ekzistantan konekton al %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Fiasko dum lego de prokurila respondo: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERARO %d: %s.\n" @@ -898,50 +898,50 @@ msgstr "Grando: " msgid "ignored" msgstr "preteratentita" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Averto: ĵokeroj ne estas subtenataj en HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Arenea reÄimo ebligita. Kontrolu ĉu fora dosiero ekzistas.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ne eblas skribi al %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Mankas postulata atributo el Kaplinio 'received'.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "AÅtentikigo de uzantnomo/pasvorto fiaskis.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Ne eblas skribi al dosiero WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Ne eblas skribi al provizora dosiero WARC.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Ne eblas starigi SSL-konekton.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ne eblas forigi %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERARO: redirektigo (%d) sen loko.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -949,24 +949,24 @@ msgstr "" "Ne eblis trovi datumaron Metalink en respondo HTTP. Ni elÅutas la dosieron " "uzante HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Kapoj Metalink estis trovataj. Ni Åaltas la reÄimon Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Fora dosiero ne ekzistas -- fuÅa ligo!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Mankas ĉapo 'last-modified' -- temp-indikoj estas malaktivitaj.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Malvalida ĉapo 'last-modified' -- temp-indikoj estas preteratentitaj.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -975,16 +975,16 @@ msgstr "" "Servila dosiero ne estas pli nova ol loka %s -- ni ne elÅutas.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "La grandoj ne interkongruas (loka %s) -- ni elÅutas.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Fora dosiero estas pli nova, ni elÅutas.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -994,7 +994,7 @@ msgstr "" "elÅutas.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1002,7 +1002,7 @@ msgstr "" "Fora dosiero ekzistas sed enhavas neniun ligon -- ni ne elÅutas.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1012,7 +1012,7 @@ msgstr "" "sed rikuro estas malaktivita -- ni ne elÅutas.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1020,12 +1020,12 @@ msgstr "" "Fora dosiero ekzistas.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "URL %s: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1034,7 +1034,7 @@ msgstr "" "%s (%s) - skribita al ĉefeligujo %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1043,27 +1043,27 @@ msgstr "" "%s (%s) - %s konservita [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Konekto fermita ĉe la bajto %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Leg-eraro ĉe la bajto %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Leg-eraro ĉe la bajto %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nesubtenata eco de protekto '%s'.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nesubtenata algoritmo '%s'.\n" @@ -1074,7 +1074,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC indikas %s, kiu ne povas esti prenita pro la eraro: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ne eblas legi %s (%s).\n" @@ -3002,17 +3002,17 @@ msgstr "ioctl() fiaskis. La ingo ne povis esti difinata kiel blokantan.\n" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: averto: la ĵetono %s aperas antaÅ iu ajn maÅina nomo\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: nekonata ĵetono \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uzmaniero: :%s NETRC [GASTIGANT-NOMO]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: ne eblas apliki stat al %s: %s\n" @@ -3177,22 +3177,22 @@ msgstr "Ne eblas malfermi %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Ni Åargas je robots.txt; bonvolu preteratenti erarojn.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Eraro dum analizado de prokurila URL %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Eraro en prokurila URL %s: devas esti HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d rediktegij troigi.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3200,7 +3200,7 @@ msgstr "" "Ni rezignas.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" Binary files differ@@ -21,13 +21,13 @@ # # Salvador Gimeno Zanón <salgiza@jazzfree.com>, 2001. # Carlos E. Robinson <carlos.e.r@opensuse.org>, 2012, 2013, 2015, 2016. -# Antonio Ceballos <aceballos@gmail.com>, 2021, 2022. +# Antonio Ceballos <aceballos@gmail.com>, 2021, 2022, 2023. msgid "" msgstr "" -"Project-Id-Version: GNU wget 1.21.3\n" +"Project-Id-Version: GNU wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-03-19 00:06+0100\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-06-17 14:20+0200\n" "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n" "Language-Team: Spanish <es@tp.org.es>\n" "Language: es\n" @@ -497,12 +497,12 @@ msgstr "El fichero %s ya está ahÃ, no se recupera.\n" # nota jjrs: no serÃa mejor intento? # pues sà - Salva # decididamente si - cll -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(intento:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -511,7 +511,7 @@ msgstr "" "%s (%s) - escritos a stdout %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -521,7 +521,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Eliminando %s.\n" @@ -911,7 +911,7 @@ msgstr "Reutilizando la conexión con %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Fallo leyendo la respuesta del proxy: %s.\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR %d: %s.\n" @@ -1054,51 +1054,51 @@ msgstr "Longitud: " msgid "ignored" msgstr "descartado" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Aviso: no se admiten comodines en HTTP.\n" # CER, 20101031: ¿Admitimos humor? ?Modo arácnido? ;-) -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Modo arácnido activado. Comprobar si el fichero remoto existe.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "No se puede escribir a %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Recibido el atributo requerido que faltaba de la cabecera.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "La autentificación usuario/contraseña falló.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "No se puede escribir en fichero WARC..\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "No se puede escribir en fichero WARC temporal.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "No se pudo establecer la conexión SSL.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "No se puede des-enlazar %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: redirección (%d) sin localización.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1106,29 +1106,29 @@ msgstr "" "No se pudo encontrar los datos Metalink en la respuesta HTTP. Descargando el " "fichero usando HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Se han encontrado cabeceras Metalink. Cambiando a modo Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "No existe el fichero remoto -- ¡¡¡enlace roto!!!\n" # asà se entiende mejor -Salva # CER, 20101031: Mejor asÃ: Falta la fecha de -> Falta la cabecera de fecha de ; y apagadas -> desactivadas -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Falta la cabecera de fecha de la última modificación -- marcas de tiempo " "desactivadas.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "La cabecera de fecha de última modificación es inválida -- marca de tiempo " "descartada.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1138,16 +1138,16 @@ msgstr "" "descargará.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Los tamaños no concuerdan (%s local) -- recuperando.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "El fichero remoto es más nuevo, recuperando.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1157,7 +1157,7 @@ msgstr "" "descargando.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1165,7 +1165,7 @@ msgstr "" "El fichero remoto existe pero no contiene ningún enlace -- no se " "descargará.\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1175,7 +1175,7 @@ msgstr "" "pero la recursión está desactivada -- no se recupera.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1183,12 +1183,12 @@ msgstr "" "El fichero remoto existe.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1197,7 +1197,7 @@ msgstr "" "%s (%s) - escritos a stdout %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1206,27 +1206,27 @@ msgstr "" "%s (%s) - %s guardado [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Conexión cerrada en el byte %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Error de lectura en el byte %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Error de lectura en el byte %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Calidad de protección no soportada '%s'.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritmo no soportado '%s'.\n" @@ -1238,7 +1238,7 @@ msgid "" msgstr "" "%s: WGETRC apunta a %s, al cual no se pudo acceder debido al error: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: No se pudo leer %s (%s).\n" @@ -1579,16 +1579,12 @@ msgstr "" "rechazada\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=ERRORS lista separada por comas de errores " -"HTTP a reintentar\n" +" --retry-on-host-error considera errores transitorios, no " +"fatales, los de anfitrión.\n" #: src/main.c:653 msgid "" @@ -3266,12 +3262,12 @@ msgstr "" # traducido en informática como `sÃmbolo'. La traducción, por lo tanto, # es correcta - cll # -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: sÃmbolo desconocido \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Modo de empleo: %s NETRC [NOMBREDEMÃQUINA]\n" @@ -3280,7 +3276,7 @@ msgstr "Modo de empleo: %s NETRC [NOMBREDEMÃQUINA]\n" # nota jjrs: stat es una función de C que obtiene datos de un archivo # y en esta parte solamente lo usa para checar si existe el archivo # pero el wget no utiliza esta función. -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: no se pudo ejecutar “stat†sobre %s: %s\n" @@ -3311,14 +3307,13 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: valor de opción %d de 'secure-protocol' no implementada\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "Su versión de OpenSSL es demasiado antigua para soportar TLS 1.3\n" +msgstr "Su versión de OpenSSL no admite la opción '%s'.\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "Reconstruir Wget y/o OpenSSL puede ser de ayuda en esta situación.\n" #: src/openssl.c:341 #, c-format @@ -3451,22 +3446,22 @@ msgstr "No se puede abrir %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Cargando robots.txt; por favor ignore los errores.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Error analizando la URL del proxy %s: %s\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Error en la URL del proxy %s: Debe ser HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "Sobrepasadas las %d redirecciones.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3474,7 +3469,7 @@ msgstr "" "Abandonando.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3510,20 +3505,16 @@ msgid "No error" msgstr "No hay error" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Esquema %s no soportado" +msgstr "Esquema no soportado" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "El soporte HTTPS no ha sido compilado" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "El soporte HTTPS no ha sido compilado" +msgstr "El soporte FTPS no ha sido compilado" #: src/url.c:692 msgid "Scheme missing" Binary files differ@@ -1,14 +1,14 @@ # This file is distributed under the same license as the wget package. # Estonian translations for GNU wget. # Copyright (C) 1998 Free Software Foundation, Inc. -# Toomas Soome <tsoome@me.com>, 2022. +# Toomas Soome <tsoome@me.com>, 2023. # msgid "" msgstr "" -"Project-Id-Version: GNU wget 1.21.3\n" +"Project-Id-Version: GNU wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-02-27 12:40+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-11 19:06+0300\n" "Last-Translator: Toomas Soome <tsoome@me.com>\n" "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n" "Language: et\n" @@ -382,12 +382,12 @@ msgstr "Andmete ülekanne katkestatud.\n" msgid "File %s already there; not retrieving.\n" msgstr "Fail %s on juba olemas, ei tõmba.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(katse:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -396,7 +396,7 @@ msgstr "" "%s (%s) - kirjutatud standardväljundissse %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -406,7 +406,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Kustutan %s.\n" @@ -761,7 +761,7 @@ msgstr "Kasutan ühendust serveriga %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Proksi vastuse lugemine ebaõnnestus: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s VIGA %d: %s.\n" @@ -890,75 +890,75 @@ msgstr "Pikkus: " msgid "ignored" msgstr "ignoreerin" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Hoiatus: HTTP ei toeta jokkereid.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "Ämbliku režiim on sisse lülitatud. Kontrollige et mittelokaalne fail on " "olemas.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ei saa kirjutada faili %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Laekunud päises puudub nõutud atribuut.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Kasutajanimi/Parool autentimine ebaõnnestus.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Ei saa kirjutada WARC faili.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Ei saa kirjutada ajutisse WARC faili.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "SSL ühenduse loomine ei õnnestu.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ei saa kustutada %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "VIGA: Ãœmbersuunamine (%d) ilma asukohata.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" "Ei leia HTTP vastuses Metalink andmeid. Laen faili kasutades HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Leidsin metalink päised. Lülitan metalink moodi.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Mittelokaalset faili pole -- katkine viide!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified päist pole -- ei kasuta ajatempleid.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified päis on vigane -- ignoreerin ajatemplit.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -967,16 +967,16 @@ msgstr "" "Fail serveril ei ole uuem lokaalsest failist %s -- ei lae.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Suurused ei klapi (lokaalne %s) -- laen uuesti.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Kauge fail on uuem, laen alla.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -986,13 +986,13 @@ msgstr "" "laen.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "Kauge fail on olemas, aga ei sisalda viiteid -- ei lae.\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1002,7 +1002,7 @@ msgstr "" "aga rekursioon pole lubatud -- ei lae.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1010,12 +1010,12 @@ msgstr "" "Kauge fail on olemas.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1024,7 +1024,7 @@ msgstr "" "%s (%s) - %s salvestatud [%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1033,27 +1033,27 @@ msgstr "" "%s (%s) - %s salvestatud [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Ãœhendus suletud baidil %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Lugemise viga baidil %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Lugemise viga baidil %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Mittetoetatud kaitse kvaliteet '%s'.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Mittetoetatud algoritm '%s'.\n" @@ -1064,7 +1064,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC viitab failile %s, mille kasutamisel on viga: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: %s ei saa lugeda (%s).\n" @@ -1372,16 +1372,10 @@ msgstr "" " --retry-connrefused korda isegi kui ühendusest keeldutakse\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" -msgstr "" -" --retry-on-http-error=VEAD komaga-eraldatud loend HTTP vigadest " -"mille korral korrata\n" +msgstr " --retry-on-host-error hosti vigade korral proovi uuesti\n" #: src/main.c:653 msgid "" @@ -2907,17 +2901,17 @@ msgstr "ioctl() sai vea. Pistikut ei õnnestunud seada blokeerivaks.\n" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: hoiatus: %s lekseem on enne masina nime\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: tundmatu lekseem \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Kasuta: %s NETRC [HOSTINIMI]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: stat operatsioon ebaõnnestus %s: %s\n" @@ -2948,14 +2942,13 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: realiseerimata 'secure-protocol' parameetri väärtus %d\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "Teie OpenSSL versioon on TLSv1.3 jaoks liiga vana\n" +msgstr "Teie OpenSSL versioon ei toeta võtit '%s'.\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "Wget ja/või OpenSSL ümberkompileerimine võib aidata.\n" #: src/openssl.c:341 #, c-format @@ -3085,28 +3078,28 @@ msgstr "Ei saa avada %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Laen robots.txti faili; palun ignoreerige võimalikk vigu.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Viga proxy urli parsimisel %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Viga proxy urlis %s: Peab olema HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d ümbersuunamist ületatud.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" msgstr "Annan alla.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3138,20 +3131,16 @@ msgid "No error" msgstr "Vigu pole" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Mittetoetatud skeem %s" +msgstr "Mittetoetatud skeem" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "HTTPS tuge pole sisse kompileeritud" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "HTTPS tuge pole sisse kompileeritud" +msgstr "FTPS tuge pole sisse kompileeritud" #: src/url.c:692 msgid "Scheme missing" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.14.128\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2013-06-14 00:35+0100\n" "Last-Translator: Mikel Olasagasti Uranga <mikel@olasagasti.info>\n" "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n" @@ -389,19 +389,19 @@ msgstr "Datu transferentzia abortatua.\n" msgid "File %s already there; not retrieving.\n" msgstr "`%s' fitxategia dagoeneko badago, ez da jasoko.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(saiatu:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -411,7 +411,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "%s ezabatzen.\n" @@ -764,7 +764,7 @@ msgstr "Konexioa berrerabiltzen %srentzat: %hu.\n" msgid "Failed reading proxy response: %s\n" msgstr "Huts egin da HTTP eskaera idazterakoan: %s.\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROREA %d %s.\n" @@ -888,73 +888,73 @@ msgstr "Luzera: " msgid "ignored" msgstr "baztertua" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Oharra: komodinak ez daude onartuak HTTPean.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4443 +#: src/http.c:4447 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ezin da `%s' idatzi (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4476 +#: src/http.c:4480 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Ezin da `%s' idatzi (%s).\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Ezinezkoa SSL konexioa sortzea.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ezin da `%s' idatzi (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROREA: (%d) helbideraketa kokapenik gabe.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Azken·burugoiko·modifikazitua falta da·-·ordu·zigilua·itzalia.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Azken burugoiko modifikazioa baliogabekoa - ordu zigilua ignoratua.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -964,16 +964,16 @@ msgstr "" "da jasoko.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, fuzzy, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Tamainuak·ez·dute·ezkontzen·(lokalak·%ld)·--·jasotzen.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Fitxategi erremotoa berriagoa da, jasotzen.\n" -#: src/http.c:4676 +#: src/http.c:4680 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -981,7 +981,7 @@ msgid "" "\n" msgstr "`%s' fitxategi erremotoa bertakoa baina berriagoa da -- jasotzen.\n" -#: src/http.c:4682 +#: src/http.c:4686 #, fuzzy msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" @@ -989,33 +989,33 @@ msgid "" msgstr "" "`%s' fitxategi erremotoa ez da bertakoa baina berriagoa -- ez da jasoko.\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4697 +#: src/http.c:4701 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr "Fitxategi erremotoa berriagoa da, jasotzen.\n" -#: src/http.c:4706 +#: src/http.c:4710 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s ERROREA %d %s.\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4755 +#: src/http.c:4759 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1024,27 +1024,27 @@ msgstr "" "%s (%s) - `%s' gordeta [%ld/%ld]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, fuzzy, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Konexioa itxia ondorengo bytean %ld. " -#: src/http.c:4844 +#: src/http.c:4848 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Irakurtze errorea %ld bytean (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Irakurtze errorea %ld/%ld bytean (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5115 +#: src/http.c:5119 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Sostengu gabeko eskema" @@ -1056,7 +1056,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC %sra apuntatzen du, ez dena existitzen.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ezin irakurri %s (%s).\n" @@ -2696,17 +2696,17 @@ msgstr "" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: abisua: \"%s\" tokena makina izenanen aurretik dago\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: token ezezaguna \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Erabilera: %s NETRC [HOST-IZENA]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: ezin da identifikatu %s: %s\n" @@ -2869,22 +2869,22 @@ msgstr "Ezin dira %s-ko linkak bihurtu: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Robots.txt kargatzen; mesedez ignoratu erroreak.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Proxy URLa parseatzen errorea %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Errorea proxy URLan %s: HTTP izan behar du.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d erredirekzio kopurua gainditua.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -2892,7 +2892,7 @@ msgstr "" "Utzitzen.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.21\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2021-03-08 00:08+0200\n" "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" @@ -388,12 +388,12 @@ msgstr "Tiedonsiirto keskeytetty.\n" msgid "File %s already there; not retrieving.\n" msgstr "Tiedostoa %s ei noudeta, koska se on jo olemassa.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(yritys:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -402,7 +402,7 @@ msgstr "" "%s (%s) - kirjoitettu vakiotulosteeseen %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -412,7 +412,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Poistetaan %s.\n" @@ -771,7 +771,7 @@ msgstr "Uudelleenkäytetään yhteyttä osoitteeseen %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Välityspalvelimen vastauksen vastaanotto epäonnistui: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s VIRHE %d: %s.\n" @@ -899,73 +899,73 @@ msgstr "Pituus: " msgid "ignored" msgstr "jätetty huomiotta" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Varoitus: HTTP ei tue jokerimerkkejä.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Hakurobottitila aktivoitu. Tarkista, onko etätiedosto olemassa.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Kirjoittaminen tiedostoon %s epäonnistui (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Vastaanotetusta otsakkeesta puuttuu vaadittu attribuutti.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Käyttäjätunnus-salasanatodennus epäonnistui.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "WARC-tiedostoon kirjoittaminen epäonnistui.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Tilapäiseen WARC-tiedostoon kirjoittaminen epäonnistui.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "SSL-yhteyden muodostaminen ei onnistunut.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Linkin %s (%s) purkaminen epäonnistui.\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "VIRHE: Uudelleenohjaus (%d) ilman sijaintia.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Etätiedostoa ei ole olemassa – rikkinäinen linkki!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "â€Last-modifiedâ€-otsake puuttuu – aikaleimat poistettu käytöstä.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "â€Last-modifiedâ€-otsake on virheellinen – aikaleima jätetty huomiotta.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -974,16 +974,16 @@ msgstr "" "Palvelimen tiedosto %s ei ole paikallista uudempi – ei noudeta.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Koot eivät täsmää (paikallinen %s) – noudetaan.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Etätiedosto on uudempi, noudetaan.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -993,7 +993,7 @@ msgstr "" "noudetaan.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1002,7 +1002,7 @@ msgstr "" "\n" # Tämä kuten useat aiemmat yllä ovat lokitiedostorivejä, joilla kommentoidaan hakurobotin tekemisiä ja tekemättä jättämisiä. -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1012,7 +1012,7 @@ msgstr "" "Rekursio ei kuitenkaan ole käytössä, joten linkkejä ei seurata.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1020,12 +1020,12 @@ msgstr "" "Etätiedosto on olemassa.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1034,7 +1034,7 @@ msgstr "" "%s (%s) - kirjoitettu vakiotulosteeseen %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1043,27 +1043,27 @@ msgstr "" "%s (%s) - %s tallennettu [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Yhteys suljettu tavun %s kohdalla. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Lukuvirhe tavun %s kohdalla (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Lukuvirhe tavun %s/%s kohdalla (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Tukematon suojauksen laatu â€%sâ€.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Tukematon algoritmi â€%sâ€.\n" @@ -1076,7 +1076,7 @@ msgstr "" "%s: WGETRC osoittaa kohteeseen %s, jota ei pystytty käyttämään virheen " "vuoksi: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Tiedoston %s lukeminen epäonnistui (%s).\n" @@ -2981,17 +2981,17 @@ msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: varoitus: %s-merkintä esiintyy kaikkien koneiden nimien edessä\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, fuzzy, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: tuntematon merkki â€%sâ€\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Käyttö: %s NETRC [KONENIMI]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: tiedoston %s tilan lukeminen epäonnistui: %s\n" @@ -3160,22 +3160,22 @@ msgstr "Tiedoston %s avaaminen epäonnistui: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Ladataan robots.txt, älä välitä virheistä.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Virhe tulkittaessa välityspalvelimen URLia %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Virhe välityspalvelimen URLissa %s: Oltava HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d uudelleenohjausta ylitetty.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3183,7 +3183,7 @@ msgstr "" "Luovutetaan.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.21.3\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2022-07-04 23:56+0200\n" "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n" "Language-Team: French <traduc@traduc.org>\n" @@ -393,12 +393,12 @@ msgstr "Abandon du transfert des données.\n" msgid "File %s already there; not retrieving.\n" msgstr "Fichier %s déjà présent ; pas de récupération.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(essai : %2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -407,7 +407,7 @@ msgstr "" "%s (%s) — envoi sur la sortie standard %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -417,7 +417,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Destruction de %s.\n" @@ -787,7 +787,7 @@ msgid "Failed reading proxy response: %s\n" msgstr "" "Échec de lecture de la réponse du serveur mandataire (« proxy ») : %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s erreur %d : %s.\n" @@ -922,51 +922,51 @@ msgstr "Taille : " msgid "ignored" msgstr "ignoré" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Avertissement : les jokers ne sont pas permis en HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "Mode « spider » activé. Vérification de l’existence d’un fichier distant.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Impossible d’écrire dans %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Attribut nécessaire manquant dans l’en-tête reçu.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Échec d’authentification par identifiant et mot de passe.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Impossible d’écrire dans le fichier WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Impossible d’écrire dans le fichier WARC temporaire.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Incapable d’établir une connexion SSL.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Impossible de supprimer le lien %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "Erreur : redirection (%d) sans destination.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -974,23 +974,23 @@ msgstr "" "Impossible de trouver les données Metalink dans la réponse HTTP. " "Téléchargement du fichier via HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Entêtes Metalink trouvées. Passage en mode Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Le fichier distant n’existe pas — lien mort.\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "En-tête de dernière modification manquant — horodatage arrêté.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "En-tête de dernière modification incorrect — horodatage ignoré.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1000,16 +1000,16 @@ msgstr "" "récupération.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Les tailles ne correspondent pas (%s localement) — récupération.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Le fichier distant est plus récent, récupération.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1019,7 +1019,7 @@ msgstr "" "ressources — récupération en cours.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1028,7 +1028,7 @@ msgstr "" "récupération.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1038,7 +1038,7 @@ msgstr "" "mais le mode récursif est désactivée — pas de récupération.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1046,12 +1046,12 @@ msgstr "" "Le fichier distant existe.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "URL %s : %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1060,7 +1060,7 @@ msgstr "" "%s (%s) — envoi vers sortie standard %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1069,27 +1069,27 @@ msgstr "" "%s (%s) — %s sauvegardé [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) — Fermeture de la connexion à l’octet %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) — Erreur de lecture à l’octet %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) — Erreur de lecture à l’octet %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Qualité de protection « %s » non prise en charge.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algorithme « %s » non pris en charge.\n" @@ -1102,7 +1102,7 @@ msgstr "" "%s : WGETRC pointe vers %s qui n'est pas accessible à cause de l'erreur : " "%s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s : impossible de lire %s (%s).\n" @@ -3128,17 +3128,17 @@ msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s : %s:%d : avertissement : le jeton %s apparaît devant le nom de machine\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s : %s:%d : jeton « %s » inconnu\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Utilisation : %s NETRC [HÔTE]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s : impossible d’obtenir l’état de %s : %s\n" @@ -3321,23 +3321,23 @@ msgstr "Impossible d’ouvrir %s : %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Chargement de robots.txt ; veuillez ignorer les erreurs.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Erreur d’analyse de l’URL du serveur mandataire (« proxy ») %s : %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "" "Erreur d’URL de serveur mandataire (« proxy ») %s : doit être de type HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redirections dépassant la limite permise.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3345,7 +3345,7 @@ msgstr "" "Abandon.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2017-01-17 11:59-0500\n" "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n" "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n" @@ -389,12 +389,12 @@ msgstr "Tobscoireadh an t-aistriú sonraÃ.\n" msgid "File %s already there; not retrieving.\n" msgstr "Tá comhad %s ann cheana; nà aisghabhfar é.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(iarracht:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -403,7 +403,7 @@ msgstr "" "%s (%s) - scrÃofa ar stdout %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -413,7 +413,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "%s á bhaint.\n" @@ -779,7 +779,7 @@ msgstr "Ag baint athúsáid as an gceangal le %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Theip ar léamh freagra ón seachfhreastalaÃ: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s EARRÃID %d: %s.\n" @@ -912,50 +912,50 @@ msgstr "Fad: " msgid "ignored" msgstr "rinneadh neamhaird" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Rabhadh: nÃl saoróga ar fáil i HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "CumasaÃodh an mód crúbadáin. Seiceáil an bhfuil an cianchomhad ann.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nà féidir scrÃobh i gcomhad %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Fuarthas aitreabúid riachtanach a bhà ar iarraidh ón Cheanntásc.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Theip ar fhÃordheimhniú Ainm Úsáideora/Focal Faire.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Nà féidir scrÃobh sa chomhad WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Nà féidir scrÃobh i gcomhad sealadach WARC.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Nà féidir ceangal SSL a dhéanamh.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Nà féidir %s a dhÃnascadh (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "EARRÃID: Atreorú (%d) gan suÃomh.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -963,24 +963,24 @@ msgstr "" "NÃor aimsÃodh na sonraà Metalink sa fhreagra HTTP. Comhad á Ãoslódáil trà " "HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "AimsÃodh na ceanntásca Metalink. Bainfear úsáid as an mód Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "NÃl an cianchomhad ann -- nasc briste!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Ceanntásc `Last-modified' ar iarraidh -- nà úsáidfear stampaà ama.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Ceanntásc neamhbhailà `Last-modified' -- tugadh neamhaird ar an stampa ama.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -990,16 +990,16 @@ msgstr "" "aisghabhfar é.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "NÃl an méid céanna ar na comhaid (áitiúil %s) -- á aisghabh.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Tá an cianchomhad nÃos nuaÃ, á aisghabháil.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1009,7 +1009,7 @@ msgstr "" "-- á aisghabháil.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1017,7 +1017,7 @@ msgstr "" "Tá an cianchomhad ann ach nÃl aon nasc ann -- nà aisghabhfar é.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1027,7 +1027,7 @@ msgstr "" "ach dÃchumasaÃodh athchúrsáil -- nà aisghabhfar é.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1035,12 +1035,12 @@ msgstr "" "Tá an cianchomhad ann.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "URL %s: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1049,7 +1049,7 @@ msgstr "" "%s (%s) - scrÃofa ar stdout %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1058,27 +1058,27 @@ msgstr "" "%s (%s) - %s sábháilte [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Ceangal dúnta ag beart %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Earráid léimh ag beart %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Earráid léimh ag beart %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "CáilÃocht cosanta nach dtacaÃtear léi '%s'.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algartam gan tacaÃocht '%s'.\n" @@ -1090,7 +1090,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: Tá WGETRC dÃrithe ar %s, agus nÃl sé seo ann ar chor ar bith.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nà féidir %s a léamh (%s).\n" @@ -2993,17 +2993,17 @@ msgstr "Theip ar ioctl(). NÃorbh fhéidir an soicéad a shocrú mar bhlocáil.\ msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: rabhadh: tagann an teaghrán %s roimh aon ainm meaisÃn\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: teaghrán anaithnid comharthach \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Úsáid: %s NETRC [ÓSTAINM]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: nà féidir %s a stat: %s\n" @@ -3174,22 +3174,22 @@ msgstr "Nà féidir %s a oscailt: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "robots.txt á lódáil; déan neamhaird d'earráidà le do thoil.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Earráid agus URL an seachfhreastalaà %s á pharsáil: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Earráid i URL seachfhreastalaà %s: Nà foláir a bheith HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "nÃos mó ná %d atreorú.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3197,7 +3197,7 @@ msgstr "" "à éirà as.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.14\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2012-11-11 23:30+0100\n" "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -390,12 +390,12 @@ msgstr "Transferencia de datos interrompida.\n" msgid "File %s already there; not retrieving.\n" msgstr "O ficheiro %s xa está aÃ, non se ha descargar.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(intento:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -404,7 +404,7 @@ msgstr "" "%s (%s) - escrito en stdout %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -414,7 +414,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Retirando %s.\n" @@ -784,7 +784,7 @@ msgstr "Reutilizando a conexión existente con %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Produciuse un erro ao ler a resposta do proxy: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERRO %d: %s.\n" @@ -907,72 +907,72 @@ msgstr "Lonxitude: " msgid "ignored" msgstr "ignorado" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Aviso: comodÃns non compatÃbeis en HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Non é posÃbel escribir en %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Non é posÃbel escribir no ficheiro WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Non é posÃbel escribir no ficheiro WARC temporal.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Non foi posÃbel establecer a conexión SSL.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Non é posÃbel desligar %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: Redirección (%d) sen destino.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "O ficheiro remoto non exite -- ligazón rota!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Falta a cabeceira Last-modified -- marcas de tempo desactivadas.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Cabeceira Last-modified incorrecta -- ignorouse a marca de tempo.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -982,16 +982,16 @@ msgstr "" "descarga.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Os tamaños non coinciden (local %s) -- descargando.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "O ficheiro remoto é máis novo, descargando.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1001,7 +1001,7 @@ msgstr "" "descargando.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1010,14 +1010,14 @@ msgstr "" "descarga.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1025,12 +1025,12 @@ msgstr "" "O ficheiro remoto existe.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1039,7 +1039,7 @@ msgstr "" "%s (%s) - escrito en stdout %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1048,27 +1048,27 @@ msgstr "" "%s (%s) - gardouse %s [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Conexión pechada no byte %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Erro de lectura no byte %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Erro de lectura no byte %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5115 +#: src/http.c:5119 #, fuzzy, c-format #| msgid "Unsupported scheme %s" msgid "Unsupported algorithm '%s'.\n" @@ -1081,7 +1081,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC apunta a %s, que non existe.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Non é posÃbel ler %s (%s).\n" @@ -2951,17 +2951,17 @@ msgstr "" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: aviso: o elemento %s aparece antes dos nomes de máquina\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: elemento «%s» descoñecido\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uso: %s NETRC [SERVIDOR]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: non é posÃbel obter información de %s: %s\n" @@ -3128,22 +3128,22 @@ msgstr "Non é posÃbel abrir %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Cargando robots.txt; ignore os erros.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Produciuse un erro ao analizar o URL do proxy %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Erro no URL do proxy %s: Debe ser HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "Superáronse %d redireccións.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3151,7 +3151,7 @@ msgstr "" "Abandonando.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.8.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2002-02-03 20:08+0200\n" "Last-Translator: Eli Zaretskii <eliz@gnu.org>\n" "Language-Team: Hebrew <eliz@gnu.org>\n" @@ -426,12 +426,12 @@ msgstr "ä÷ñôåä íéðåúð úøáòä\n" msgid "File %s already there; not retrieving.\n" msgstr ".åúåà êåùîì êøåö ïéà ,ïàë øáë `%s' õáå÷\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(%2d 'ñî ïåéñð)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -439,7 +439,7 @@ msgid "" msgstr "" # I give up! -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, fuzzy, c-format #| msgid "" #| "%s (%s) - `%s' saved [%ld]\n" @@ -452,7 +452,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr ".%s ÷çåî\n" @@ -828,7 +828,7 @@ msgstr ".%s:%hu-ì øåáéçá ùîúùäì êéùîî\n" msgid "Failed reading proxy response: %s\n" msgstr ".HTTP úééðô ìù äçéìùá (%s) äì÷ú\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR %d: %s.\n" @@ -960,76 +960,76 @@ msgstr "Length: " msgid "ignored" msgstr "ignored" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr ".HTTP-á íéëîúð íðéà (wildcards) äììëä éåú :äøäæà\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4443 +#: src/http.c:4447 #, fuzzy, c-format #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot write to %s (%s).\n" msgstr ".`%s' úáéúëá (%s) äì÷ú\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4476 +#: src/http.c:4480 #, fuzzy #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot write to WARC file.\n" msgstr ".`%s' úáéúëá (%s) äì÷ú\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr ".(SSL) çèáåàî øù÷ õåøò íé÷äì ïúéð àì\n" -#: src/http.c:4493 +#: src/http.c:4497 #, fuzzy, c-format #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot unlink %s (%s).\n" msgstr ".`%s' úáéúëá (%s) äì÷ú\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr ".øúà íù àìì áåúéð (%d) éåðéù :äì÷ú\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr ".úåðéîæ åéäé àì ïîæ úåîéúç -- äàöîð àì ïåøçà éåðéù ïîæ úøúåë\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr ".ïîæä úîéúçî íìòúî -- äéåâù ïåøçà éåðéù ïîæ úøúåë\n" -#: src/http.c:4641 +#: src/http.c:4645 #, fuzzy, c-format #| msgid "" #| "Server file no newer than local file `%s' -- not retrieving.\n" @@ -1041,17 +1041,17 @@ msgstr "" ".êùîéé àì õáå÷ä -- `%s' éîå÷î õáå÷î øúåé éðëãò åðéà úøùá õáå÷\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, fuzzy, c-format #| msgid "The sizes do not match (local %ld) -- retrieving.\n" msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr ".êùîéé õáå÷ä -- (%ld :éîå÷î õáå÷) ääæ åðéà ìãåâ\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr ".êùîéé õáå÷ä ,øúåé éðëãò ÷çåøî õáå÷\n" -#: src/http.c:4676 +#: src/http.c:4680 #, fuzzy #| msgid "" #| "Remote file is newer than local file `%s' -- retrieving.\n" @@ -1062,7 +1062,7 @@ msgid "" "\n" msgstr ".êùîéé õáå÷ä -- `%s' éîå÷î õáå÷î øúåé éðëãò ÷çåøî õáå÷\n" -#: src/http.c:4682 +#: src/http.c:4686 #, fuzzy #| msgid "Remote file no newer than local file `%s' -- not retrieving.\n" msgid "" @@ -1070,14 +1070,14 @@ msgid "" "\n" msgstr ".êùîéé àì õáå÷ä -- `%s' éîå÷î õáå÷î øúåé éðëãò åðéà ÷çåøî õáå÷\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4697 +#: src/http.c:4701 #, fuzzy #| msgid "Remote file is newer, retrieving.\n" msgid "" @@ -1085,13 +1085,13 @@ msgid "" "\n" msgstr ".êùîéé õáå÷ä ,øúåé éðëãò ÷çåøî õáå÷\n" -#: src/http.c:4706 +#: src/http.c:4710 #, fuzzy, c-format #| msgid "%s ERROR %d: %s.\n" msgid "%s URL: %s %2d %s\n" msgstr "%s ERROR %d: %s.\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1099,7 +1099,7 @@ msgid "" msgstr "" # Come on, are they serious?? -#: src/http.c:4755 +#: src/http.c:4759 #, fuzzy, c-format #| msgid "" #| "%s (%s) - `%s' saved [%ld/%ld]\n" @@ -1111,30 +1111,30 @@ msgstr "" "%s (%s) - `%s' saved [%ld/%ld]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, fuzzy, c-format #| msgid "%s (%s) - Connection closed at byte %ld. " msgid "%s (%s) - Connection closed at byte %s. " msgstr ".øâñð øåáéçä ,%s-á (%s) íéúá %ld éøçà äì÷ú " -#: src/http.c:4844 +#: src/http.c:4848 #, fuzzy, c-format #| msgid "%s (%s) - Read error at byte %ld (%s)." msgid "%s (%s) - Read error at byte %s (%s)." msgstr ".%s-á %s áö÷á åìá÷úðù íéúá %ld éøçà (%s) äàéø÷ úì÷ú" -#: src/http.c:4853 +#: src/http.c:4857 #, fuzzy, c-format #| msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr ".%s-á %s áö÷á åìá÷úðù íéúá %ld/%ld éøçà (%s) äàéø÷ úì÷ú " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "" @@ -1145,7 +1145,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr ".%s úéðëú é\"ò %s õáå÷ úçéúôá (%s) äì÷ú\n" @@ -2817,17 +2817,17 @@ msgstr "" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: áùçîä íù øãâåäù éðôì äòéôåî \"%s\" çúôî úìéî :äøäæà\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: \"%s\" úøëåî-éúìá çúôî úìéî\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "%s NETRC [çøàî-áùçî íù] :ùåîéùä ïôåà\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s úéðëúá %s õáå÷ì äùéâá (%s) äì÷ú\n" @@ -2990,25 +2990,25 @@ msgstr "á (%s: %s) íéøåùé÷ úøîä úì÷ú\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr ".äàéâù úåòãåäî íìòúäì àð ;robots.txt õáå÷ ïòåè\n" -#: src/retr.c:921 +#: src/retr.c:925 #, fuzzy, c-format #| msgid "Error writing to `%s': %s\n" msgid "Error parsing proxy URL %s: %s.\n" msgstr "`%s'-ì äáéúëá (%s) äì÷ú\n" -#: src/retr.c:934 +#: src/retr.c:938 #, fuzzy, c-format #| msgid "Proxy %s: Must be HTTP.\n" msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr ".HTTP úåéäì áééç :%s äùøåî úøù\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, fuzzy, c-format #| msgid "%s: Redirection cycle detected.\n" msgid "%d redirections exceeded.\n" msgstr ".%s úéðëúá úéìâòî äééðôä äúìâúä\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3016,7 +3016,7 @@ msgstr "" "!òðëð éðà\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" Binary files differ@@ -9,13 +9,13 @@ # Domagoj Margan <sartrum@gmail.com>, 2010-2011. # Vedran Miletić <rivanvx@gmail.com>, 2010-2011. # Tomislav Krznar <tomislav.krznar@gmail.com>, 2012. -# Božidar Putanec <bozidarp@yahoo.com>, 2016, 2017, 2018, 2019, 2020, 2021, 2022. +# Božidar Putanec <bozidarp@yahoo.com>, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023. msgid "" msgstr "" -"Project-Id-Version: GNU wget-1.21.3\n" +"Project-Id-Version: GNU wget-1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2023-05-01 16:13-0700\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-26 20:49-0700\n" "Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n" "Language-Team: Croatian <lokalizacija@linux.hr>\n" "Language: hr\n" @@ -120,7 +120,7 @@ msgstr "Nije moguće dobiti kolaÄić za %s\n" #: src/cookies.c:464 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" -msgstr "SintaktiÄna greÅ¡ka u Set-Cookie“: %s na poziciji %d\n" +msgstr "sintaktiÄka greÅ¡ka u Set-Cookie“: %s na poziciji %d\n" #: src/cookies.c:777 #, c-format @@ -394,12 +394,12 @@ msgstr "Prijenos podataka je prekinut\n" msgid "File %s already there; not retrieving.\n" msgstr "Datoteka %s već postoji -- ne preuzima se\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(pokuÅ¡aj:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -408,7 +408,7 @@ msgstr "" "%s (%s) - zapisano na standardni izlaz %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -418,7 +418,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Uklanja se %s\n" @@ -482,7 +482,8 @@ msgstr "Kreira se simboliÄka poveznica %s -> %s\n" #: src/ftp.c:2372 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" -msgstr "SimboliÄke poveznice nisu podržane -- preskaÄe se simveza %s\n" +msgstr "" +"SimboliÄke poveznice (simveza) nisu podržane -- preskaÄe se simveza %s\n" #: src/ftp.c:2387 #, c-format @@ -741,7 +742,7 @@ msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "" -"Datoteka %s već postoji -- ne preuzima \n" +"Datoteka %s već postoji -- ne preuzima\n" "\n" #: src/http.c:1834 @@ -779,7 +780,7 @@ msgstr "" "Nije uspjelo proÄitati odgovor proxy-a: %s.\n" " \n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s GREÅ KA %d: %s.\n" @@ -917,50 +918,50 @@ msgstr "Duljina: " msgid "ignored" msgstr "zanemareno" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Upozorenje: HTTP ne podržava viÅ¡eznaÄnike (wildcards)\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Spider je omogućen. Provjerite postoji li datoteka na serveru.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nije moguće pisati u %s (%s)\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Obvezni atribut manjkaju u preuzetom zaglavlju\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Autentifikacija korisnik/lozinka nije uspjela\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "U WARC datoteku nije moguće pisati\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "U privremenu WARC datoteku nije moguće pisati\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Nije moguće uspostaviti SSL poveznicu\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Poveznicu %s (%s) nije moguće ukloniti\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "GREÅ KA: Preusmjeravanje (%d) bez cilja (adrese).\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -968,23 +969,23 @@ msgstr "" "Nema Metalink podataka u HTTP odgovoru. Datoteka se preuzima pomoću HTTP " "GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "NaÄ‘eno je Metalink zaglavlje. Prelazi se na Metalink naÄin rada.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Datoteka ne postoji na serveru -- nevaljani hyperlink!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Manjka Last-modified zaglavlje -- vremenske oznake se iskljuÄuju\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Nevaljano Last-modified zaglavlje -- vremenska oznaka je zanemarena\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -993,16 +994,16 @@ msgstr "" "Lokalna datoteka %s je novija od one na serveru -- ne preuzima se\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "VeliÄine se ne slažu (lokalno %s) -- preuzimamo\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Datoteka na serveru je novija -- preuzima se\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1012,7 +1013,7 @@ msgstr "" "preuzima se\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1020,7 +1021,7 @@ msgstr "" "Datoteka na serveru postoji, ali nema nikakvih poveznica -- ne preuzima se\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1030,7 +1031,7 @@ msgstr "" "ali rekurzija je onemogućena -- ne preuzima se\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1038,12 +1039,12 @@ msgstr "" "Datoteka na serveru postoji\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1052,7 +1053,7 @@ msgstr "" "%s (%s) - zapisano na standardni izlaz %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1061,27 +1062,27 @@ msgstr "" "%s (%s) - %s spremljeno [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Veza zatvorena na bajtu %s " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - GreÅ¡ka Äitanja na bajtu %s (%s)" -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - GreÅ¡ka Äitanja na bajtu %s/%s (%s) " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nepodržana kvaliteta zaÅ¡tite „%s“\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nepodržani algoritam „%s“\n" @@ -1093,7 +1094,7 @@ msgid "" msgstr "" "%s: WGETRC pokazuje na %s a kojem nije moguće pristupiti zbog greÅ¡ke: %s\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: nije moguće proÄitati %s (%s)\n" @@ -1106,7 +1107,7 @@ msgstr "%s: greÅ¡ka u %s u retku %d\n" #: src/init.c:718 #, c-format msgid "%s: Syntax error in %s at line %d.\n" -msgstr "%s: sintaktiÄna greÅ¡ka u %s u retku %d\n" +msgstr "%s: sintaktiÄka greÅ¡ka u %s u retku %d\n" # c-format #: src/init.c:723 @@ -3098,17 +3099,17 @@ msgstr "" "%s: %s:%d: upozorenje: simbol %s se pojavljuje prije bilo kojeg imena " "raÄunala\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: nepoznati simbol „%s“\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uporaba: %s NETRC [HOSTNAME]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: ne može se dobiti status od %s: %s\n" @@ -3283,22 +3284,22 @@ msgstr "Nije moguće otvoriti %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "UÄitava se robots.txt; molimo zanemarite greÅ¡ke\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "GreÅ¡ka pri obradi proxy URL-a %s: %s\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "GreÅ¡ka u proxy URL adresi %s: mora biti HTTP\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d: prekoraÄen je broj preusmjerenja\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3306,7 +3307,7 @@ msgstr "" "ZavrÅ¡eno.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.21.3\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2023-04-18 19:35+0200\n" "Last-Translator: Balázs Úr <ur.balazs@fsf.hu>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" @@ -392,12 +392,12 @@ msgstr "Adatátvitel megszakÃtva.\n" msgid "File %s already there; not retrieving.\n" msgstr "A fájl (%s) már megvan, nem kerül letöltésre.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(próba:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -406,7 +406,7 @@ msgstr "" "%s (%s) -- szabványos kimenetre Ãrva %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -416,7 +416,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "%s eltávolÃtása.\n" @@ -776,7 +776,7 @@ msgstr "MeglévÅ‘ kapcsolat újrafelhasználása a következÅ‘höz: %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "A proxy válasz olvasása meghiúsult: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s HIBA %d: %s.\n" @@ -909,50 +909,50 @@ msgstr "Hossz: " msgid "ignored" msgstr "figyelmen kÃvül hagyva" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Figyelmeztetés: a helyettesÃtÅ‘ karaktereket a HTTP nem támogatja.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "A „spider†mód bekapcsolva. A távoli fájl létezésének ellenÅ‘rzése.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "%s nem Ãrható (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "A kapott fejlécbÅ‘l hiányzik egy kötelezÅ‘ attribútum.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "A felhasználónév/jelszó hitelesÃtés meghiúsult.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Nem Ãrható a WARC-fájl.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Nem Ãrható az átmeneti WARC-fájl.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Nem lehet létrehozni SSL-kapcsolatot.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "%s nem törölhetÅ‘ (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "HIBA: ÃtirányÃtás (%d) hely nélkül.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -960,25 +960,25 @@ msgstr "" "Nem találhatók Metalink adatok a HTTP válaszban. A fájl letöltése HTTP GET " "használatával.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Metalink fejlécek megtalálva. Váltás Metalink módba.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "A távoli fájl nem létezik -- hibás hivatkozás!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Az utolsó módosÃtás fejléc hiányzik -- az idÅ‘bélyegek kikapcsolva.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Az utolsó módosÃtás fejléc érvénytelen -- az idÅ‘bélyeg figyelmen kÃvül " "hagyva.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -988,16 +988,16 @@ msgstr "" "letöltésre.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "A méretek nem egyeznek (a helyi: %s) -- letöltésre kerül.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "A távoli fájl újabb, letöltésre kerül.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1007,7 +1007,7 @@ msgstr "" "letöltésre kerül.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1015,7 +1015,7 @@ msgstr "" "A távoli fájl létezik, de nem tartalmaz hivatkozásokat -- nem kerül " "letöltésre.\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1025,7 +1025,7 @@ msgstr "" "de a rekurzió le van tiltva -- nem kerül letöltésre.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1033,12 +1033,12 @@ msgstr "" "A távoli fájl létezik.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1047,7 +1047,7 @@ msgstr "" "%s (%s) -- %s kiÃrva a szabványos kimenetre [%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1056,27 +1056,27 @@ msgstr "" "%s (%s) -- %s mentve [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) -- A kapcsolat lezárva a(z) %s. bájtnál. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) -- Olvasási hiba a(z) %s. bájtnál (%s). " -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) -- Olvasási hiba a(z) %s/%s. bájtnál (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nem támogatott védelmi minÅ‘ség: „%sâ€.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nem támogatott algoritmus: „%sâ€.\n" @@ -1089,7 +1089,7 @@ msgstr "" "%s: A WGETRC a(z) %s elemre mutat, amelyet nem sikerült elérni az alábbi " "hiba miatt: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: %s nem olvasható (%s).\n" @@ -3107,17 +3107,17 @@ msgstr "az ioctl() meghiúsult. A foglalat nem állÃtható be blokkolóként.\n msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: figyelmeztetés: %s token található a gépnév elÅ‘tt\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: ismeretlen token „%sâ€\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Használat: %s NETRC [GÉPNÉV]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: %s nem érhetÅ‘ el: %s\n" @@ -3289,22 +3289,22 @@ msgstr "%s nem nyitható meg: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "robots.txt betöltése; hagyja figyelmen kÃvül a hibákat.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Hiba a proxy URL feldolgozása közben: %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Hiba a(z) %s proxy URL-ben: HTTP kell legyen.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d átirányÃtás túllépve.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3312,7 +3312,7 @@ msgstr "" "Feladás.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" Binary files differ@@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU wget 1.21.3\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2022-05-03 13:20+0700\n" "Last-Translator: Andika Triwidada <andika@gmail.com>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" @@ -389,12 +389,12 @@ msgstr "Transfer data digugurkan.\n" msgid "File %s already there; not retrieving.\n" msgstr "Berkas %s sudah ada di sana; tidak mengambil.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(coba:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -403,7 +403,7 @@ msgstr "" "%s (%s) - ditulis ke stdout %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -413,7 +413,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Menghapus %s.\n" @@ -771,7 +771,7 @@ msgstr "Menggunakan koneksi yang sudah ada ke %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Gagal membaca balasan proksi: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s GALAT %d: %s.\n" @@ -905,51 +905,51 @@ msgstr "Panjang: " msgid "ignored" msgstr "diabaikan" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Peringatan: wildcard tidak didukung dalam HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 #, fuzzy msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Mode laba-laba diaktifkan. Check jika berkas tujuan ada.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Tidak dapat menulis ke %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Atribut yang diperlukan hilang dari Header yang diterima.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Autentikasi Nama Pengguna/Kata Sandi Gagal.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Tidak dapat menulis ke berkas WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Tidak dapat menulis ke berkas WARC sementara.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Tidak dapat menjalin koneksi SSL.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Tidak dapat unlink %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "GALAT: Redireksi (%d) tanpa lokasi.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -957,23 +957,23 @@ msgstr "" "Tak bisa menemukan data Metalink dalam respons HTTP. Mengunduh berkas " "menggunakan HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Header metalink ditemukan. Beralih ke mode Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Berkas remote tidak ada -- tautan rusak!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Header Last-modified hilang -- stempel waktu dimatikan.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Header Last-modified tidak valid -- stempel waktu diabaikan.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -982,16 +982,16 @@ msgstr "" "Berkas server tidak lebih baru dari berkas lokal %s -- tidak mengambil.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Ukuran tidak cocok (lokal %s) -- mengambil.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Berkas remote lebih baru, mengambil.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1001,7 +1001,7 @@ msgstr "" "mengambil.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1009,7 +1009,7 @@ msgstr "" "Berkas tujuan ada tapi tidak berisi tautan apa pun -- tidak mengambil.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1019,7 +1019,7 @@ msgstr "" "tetapi rekursi dinonaktifkan -- tidak mengambil.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1027,12 +1027,12 @@ msgstr "" "Berkas remote ada.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s: URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1041,7 +1041,7 @@ msgstr "" "%s (%s) - ditulis ke stdout %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1050,27 +1050,27 @@ msgstr "" "%s (%s) - %s disimpan [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Hubungan ditutup pada byte %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Galat baca pada byte %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Galat baca pada byte %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Kualitas perlindungan yang tidak didukung '%s'.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritma yang tidak didukung '%s'.\n" @@ -1082,7 +1082,7 @@ msgid "" msgstr "" "%s: WGETRC menunjuk ke %s, yang tidak dapat diakses karena galat: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Tidak dapat membaca %s (%s).\n" @@ -3086,17 +3086,17 @@ msgstr "ioctl() gagal. Soket tidak dapat diatur sebagai memblokir.\n" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: peringatan: token %s muncul sebelum sebarang nama mesin\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: token tidak dikenal \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Penggunaan: %s NETRC [NAMAHOST]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: tidak bisa men-stat %s: %s\n" @@ -3266,22 +3266,22 @@ msgstr "Tidak dapat membuka %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Sedang memuat berkas robot.txt; harap abaikan kesalahan.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Galat saat mengurai URL proksi %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Galat dalam URL proksi %s: Harus berupa HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d pengalihan terlampaui.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3289,7 +3289,7 @@ msgstr "" "Menyerah.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.21\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2021-03-22 20:42+0100\n" "Last-Translator: Milo Casagrande <milo@milo.name>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -397,12 +397,12 @@ msgstr "Trasferimento dati interrotto.\n" msgid "File %s already there; not retrieving.\n" msgstr "Il file %s è già presente, non viene scaricato.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(tentativo:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -411,7 +411,7 @@ msgstr "" "%s (%s) - scritto su stdout %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -421,7 +421,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Rimozione di %s.\n" @@ -789,7 +789,7 @@ msgstr "Riutilizzo della connessione esistente a %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Lettura della risposta del proxy non riuscita: %s.\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERRORE %d: %s.\n" @@ -922,50 +922,50 @@ msgstr "Lunghezza: " msgid "ignored" msgstr "ignorato" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Attenzione: i metacaratteri non sono supportati in HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Modalità spider abilitata. Controllare se il file remoto esiste.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Impossibile scrivere in %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Manca un attributo richiesto nello header ricevuto.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Autenticazione nome utente/password non riuscita.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Impossibile scrivere nel file WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Impossibile scrivere nel file WARC temporaneo.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Impossibile stabilire una connessione SSL.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Impossibile rimuovere %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERRORE: ridirezione (%d) senza posizione di destinazione.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -973,25 +973,25 @@ msgstr "" "Impossibile trovare dati Metalink nella risposta HTTP. Il file viene " "scaricato con HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Trovata intestazione Metalink: attivata la modalità Metalink.\n" # FIXME -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Il file remoto non esiste -- collegamento rotto!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Intestazione Last-modified mancante -- time-stamp disattivati.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Intestazione Last-modified non valido -- time-stamp ignorato.\n" # Perché "server file" e non "remote file"? C'è differenza? -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -999,16 +999,16 @@ msgid "" msgstr "" "Il file del server è più vecchio del file locale %s -- non viene scaricato.\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Le dimensioni non coincidono (locale %s) -- scaricamento in corso.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Il file remoto è più recente, scaricamento in corso.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1017,14 +1017,14 @@ msgstr "" "Il file remoto esiste e potrebbe contenere collegamenti ad altre risorse -- " "scaricamento in corso.\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "" "Il file remoto esiste ma non contiene collegamenti -- non viene scaricato.\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1033,18 +1033,18 @@ msgstr "" "Il file remoto esiste e potrebbe contenere ulteriori collegamenti,\n" "ma la ricorsione è disabilitata -- non viene scaricato.\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" msgstr "Il file remoto esiste.\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1053,7 +1053,7 @@ msgstr "" "%s (%s) - scritto su stdout %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1062,27 +1062,27 @@ msgstr "" "%s (%s) - %s salvato [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Connessione chiusa al byte %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Errore di lettura al byte %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Errore di lettura al byte %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Qualità di protezione \"%s\" non gestita.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritmo \"%s\" non supportato.\n" @@ -1095,7 +1095,7 @@ msgstr "" "%s: WGETRC punta a %s, a cui non è possibile accedere per via dell'errore: " "%s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: impossibile leggere %s (%s).\n" @@ -3150,17 +3150,17 @@ msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: attenzione: %s appare prima di un nome di macchina\n" # token: termine? -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: termine \"%s\" sconosciuto\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uso: %s NETRC [HOSTNAME]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: stat di %s non riuscita: %s\n" @@ -3347,22 +3347,22 @@ msgstr "Impossibile aprire %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Caricamento di robots.txt; ignorare eventuali errori.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Errore analizzando l'URL del proxy %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Errore nell'URL del proxy %s: deve essere HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "superate %d ridirezioni.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3370,7 +3370,7 @@ msgstr "" "Rinuncio.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" Binary files differ@@ -2,14 +2,14 @@ # Copyright (C) 1998 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # Originally translated by Penguin Kun <penguin-kun@geocities.com>, 1998 -# Hiroshi Takekawa <sian@big.or.jp>, <sian.ht@gmail.com>, 2000, 2019, 2020, 2021, 2022 +# Hiroshi Takekawa <sian@big.or.jp>, <sian.ht@gmail.com>, 2000, 2019, 2020, 2021, 2022, 2023 # msgid "" msgstr "" -"Project-Id-Version: GNU wget 1.21.3\n" +"Project-Id-Version: GNU wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-02-27 21:58+0900\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-12 20:25+0900\n" "Last-Translator: Hiroshi Takekawa <sian@big.or.jp>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" "Language: ja\n" @@ -387,12 +387,12 @@ msgstr "データ転é€ã‚’ä¸æ–ã—ã¾ã—ãŸã€‚\n" msgid "File %s already there; not retrieving.\n" msgstr "ファイル %s ã¯ã™ã§ã«å˜åœ¨ã™ã‚‹ã®ã§ã€å–å¾—ã—ã¾ã›ã‚“。\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(試行:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -401,7 +401,7 @@ msgstr "" "%s (%s) - stdout ã¸å‡ºåŠ›ã—ã¾ã—㟠%s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -411,7 +411,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "%s を削除ã—ã¾ã—ãŸã€‚\n" @@ -771,7 +771,7 @@ msgstr "%s:%d ã¸ã®æŽ¥ç¶šã‚’å†åˆ©ç”¨ã—ã¾ã™ã€‚\n" msgid "Failed reading proxy response: %s\n" msgstr "プãƒã‚¯ã‚·ã‹ã‚‰ã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s エラー %d: %s。\n" @@ -903,51 +903,51 @@ msgstr "é•·ã•: " msgid "ignored" msgstr "無視ã—ã¾ã—ãŸ" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "è¦å‘Š: HTTPã¯ãƒ¯ã‚¤ãƒ«ãƒ‰ã‚«ãƒ¼ãƒ‰ã«å¯¾å¿œã—ã¦ã„ã¾ã›ã‚“。\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "スパイダーモードãŒæœ‰åŠ¹ã§ã™ã€‚リモートファイルãŒå˜åœ¨ã—ã¦ã‚‹ã‹ç¢ºèªã—ã¾ã™ã€‚\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "%s ã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“(%s)。\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "å¿…è¦ãªã‚¢ãƒˆãƒªãƒ“ュートãŒå—ã‘ã¨ã£ãŸãƒ˜ãƒƒãƒ€ã«ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Username/Password ã«ã‚ˆã‚‹èªè¨¼ã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "WARC ファイルã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“。\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "一時 WARC ファイルã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“。\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "SSL ã«ã‚ˆã‚‹æŽ¥ç¶šãŒç¢ºç«‹ã§ãã¾ã›ã‚“。\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "%s を削除ã§ãã¾ã›ã‚“(%s)。\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "エラー: å ´æ‰€ãŒå˜åœ¨ã—ãªã„リダイレクション(%d)ã§ã™ã€‚\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -955,23 +955,23 @@ msgstr "" "HTTP å¿œç”ã«ãƒ¡ã‚¿ãƒªãƒ³ã‚¯æƒ…å ±ãŒã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚HTTP GET ã§ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¾" "ã™ã€‚\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "メタリンクヘッダãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚メタリンクモードã«å¤‰æ›´ã—ã¾ã™ã€‚\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "リモートファイルãŒå˜åœ¨ã—ã¦ã„ã¾ã›ã‚“ -- リンクãŒå£Šã‚Œã¦ã„ã¾ã™!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified ヘッダãŒã‚ã‚Šã¾ã›ã‚“ -- 日付を無効ã«ã—ã¾ã™ã€‚\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified ヘッダãŒç„¡åŠ¹ã§ã™ -- 日付を無視ã—ã¾ã™ã€‚\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -980,16 +980,16 @@ msgstr "" "サーãƒå´ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚ˆã‚Šãƒãƒ¼ã‚«ãƒ«ã®ãƒ•ã‚¡ã‚¤ãƒ« %s ã®æ–¹ãŒæ–°ã—ã„ã®ã§å–å¾—ã—ã¾ã›ã‚“。\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "大ãã•ãŒåˆã‚ãªã„ã®ã§(ãƒãƒ¼ã‚«ãƒ«ã¯ %s)ã€è»¢é€ã—ã¾ã™ã€‚\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "リモートファイルã®ã»ã†ãŒæ–°ã—ã„ã®ã§ã€è»¢é€ã—ã¾ã™ã€‚\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -999,7 +999,7 @@ msgstr "" "ä¸ã€‚\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1008,7 +1008,7 @@ msgstr "" "ん。\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1018,18 +1018,18 @@ msgstr "" "ã™ -- å–å¾—ã—ã¾ã›ã‚“。\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" msgstr "リモートファイルãŒå˜åœ¨ã—ã¾ã™ã€‚\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1038,7 +1038,7 @@ msgstr "" "%s (%s) - stdout ã¸å‡ºåŠ›å®Œäº† %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1047,27 +1047,27 @@ msgstr "" "%s (%s) - %s ã¸ä¿å˜å®Œäº† [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - %s ãƒã‚¤ãƒˆã§æŽ¥ç¶šãŒçµ‚了ã—ã¾ã—ãŸã€‚ " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - %s ãƒã‚¤ãƒˆã§èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(%s)。" -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - %s/%s ãƒã‚¤ãƒˆã§èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(%s)。 " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "'%s' ã¨ã„ã†ä¿è·æ–¹å¼ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "'%s' ã¨ã„ã†ã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。\n" @@ -1078,7 +1078,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC ㌠%s を指ã—ã¦ã„ã¾ã™ãŒ, å˜åœ¨ã—ã¾ã›ã‚“: %s\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: %s (%s)ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“。\n" @@ -1392,16 +1392,12 @@ msgid "" msgstr " --retry-connrefused 接続を拒å¦ã•ã‚Œã¦ã‚‚リトライã™ã‚‹\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=ERRORS コンマ区切りã§æŒ‡å®šã—ãŸHTTPã®ã‚¨ãƒ©ãƒ¼ã®å ´" -"åˆãƒªãƒˆãƒ©ã‚¤ã™ã‚‹\n" +" --retry-on-http-error ホストã®ã‚¨ãƒ©ãƒ¼ã¯è‡´å‘½çš„ãªã‚‚ã®ã¨ã—ã¦æ‰±" +"ã†\n" #: src/main.c:653 msgid "" @@ -2974,17 +2970,17 @@ msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: è¦å‘Š: 区切り記å·(token) %s ã¯ã™ã¹ã¦ã®ãƒžã‚·ãƒ³åã®å‰ã«ç¾ã‚ã‚Œã¾ã™\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: \"%s\" ã¯ä¸æ˜ŽãªåŒºåˆ‡ã‚Šè¨˜å·(token)ã§ã™\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "使ã„æ–¹: %s NETRC [ホストå]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: %sã®æƒ…å ±ã‚’å–å¾—ã§ãã¾ã›ã‚“: %s\n" @@ -3015,14 +3011,13 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: 実装ã•ã‚Œã¦ã„ãªã„ 'secure-protocol' オプション値 %d\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "OpenSSL ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒå¤ã™ãŽã¦ TLSv1.3 をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" +msgstr "OpenSSL ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ '%s' オプションをサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "wgetã‚„OpenSSLをリビルドã™ã‚‹ã¨ã“ã®å•é¡Œã‚’解決ã§ãã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。\n" #: src/openssl.c:341 #, c-format @@ -3148,22 +3143,22 @@ msgstr "%s ã‚’é–‹ã‘ã¾ã›ã‚“: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "robots.txtã‚’èªã¿è¾¼ã‚“ã§ã„ã¾ã™ã€ã‚¨ãƒ©ãƒ¼ã¯ç„¡è¦–ã—ã¦ãã ã•ã„。\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "proxy URL %s を解釈ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "proxy URL %s ã«é–“é•ã„ãŒã‚ã‚Šã¾ã™: HTTPã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "リダイレクション回数㌠%d を越ãˆã¾ã—ãŸã€‚\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3171,7 +3166,7 @@ msgstr "" "ä¸æ¢ã—ã¾ã—ãŸã€‚\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3207,20 +3202,16 @@ msgid "No error" msgstr "エラーãªã—" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "%s ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„スã‚ームã§ã™" +msgstr "サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„スã‚ームã§ã™" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "HTTPS ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã‚‹ã‚ˆã†ã‚³ãƒ³ãƒ‘イルã•ã‚Œã¦ã„ã¾ã›ã‚“" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "HTTPS ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã‚‹ã‚ˆã†ã‚³ãƒ³ãƒ‘イルã•ã‚Œã¦ã„ã¾ã›ã‚“" +msgstr "FTPS ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã‚‹ã‚ˆã†ã‚³ãƒ³ãƒ‘イルã•ã‚Œã¦ã„ã¾ã›ã‚“" #: src/url.c:692 msgid "Scheme missing" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU wget 1.21.3\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2022-06-23 09:23+0200\n" "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n" "Language-Team: Georgian <(nothing)>\n" @@ -378,19 +378,19 @@ msgstr "" msgid "File %s already there; not retrieving.\n" msgstr "" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(ცდáƒ:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -398,7 +398,7 @@ msgid "" msgstr "" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "წáƒáƒ¨áƒšáƒ %s.\n" @@ -743,7 +743,7 @@ msgstr "" msgid "Failed reading proxy response: %s\n" msgstr "" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s-ის შეცდáƒáƒ›áƒ %d: %s\n" @@ -862,126 +862,126 @@ msgstr "სიგრძე: " msgid "ignored" msgstr "იგნáƒáƒ ირებულიáƒ" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "ბმულის მáƒáƒ®áƒ¡áƒœáƒ˜áƒ¡ შეცდáƒáƒ›áƒ:%s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" "\n" msgstr "" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" msgstr "დáƒáƒ¨áƒáƒ ებული ფáƒáƒ˜áƒšáƒ˜ áƒáƒ სებáƒáƒ‘ს.\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -990,27 +990,27 @@ msgstr "" "%s (%s) - %s შენáƒáƒ®áƒ£áƒšáƒ˜áƒ [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - შეერთებრდáƒáƒ˜áƒ®áƒ£áƒ რბáƒáƒ˜áƒ¢áƒ—áƒáƒœ %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - კითხვის შეცდáƒáƒ›áƒ ბáƒáƒ˜áƒ¢áƒ—áƒáƒœ %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - კითხვის შეცდáƒáƒ›áƒ ბáƒáƒ˜áƒ¢áƒ—áƒáƒœ %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "მხáƒáƒ დáƒáƒ£áƒáƒ”რელი áƒáƒšáƒ’áƒáƒ ითმი '%s'.\n" @@ -1021,7 +1021,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: წáƒáƒ™áƒ˜áƒ—ხვრშეუძლებელირ%s (%s).\n" @@ -2651,17 +2651,17 @@ msgstr "" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "" @@ -2816,28 +2816,28 @@ msgstr "გáƒáƒ®áƒ¡áƒœáƒ˜áƒ¡ შეცდáƒáƒ›áƒ: %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" msgstr "შევეშვი.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" Binary files differ@@ -3,14 +3,14 @@ # This file is distributed under the same license as the wget package. # Bang Jun-Young <bangjy@nownuri.nowcom.co.kr>, 1996-1997. # Changwoo Ryu <cwryu@debian.org>, 2001-2002. -# Seong-ho Cho <darkcircle.0426@gmail.com>, 2021-2022. +# Seong-ho Cho <darkcircle.0426@gmail.com>, 2021-2023. # msgid "" msgstr "" -"Project-Id-Version: wget-1.21.3\n" +"Project-Id-Version: wget-1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-03-04 21:52+0900\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-07-14 02:07+0900\n" "Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n" "Language-Team: Korean <translation-team-ko@googlegroups.com>\n" "Language: ko\n" @@ -25,7 +25,7 @@ msgstr "" #: src/connect.c:201 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" -msgstr "%s: %s ë°”ì¸ë”© 주소 í•´ì„ ì‹¤íŒ¨. ë°”ì¸ë”© ê¸°ëŠ¥ì„ ì‚¬ìš©í•˜ì§€ ì•ŠìŒ.\n" +msgstr "%s: %s ë°”ì¸ë”© 주소 í•´ì„ ì‹¤íŒ¨. ë°”ì¸ë”© ê¸°ëŠ¥ì„ ì‚¬ìš©í•˜ì§€ 않습니다.\n" #: src/connect.c:282 #, c-format @@ -388,12 +388,12 @@ msgstr "ë°ì´í„° ì „ì†¡ì„ ë©ˆì¶”ì—ˆìŠµë‹ˆë‹¤.\n" msgid "File %s already there; not retrieving.\n" msgstr "%s 파ì¼ì´ ì´ë¯¸ 있습니다. ê°€ì ¸ì˜¤ì§€ ì•ŠìŒ.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(ì‹œë„횟수:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -402,7 +402,7 @@ msgstr "" "%s (%s) - 표준 ì¶œë ¥ì— ê¸°ë¡ %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -412,7 +412,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "%s ì œê±° 중.\n" @@ -767,7 +767,7 @@ msgstr "%sì— ê¸°ì¡´ ì—°ê²° 재활용:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "프ë¡ì‹œ ì‘답 ì½ê¸° 실패: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s 오류 %d: %s.\n" @@ -898,50 +898,50 @@ msgstr "길ì´: " msgid "ignored" msgstr "무시함" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "ê²½ê³ : HTTPì— ì™€ì¼ë“œì¹´ë“œ 문ìžë¥¼ 지ì›í•˜ì§€ 않습니다.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "스파ì´ë” 모드를 켰습니다. ì›ê²© 파ì¼ì´ 있는지 검사합니다.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "%sì— ì“¸ 수 ì—†ìŒ (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "ìˆ˜ì‹ í•œ í—¤ë”ì— í•„ìš”í•œ ì†ì„±ì´ ë¹ ì¡ŒìŠµë‹ˆë‹¤.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "사용ìžì´ë¦„/암호 ì¸ì¦ì— 실패했습니다.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "WARC 파ì¼ì— 쓸 수 없습니다.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "ìž„ì‹œ WARC 파ì¼ì„ 쓸 수 없습니다.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "SSL ì—°ê²°ì„ ìˆ˜ë¦½í• ìˆ˜ 없습니다.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "%s ë§í¬ë¥¼ ëŠì„ 수 없습니다(%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "오류: 위치 ì •ë³´ ì—†ì´ ê²½ë¡œ ì „í™˜í•¨(%d).\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -949,23 +949,23 @@ msgstr "" "HTTP ì‘ë‹µì— ë©”íƒ€ë§í¬ ë°ì´í„°ê°€ 없습니다. HTTP GET ë°©ì‹ìœ¼ë¡œ 파ì¼ì„ 다운로드합니" "다.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "메타ë§í¬ í—¤ë”를 찾았습니다. 메타ë§í¬ 모드로 ì „í™˜í•©ë‹ˆë‹¤.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "ì›ê²© 파ì¼ì´ 없습니다. 깨진 ë§í¬ìž…니다!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified í—¤ë”ê°€ ë¹ ì¡ŒìŠµë‹ˆë‹¤. 타임스탬프를 ë•ë‹ˆë‹¤.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified í—¤ë”ê°€ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤. 타임스탬프 무시.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -974,16 +974,16 @@ msgstr "" "%s 로컬 파ì¼ë³´ë‹¤ ìµœì‹ ì˜ íŒŒì¼ì´ ì„œë²„ì— ì—†ìŠµë‹ˆë‹¤. ê°€ì ¸ì˜¤ì§€ ì•ŠìŒ.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "í¬ê¸°ê°€ ì¼ì¹˜í•˜ì§€ 않습니다 (로컬 %s). ê°€ì ¸ì˜¤ëŠ” 중.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "ì›ê²© 파ì¼ì´ ìµœì‹ ìž…ë‹ˆë‹¤. ê°€ì ¸ì˜¤ëŠ” 중.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -992,7 +992,7 @@ msgstr "" "ì›ê²© 파ì¼ì´ 있으며 다른 ìžë£Œë¡œì˜ ë§í¬ê°€ ìžˆì„ ìˆ˜ 있습니다. ê°€ì ¸ì˜¤ëŠ” 중.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1000,7 +1000,7 @@ msgstr "" "ì›ê²© 파ì¼ì´ 있지만 ì–´ë–¤ ë§í¬ë„ 없습니다. ê°€ì ¸ì˜¤ì§€ ì•ŠìŒ.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1010,18 +1010,18 @@ msgstr "" "재귀 추ì ì„ í•˜ì§€ 않습니다. ê°€ì ¸ì˜¤ì§€ ì•ŠìŒ.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" msgstr "ì›ê²© 파ì¼ì´ 있습니다.\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1030,7 +1030,7 @@ msgstr "" "%s (%s) - 표준 ì¶œë ¥ì— ê¸°ë¡: %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1039,27 +1039,27 @@ msgstr "" "%s (%s) - %s ì €ìž¥í•¨ [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - %s ë°”ì´íŠ¸ì— ì—°ê²° ëŠìŒ. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - %s ë°”ì´íŠ¸ì—ì„œ ì½ê¸° 오류 (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - %s/%s ë°”ì´íŠ¸ì—ì„œ ì½ê¸° 오류 (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "'%s' 보호 ìˆ˜ì¤€ì„ ì§€ì›í•˜ì§€ 않습니다.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "'%s' ì•Œê³ ë¦¬ì¦˜ì„ ì§€ì›í•˜ì§€ 않습니다.\n" @@ -1070,7 +1070,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRCì—ì„œ 오류로 ì¸í•´ ì ‘ê·¼í• ìˆ˜ 없는 %sì„(를) 가리킵니다: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: %sì„(를) ì½ì„ 수 없습니다 (%s).\n" @@ -1268,20 +1268,21 @@ msgstr "시작:\n" #: src/main.c:594 msgid "" " -V, --version display the version of Wget and exit\n" -msgstr " -V, --version Wget ë²„ì „ì„ í‘œì‹œí•œ 후 나갑니다\n" +msgstr " -V, --version wget ë²„ì „ì„ í‘œì‹œí•œ 후 나갑니다\n" #: src/main.c:596 msgid " -h, --help print this help\n" -msgstr " -h, --help ì´ ë„움ë§ì„ ì¶œë ¥í•©ë‹ˆë‹¤\n" +msgstr " -h, --help ì´ ë„움ë§ì„ ì¶œë ¥í•©ë‹ˆë‹¤\n" #: src/main.c:598 msgid " -b, --background go to background after startup\n" msgstr "" -" -b, --background 시작 후 백그ë¼ìš´ë“œ ë™ìž‘으로 ì „í™˜í•©ë‹ˆë‹¤\n" +" -b, --background 시작 후 백그ë¼ìš´ë“œ ë™ìž‘으로 ì „í™˜í•©ë‹ˆë‹¤\n" #: src/main.c:600 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" -msgstr " -e, --execute=<ëª…ë ¹> `.wgetrc' ë°©ì‹ ëª…ë ¹ì„ ì‹¤í–‰í•©ë‹ˆë‹¤\n" +msgstr "" +" -e, --execute=<ëª…ë ¹> `.wgetrc' ë°©ì‹ ëª…ë ¹ì„ ì‹¤í–‰í•©ë‹ˆë‹¤\n" #: src/main.c:604 msgid "Logging and input file:\n" @@ -1304,23 +1305,23 @@ msgstr " -d, --debug 방대한 디버깅 ì •ë³´ë¥¼ ì¶œë ¥í #: src/main.c:615 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -" --wdebug Watt-32 디버깅 ì¶œë ¥ ë‚´ìš©ì„ ë‚˜íƒ€ëƒ…ë‹ˆë‹¤\n" +" --wdebug watt-32 디버깅 ì¶œë ¥ ë‚´ìš©ì„ ë‚˜íƒ€ëƒ…ë‹ˆë‹¤\n" #: src/main.c:618 msgid " -q, --quiet quiet (no output)\n" -msgstr " -q, --quiet ì–´ë–¤ ë‚´ìš©ë„ ì¶œë ¥í•˜ì§€ 않습니다\n" +msgstr " -q, --quiet ì–´ë–¤ ë‚´ìš©ë„ ì¶œë ¥í•˜ì§€ 않습니다\n" #: src/main.c:620 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -" -v, --verbose ê³¼ì •ì„ ìžì„¸í•˜ê²Œ 나타냅니다 (기본 ì„¤ì •)\n" +" -v, --verbose ê³¼ì •ì„ ìžì„¸í•˜ê²Œ 나타냅니다 (기본 ì„¤ì •)\n" #: src/main.c:622 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -" -nv, --no-verbose 아무 ë‚´ìš©ë„ ì¶œë ¥í•˜ëŠ”ê±´ 아니지만, ì¶œë ¥ ë‚´ìš©" +" -nv, --no-verbose 아무 ë‚´ìš©ë„ ì¶œë ¥í•˜ì§„ 않지만, ì¶œë ¥ ë‚´ìš©" "ì„ ì¤„ìž…ë‹ˆë‹¤\n" #: src/main.c:624 @@ -1329,7 +1330,8 @@ msgid "" "bits\n" msgstr "" " --report-speed=<형ì‹> ì§€ì • <형ì‹>ì— ë”°ë¼ ëŒ€ì—í ì •ë³´ë¥¼ ì¶œë ¥í•©" -"니다. <형ì‹>ì˜ ê°’ì€ bitsì¼ ìˆ˜ 있습니다\n" +"니다.\n" +" <형ì‹>ì˜ ê°’ì€ bit ëŒ ìœ„ì¼ ìˆ˜ 있습니다\n" #: src/main.c:626 msgid "" @@ -1349,7 +1351,7 @@ msgstr "" #: src/main.c:632 msgid " -F, --force-html treat input file as HTML\n" -msgstr " -F, --force-html ìž…ë ¥ 파ì¼ì„ HTMLë¡œ 취급합니다\n" +msgstr " -F, --force-html ìž…ë ¥ 파ì¼ì„ HTMLë¡œ 취급합니다\n" #: src/main.c:634 msgid "" @@ -1357,21 +1359,22 @@ msgid "" " relative to URL\n" msgstr "" " -B, --base=<URL> <URL>ì— ìƒëŒ€ì ì¸ ìœ„ì¹˜ì—ì„œ \n" -" HTML ìž…ë ¥ 파ì¼ì—°ê²° (-i -F)ì„ í•´ì„합니" +" HTML ìž…ë ¥ íŒŒì¼ ì—°ê²°(-i -F)ì„ í•´ì„합니" "다\n" #: src/main.c:637 msgid " --config=FILE specify config file to use\n" -msgstr " --config=<파ì¼> í™œìš©í• ì„¤ì • 파ì¼ì„ ì§€ì •\n" +msgstr " --config=<파ì¼> í™œìš©í• ì„¤ì • 파ì¼ì„ ì§€ì •í•©ë‹ˆë‹¤\n" #: src/main.c:639 msgid " --no-config do not read any config file\n" -msgstr " --no-config ì–´ë–¤ ì„¤ì • 파ì¼ë„ ì½ì§€ ì•ŠìŒ\n" +msgstr " --no-config ì–´ë–¤ ì„¤ì • 파ì¼ë„ ì½ì§€ 않습니다\n" #: src/main.c:641 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" -msgstr " --rejected-log=<파ì¼> <파ì¼> URL ê±°ì ˆ ì´ìœ 를 기ë¡\n" +msgstr "" +" --rejected-log=<파ì¼> <파ì¼> URL ê±°ì ˆ ì´ìœ 를 기ë¡í•©ë‹ˆë‹¤\n" #: src/main.c:645 msgid "Download:\n" @@ -1382,25 +1385,23 @@ msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -" -t, --tries=<숫ìž> ìž¬ì‹œë„ íšŸìˆ˜ë¥¼ <숫ìž>ë¡œ ì§€ì • (0: 무한)\n" +" -t, --tries=<숫ìž> ìž¬ì‹œë„ íšŸìˆ˜ë¥¼ <숫ìž>ë¡œ ì§€ì •í•©ë‹ˆë‹¤ (0: 무" +"í•œ)\n" #: src/main.c:649 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -" --retry-connrefused ì—°ê²°ì„ ì›ê²©ì—ì„œ ê±°ì ˆí•´ë„ ë‹¤ì‹œ ì‹œë„\n" +" --retry-connrefused ì—°ê²°ì„ ì›ê²©ì—ì„œ ê±°ì ˆí•´ë„ ë‹¤ì‹œ ì‹œë„합니" +"다\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=<오류코드> 다시 ì‹œë„í• ê²½ìš°ì˜ ì‰¼í‘œ 구분 HTTP " -"오류 코드\n" +" --retry-on-host-error 호스트 오류를 치명ì ì´ ì•„ë‹Œ ìž ê¹ì˜ 오류" +"ë¡œ 간주합니다\n" #: src/main.c:653 msgid "" @@ -1412,50 +1413,51 @@ msgstr "" #: src/main.c:655 msgid " -O, --output-document=FILE write documents to FILE\n" -msgstr " -O, --output-document=<파ì¼> <파ì¼>ì— ë¬¸ì„œ 쓰기\n" +msgstr " -O, --output-document=<파ì¼> <파ì¼>ì— ë¬¸ì„œë¥¼ ì”니다\n" #: src/main.c:657 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -" -nc, --no-clobber 기존 파ì¼ì— 다운로드(ë®ì–´ì“°ê¸°) í• ê²½ìš° \n" -" 다운로드 건너뛰기\n" +" -nc, --no-clobber 기존 파ì¼ì— 다운로드(ë®ì–´ì“°ê¸°)í• ê²½ìš° ê±´" +"너ëœë‹ˆë‹¤\n" #: src/main.c:660 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -" --no-netrc .netrcì—ì„œ ì¸ì¦ ì •ë³´ ê°€ì ¸ì˜¤ê¸° ì‹œë„하지 ì•Š" -"ìŒ\n" +" --no-netrc .netrcì—ì„œ ì¸ì¦ ì •ë³´ ê°€ì ¸ì˜¤ê¸°ë¥¼ ì‹œë„하" +"지 않습니다\n" #: src/main.c:662 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -" -c, --continue ì¼ë¶€ë§Œ 다운로드한 íŒŒì¼ ê°€ì ¸ì˜¤ê¸° 재개\n" +" -c, --continue ì¼ë¶€ë§Œ 다운로드한 파ì¼ì˜ 다운로드를 계" +"ì† ì§„í–‰í•©ë‹ˆë‹¤\n" #: src/main.c:664 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -" --start-pos=<오프셋> <오프셋> 위치를 ì˜ì 으로 하여 다운로드 " -"시작\n" +" --start-pos=<오프셋> <오프셋> 위치를 ì›ì 으로 간주하여\n" +" 다운로드를 시작합니다\n" #: src/main.c:666 msgid " --progress=TYPE select progress gauge type\n" -msgstr " --progress=<형ì‹> 진행 표시 í˜•ì‹ ì„ íƒ\n" +msgstr " --progress=<형ì‹> 진행 표시 형ì‹ì„ ì„ íƒí•©ë‹ˆë‹¤\n" #: src/main.c:668 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -" --show-progress ì–´ë–¤ 대량 ì¶œë ¥ 모드ì—ì„œë“ ì§„í–‰ 표시줄 출" -"ë ¥\n" +" --show-progress ì–´ë–¤ ëŒ€ëŸ‰ì¶œë ¥ 모드ì—ì„œë“ ì§„í–‰ í‘œì‹œì¤„ì„ " +"ì¶œë ¥í•©ë‹ˆë‹¤\n" #: src/main.c:670 msgid "" @@ -1463,8 +1465,9 @@ msgid "" "than\n" " local\n" msgstr "" -" -N, --timestamping 로컬 파ì¼ë³´ë‹¤ ìµœì‹ ì´ ì•„ë‹ˆë©´ 파ì¼ì„ 다시\n" -" ê°€ì ¸ì˜¤ì§€ ì•ŠìŒ\n" +" -N, --timestamping 로컬 파ì¼ë³´ë‹¤ ìµœì‹ ì´ ì•„ë‹ˆë©´ 파ì¼ì„ 다" +"ì‹œ\n" +" ê°€ì ¸ì˜¤ì§€ 않습니다\n" #: src/main.c:673 msgid "" @@ -1472,29 +1475,31 @@ msgid "" "get\n" " requests in timestamping mode\n" msgstr "" -" --no-if-modified-since 타임스탬프 모드로 조건부 if-modified-" +" --no-if-modified-since 타임스탬프 모드로 조건부 if-modified-" "since\n" -" GET ìš”ì²ì„ 하지 ì•ŠìŒ\n" +" GET ìš”ì²ì„ 하지 않습니다\n" #: src/main.c:676 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -" --no-use-server-timestamps 로컬 파ì¼ì˜ 타임 스탬프를 서버 파ì¼ì˜\n" -" 타임스탬프로 ì„¤ì •í•˜ì§€ ì•ŠìŒ\n" +" --no-use-server-timestamps 로컬 파ì¼ì˜ 타임스탬프를 서버 파ì¼ì˜\n" +" 타임스탬프로 ì„¤ì •í•˜ì§€ 않습니다\n" #: src/main.c:679 msgid " -S, --server-response print server response\n" -msgstr " -S, --server-response 서버 ì‘답 ì¶œë ¥\n" +msgstr " -S, --server-response 서버 ì‘ë‹µì„ ì¶œë ¥í•©ë‹ˆë‹¤\n" #: src/main.c:681 msgid " --spider don't download anything\n" -msgstr " --spider ì•„ë¬´ê²ƒë„ ë‹¤ìš´ë¡œë“œí•˜ì§€ ì•ŠìŒ\n" +msgstr " --spider ì•„ë¬´ê²ƒë„ ê°€ì ¸ì˜¤ì§€ 않습니다\n" #: src/main.c:683 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" -msgstr " -T, --timeout=<ì´ˆ> ëª¨ë“ ê²½ìš°ì˜ ì œí•œ ì‹œê°„ì„ <ì´ˆ>ë¡œ ì§€ì •\n" +msgstr "" +" -T, --timeout=<ì´ˆ> ëª¨ë“ ê²½ìš°ì˜ ì œí•œ ì‹œê°„ì„ <ì´ˆ>ë¡œ ì§€ì •í•©ë‹ˆ" +"다\n" #: src/main.c:686 msgid "" @@ -1508,19 +1513,22 @@ msgid "" "IP) on local host\n" msgstr "" " --bind-dns-address=<주소> DNS í•´ì„ ì„œë²„ë¥¼ 로컬 í˜¸ìŠ¤íŠ¸ì˜ <주소>(호스" -"트 ì´ë¦„/IP)ë¡œ ë°”ì¸ë”©\n" +"트 ì´ë¦„/IP)ë¡œ ë°”ì¸ë”©í•©ë‹ˆë‹¤\n" #: src/main.c:691 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" -msgstr " --dns-timeout=<ì´ˆ> DNS íƒìƒ‰ ì œí•œ ì‹œê°„ì„ <ì´ˆ>ë¡œ ì§€ì •\n" +msgstr "" +" --dns-timeout=<ì´ˆ> DNS íƒìƒ‰ ì œí•œ ì‹œê°„ì„ <ì´ˆ>ë¡œ ì§€ì •í•©ë‹ˆë‹¤\n" #: src/main.c:693 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" -msgstr " --connect-timeout=<ì´ˆ> ì—°ê²° ì œí•œ ì‹œê°„ì„ <ì´ˆ>ë¡œ ì§€ì •\n" +msgstr "" +" --connect-timeout=<ì´ˆ> ì—°ê²° ì œí•œ ì‹œê°„ì„ <ì´ˆ>ë¡œ ì§€ì •í•©ë‹ˆë‹¤\n" #: src/main.c:695 msgid " --read-timeout=SECS set the read timeout to SECS\n" -msgstr " --read-timeout=<ì´ˆ> ì½ê¸° ì œí•œ ì‹œê°„ì„ <ì´ˆ>ë¡œ ì§€ì •\n" +msgstr "" +" --read-timeout=<ì´ˆ> ì½ê¸° ì œí•œ ì‹œê°„ì„ <ì´ˆ>ë¡œ ì§€ì •í•©ë‹ˆë‹¤\n" #: src/main.c:697 msgid "" @@ -1528,7 +1536,8 @@ msgid "" " (applies if more then 1 URL is to be " "retrieved)\n" msgstr "" -" -w, --wait=<ì´ˆ> ì „ì†¡ ë™ìž‘ê°„ 대기 ì‹œê°„ì„ <ì´ˆ>ë¡œ ì§€ì •\n" +" -w, --wait=<ì´ˆ> ì „ì†¡ ë™ìž‘ê°„ 대기 ì‹œê°„ì„ <ì´ˆ>ë¡œ ì§€ì •í•©ë‹ˆ" +"다\n" " (하나 ì´ìƒì˜ URLì„ ê°€ì ¸ì˜¬ ë•Œ ì ìš©)\n" #: src/main.c:700 @@ -1538,7 +1547,8 @@ msgid "" " (applies if more then 1 URL is to be " "retrieved)\n" msgstr "" -" --waitretry=<ì´ˆ> ì „ì†¡ ìž¬ì‹œë„ ì‹œê°„ ê°„ê²©ì„ 1..<ì´ˆ> 사ì´ë¡œ ì§€ì •\n" +" --waitretry=<ì´ˆ> ì „ì†¡ ìž¬ì‹œë„ ì‹œê°„ ê°„ê²©ì„ 1..<ì´ˆ> 사ì´ë¡œ " +"ì§€ì •í•©ë‹ˆë‹¤\n" " (하나 ì´ìƒì˜ URLì„ ê°€ì ¸ì˜¬ ë•Œ ì ìš©)\n" #: src/main.c:703 @@ -1548,58 +1558,61 @@ msgid "" " (applies if more then 1 URL is to be " "retrieved)\n" msgstr "" -" --random-wait ì „ì†¡ ë™ìž‘ê°„ 대기 ì‹œê°„ì„ 0.5*<대기>...1.5*<" -"대기> 사ì´ë¡œ ì§€ì •\n" -" (하나 ì´ìƒì˜ URLì„ ê°€ì ¸ì˜¬ ë•Œ ì ìš©)\n" +" --random-wait ì „ì†¡ ë™ìž‘ê°„ 대기 ì‹œê°„ì„ 0.5*<대기" +">...1.5*<대기>\n" +" 사ì´ë¡œ ì§€ì •í•©ë‹ˆë‹¤ (하나 ì´ìƒì˜ URLì„ ê°€" +"ì ¸ì˜¬ ë•Œ ì ìš©)\n" #: src/main.c:706 msgid " --no-proxy explicitly turn off proxy\n" -msgstr " --no-proxy 프ë¡ì‹œë¥¼ ì™„ì „ížˆ 사용하지 ì•ŠìŒ\n" +msgstr "" +" --no-proxy 프ë¡ì‹œë¥¼ ì™„ì „ížˆ 사용하지 않습니다\n" #: src/main.c:708 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" -msgstr " -Q, --quota=<숫ìž> <숫ìž>ë¡œ ì „ì†¡ëŸ‰ ì œí•œ\n" +msgstr " -Q, --quota=<숫ìž> <숫ìž>ë¡œ ì „ì†¡ëŸ‰ì„ ì œí•œí•©ë‹ˆë‹¤\n" #: src/main.c:710 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -" --bind-address=<주소> 로컬 호스트를 <주소>(호스트 ì´ë¦„/IP)ë¡œ ë°”ì¸" -"딩\n" +" --bind-address=<주소> 로컬 호스트를 <주소>(호스트 ì´ë¦„/IP)ë¡œ " +"ë°”ì¸ë”©\n" #: src/main.c:712 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -" --limit-rate=<ì „ì†¡ìœ¨> 다운로드 ì „ì†¡ìœ¨ì„ <ì „ì†¡ìœ¨>ë¡œ ì œí•œí•©ë‹ˆ" +" --limit-rate=<ì „ì†¡ìœ¨> 다운로드 ì „ì†¡ìœ¨ì„ <ì „ì†¡ìœ¨>ë¡œ ì œí•œí•©ë‹ˆ" "다\n" #: src/main.c:714 msgid " --no-dns-cache disable caching DNS lookups\n" -msgstr " --no-dns-cache DNS íƒìƒ‰ ìºì‹±ì„ ë•ë‹ˆë‹¤\n" +msgstr " --no-dns-cache DNS íƒìƒ‰ ìºì‹±ì„ ë•ë‹ˆë‹¤\n" #: src/main.c:716 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -" --restrict-file-names=<ìš´ì˜ì²´ì œ> <ìš´ì˜ì²´ì œ>ê°€ 허용하는 íŒŒì¼ ì´ë¦„ 문" -"ìžë¡œ ì œí•œ\n" +" --restrict-file-names=<ìš´ì˜ì²´ì œ> <ìš´ì˜ì²´ì œ>ê°€ 허용하는 파ì¼ì´ë¦„ 문" +"ìžë¡œ ì œí•œí•©ë‹ˆë‹¤\n" #: src/main.c:718 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -" --ignore-case 파ì¼/ë””ë ‰í„°ë¦¬ 검색시 ëŒ€ì†Œë¬¸ìž ë¬´ì‹œ\n" +" --ignore-case 파ì¼/ë””ë ‰í„°ë¦¬ 검색시 ëŒ€ì†Œë¬¸ìž êµ¬ë¶„ì„ ë¬´" +"시합니다\n" #: src/main.c:721 msgid " -4, --inet4-only connect only to IPv4 addresses\n" -msgstr " -4, --inet4-only IPv4 주소로만 ì—°ê²°\n" +msgstr " -4, --inet4-only IPv4 주소로만 연결합니다\n" #: src/main.c:723 msgid " -6, --inet6-only connect only to IPv6 addresses\n" -msgstr " -6, --inet6-only IPv6 주소로만 ì—°ê²°\n" +msgstr " -6, --inet6-only IPv6 주소로만 연결합니다\n" #: src/main.c:725 msgid "" @@ -1607,22 +1620,24 @@ msgid "" "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -" --prefer-family=<형ì‹> ì§€ì •í˜•ì‹ìœ¼ë¡œ 주소로 ìš°ì„ ì—°ê²°í•©ë‹ˆë‹¤.\n" -" IPv6, IPv4, none 중 하나.\n" +" --prefer-family=<형ì‹> IPv6, IPv4, none 중 한가지 ì§€ì • 계열 주" +"소로 ìš°ì„ ì—°ê²°í•©ë‹ˆë‹¤\n" #: src/main.c:729 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -" --user=<사용ìž> http/ftp 사용ìžë¥¼ <사용ìž>ë¡œ ì§€ì •\n" +" --user=<사용ìž> http/ftp 사용ìžë¥¼ <사용ìž>ë¡œ ì§€ì •í•©ë‹ˆ" +"다\n" #: src/main.c:731 msgid "" " --password=PASS set both ftp and http password to PASS\n" -msgstr " --password=<암호> http/ftp 암호를 <암호>ë¡œ ì§€ì •\n" +msgstr "" +" --password=<암호> http/ftp 암호를 <암호>ë¡œ ì§€ì •í•©ë‹ˆë‹¤\n" #: src/main.c:733 msgid " --ask-password prompt for passwords\n" -msgstr " --ask-password 암호 물어보기\n" +msgstr " --ask-password 암호를 물어봅니다\n" #: src/main.c:736 msgid "" @@ -1634,70 +1649,72 @@ msgid "" "SSH_ASKPASS \n" " environment variable is used.\n" msgstr "" -" --use-askpass=<ëª…ë ¹> ì‚¬ìš©ìž ì´ë¦„ ë° ì•”í˜¸ë¥¼ ìš”ì²í• ì¸ì¦ 핸들러를 " -"ì§€ì •í•©ë‹ˆë‹¤.\n" +" --use-askpass=<ëª…ë ¹> ì‚¬ìš©ìž ì´ë¦„ ë° ì•”í˜¸ë¥¼ ìš”ì²í• ì¸ì¦ 핸들러" +"를 ì§€ì •í•©ë‹ˆë‹¤.\n" " <ëª…ë ¹>ì´ ì—†ìœ¼ë©´ WGET_ASKPASS ë˜ëŠ” " -"SSH_ASKPASS 환경 ë³€ìˆ˜ì— \n" -" ì§€ì •í•œ ê°’ì„ ì‚¬ìš©í•©ë‹ˆë‹¤.\n" +"SSH_ASKPASS\n" +" 환경 ë³€ìˆ˜ì— ì§€ì •í•œ ê°’ì„ ì‚¬ìš©í•©ë‹ˆë‹¤.\n" #: src/main.c:742 msgid " --no-iri turn off IRI support\n" -msgstr " --no-iri IRI 지ì›ì„ ë•ë‹ˆë‹¤\n" +msgstr " --no-iri IRI 지ì›ì„ ë•ë‹ˆë‹¤\n" #: src/main.c:744 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -" --local-encoding=<ì¸ì½”딩> IRI 로컬 ì¸ì½”ë”©ì„ <ì¸ì½”딩> ê°’ì— ë”°" -"릅\n" +" --local-encoding=<ì¸ì½”딩> IRI 로컬 ì¸ì½”ë”©ì„ <ì¸ì½”딩> ê°’ì— ë”°ë¦…ë‹ˆ" +"다\n" #: src/main.c:746 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -" --remote-encoding=<ì¸ì½”딩> ì›ê²© 기본 ì¸ì½”ë”©ì„ <ì¸ì½”딩> ê°’ì— ë”°" -"름\n" +" --remote-encoding=<ì¸ì½”딩> ì›ê²© 기본 ì¸ì½”ë”©ì„ <ì¸ì½”딩> ê°’ì— ë”°ë¦…ë‹ˆ" +"다\n" #: src/main.c:748 msgid " --unlink remove file before clobber\n" -msgstr " --unlink 파ì¼ì— ì†ìƒì„ 가하지 ì•Šê³ ì œê±°\n" +msgstr "" +" --unlink 파ì¼ì— ì†ìƒì„ 가하지 ì•Šê³ ì œê±°í•©ë‹ˆë‹¤\n" #: src/main.c:751 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -" --keep-badhash ì²´í¬ì„¬ 불ì¼ì¹˜ íŒŒì¼ ìœ ì§€(.badhash 붙임)\n" +" --keep-badhash ì²´í¬ì„¬ 불ì¼ì¹˜ íŒŒì¼ ìœ ì§€(.badhash 붙임)\n" #: src/main.c:753 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -" --metalink-index=<숫ìž> 메타ë§í¬ application/metalink4+xml " -"metaurl 서수 <숫ìž> ì§€ì •\n" +" --metalink-index=<숫ìž> 메타ë§í¬ application/metalink4+xml " +"metaurl\n" +" 서수 <숫ìž>를 ì§€ì •í•©ë‹ˆë‹¤\n" #: src/main.c:755 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -" --metalink-over-http HTTP ì‘답 í—¤ë”ì˜ ë©”íƒ€ë§í¬ 메타ë°ì´í„° 활" -"ìš©\n" +" --metalink-over-http HTTP ì‘답 í—¤ë”ì˜ ë©”íƒ€ë§í¬ 메타ë°ì´í„°ë¥¼ " +"활용합니다\n" #: src/main.c:757 msgid "" " --preferred-location preferred location for Metalink " "resources\n" -msgstr " --preferred-location 메타ë§í¬ ìžì› ì„ í˜¸ 위치\n" +msgstr " --preferred-location 메타ë§í¬ ìžì› ì„ í˜¸ 위치\n" #: src/main.c:761 msgid "" " --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" -" --xattr ì €ìž¥ ìž¥ì¹˜ì˜ íŒŒì¼ ì†ì„± 확장 메타ë°ì´í„° 기능" -"ì„ ì¼ë‹ˆë‹¤\n" +" --xattr ì €ìž¥ ìž¥ì¹˜ì˜ íŒŒì¼ ì†ì„± 확장 메타ë°ì´í„° 기" +"ëŠ¥ì„ ì¼ë‹ˆë‹¤\n" #: src/main.c:766 msgid "Directories:\n" @@ -1705,32 +1722,36 @@ msgstr "ë””ë ‰í„°ë¦¬:\n" #: src/main.c:768 msgid " -nd, --no-directories don't create directories\n" -msgstr " -nd, --no-directories ë””ë ‰í„°ë¦¬ë¥¼ 만들지 ì•ŠìŒ\n" +msgstr " -nd, --no-directories ë””ë ‰í„°ë¦¬ë¥¼ 만들지 않습니다\n" #: src/main.c:770 msgid " -x, --force-directories force creation of directories\n" -msgstr " -x, --force-directories 무조건 ë””ë ‰í„°ë¦¬ë¥¼ 만듬\n" +msgstr " -x, --force-directories 무조건 ë””ë ‰í„°ë¦¬ë¥¼ 만ë“니다\n" #: src/main.c:772 msgid " -nH, --no-host-directories don't create host directories\n" -msgstr " -nH, --no-host-directories 호스트 ë””ë ‰í„°ë¦¬ë¥¼ 만들지 ì•ŠìŒ\n" +msgstr "" +" -nH, --no-host-directories 호스트 ë””ë ‰í„°ë¦¬ë¥¼ 만들지 않습니다\n" #: src/main.c:774 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -" --protocol-directories ë””ë ‰í„°ë¦¬ ì´ë¦„ì„ í”„ë¡œí† ì½œ ì´ë¦„으로 사용\n" +" --protocol-directories ë””ë ‰í„°ë¦¬ ì´ë¦„ì„ í”„ë¡œí† ì½œ ì´ë¦„으로 사용합" +"니다\n" #: src/main.c:776 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -" -P, --directory-prefix=<ì ‘ë‘부> 파ì¼ì„ <ì ‘ë‘부>/ ë””ë ‰í„°ë¦¬ì— ì €ìž¥..\n" +" -P, --directory-prefix=<ì ‘ë‘부> 파ì¼ì„ <ì ‘ë‘부>/.. ë””ë ‰í„°ë¦¬ì— ì €ìž¥í•©ë‹ˆ" +"다\n" #: src/main.c:778 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -" --cut-dirs=<숫ìž> <숫ìž> 만í¼ì˜ ì›ê²© ë””ë ‰í„°ë¦¬ 갯수를 무시\n" +" --cut-dirs=<숫ìž> <숫ìž> 만í¼ì˜ ì›ê²© ë””ë ‰í„°ë¦¬ 갯수를 무시" +"합니다\n" #: src/main.c:782 msgid "HTTP options:\n" @@ -1739,35 +1760,40 @@ msgstr "HTTP 옵션:\n" #: src/main.c:784 msgid " --http-user=USER set http user to USER\n" msgstr "" -" --http-user=<사용ìž> http ì‚¬ìš©ìž ì´ë¦„ì„ <사용ìž>ë¡œ ì§€ì •\n" +" --http-user=<사용ìž> http ì‚¬ìš©ìž ì´ë¦„ì„ <사용ìž>ë¡œ ì§€ì •í•©ë‹ˆ" +"다\n" #: src/main.c:786 msgid " --http-password=PASS set http password to PASS\n" -msgstr " --http-password=<암호> http 암호를 <암호>ë¡œ ì§€ì •\n" +msgstr " --http-password=<암호> http 암호를 <암호>ë¡œ ì§€ì •í•©ë‹ˆë‹¤\n" #: src/main.c:788 msgid " --no-cache disallow server-cached data\n" -msgstr " --no-cache 서버 ë°ì´í„° ìºì‹±ì„ 허용하지 ì•ŠìŒ\n" +msgstr "" +" --no-cache 서버 ë°ì´í„° ìºì‹±ì„ 허용하지 않습니다\n" #: src/main.c:790 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -" --default-page=<ì´ë¦„> 기본 페ì´ì§€ ì´ë¦„ì„ ë°”ê¿‰ë‹ˆë‹¤ (보통\n" -" 'index.html' 입니다.)\n" +" --default-page=<ì´ë¦„> 기본 페ì´ì§€ ì´ë¦„ì„ ë°”ê¿‰ë‹ˆë‹¤\n" +" (보통 'index.html' 입니다.)\n" #: src/main.c:793 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -" -E, --adjust-extension HTML/CSS 문서를 ì ì ˆí•œ 확장ìžë¡œ ì €ìž¥\n" +" -E, --adjust-extension HTML/CSS 문서를 ì ì ˆí•œ 확장ìžë¡œ ì €ìž¥í•©ë‹ˆ" +"다\n" #: src/main.c:795 msgid "" " --ignore-length ignore 'Content-Length' header field\n" -msgstr " --ignore-length 'Content-Length' í—¤ë” í•„ë“œ 무시\n" +msgstr "" +" --ignore-length 'Content-Length' í—¤ë” í•„ë“œë¥¼ 무시합니" +"다\n" #: src/main.c:797 msgid " --header=STRING insert STRING among the headers\n" @@ -1778,60 +1804,65 @@ msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -" --compression=<형ì‹> auto, gzip, none 중 압축 ë°©ì‹ ì„ íƒ. (기" -"본값: none)\n" +" --compression=<형ì‹> auto, gzip, none 중 압축 ë°©ì‹ì„ ì„ íƒí•©ë‹ˆ" +"다.\n" +" (기본값: none)\n" #: src/main.c:803 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -" --max-redirect 페ì´ì§€ë‹¹ 최대 경로 재ì´ë™ 허용 횟수\n" +" --max-redirect 페ì´ì§€ë‹¹ 최대 경로 재ì´ë™ 허용 횟수\n" #: src/main.c:805 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -" --proxy-user=<사용ìž> 프ë¡ì‹œ ì‚¬ìš©ìž ì´ë¦„ì„ <사용ìž>ë¡œ ì§€ì •\n" +" --proxy-user=<사용ìž> 프ë¡ì‹œ ì‚¬ìš©ìž ì´ë¦„ì„ <사용ìž>ë¡œ ì§€ì •í•©ë‹ˆ" +"다\n" #: src/main.c:807 msgid " --proxy-password=PASS set PASS as proxy password\n" -msgstr " --proxy-password=<암호> 프ë¡ì‹œ 암호를 <암호>ë¡œ ì§€ì •\n" +msgstr "" +" --proxy-password=<암호> 프ë¡ì‹œ 암호를 <암호>ë¡œ ì§€ì •í•©ë‹ˆë‹¤\n" #: src/main.c:809 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -" --referer=<URL> HTTPìš”ì²ì— 'Referer: URL' í—¤ë” ì¶”ê°€\n" +" --referer=<URL> HTTPìš”ì²ì— 'Referer: URL' í—¤ë”를 추가합" +"니다\n" #: src/main.c:811 msgid " --save-headers save the HTTP headers to file\n" -msgstr " --save-headers HTTP í—¤ë”를 파ì¼ë¡œ ì €ìž¥\n" +msgstr " --save-headers HTTP í—¤ë”를 파ì¼ë¡œ ì €ìž¥í•©ë‹ˆë‹¤\n" #: src/main.c:813 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -" -U, --user-agent=<ì—ì´ì „트> wget/<ë²„ì „> ëŒ€ì‹ <ì—ì´ì „트>ë¡œ í´ë¼ì´" -"언트 ì‹ë³„\n" +" -U, --user-agent=<ì—ì´ì „트> wget/<ë²„ì „> ëŒ€ì‹ <ì—ì´ì „트>ë¡œ ê³ ìœ \n" +" í´ë¼ì´ì–¸íŠ¸ë¥¼ 나타냅니다\n" #: src/main.c:815 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -" --no-http-keep-alive HTTP keep-alive (ì˜êµ¬ ì—°ê²°)를 사용하지 ì•Š" -"ìŒ\n" +" --no-http-keep-alive HTTP keep-alive (ì˜êµ¬ ì—°ê²°)를 사용하지 " +"않습니다\n" #: src/main.c:817 msgid " --no-cookies don't use cookies\n" -msgstr " --no-cookies ì¿ í‚¤ 사용 안함\n" +msgstr " --no-cookies ì¿ í‚¤ë¥¼ 사용하지 않습니다\n" #: src/main.c:819 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -" --load-cookies=<파ì¼> 세션 수립 ì „ <파ì¼>ì—ì„œ ì¿ í‚¤ 불러오기\n" +" --load-cookies=<파ì¼> 세션 수립 ì „ <파ì¼>ì—ì„œ ì¿ í‚¤ë¥¼ 불러옵니" +"다\n" #: src/main.c:821 msgid " --save-cookies=FILE save cookies to FILE after session\n" @@ -1843,7 +1874,8 @@ msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -" --keep-session-cookies (ë°˜ì˜êµ¬) 세션 ì¿ í‚¤ë¥¼ ë¶ˆëŸ¬ì˜¤ê³ ì €ìž¥\n" +" --keep-session-cookies (ë°˜ì˜êµ¬) 세션 ì¿ í‚¤ë¥¼ ë¶ˆëŸ¬ì˜¤ê³ ì €ìž¥í•©ë‹ˆ" +"다\n" #: src/main.c:825 msgid "" @@ -1864,23 +1896,24 @@ msgstr "" #: src/main.c:829 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" -msgstr " --method=<HTTPìš”ì²ë°©ì‹> ìš”ì²ì‹œ <HTTPìš”ì²ë°©ì‹> 사용\n" +msgstr "" +" --method=<HTTPìš”ì²ë°©ì‹> ìš”ì²ì‹œ <HTTPìš”ì²ë°©ì‹>ì„ ì‚¬ìš©í•©ë‹ˆë‹¤\n" #: src/main.c:831 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -" --body-data=<문ìžì—´> <문ìžì—´>ì„ ë°ì´í„°ë¡œ 보냅니다. --method" -"를 반드시 ì§€ì •í•´ì•¼ 합니다.\n" +" --body-data=<문ìžì—´> <문ìžì—´>ì„ ë°ì´í„°ë¡œ 보냅니다.\n" +" --method를 반드시 ì§€ì •í•´ì•¼ 합니다.\n" #: src/main.c:833 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -" --body-file=<파ì¼> <파ì¼> 컨í…ì¸ ë¥¼ 보냅니다. --method를 ë°˜" -"드시 ì§€ì •í•´ì•¼ 합니다.\n" +" --body-file=<파ì¼> <파ì¼> 컨í…ì¸ ë¥¼ 보냅니다.\n" +" --method를 반드시 ì§€ì •í•´ì•¼ 합니다.\n" #: src/main.c:835 msgid "" @@ -1889,16 +1922,17 @@ msgid "" " choosing local file names " "(EXPERIMENTAL)\n" msgstr "" -" --content-disposition 로컬 íŒŒì¼ ì´ë¦„ì„ ì„ íƒí• ë•Œ Content-" +" --content-disposition 로컬 파ì¼ì´ë¦„ì„ ì„ íƒí• ë•Œ Content-" "Disposition\n" -" í—¤ë” ìš”ì²ì‚¬í• ì´í–‰ (시험 기능!!)\n" +" í—¤ë” ìš”ì²ì‚¬í•ì„ ì´í–‰í•©ë‹ˆë‹¤(시험기능!!)\n" #: src/main.c:838 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -" --content-on-error 서버 오류 ë°œìƒì‹œ ì „ì†¡ ë°›ì€ ì»¨í…트 ì¶œë ¥\n" +" --content-on-error 서버 오류 ë°œìƒì‹œ ì „ì†¡ë°›ì€ ì»¨í…트를 ì¶œë ¥" +"합니다\n" #: src/main.c:840 msgid "" @@ -1907,9 +1941,8 @@ msgid "" " without first waiting for the server's\n" " challenge\n" msgstr "" -" --auth-no-challenge ì„œë²„ì˜ ì²« ì§ˆë¬¸ì„ ê¸°ë‹¤ë¦¬ì§€ ì•Šê³ ê¸°ë³¸ HTTP " -"ì¸ì¦\n" -" ì •ë³´ë¥¼ 보냄\n" +" --auth-no-challenge ì„œë²„ì˜ ì²« ìš”ì²ì„ 기다리지 ì•Šê³ \n" +" 기본 HTTP ì¸ì¦ ì •ë³´ë¥¼ 보냅니다\n" #: src/main.c:847 msgid "HTTPS (SSL/TLS) options:\n" @@ -1922,19 +1955,19 @@ msgid "" " SSLv3, TLSv1, TLSv1_1, TLSv1_2, TLSv1_3 " "and PFS\n" msgstr "" -" --secure-protocol=<í”„ë¡œí† ì½œ> auto, SSLv2, SSLv3, TLSv1, " -"TLSv1_1,\n" -" TLSv1_2, TLSv1_3, PFS 중 보안 í”„ë¡œí† ì½œ " -"하나 ì„ íƒ\n" +" --secure-protocol=<í”„ë¡œí† ì½œ> auto, SSLv2, SSLv3, TLSv1, TLSv1_1, " +"TLSv1_2,\n" +" TLSv1_3, PFS 중 보안 í”„ë¡œí† ì½œ 하나를 ì„ " +"íƒí•©ë‹ˆë‹¤\n" #: src/main.c:852 msgid " --https-only only follow secure HTTPS links\n" -msgstr " --https-only ì•ˆì „í•œ HTTPS ë§í¬ë§Œ ë”°ë¼ê°\n" +msgstr " --https-only ì•ˆì „í•œ HTTPS ë§í¬ë§Œ ë”°ë¼ê°‘니다\n" #: src/main.c:854 msgid "" " --no-check-certificate don't validate the server's certificate\n" -msgstr " --no-check-certificate 서버 ì¸ì¦ì„œ ê²€ì¦í•˜ì§€ ì•ŠìŒ\n" +msgstr " --no-check-certificate 서버 ì¸ì¦ì„œë¥¼ ê²€ì¦í•˜ì§€ 않습니다\n" #: src/main.c:856 msgid " --certificate=FILE client certificate file\n" @@ -1962,7 +1995,7 @@ msgstr " --ca-certificate=<파ì¼> CA 번들 파ì¼\n" msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" -msgstr " --ca-directory=<ë””ë ‰í„°ë¦¬> CA í•´ì‹œ ëª©ë¡ ì €ìž¥ ë””ë ‰í„°ë¦¬\n" +msgstr " --ca-directory=<ë””ë ‰í„°ë¦¬> CA í•´ì‹œ ëª©ë¡ ì €ìž¥ ë””ë ‰í„°ë¦¬\n" #: src/main.c:868 msgid " --crl-file=FILE file with bundle of CRLs\n" @@ -1979,9 +2012,9 @@ msgid "" msgstr "" " --pinnedpubkey=<파ì¼>/<í•´ì‹œ> 피어 ê²€ì¦ì— í™œìš©í• ê³µìš© 키(PEM/DER) 파" "ì¼,\n" -" ë˜ëŠ” 'sha256//'ë¡œ 시작하여 ';'ë¡œ 구분하는 " -"base64ë¡œ ì¸ì½”딩한\n" -" sha256 해시값\n" +" ë˜ëŠ” 'sha256//'ë¡œ 시작하여 ';'ë¡œ 구분하" +"는\n" +" base64 ì¸ì½”딩 sha256 í•´ì‹œ 값입니다\n" #: src/main.c:876 msgid "" @@ -2007,12 +2040,15 @@ msgid "" " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" -" --ciphers=<STR> 문ìžì—´(GnuTLS) ë˜ëŠ” 암호화 ëª©ë¡ ë¬¸ìžì—´" -"(OpenSSL) ìš°ì„ ìˆœìœ„ë¥¼ ì§ì ‘ ì§€ì •í•©ë‹ˆë‹¤.\n" -" ìœ ì˜í•˜ì—¬ 사용하ì‹ì‹œì˜¤. ì´ ì˜µì…˜ì€ --secure-" -"protocol ì§€ì •ê°’ì„ ë®ì–´ì”니다.\n" -" ì´ ë¬¸ìžì—´ì˜ 형ì‹ê³¼ ë¬¸ë²•ì€ ì§€ì • SSL/TLS ì—”" -"ì§„ì— ë”°ë¼ ë‹¤ë¦…ë‹ˆë‹¤.\n" +" --ciphers=<STR> 문ìžì—´(GnuTLS) ë˜ëŠ” 암호화 ëª©ë¡ ë¬¸ìžì—´" +"(OpenSSL)\n" +" ìš°ì„ ìˆœìœ„ë¥¼ ì§ì ‘ ì§€ì •í•©ë‹ˆë‹¤. ìœ ì˜í•˜ì—¬ 사" +"용하ì‹ì‹œì˜¤.\n" +" ì´ ì˜µì…˜ì€ --secure-protocol ì§€ì •ê°’ì„ ë®" +"ì–´ì”니다.\n" +" ì´ ë¬¸ìžì—´ì˜ 형ì‹ê³¼ ë¬¸ë²•ì€ ì§€ì • SSL/TLS " +"ì—”ì§„ì— ë”°ë¼\n" +" 다릅니다.\n" #: src/main.c:891 msgid "HSTS options:\n" @@ -2020,15 +2056,15 @@ msgstr "HSTS 옵션:\n" #: src/main.c:893 msgid " --no-hsts disable HSTS\n" -msgstr " --no-hsts HSTS 비활성\n" +msgstr " --no-hsts HSTS를 사용하지 않습니다\n" #: src/main.c:895 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -" --hsts-file HSTS ë°ì´í„°ë² ì´ìŠ¤ 경로(기본값 ë®ì–´ì“°ê¸° ì " -"ìš©)\n" +" --hsts-file HSTS ë°ì´í„°ë² ì´ìŠ¤ 경로(기본값 ë®ì–´ì“°ê¸° " +"ì ìš©)\n" #: src/main.c:900 msgid "FTP options:\n" @@ -2039,43 +2075,45 @@ msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -" --ftp-stmlf ëª¨ë“ ë°”ì´ë„ˆë¦¬ FTP 파ì¼ì— 대해 Stream_LF 형" -"ì‹ ì‚¬ìš©\n" +" --ftp-stmlf ëª¨ë“ ë°”ì´ë„ˆë¦¬ FTP 파ì¼ì— 대해 Stream_LF " +"형ì‹ì„ 사용합니다\n" #: src/main.c:906 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -" --ftp-user=<사용ìž> ftp ì‚¬ìš©ìž ì´ë¦„ì„ <사용ìž>ë¡œ ì§€ì •\n" +" --ftp-user=<사용ìž> ftp ì‚¬ìš©ìž ì´ë¦„ì„ <사용ìž>ë¡œ ì§€ì •í•©ë‹ˆ" +"다\n" #: src/main.c:908 msgid " --ftp-password=PASS set ftp password to PASS\n" -msgstr " --ftp-password=<암호> ftp 암호를 <암호>ë¡œ ì§€ì •\n" +msgstr " --ftp-password=<암호> ftp 암호를 <암호>ë¡œ ì§€ì •í•©ë‹ˆë‹¤\n" #: src/main.c:910 msgid " --no-remove-listing don't remove '.listing' files\n" -msgstr " --no-remove-listing '.listing' 파ì¼ì„ ì œê±°í•˜ì§€ ì•ŠìŒ\n" +msgstr "" +" --no-remove-listing '.listing' 파ì¼ì„ ì œê±°í•˜ì§€ 않습니다\n" #: src/main.c:912 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -" --no-glob FTP íŒŒì¼ ì´ë¦„ ì¼ê´„ 수집 ë™ìž‘ì„ ë•ë‹ˆë‹¤\n" +" --no-glob FTP 파ì¼ì´ë¦„ ì¼ê´„ 수집 ë™ìž‘ì„ ë•ë‹ˆë‹¤\n" #: src/main.c:914 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" -msgstr " --no-passive-ftp \"수ë™\" ì „ì†¡ 모드를 ë•ë‹ˆë‹¤\n" +msgstr " --no-passive-ftp \"수ë™\" ì „ì†¡ 모드를 ë•ë‹ˆë‹¤\n" #: src/main.c:916 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -" --preserve-permissions ì›ê²© íŒŒì¼ ê¶Œí•œ ì„¤ì •ì„ ê·¸ëŒ€ë¡œ 둡니다\n" +" --preserve-permissions ì›ê²© íŒŒì¼ ê¶Œí•œ ì„¤ì •ì„ ê·¸ëŒ€ë¡œ 둡니다\n" #: src/main.c:918 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -" --retr-symlinks 재귀 ìš”ì²ì‹œ, linked-to 파ì¼ì„ ê°€ì ¸ì˜µë‹ˆë‹¤" +" --retr-symlinks 재귀 ìš”ì²ì‹œ, linked-to 파ì¼ì„ ê°€ì ¸ì˜µë‹ˆë‹¤" "(ë””ë ‰í„°ë¦¬ 아님)\n" #: src/main.c:923 @@ -2087,7 +2125,7 @@ msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -" --ftps-implicit 암시 FTPS í”„ë¡œí† ì½œ 사용 (기본 í¬íŠ¸ " +" --ftps-implicit 암시 FTPS í”„ë¡œí† ì½œ 사용 (기본 í¬íŠ¸ " "990)\n" #: src/main.c:927 @@ -2096,25 +2134,25 @@ msgid "" "the control connection when\n" " opening a data connection\n" msgstr "" -" --ftps-resume-ssl ë°ì´í„° ì—°ê²°ì„ ì—´ ë•Œ ì œì–´ ì—°ê²°ì—ì„œ 시작" -"하는\n" -" SSL/TLS ì„¸ì…˜ì„ ìž¬ê°œí•©ë‹ˆë‹¤\n" +" --ftps-resume-ssl ë°ì´í„° ì—°ê²°ì„ ì—´ ë•Œ ì œì–´ ì—°ê²°ì—ì„œ 시작하" +"는\n" +" SSL/TLS ì„¸ì…˜ì„ ìž¬ê°œí•©ë‹ˆë‹¤\n" #: src/main.c:930 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -" --ftps-clear-data-connection ì œì–´ ì±„ë„ ì•”í˜¸í™” ì „ìš©. ëª¨ë“ ë°ì´í„°ëŠ” " -"í‰ë¬¸ìž…니다\n" +" --ftps-clear-data-connection ì œì–´ ì±„ë„ ì•”í˜¸í™” ì „ìš©. ëª¨ë“ ë°ì´í„°ëŠ” í‰" +"문입니다\n" #: src/main.c:932 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -" --ftps-fallback-to-ftp ëŒ€ìƒ ì„œë²„ì—ì„œ FTPS를 지ì›í•˜ì§€ 않으면 " -"FTP를 ëŒ€ì‹ ì‚¬ìš©\n" +" --ftps-fallback-to-ftp ëŒ€ìƒ ì„œë²„ì—ì„œ FTPS를 지ì›í•˜ì§€ 않으면 FTP" +"를 ëŒ€ì‹ ì‚¬ìš©í•©ë‹ˆë‹¤\n" #: src/main.c:936 msgid "WARC options:\n" @@ -2125,7 +2163,7 @@ msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -" --warc-file=<íŒŒì¼ ì´ë¦„> ìš”ì² ì‘답 ë°ì´í„°ë¥¼ .warc.gz 파ì¼ì— ì €ìž¥" +" --warc-file=<파ì¼ì´ë¦„> ìš”ì² ì‘답 ë°ì´í„°ë¥¼ .warc.gz 파ì¼ì— ì €ìž¥" "합니다\n" #: src/main.c:940 @@ -2139,37 +2177,40 @@ msgstr "" msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -" --warc-max-size=<숫ìž> WARC 파ì¼ì˜ 최대 í¬ê¸°ë¥¼ <숫ìž>ë¡œ ì§€ì •í•©ë‹ˆ" -"다\n" +" --warc-max-size=<숫ìž> WARC 파ì¼ì˜ 최대 í¬ê¸°ë¥¼ <숫ìž>ë¡œ ì§€ì •í•©" +"니다\n" #: src/main.c:944 msgid " --warc-cdx write CDX index files\n" -msgstr " --warc-cdx CDX ì¸ë±ìŠ¤ 파ì¼ì„ 기ë¡í•©ë‹ˆë‹¤\n" +msgstr " --warc-cdx CDX ì¸ë±ìŠ¤ 파ì¼ì„ 기ë¡í•©ë‹ˆë‹¤\n" #: src/main.c:946 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -" --warc-dedup=<íŒŒì¼ ì´ë¦„> ì´ CDX 파ì¼ì— 있는 ë ˆì½”ë“œë¥¼ ì €ìž¥í•˜ì§€ ì•Š" -"ìŒ\n" +" --warc-dedup=<파ì¼ì´ë¦„> ì´ CDX 파ì¼ì— 있는 ë ˆì½”ë“œë¥¼ ì €ìž¥í•˜ì§€ ì•Š" +"습니다\n" #: src/main.c:949 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -" --no-warc-compression WARC 파ì¼ì„ GZIP 형ì‹ìœ¼ë¡œ 압축하지 ì•ŠìŒ\n" +" --no-warc-compression WARC 파ì¼ì„ GZIP 형ì‹ìœ¼ë¡œ 압축하지 않습" +"니다\n" #: src/main.c:952 msgid " --no-warc-digests do not calculate SHA1 digests\n" -msgstr " --no-warc-digests SHA1 다ì´ì œìŠ¤íŠ¸ë¥¼ 처리하지 ì•ŠìŒ\n" +msgstr "" +" --no-warc-digests SHA1 다ì´ì œìŠ¤íŠ¸ë¥¼ 처리하지 않습니다\n" #: src/main.c:954 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -" --no-warc-keep-log WARC ë ˆì½”ë“œì— ë¡œê·¸ 파ì¼ì„ ì €ìž¥í•˜ì§€ ì•ŠìŒ\n" +" --no-warc-keep-log WARC ë ˆì½”ë“œì— ë¡œê·¸ 파ì¼ì„ ì €ìž¥í•˜ì§€ 않습" +"니다\n" #: src/main.c:956 msgid "" @@ -2177,7 +2218,7 @@ msgid "" "the\n" " WARC writer\n" msgstr "" -" --warc-tempdir=<ë””ë ‰í„°ë¦¬> WARC ë¼ì´í„°ê°€ ë§Œë“ ìž„ì‹œ 파ì¼ì˜ 위치\n" +" --warc-tempdir=<ë””ë ‰í„°ë¦¬> WARC ë¼ì´í„°ê°€ ë§Œë“ ìž„ì‹œ 파ì¼ì˜ 위치\n" "\n" #: src/main.c:961 @@ -2186,21 +2227,21 @@ msgstr "재귀 다운로드:\n" #: src/main.c:963 msgid " -r, --recursive specify recursive download\n" -msgstr " -r, --recursive 다운로드 재귀 ë™ìž‘ì„ ì§€ì •í•©ë‹ˆë‹¤\n" +msgstr " -r, --recursive 다운로드 재귀 ë™ìž‘ì„ ì§€ì •í•©ë‹ˆë‹¤\n" #: src/main.c:965 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" -msgstr " -l, --level=<숫ìž> 최대 재귀 ê¹Šì´ (inf, 0ì€ ë¬´í•œ)\n" +msgstr " -l, --level=<숫ìž> 최대 재귀 ê¹Šì´ (inf, 0ì€ ë¬´í•œ)\n" #: src/main.c:967 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -" --delete-after 파ì¼ì„ 다운로드 í•œ 후 ìžì²´ì 으로 ì‚ì œí•©ë‹ˆ" -"다\n" +" --delete-after 파ì¼ì„ 다운로드 í•œ 후 ìžì²´ì 으로 ì‚ì œí•©" +"니다\n" #: src/main.c:969 msgid "" @@ -2208,16 +2249,15 @@ msgid "" "point to\n" " local files\n" msgstr "" -" -k, --convert-links 다운로드한 HTML, CSS 파ì¼ì„ 로컬 파ì¼ë¡œ ê°€" -"리키는\n" -" ë§í¬ë¥¼ 만ë“니다\n" +" -k, --convert-links 다운로드한 HTML, CSS 파ì¼ì„\n" +" 로컬 파ì¼ë¡œ 가리키는 ë§í¬ë¥¼ 만ë“니다\n" #: src/main.c:972 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -" --convert-file-only URLì„ íŒŒì¼ ë¶€ë¶„ë§Œ (보통 basename ì´ë¼ê³ " +" --convert-file-only URLì„ íŒŒì¼ ë¶€ë¶„ë§Œ (보통 basename ì´ë¼ê³ " "함) 남ë„ë¡ ë³€í™˜í•©ë‹ˆë‹¤\n" #: src/main.c:974 @@ -2225,29 +2265,29 @@ msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -" --backups=<숫ìž> X 파ì¼ì— 쓰기 ì „, <숫ìž>번 만í¼ì˜ ë°±" -"ì—… 파ì¼ì„ 만ë“니다\n" +" --backups=<숫ìž> X 파ì¼ì— 쓰기 ì „, <숫ìž>번 만í¼ì˜ 백업 " +"파ì¼ì„ 만ë“니다\n" #: src/main.c:978 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -" -K, --backup-converted X íŒŒì¼ ë³€í™˜ ì „, X_orig 처럼 백업합니다\n" +" -K, --backup-converted X íŒŒì¼ ë³€í™˜ ì „, X_orig 처럼 백업합니다\n" #: src/main.c:981 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -" -K, --backup-converted X íŒŒì¼ ë³€í™˜ ì „, X.orig 처럼 백업합니다\n" +" -K, --backup-converted X íŒŒì¼ ë³€í™˜ ì „, X.orig 처럼 백업합니다\n" #: src/main.c:984 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -" -m, --mirror -N -r -l inf --no-remove-listing 단축 옵" +" -m, --mirror -N -r -l inf --no-remove-listing 단축 옵" "ì…˜\n" #: src/main.c:986 @@ -2255,16 +2295,16 @@ msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -" -p, --page-requisites HTML 페ì´ì§€ í‘œì‹œì— í•„ìš”í•œ ëª¨ë“ ê·¸ë¦¼ ë“±ì„ " -"ê°€ì ¸ì˜µë‹ˆë‹¤\n" +" -p, --page-requisites HTML 페ì´ì§€ í‘œì‹œì— í•„ìš”í•œ ëª¨ë“ ê·¸ë¦¼ 등" +"ì„ ê°€ì ¸ì˜µë‹ˆë‹¤\n" #: src/main.c:988 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -" --strict-comments HTML 주ì„ì„ ì²˜ë¦¬í• ì—„ê²©í•œ (SGML) 처리 기능" -"ì„ ì¼ë‹ˆë‹¤\n" +" --strict-comments HTML 주ì„ì„ ì²˜ë¦¬í• ì—„ê²©í•œ (SGML) 처리 기" +"ëŠ¥ì„ ì¼ë‹ˆë‹¤\n" #: src/main.c:992 msgid "Recursive accept/reject:\n" @@ -2284,11 +2324,11 @@ msgstr " -R, --reject=<목ë¡> 쉼표로 구분한 ê±°ì ˆ 확장 #: src/main.c:998 msgid " --accept-regex=REGEX regex matching accepted URLs\n" -msgstr " --accept-regex=<ì •ê·œì‹> 허용 URLì— ì¼ì¹˜í•˜ëŠ” ì •ê·œì‹\n" +msgstr " --accept-regex=<ì •ê·œì‹> 허용 URLì— ì¼ì¹˜í•˜ëŠ” ì •ê·œì‹\n" #: src/main.c:1000 msgid " --reject-regex=REGEX regex matching rejected URLs\n" -msgstr " --reject-regex=<ì •ê·œì‹> ê±°ì ˆ URLì— ì¼ì¹˜í•˜ëŠ” ì •ê·œì‹\n" +msgstr " --reject-regex=<ì •ê·œì‹> ê±°ì ˆ URLì— ì¼ì¹˜í•˜ëŠ” ì •ê·œì‹\n" #: src/main.c:1003 msgid " --regex-type=TYPE regex type (posix|pcre)\n" @@ -2301,39 +2341,41 @@ msgstr " --regex-type=<형ì‹> ì •ê·œì‹ í˜•ì‹ (posix)\n" #: src/main.c:1009 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" -msgstr " -D, --domains=<목ë¡> 쉼표로 구분한 허용 ë„ë©”ì¸ ëª©ë¡\n" +msgstr " -D, --domains=<목ë¡> 쉼표로 구분한 ë„ë©”ì¸ í—ˆìš© 목ë¡\n" #: src/main.c:1011 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" -msgstr " --exclude-domains=<목ë¡> 쉼표로 구분한 ê±°ì ˆ ë„ë©”ì¸ ëª©ë¡\n" +msgstr " --exclude-domains=<목ë¡> 쉼표로 구분한 ë„ë©”ì¸ ê±°ì ˆ 목ë¡\n" #: src/main.c:1013 msgid "" " --follow-ftp follow FTP links from HTML documents\n" -msgstr " --follow-ftp HTML ë¬¸ì„œì˜ FTP ë§í¬ë¥¼ ë”°ë¼ê°\n" +msgstr "" +" --follow-ftp HTML ë¬¸ì„œì˜ FTP ë§í¬ë¥¼ ë”°ë¼ê°‘니다\n" #: src/main.c:1015 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -" --follow-tags=<목ë¡> 쉼표로 구분한 í—ˆìš©í• HTML 태그 목ë¡\n" +" --follow-tags=<목ë¡> 쉼표로 구분한 HTML 태그 허용 목ë¡\n" #: src/main.c:1017 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -" --ignore-tags=<목ë¡> 쉼표로 구분한 ë¬´ì‹œí• HTML 태그 목ë¡\n" +" --ignore-tags=<목ë¡> 쉼표로 구분한 HTML 태그 무시 목ë¡\n" #: src/main.c:1019 msgid " -H, --span-hosts go to foreign hosts when recursive\n" -msgstr " -H, --span-hosts 재귀 추ì ì‹œ 외부 호스트로 ì´ë™\n" +msgstr "" +" -H, --span-hosts 재귀 추ì ì‹œ 외부 호스트로 ì´ë™í•©ë‹ˆë‹¤\n" #: src/main.c:1021 msgid " -L, --relative follow relative links only\n" -msgstr " -L, --relative ìƒëŒ€ 경로 ë§í¬ë§Œ 따름\n" +msgstr " -L, --relative ìƒëŒ€ 경로 ë§í¬ë§Œ 따름\n" #: src/main.c:1023 msgid " -I, --include-directories=LIST list of allowed directories\n" @@ -2345,8 +2387,8 @@ msgid "" "redirection\n" " URL's last component\n" msgstr "" -" --trust-server-names 재ì´ë™ URLì˜ ìµœì¢… 요소로 ì§€ì •í•œ ì´ë¦„ì„ í™œ" -"용합니다\n" +" --trust-server-names 재ì´ë™ URLì˜ ìµœì¢… 요소로 ì§€ì •í•œ ì´ë¦„ì„ " +"활용합니다\n" #: src/main.c:1028 msgid " -X, --exclude-directories=LIST list of excluded directories\n" @@ -2356,7 +2398,8 @@ msgstr " -X, --exclude-directories=<목ë¡> ê±°ì ˆ ë””ë ‰í„°ë¦¬ 목ë¡\n" msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -" -np, --no-parent ìƒìœ„ ë””ë ‰í„°ë¦¬ë¡œ 거슬러 올ë¼ê°€ì§€ 않습니다\n" +" -np, --no-parent ìƒìœ„ ë””ë ‰í„°ë¦¬ë¡œ 거슬러 올ë¼ê°€ì§€ 않습니" +"다\n" #: src/main.c:1033 msgid "" @@ -2942,17 +2985,17 @@ msgstr "ioctl() 처리 실패. ì†Œì¼“ì„ ë¸”ë¡œí‚¹ ìƒíƒœë¡œ ì„¤ì •í• ìˆ˜ ì—†ì msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: ê²½ê³ : %s í† í°ì´ ë¨¸ì‹ ì´ë¦„ ì „ì— ë‚˜íƒ€ë‚¬ìŠµë‹ˆë‹¤\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: ì•Œ 수 없는 \"%s\" í† í°\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "사용법: %s NETRC [<호스트ì´ë¦„>]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: %s ìƒíƒœ ì •ë³´ í™•ì¸ ë¶ˆê°€: %s\n" @@ -2983,14 +3026,14 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: 구현하지 ì•Šì€ 'secure-protocol' 옵션 ê°’ %d\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "TLSv1.3ì„ ì§€ì›í•˜ê¸°ì—는 OpenSSL ë²„ì „ì´ ë„ˆë¬´ 오래ë˜ì—ˆìŠµë‹ˆë‹¤.\n" +msgstr "OpenSSL ë²„ì „ì—ì„œ '%s' ì˜µì…˜ì„ ì§€ì›í•˜ì§€ 않습니다.\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" msgstr "" +"wgetê³¼/ë˜ëŠ” OpenSSLì„ ë‹¤ì‹œ 빌드하면 ì´ ìƒí™© í•´ê²°ì— ë„ì›€ì„ ë°›ì„ ìˆ˜ 있습니다.\n" #: src/openssl.c:341 #, c-format @@ -3120,22 +3163,22 @@ msgstr "%sì„(를) ì—´ 수 ì—†ìŒ: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "robots.txt 불러오는 중. 오류는 무시하ì‹ì‹œì˜¤.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "%s 프ë¡ì‹œ URL í•´ì„ ì˜¤ë¥˜: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "%s 프ë¡ì‹œ URL 오류: HTTP여야 합니다.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "재ì´ë™ 횟수 %d 번 초과.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3143,7 +3186,7 @@ msgstr "" "í¬ê¸°í•©ë‹ˆë‹¤.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3176,20 +3219,16 @@ msgid "No error" msgstr "오류 ì—†ìŒ" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "지ì›í•˜ì§€ 않는 %s 스킴" +msgstr "지ì›í•˜ì§€ 않는 스킴" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "HTTPS ì§€ì› ê¸°ëŠ¥ì„ ì»´íŒŒì¼í•´ 넣지 않았습니다" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "HTTPS ì§€ì› ê¸°ëŠ¥ì„ ì»´íŒŒì¼í•´ 넣지 않았습니다" +msgstr "FTPS ì§€ì› ê¸°ëŠ¥ì„ ì»´íŒŒì¼í•´ 넣지 않았습니다" #: src/url.c:692 msgid "Scheme missing" @@ -3393,159 +3432,3 @@ msgstr "ìž„ì‹œ WARC 파ì¼ì„ ì—´ 수 없습니다.\n" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "CDX 파ì¼ì— ì¼ì¹˜í•˜ëŠ” ë‚´ìš©ì„ ì°¾ì•˜ìŠµë‹ˆë‹¤. WARCì— ìž¬ë°©ë¬¸ 기ë¡ì„ ì €ìž¥í•©ë‹ˆë‹¤.\n" - -#~ msgid "Unknown system error" -#~ msgstr "ì•Œ 수 없는 시스템 오류" - -#~ msgid "Address family for hostname not supported" -#~ msgstr "호스트 ì´ë¦„ì— ëŒ€í•œ ì´ ì£¼ì†Œ 체계는 지ì›í•˜ì§€ 않습니다" - -#~ msgid "Bad value for ai_flags" -#~ msgstr "AI_FLAGSì˜ ìž˜ëª»ëœ ê°’" - -#~ msgid "Non-recoverable failure in name resolution" -#~ msgstr "ë³µì›í• 수 없는 ì´ë¦„ í•´ì„ ì‹¤íŒ¨" - -#~ msgid "ai_family not supported" -#~ msgstr "AI_FAMILY를 지ì›í•˜ì§€ 않습니다" - -#~ msgid "Memory allocation failure" -#~ msgstr "메모리 í• ë‹¹ 실패" - -#~ msgid "No address associated with hostname" -#~ msgstr "호스트 ì´ë¦„ì— í• ë‹¹í•œ 주소가 없습니다" - -#~ msgid "Name or service not known" -#~ msgstr "ì•Œ 수 없는 ì´ë¦„ ë˜ëŠ” 서비스" - -#~ msgid "Servname not supported for ai_socktype" -#~ msgstr "AI_SOCKTYPEì— ì„œë²„ ì´ë¦„ì„ ì§€ì›í•˜ì§€ 않습니다" - -#~ msgid "ai_socktype not supported" -#~ msgstr "AI_SOCKTYPEì„ ì§€ì›í•˜ì§€ 않습니다" - -#~ msgid "System error" -#~ msgstr "시스템 오류" - -#~ msgid "Argument buffer too small" -#~ msgstr "ì¸ìž 버í¼ê°€ 너무 작습니다" - -#~ msgid "Processing request in progress" -#~ msgstr "처리 ìš”ì² ì§„í–‰ì¤‘" - -#~ msgid "Request canceled" -#~ msgstr "ìš”ì²ì„ 취소했습니다" - -#~ msgid "Request not canceled" -#~ msgstr "ìš”ì²ì„ 취소하지 않았습니다" - -#~ msgid "All requests done" -#~ msgstr "ëª¨ë“ ìš”ì²ì„ 처리했습니다" - -#~ msgid "Interrupted by a signal" -#~ msgstr "시그ë„ë¡œ 중단함" - -#~ msgid "Parameter string not correctly encoded" -#~ msgstr "매개변수 문ìžì—´ì„ ì œëŒ€ë¡œ ì¸ì½”ë”©í• ìˆ˜ 없습니다" - -#~ msgid "%s: option '%s%s' is ambiguous\n" -#~ msgstr "%s: '%s%s' ì˜µì…˜ì´ ëª¨í˜¸í•©ë‹ˆë‹¤\n" - -#~ msgid "%s: option '%s%s' is ambiguous; possibilities:" -#~ msgstr "%s: '%s%s' ì˜µì…˜ì´ ëª¨í˜¸í•©ë‹ˆë‹¤. 가능한 옵션:" - -#~ msgid "%s: unrecognized option '%s%s'\n" -#~ msgstr "%s: '%s%s' ì˜µì…˜ì„ ì¸ì‹í• 수 없습니다\n" - -#~ msgid "%s: option '%s%s' doesn't allow an argument\n" -#~ msgstr "%s: '%s%s' ì˜µì…˜ì€ ì¸ìžë¥¼ 허용하지 않습니다\n" - -#~ msgid "%s: option '%s%s' requires an argument\n" -#~ msgstr "%s: '%s%s' ì˜µì…˜ì— ì¸ìžê°€ 필요합니다\n" - -#~ msgid "%s: invalid option -- '%c'\n" -#~ msgstr "%s: 부ì ì ˆí•œ '%c' 옵션\n" - -#~ msgid "%s: option requires an argument -- '%c'\n" -#~ msgstr "%s: '%c' ì˜µì…˜ì— ì¸ìžê°€ 필요합니다\n" - -#~ msgid "`" -#~ msgstr "`" - -#~ msgid "'" -#~ msgstr "'" - -#~ msgid "Success" -#~ msgstr "성공" - -#~ msgid "No match" -#~ msgstr "ì¼ì¹˜í•˜ëŠ” í•ëª© ì—†ìŒ" - -#~ msgid "Invalid regular expression" -#~ msgstr "부ì ì ˆí•œ ì •ê·œ 표현ì‹" - -#~ msgid "Invalid collation character" -#~ msgstr "부ì ì ˆí•œ ì¡°í•© 문ìž" - -#~ msgid "Invalid character class name" -#~ msgstr "부ì ì ˆí•œ ë¬¸ìž í´ëž˜ìŠ¤ ì´ë¦„" - -#~ msgid "Trailing backslash" -#~ msgstr "ë°± 슬래시 문ìžê°€ ë”°ë¼ì˜´" - -#~ msgid "Invalid back reference" -#~ msgstr "부ì ì ˆí•œ 후위 참조" - -#~ msgid "Unmatched [, [^, [:, [., or [=" -#~ msgstr "ì¼ì¹˜í•˜ì§€ 않는 [, [^, [:, [., [=" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "ì¼ì¹˜í•˜ì§€ 않는 ( ë˜ëŠ” \\( 괄호" - -#~ msgid "Unmatched \\{" -#~ msgstr "ì¼ì¹˜í•˜ì§€ 않는 \\{ 괄호" - -#~ msgid "Invalid content of \\{\\}" -#~ msgstr "부ì ì ˆí•œ \\{\\} ë‚´ìš©" - -#~ msgid "Invalid range end" -#~ msgstr "부ì ì ˆí•œ 범위 ë" - -#~ msgid "Memory exhausted" -#~ msgstr "메모리가 바닥남" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "부ì ì ˆí•œ ì„ í–‰ ì •ê·œ 표현ì‹" - -#~ msgid "Premature end of regular expression" -#~ msgstr "ì •ê·œ í‘œí˜„ì‹ ë§ˆê° í‘œí˜„ì´ ì•žì„œìžˆìŠµë‹ˆë‹¤" - -#~ msgid "Regular expression too big" -#~ msgstr "ì •ê·œ 표현ì‹ì´ 너무 ê¹ë‹ˆë‹¤" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "ì¼ì¹˜í•˜ì§€ 않는 ) ë˜ëŠ” \\) 괄호" - -#~ msgid "No previous regular expression" -#~ msgstr "ì´ì „ ì •ê·œ í‘œí˜„ì‹ ì—†ìŒ" - -#~ msgid "cannot create pipe" -#~ msgstr "파ì´í”„를 만들 수 없습니다" - -#~ msgid "%s subprocess failed" -#~ msgstr "%s 하위 프로세스 처리 실패" - -#~ msgid "_open_osfhandle failed" -#~ msgstr "_open_osfhandle 실행 실패" - -#~ msgid "cannot restore fd %d: dup2 failed" -#~ msgstr "íŒŒì¼ ì„œìˆ ìž %dë²ˆì„ ë³µì›í• 수 없습니다: dup2 실패" - -#~ msgid "%s subprocess" -#~ msgstr "%s 하위 프로세스" - -#~ msgid "%s subprocess got fatal signal %d" -#~ msgstr "%s 하위 프로세스ì—ì„œ 중대한 ì‹œê·¸ë„ %dë²ˆì„ ë°›ì•˜ìŠµë‹ˆë‹¤" - -#~ msgid "memory exhausted" -#~ msgstr "메모리가 바닥남" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: wget-1.11.3\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2009-01-29 00:21+0200\n" "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -413,12 +413,12 @@ msgstr "Duomenų siuntimas nutrauktas.\n" msgid "File %s already there; not retrieving.\n" msgstr "Failas „%s“ jau egzistuoja; nesiunÄiama.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(bandymas:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, fuzzy, c-format #| msgid "" #| "%s (%s) - `%s' saved [%s/%s]\n" @@ -430,7 +430,7 @@ msgstr "" "%s (%s) - „%s“ įraÅ¡yta [%s/%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, fuzzy, c-format #| msgid "" #| "%s (%s) - `%s' saved [%s]\n" @@ -443,7 +443,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Å alinamas %s.\n" @@ -832,7 +832,7 @@ msgstr "Naudojamas esamas prisijungimas prie %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Klaida skaitant tarpinÄ—s stoties atsakÄ…: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s KLAIDA %d: %s.\n" @@ -956,76 +956,76 @@ msgstr "Dydis: " msgid "ignored" msgstr "ignoruojamas" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "PerspÄ—jimas: Å¡ablonai nesuderinami su HTTP protokolu.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "PaieÅ¡kos veiksena įjungta. Tikrinama, ar nutolÄ™s failas egzistuoja.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, fuzzy, c-format #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot write to %s (%s).\n" msgstr "Nepavyksta raÅ¡yti į „%s“ (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4476 +#: src/http.c:4480 #, fuzzy #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot write to WARC file.\n" msgstr "Nepavyksta raÅ¡yti į „%s“ (%s).\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Nepavyko užmegzti SSL prisijungimo.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, fuzzy, c-format #| msgid "Cannot write to `%s' (%s).\n" msgid "Cannot unlink %s (%s).\n" msgstr "Nepavyksta raÅ¡yti į „%s“ (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "KLAIDA: Nukreipimas (%d) niekur neveda.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "NutolÄ™s failas neegzistuoja – klaidinga nuoroda!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "TrÅ«ksta paskutinio keitimo antraÅ¡tÄ—s – laiko žymÄ—s iÅ¡jungtos.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Paskutinio keitimo antraÅ¡tÄ— netaisyklinga – laiko žymÄ—s iÅ¡jungtos.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, fuzzy, c-format #| msgid "" #| "Server file no newer than local file `%s' -- not retrieving.\n" @@ -1037,16 +1037,16 @@ msgstr "" "Serverio filas ne naujesnis negu vietinis failas „%s“ – nesiunÄiama.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Nesutampa failų dydžiai (vietinis failas %s) – siunÄiama.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "NutolÄ™s failas yra naujesnis, siunÄiama.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1056,7 +1056,7 @@ msgstr "" "siunÄiama.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1064,7 +1064,7 @@ msgstr "" "NutolÄ™s failas egzistuoja, bet jame nÄ—ra nuorodų – nesiunÄiama.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1074,7 +1074,7 @@ msgstr "" "bet rekursija iÅ¡junga – nesiunÄiama.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1082,13 +1082,13 @@ msgstr "" "NutolÄ™s failas egzistuoja.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, fuzzy, c-format #| msgid "%s: Invalid URL %s: %s\n" msgid "%s URL: %s %2d %s\n" msgstr "%s: NekorektiÅ¡kas URL adresas %s: %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, fuzzy, c-format #| msgid "" #| "%s (%s) - `%s' saved [%s/%s]\n" @@ -1100,7 +1100,7 @@ msgstr "" "%s (%s) - „%s“ įraÅ¡yta [%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, fuzzy, c-format #| msgid "" #| "%s (%s) - `%s' saved [%s/%s]\n" @@ -1112,27 +1112,27 @@ msgstr "" "%s (%s) - „%s“ įraÅ¡yta [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Prisijungimas užvertas ties %s baitu. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Skaitymo klaida ties %s (%s) baitu." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Skaitymo klaida ties %s/%s (%s) baitu. " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5115 +#: src/http.c:5119 #, fuzzy, c-format #| msgid "Unsupported scheme" msgid "Unsupported algorithm '%s'.\n" @@ -1145,7 +1145,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC veda į %s, kuri neegzistuoja.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nepavyksta nuskaityti %s (%s).\n" @@ -3325,17 +3325,17 @@ msgstr "" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: įspÄ—jimas: „%s“ yra prieÅ¡ kompiuterio vardÄ…\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: nežinomas elementas „%s“\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Naudojimas: %s NETRC [HOSTNAME]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: nepavyko patikrinti %s: %s\n" @@ -3506,22 +3506,22 @@ msgstr "Nepavyko atverti %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Ä®keliamas robots.txt; nekreipkite dÄ—mesio į klaidas.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Klaida apdorojant tarpinÄ—s stoties URL %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Klaida tarpinÄ—s stoties URL %s: Turi bÅ«ti HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "virÅ¡yta %d peradresavimų.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3529,7 +3529,7 @@ msgstr "" "Pasiduodama.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" Binary files differ@@ -3,14 +3,14 @@ # This file is distributed under the same license as the wget package. # Robert Schmidt <rsc@vingmed.no>, 1998. # Ã…ka Sikrom <a4@hush.com>, 2018. -# Johnny A. Solbu <johnny@solbu.net>, 2021 - 2022 +# Johnny A. Solbu <johnny@solbu.net>, 2021 - 2024 # msgid "" msgstr "" -"Project-Id-Version: wget-1.21.3\n" +"Project-Id-Version: wget-1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-02-27 21:15+0100\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2024-01-06 16:24+0100\n" "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n" "Language-Team: Norwegian Bokmaal <l10n-no@lister.huftis.org>\n" "Language: nb\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2.3\n" +"X-Generator: Poedit 2.4.2\n" #: src/connect.c:201 #, c-format @@ -387,12 +387,12 @@ msgstr "Dataoverføring avbrutt.\n" msgid "File %s already there; not retrieving.\n" msgstr "Fila %s ligger allerede der, og blir ikke hentet pÃ¥ nytt.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(prøv:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -401,7 +401,7 @@ msgstr "" "%s (%s) - skrevet til standard utkanal %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -411,7 +411,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Fjerner %s.\n" @@ -772,7 +772,7 @@ msgstr "Bruker etablert tilkobling til %s:%d pÃ¥ nytt.\n" msgid "Failed reading proxy response: %s\n" msgstr "Lesing av respons fra mellomtjener mislyktes: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s PROGRAMFEIL %d: %s.\n" @@ -904,73 +904,73 @@ msgstr "Lengde: " msgid "ignored" msgstr "ignorert" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Advarsel: jokertegn støttes ikke i HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Edderkoppmodus er slÃ¥tt pÃ¥. Kontroller om ekstern fil finnes.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Klarte ikke Ã¥ skrive til %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Obligatorisk attributt mangler pÃ¥ mottatt linje.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Autentisering med brukernavn og passord mislyktes.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Klarte ikke Ã¥ skrive til WARC-fil.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Klarte ikke Ã¥ skrive til midlertidig WARC-fil.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Klarte ikke Ã¥ sette opp SSL-tilkobling.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Klarte ikke Ã¥ fjerne lenke til %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "PROGRAMFEIL: Videresending (%d) uten plassering.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" "Fant ingen Metalink-data i HTTP-svar. Bruker HTTP GET til Ã¥ laste ned.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Fant Metalink-hoder. GÃ¥r i Metalink-modus.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Ekstern fil finnes ikke. Død lenke!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Linja «Last-modified» mangler. Tidsstempler er slÃ¥tt av.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Linja «Last-modified» er ugyldig. Tidsstempler ignoreres.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -980,16 +980,16 @@ msgstr "" "lastet ned.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Filene er av ulik størrelse (lokal: %s). Laster ned.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Ekstern versjon av fila er nyest, og blir lastet ned.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -999,7 +999,7 @@ msgstr "" "ned.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1007,7 +1007,7 @@ msgstr "" "Ekstern fil finnes, men inneholder ingen lenke. Laster ikke ned.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1017,7 +1017,7 @@ msgstr "" "men jobbing i undermapper er slÃ¥tt av. Laster ikke ned.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1025,12 +1025,12 @@ msgstr "" "Ekstern fil finnes.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s nettadresse: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1039,7 +1039,7 @@ msgstr "" "%s (%s) - skrevet til standard utkanal %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1048,27 +1048,27 @@ msgstr "" "%s (%s) - %s lagret [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Tilkobling lukket ved byte %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Lesefeil ved byte %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Lesefeil ved byte %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Beskyttelseskvalitet «%s» støttes ikke.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritmen «%s» støttes ikke.\n" @@ -1079,7 +1079,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC peker pÃ¥ %s, som ble avvist pÃ¥ grunn av feil: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Klarte ikke Ã¥ lese %s (%s).\n" @@ -1399,16 +1399,12 @@ msgstr "" " --retry-connrefused prøv pÃ¥ nytt selv om tilkobling nektes\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=FEIL kommaseparert liste over HTML-tagger " -"som skal prøves pÃ¥ nytt\n" +" --retry-on-http-error betrakt vertsfeil som ikke-fatale, " +"forbigÃ¥ende feil\n" #: src/main.c:653 msgid "" @@ -3015,17 +3011,17 @@ msgstr "ioctl() mislyktes. Klarte ikke Ã¥ sette opp sokkelen som blokkering.\n" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: advarsel: symbolet %s dukker opp før maskinnavn\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: «%s» er et ukjent symbol\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Bruk: %s NETRC [VERTSNAVN]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: klarte ikke Ã¥ lage statistikk av %s: %s\n" @@ -3058,14 +3054,14 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: verdi %d er ikke implementert for valget «secure-protocol»\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "Installert OpenSSL-versjon er for gammel til Ã¥ støtte TLSv1.3\n" +msgstr "OpenSSL-versjonen din støtter ikke valget «%s».\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" msgstr "" +"Rekompilering av Wget og/eller OpenSSL kan hjelpe i denne situasjonen.\n" #: src/openssl.c:341 #, c-format @@ -3194,22 +3190,22 @@ msgstr "Klarte ikke Ã¥ Ã¥pne %s. %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Laster inn «robots.txt». Ignorer feilmeldinger.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Feil ved tolkning av nettadressen %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Feil i mellomtjeneradressen %s. Denne mÃ¥ være HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d videresendinger overskredet.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3217,7 +3213,7 @@ msgstr "" "Gir opp.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3253,20 +3249,16 @@ msgid "No error" msgstr "Ingen feilmelding" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Skjemaet %s støttes ikke" +msgstr "Skjemaet støttes ikke" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "HTTPS-støtte er ikke innebygget i denne versjonen" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "HTTPS-støtte er ikke innebygget i denne versjonen" +msgstr "FTPS-støtte er ikke innebygget i denne versjonen" #: src/url.c:692 msgid "Scheme missing" Binary files differ@@ -1,27 +1,26 @@ # Dutch translations for GNU wget. -# Copyright (C) 2015 Free Software Foundation, Inc. +# Copyright (C) 2023 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # # '''Oh, all the things you could see she had no need of!''' # -# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2006, 2007, 2008, 2010, 2012, 2013, 2015. +# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2006, 2007, 2008, 2010, 2012, 2013, 2015, 2023. # Erwin Poeze <erwin.poeze@gmail.com>, 2009. # Elros Cyriatan <cyriatan@fastmail.fm>, 2004. # André van Dijk <ady@unseen.demon.nl>, 1998. msgid "" msgstr "" -"Project-Id-Version: wget 1.16.3.124\n" +"Project-Id-Version: wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2015-09-23 11:42+0200\n" -"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-10-19 16:12+0200\n" +"Last-Translator: Benno Schulenberg <vertaling@coevern.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: src/connect.c:201 @@ -73,6 +72,8 @@ msgstr "" #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" +"Te veel open bestandsdescriptors -- kan 'select' niet gebruiken op een " +"descriptor >= %d\n" #: src/convert.c:201 #, c-format @@ -91,7 +92,7 @@ msgstr "er is niets te doen.\n" #: src/convert.c:246 #, c-format msgid "%d.\n" -msgstr "" +msgstr "%d.\n" #: src/convert.c:252 src/convert.c:276 #, c-format @@ -202,10 +203,8 @@ msgid " (unauthoritative)\n" msgstr " (onzeker)\n" #: src/ftp.c:403 -#, fuzzy -#| msgid "Could not initialize SSL. It will be disabled." msgid "Could not initialize SSL. It will be disabled.\n" -msgstr "Kan SSL niet initialiseren. Het wordt uitgeschakeld." +msgstr "Kan SSL niet initialiseren. Het wordt uitgeschakeld.\n" #: src/ftp.c:485 #, c-format @@ -391,12 +390,12 @@ msgstr "Gegevensoverdracht is afgebroken.\n" msgid "File %s already there; not retrieving.\n" msgstr "Bestand '%s' is reeds aanwezig -- wordt niet opgehaald.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(poging %2d) " -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -405,7 +404,7 @@ msgstr "" "%s (%s) - weggeschreven naar standaarduitvoer %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -415,7 +414,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Verwijderen van %s.\n" @@ -495,10 +494,9 @@ msgid "%s: unknown/unsupported file type.\n" msgstr "%s: onbekende of niet-ondersteunde bestandssoort.\n" #: src/ftp.c:2424 -#, fuzzy, c-format -#| msgid "Unable to get cookie for %s\n" +#, c-format msgid "Failed to set permissions for %s.\n" -msgstr "Kan geen cookie verkrijgen voor %s\n" +msgstr "Kan de toegangsrechten voor %s niet instellen.\n" #: src/ftp.c:2445 #, c-format @@ -523,18 +521,15 @@ msgid "Rejecting %s.\n" msgstr "'%s' wordt verworpen.\n" #: src/ftp.c:2654 -#, fuzzy, c-format -#| msgid "Rejecting %s.\n" +#, c-format msgid "Rejecting %s (Invalid Entry).\n" -msgstr "'%s' wordt verworpen.\n" +msgstr "'%s' wordt verworpen -- ongeldig item\n" #: src/ftp.c:2675 -#, fuzzy, c-format -#| msgid "Not descending to %s as it is excluded/not-included.\n" +#, c-format msgid "%s is excluded/not-included through regex.\n" msgstr "" -"Er wordt niet afgedaald naar '%s', want deze is uitgesloten of niet " -"ingesloten.\n" +"%s wordt uitgesloten (of niet ingesloten) via een reguliere expressie.\n" #: src/ftp.c:2695 #, c-format @@ -587,16 +582,13 @@ msgstr "" "FOUT: GnuTLS eist dat sleutel en certificaat van hetzelfde type zijn.\n" #: src/gnutls.c:777 src/gnutls.c:841 -#, fuzzy -#| msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgid "Your GnuTLS version is too old to support TLS 1.3\n" -msgstr "Uw OpenSSL-versie is te oud om TLSv1.1 te ondersteunen.\n" +msgstr "Uw GnuTLS-versie is te oud om TLS 1.3 te ondersteunen.\n" #: src/gnutls.c:789 -#, fuzzy, c-format -#| msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "GnuTLS: niet-geïmplementeerde 'secure-protocol'-optiewaarde %d\n" +msgstr "GnuTLS: niet-geïmplementeerde optiewaarde %u voor 'secure-protocol'\n" #: src/gnutls.c:791 src/gnutls.c:847 src/host.c:158 src/openssl.c:289 msgid "Please report this issue to bug-wget@gnu.org\n" @@ -631,10 +623,9 @@ msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Het certificaat van '%s' wordt niet vertrouwd.\n" #: src/gnutls.c:1045 -#, fuzzy, c-format -#| msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#, c-format msgid "%s: The certificate of %s doesn't have a known issuer.\n" -msgstr "%s: Het certificaat van '%s' heeft een onbekende uitgever.\n" +msgstr "%s: Het certificaat van '%s' heeft geen bekende uitgever.\n" #: src/gnutls.c:1046 #, c-format @@ -785,7 +776,7 @@ msgstr "Verbinding met %s:%d wordt hergebruikt.\n" msgid "Failed reading proxy response: %s\n" msgstr "Lezen van proxy-antwoord is mislukt: %s.\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s Fout %d: %s.\n" @@ -886,6 +877,8 @@ msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" +"Bestand %s is niet gewijzigd op de server. De download wordt overgeslagen.\n" +"\n" #: src/http.c:4016 #, c-format @@ -913,74 +906,74 @@ msgstr "Lengte: " msgid "ignored" msgstr "genegeerd" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Waarschuwing: jokertekens zijn bij HTTP niet mogelijk.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Spider-modus: controleren of bestand bestaat op server.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Kan niet naar '%s' schrijven (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Vereiste eigenschap ontbreekt in ontvangen kopregels.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Authenticatie met gebruikersnaam/wachtwoord is mislukt.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Kan niet naar WARC-bestand schrijven.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Kan niet naar tijdelijk WARC-bestand schrijven.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Kan geen SSL-verbinding maken.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Kan %s niet verwijderen (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "Fout: doorverwijzing (%d) zonder locatie.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Bestand bestaat niet op server -- verbroken hyperlink!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "'Last-modified'-kopregel ontbreekt -- tijdsstempels worden uitgeschakeld.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "'Last-modified'-kopregel is ongeldig -- tijdsstempel wordt genegeerd.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -990,16 +983,16 @@ msgstr "" "opgehaald.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "De groottes komen niet overeen (is lokaal %s) -- ophalen.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Bestand op server is nieuwer -- ophalen.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1008,7 +1001,7 @@ msgstr "" "Bestand bestaat op server en zou hyperlinks kunnen bevatten -- ophalen.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1016,7 +1009,7 @@ msgstr "" "Bestand bestaat op server maar bevat geen hyperlinks -- wordt niet " "opgehaald.\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1025,7 +1018,7 @@ msgstr "" "Bestand bestaat op server en zou verdere hyperlinks kunnen bevatten,\n" "maar recursie is uitgeschakeld -- wordt niet opgehaald.\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1033,12 +1026,12 @@ msgstr "" "Bestand bestaat op server.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1047,7 +1040,7 @@ msgstr "" "%s (%s) - geschreven naar standaarduitvoer %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1056,39 +1049,38 @@ msgstr "" "%s (%s) - '%s' opgeslagen [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Verbinding werd verbroken bij byte %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Leesfout bij byte %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Leesfout bij byte %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Niet-ondersteunde beschermingskwaliteit '%s'.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Niet-ondersteund algoritme '%s'.\n" #: src/init.c:583 -#, fuzzy, c-format -#| msgid "%s: WGETRC points to %s, which doesn't exist.\n" +#, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" -msgstr "%s: De variabele WGETRC wijst naar %s, maar deze bestaat niet.\n" +msgstr "%s: WGETRC wijst naar %s, maar deze is onbenaderbaar: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kan '%s' niet lezen (%s).\n" @@ -1147,10 +1139,9 @@ msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Ongeldige booleaan '%s' -- gebruik 'on' of 'off'.\n" #: src/init.c:1099 -#, fuzzy, c-format -#| msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" +#, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" -msgstr "%s: %s: Ongeldige booleaan '%s' -- gebruik 'on' of 'off'.\n" +msgstr "%s: %s: Ongeldige waarde '%s' -- gebruik 'on', 'off', of 'quiet'.\n" #: src/init.c:1119 #, c-format @@ -1173,10 +1164,9 @@ msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ongeldig tijdsinterval '%s'\n" #: src/init.c:1443 -#, fuzzy, c-format -#| msgid "%s: %s: Invalid time period %s\n" +#, c-format msgid "%s: %s: Negative time period %s\n" -msgstr "%s: %s: Ongeldig tijdsinterval '%s'\n" +msgstr "%s: %s: Negatief tijdsinterval '%s'\n" #: src/init.c:1471 src/main.c:1927 #, c-format @@ -1221,10 +1211,9 @@ msgid "Encoding %s isn't valid\n" msgstr "Codering %s is niet geldig\n" #: src/iri.c:140 src/url.c:1612 -#, fuzzy, c-format -#| msgid "Conversion from %s to UTF-8 isn't supported\n" +#, c-format msgid "Conversion from %s to %s isn't supported\n" -msgstr "Omzetting van %s naar UTF-8 wordt niet ondersteund\n" +msgstr "Omzetting van %s naar %s wordt niet ondersteund\n" #: src/iri.c:180 src/url.c:1642 msgid "Incomplete or invalid multibyte sequence encountered\n" @@ -1245,22 +1234,18 @@ msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode() is mislukt (%d): %s\n" #: src/iri.c:290 -#, fuzzy, c-format -#| msgid "couldn't connect to %s port %d: %s\n" +#, c-format msgid "Failed to convert to lower: %d: %s\n" -msgstr "Kan geen verbinding maken met %s op poort %d: %s\n" +msgstr "Kon niet naar kleine letter omzetten: %d: %s\n" #: src/log.c:938 src/log.c:957 -#, fuzzy, c-format -#| msgid "" -#| "\n" -#| "%s received, redirecting output to %s.\n" +#, c-format msgid "" "\n" "Redirecting output to %s.\n" msgstr "" "\n" -"%s ontvangen; uitvoer wordt omgeleid naar '%s'.\n" +"Uitvoer wordt omgeleid naar %s.\n" #: src/log.c:950 #, c-format @@ -1416,9 +1401,6 @@ msgstr "" #: src/main.c:653 #, fuzzy -#| msgid "" -#| " --ignore-tags=LIST comma-separated list of ignored HTML " -#| "tags\n" msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" @@ -1440,7 +1422,6 @@ msgstr "" #: src/main.c:660 #, fuzzy -#| msgid " --no-config do not read any config file\n" msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" @@ -1495,10 +1476,6 @@ msgstr "" #: src/main.c:676 #, fuzzy -#| msgid "" -#| " --no-use-server-timestamps don't set the local file's timestamp " -#| "by\n" -#| " the one on the server\n" msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1528,9 +1505,6 @@ msgstr "" #: src/main.c:688 #, fuzzy -#| msgid "" -#| " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on " -#| "local host\n" msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1554,7 +1528,6 @@ msgstr " --read-timeout=SECONDEN leeswachttijd instellen op SECONDEN\n" #: src/main.c:697 #, fuzzy -#| msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgid "" " -w, --wait=SECONDS wait SECONDS between retrievals\n" " (applies if more then 1 URL is to be " @@ -1565,9 +1538,6 @@ msgstr "" #: src/main.c:700 #, fuzzy -#| msgid "" -#| " --waitretry=SECONDS wait 1..SECONDS between retries of a " -#| "retrieval\n" msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1579,9 +1549,6 @@ msgstr "" #: src/main.c:703 #, fuzzy -#| msgid "" -#| " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " -#| "between retrievals\n" msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1725,12 +1692,10 @@ msgid "" msgstr "" #: src/main.c:761 -#, fuzzy -#| msgid " --warc-cdx write CDX index files\n" msgid "" " --xattr turn on storage of metadata in extended " "file attributes\n" -msgstr " --warc-cdx CDX-indexbestanden aanmaken\n" +msgstr "" #: src/main.c:766 msgid "Directories:\n" @@ -1951,10 +1916,6 @@ msgstr "HTTPS-opties (SSL/TLS):\n" #: src/main.c:849 #, fuzzy -#| msgid "" -#| " --secure-protocol=PR choose secure protocol, one of auto, " -#| "SSLv2,\n" -#| " SSLv3, TLSv1 and PFS\n" msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" @@ -2423,10 +2384,9 @@ msgid "Password: " msgstr "Wachtwoord: " #: src/main.c:1108 -#, fuzzy, c-format -#| msgid "cannot create pipe" +#, c-format msgid "Cannot create pipe\n" -msgstr "kan geen pijp aanmaken" +msgstr "Kan geen pijp aanmaken\n" #: src/main.c:1116 #, c-format @@ -2449,10 +2409,9 @@ msgid "Username for '%s%s': " msgstr "" #: src/main.c:1182 -#, fuzzy, c-format -#| msgid "Password for user %s: " +#, c-format msgid "Password for '%s%s@%s': " -msgstr "Wachtwoord voor gebruiker %s: " +msgstr "Wachtwoord voor '%s%s@%s': " #: src/main.c:1254 msgid "Wgetrc: " @@ -2567,16 +2526,13 @@ msgstr "" "convert-links' wordt gebruikt.\n" #: src/main.c:1609 -#, fuzzy, c-format -#| msgid "" -#| "Both --no-clobber and --convert-links were specified, only --convert-" -#| "links will be used.\n" +#, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -"Zowel '--no-clobber' als '--convert-links' werden opgegeven; alleen '--" -"convert-links' wordt gebruikt.\n" +"Zowel '--no-clobber' als '--convert-file-only' werden opgegeven; alleen '--" +"convert-file-only' wordt gebruikt.\n" #: src/main.c:1642 #, c-format @@ -2595,19 +2551,14 @@ msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Opties '--inet4-only' en '--inet6-only' gaan niet samen.\n" #: src/main.c:1667 -#, fuzzy -#| msgid "" -#| "Cannot specify both -k and -O if multiple URLs are given, or in " -#| "combination\n" -#| "with -p or -r. See the manual for details.\n" -#| "\n" msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" "with -p or -r. See the manual for details.\n" "\n" msgstr "" -"Opties '-k' en '-O' gaan niet samen als er meerdere URL's gegeven zijn,\n" +"Optie '-O' gaat niet samen met '-k' of '--convert-file-only' als er meerdere " +"URL's gegeven zijn,\n" "of als ook '-p' of '-r' gegeven is. Zie de handleiding voor details.\n" #: src/main.c:1676 @@ -2670,9 +2621,6 @@ msgstr "" #: src/main.c:1751 #, fuzzy, c-format -#| msgid "" -#| "WARC output does not work with --continue or --start-pos, they will be " -#| "disabled.\n" msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" @@ -2712,17 +2660,14 @@ msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Opties '--post-data' en '--post-file' gaan niet samen.\n" #: src/main.c:1842 -#, fuzzy, c-format -#| msgid "" -#| "You cannot use --post-data or --post-file along with --method. --method " -#| "expects data through --body-data and --body-file options" +#, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" "Opties '--post-data' en '--post-file' gaan niet samen met '--method'; de " "optie '--method' verwacht gegevens via de opties '--body-data' of '--body-" -"file'." +"file'.\n" #: src/main.c:1851 #, c-format @@ -2753,9 +2698,6 @@ msgstr "" #: src/main.c:2015 #, fuzzy, c-format -#| msgid "" -#| "-k or -r can be used together with -O only if outputting to a regular " -#| "file.\n" msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" @@ -2765,7 +2707,6 @@ msgstr "" #: src/main.c:2026 #, fuzzy, c-format -#| msgid "Failed to unlink symlink %s: %s\n" msgid "Failed to init libcares\n" msgstr "Verwijderen van symbolische koppeling '%s' is mislukt: %s\n" @@ -2776,13 +2717,11 @@ msgstr "" #: src/main.c:2055 #, fuzzy, c-format -#| msgid "%s: unable to resolve host address %s\n" msgid "Failed to parse IP address '%s'\n" msgstr "%s: kan host-adres '%s' niet herleiden\n" #: src/main.c:2066 #, fuzzy, c-format -#| msgid "ERROR: Failed to open cert %s: (%d).\n" msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "FOUT: Kan certificaat %s niet openen: (%d).\n" @@ -2852,7 +2791,6 @@ msgstr "" #: src/metalink.c:268 #, fuzzy, c-format -#| msgid "Failed to download %s. Skipping resource.\n" msgid "Failed to download %s. Skipping metaurl.\n" msgstr "Downloaden van %s is mislukt. Hulpbron wordt overgeslagen.\n" @@ -2876,33 +2814,25 @@ msgstr "Kan gedownload bestand niet openen.\n" #: src/metalink.c:512 #, fuzzy, c-format -#| msgid "Computing checksum for %s\n" msgid "Computing size for %s\n" msgstr "Berekenen van controlesom voor %s\n" #: src/metalink.c:517 -#, fuzzy -#| msgid "Failed to download %s. Skipping resource.\n" msgid "File size not declared. Skipping check.\n" -msgstr "Downloaden van %s is mislukt. Hulpbron wordt overgeslagen.\n" +msgstr "Bestandsgrootte is niet aangegeven. Controle wordt overgeslagen.\n" #: src/metalink.c:525 -#, fuzzy -#| msgid "Could not open downloaded file.\n" msgid "Could not get downloaded file's size.\n" -msgstr "Kan gedownload bestand niet openen.\n" +msgstr "Kan grootte van gedownload bestand niet verkrijgen.\n" #: src/metalink.c:537 -#, fuzzy, c-format -#| msgid "Checksum mismatch for file %s.\n" +#, c-format msgid "Size mismatch for file %s.\n" -msgstr "Controlesom komt niet overeen voor bestand %s.\n" +msgstr "Grootte komt niet overeen voor bestand %s.\n" #: src/metalink.c:545 -#, fuzzy -#| msgid "Checksum matches.\n" msgid "Size matches.\n" -msgstr "Controlesom komt overeen.\n" +msgstr "Grootte komt overeen.\n" #: src/metalink.c:598 #, c-format @@ -2937,8 +2867,6 @@ msgid "GPGME op_verify_result: NULL\n" msgstr "" #: src/metalink.c:819 -#, fuzzy -#| msgid "Signature validation suceeded.\n" msgid "Signature validation succeeded.\n" msgstr "Controle van ondertekening is geslaagd.\n" @@ -2953,10 +2881,8 @@ msgstr "" "vertrouwd.\n" #: src/metalink.c:863 -#, fuzzy -#| msgid "No certificate found\n" msgid "No checksums found.\n" -msgstr "Geen certificaat gevonden\n" +msgstr "Geen controlesommen gevonden.\n" #: src/metalink.c:869 #, c-format @@ -2964,10 +2890,9 @@ msgid "Failed to download %s. Skipping resource.\n" msgstr "Downloaden van %s is mislukt. Hulpbron wordt overgeslagen.\n" #: src/metalink.c:876 -#, fuzzy, c-format -#| msgid "File %s retrieved but signature does not match. \n" +#, c-format msgid "File %s retrieved but size does not match. \n" -msgstr "Bestand %s is opgehaald maar ondertekening komt niet overeen. \n" +msgstr "Bestand %s is opgehaald maar de grootte komt niet overeen. \n" #: src/metalink.c:883 #, c-format @@ -2980,10 +2905,9 @@ msgid "File %s retrieved but signature does not match. \n" msgstr "Bestand %s is opgehaald maar ondertekening komt niet overeen. \n" #: src/metalink.c:1111 -#, fuzzy, c-format -#| msgid "Removing %s.\n" +#, c-format msgid "Renaming %s to %s.\n" -msgstr "Verwijderen van %s.\n" +msgstr "Hernoemen van %s naar %s.\n" #: src/mswindows.c:96 #, c-format @@ -3028,17 +2952,17 @@ msgstr "" "%s: %s:%d: waarschuwing: '%s'-sleutelwoord aangetroffen vóór een " "machinenaam\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: onbekend sleutelwoord '%s'\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Gebruik: %s NETRC [HOSTNAAM]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: kan status van %s niet opvragen: %s\n" @@ -3054,18 +2978,16 @@ msgstr "" "Kan geen 'seed' voor PRNG vinden; gebruik eventueel '--random-file'.\n" #: src/openssl.c:272 -#, fuzzy -#| msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "Uw OpenSSL-versie is te oud om TLSv1.1 te ondersteunen.\n" +msgstr "Uw OpenSSL-versie is te oud om TLS 1.3 te ondersteunen.\n" #: src/openssl.c:278 msgid "Your OpenSSL version is too old to support TLSv1.1\n" -msgstr "Uw OpenSSL-versie is te oud om TLSv1.1 te ondersteunen.\n" +msgstr "Uw OpenSSL-versie is te oud om TLS 1.1 te ondersteunen.\n" #: src/openssl.c:282 msgid "Your OpenSSL version is too old to support TLSv1.2\n" -msgstr "Uw OpenSSL-versie is te oud om TLSv1.2 te ondersteunen.\n" +msgstr "Uw OpenSSL-versie is te oud om TLS 1.2 te ondersteunen.\n" #: src/openssl.c:288 #, c-format @@ -3073,10 +2995,9 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: niet-geïmplementeerde 'secure-protocol'-optiewaarde %d\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLSv1.1\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "Uw OpenSSL-versie is te oud om TLSv1.1 te ondersteunen.\n" +msgstr "Uw OpenSSL-versie ondersteunt optie '%s' niet.\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" @@ -3084,7 +3005,6 @@ msgstr "" #: src/openssl.c:341 #, fuzzy, c-format -#| msgid "%s: Invalid URL %s: %s\n" msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: Ongeldige URL '%s': %s.\n" @@ -3097,11 +3017,10 @@ msgid "OpenSSL: Failed to allocate verification param\n" msgstr "" #: src/openssl.c:852 -#, fuzzy -#| msgid "Could not seed PRNG; consider using --random-file.\n" msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "" -"Kan geen 'seed' voor PRNG vinden; gebruik eventueel '--random-file'.\n" +"Waarschuwing: kan geen 'seed' voor PRNG vinden. Gebruik eventueel '--random-" +"file'.\n" #: src/openssl.c:1072 #, c-format @@ -3177,20 +3096,17 @@ msgstr "Ongeldige puntjesstijl '%s' opgegeven; blijft onveranderd.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. #: src/progress.c:1006 -#, fuzzy, c-format -#| msgid " eta %s" +#, c-format msgid " eta %s" -msgstr " nog %s" +msgstr " nog %s" #. TRANSLATORS: The meaning is "elapsed time", and it is shown #. * next to the progress bar once the download is done. #. * This should not take up more room than #. * available here (6 columns). Abbreviate if necessary. #: src/progress.c:1312 -#, fuzzy -#| msgid " in " msgid " in " -msgstr " in " +msgstr " in " #: src/ptimer.c:158 #, c-format @@ -3209,31 +3125,30 @@ msgid "Removing %s since it should be rejected.\n" msgstr "'%s' wordt verwijderd omdat het verworpen dient te worden.\n" #: src/res.c:394 -#, fuzzy, c-format -#| msgid "Cannot open %s: %s" +#, c-format msgid "Cannot open %s: %s\n" -msgstr "Kan %s niet openen: %s" +msgstr "Kan %s niet openen: %s\n" #: src/res.c:556 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Laden van 'robots.txt'; fouten kunnen worden genegeerd.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Fout tijdens ontleden van proxy-URL '%s': %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Fout in proxy-URL '%s': moet HTTP zijn.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "Maximum van %d doorverwijzingen is overschreden.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3241,7 +3156,7 @@ msgstr "" "Pogingen worden gestaakt.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3277,20 +3192,16 @@ msgid "No error" msgstr "Geen fout" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Niet-ondersteund schema '%s'" +msgstr "Niet-ondersteund schema" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "Ondersteuning voor HTTPS is niet meegecompileerd" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "Ondersteuning voor HTTPS is niet meegecompileerd" +msgstr "Ondersteuning voor FTPS is niet meegecompileerd" #: src/url.c:692 msgid "Scheme missing" @@ -3322,7 +3233,6 @@ msgstr "Ongeldig numeriek IPv6-adres" #: src/url.c:1645 #, fuzzy -#| msgid "Incomplete or invalid multibyte sequence encountered\n" msgid "Unconvertable multibyte sequence encountered\n" msgstr "Incomplete of ongeldige multibyte-volgorde aangetroffen\n" @@ -3356,20 +3266,18 @@ msgstr "Verwijderen van symbolische koppeling '%s' is mislukt: %s\n" #: src/utils.c:872 #, fuzzy, c-format -#| msgid "ERROR: Failed to open cert %s: (%d).\n" msgid "Failed to Fopen file %s\n" -msgstr "FOUT: Kan certificaat %s niet openen: (%d).\n" +msgstr "Verwijderen van symbolische koppeling '%s' is mislukt: %s\n" #: src/utils.c:878 #, fuzzy, c-format -#| msgid "Unable to get cookie for %s\n" msgid "Failed to get FD for file %s\n" msgstr "Kan geen cookie verkrijgen voor %s\n" #: src/utils.c:885 -#, c-format +#, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "" +msgstr "Kan geen cookie verkrijgen voor %s\n" #: src/utils.c:895 #, c-format @@ -3378,15 +3286,13 @@ msgstr "" #: src/utils.c:930 #, fuzzy, c-format -#| msgid "ERROR: Failed to open cert %s: (%d).\n" msgid "Failed to open file %s, reason :%s\n" -msgstr "FOUT: Kan certificaat %s niet openen: (%d).\n" +msgstr "%s: kan host-adres '%s' niet herleiden\n" #: src/utils.c:936 #, fuzzy, c-format -#| msgid "Failed to unlink symlink %s: %s\n" msgid "Failed to stat file %s, error: %s\n" -msgstr "Verwijderen van symbolische koppeling '%s' is mislukt: %s\n" +msgstr "Kan geen cookie verkrijgen voor %s\n" #: src/utils.c:946 #, c-format @@ -3396,10 +3302,9 @@ msgid "" msgstr "" #: src/utils.c:2443 -#, fuzzy, c-format -#| msgid "Invalid regular expression %s, %s\n" +#, c-format msgid "Invalid regular expression %s, PCRE2 error %d\n" -msgstr "Ongeldige reguliere expressie %s, %s\n" +msgstr "Ongeldige reguliere expressie %s, PCRE2-fout %d\n" #: src/utils.c:2460 src/utils.c:2483 #, c-format @@ -3418,19 +3323,16 @@ msgstr "" #: src/warc.c:217 #, fuzzy -#| msgid "Error opening WARC file %s.\n" msgid "Error setting WARC file position.\n" msgstr "Fout bij openen van WARC-bestand %s.\n" #: src/warc.c:224 #, fuzzy -#| msgid "Error opening WARC file %s.\n" msgid "Error flushing WARC file to disk.\n" msgstr "Fout bij openen van WARC-bestand %s.\n" #: src/warc.c:234 #, fuzzy -#| msgid "Error opening WARC file %s.\n" msgid "Error duplicating WARC file file descriptor.\n" msgstr "Fout bij openen van WARC-bestand %s.\n" @@ -3568,51 +3470,39 @@ msgstr "" #~ msgid "Parameter string not correctly encoded" #~ msgstr "Parametertekst is niet juist gecodeerd" -#, c-format #~ msgid "%s: option '%s' is ambiguous; possibilities:" #~ msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:" -#, c-format #~ msgid "%s: option '%s' is ambiguous\n" #~ msgstr "%s: optie '%s' is niet eenduidig\n" -#, c-format #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s: optie '--%s' staat geen argument toe\n" -#, c-format #~ msgid "%s: option '%c%s' doesn't allow an argument\n" #~ msgstr "%s: optie '%c%s' staat geen argument toe\n" -#, c-format #~ msgid "%s: option '--%s' requires an argument\n" #~ msgstr "%s: optie '--%s' vereist een argument\n" -#, c-format #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: onbekende optie '--%s'\n" -#, c-format #~ msgid "%s: unrecognized option '%c%s'\n" #~ msgstr "%s: onbekende optie '%c%s'\n" -#, c-format #~ msgid "%s: invalid option -- '%c'\n" #~ msgstr "%s: ongeldige optie -- '%c'\n" -#, c-format #~ msgid "%s: option requires an argument -- '%c'\n" #~ msgstr "%s: optie vereist een argument -- '%c'\n" -#, c-format #~ msgid "%s: option '-W %s' is ambiguous\n" #~ msgstr "%s: optie '-W %s' is niet eenduidig\n" -#, c-format #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: optie '-W %s' staat geen argument toe\n" -#, c-format #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: optie '-W %s' vereist een argument\n" @@ -3643,15 +3533,6 @@ msgstr "" #~ msgid "Invalid back reference" #~ msgstr "Ongeldige terugverwijzing" -#~ msgid "Unmatched [ or [^" -#~ msgstr "Ongepaarde [ of [^" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Ongepaarde ( of \\(" - -#~ msgid "Unmatched \\{" -#~ msgstr "Ongepaarde \\{" - #~ msgid "Invalid content of \\{\\}" #~ msgstr "Ongeldige inhoud van \\{\\}" @@ -3676,38 +3557,43 @@ msgstr "" #~ msgid "No previous regular expression" #~ msgstr "Geen eerdere reguliere expressie" -#, c-format +#~ msgid "cannot create pipe" +#~ msgstr "kan geen pijp aanmaken" + #~ msgid "%s subprocess failed" #~ msgstr "subproces %s is mislukt" -#, c-format #~ msgid "_open_osfhandle failed" #~ msgstr "_open_osfhandle() is mislukt" -#, c-format #~ msgid "cannot restore fd %d: dup2 failed" #~ msgstr "kan bestandsdescriptor %d niet herstellen: dup2() is mislukt" -#, c-format #~ msgid "%s subprocess" #~ msgstr "subproces %s" -#, c-format #~ msgid "%s subprocess got fatal signal %d" #~ msgstr "subproces %s ontving het fatale signaal %d" #~ msgid "memory exhausted" #~ msgstr "onvoldoende geheugen beschikbaar" -#, c-format +# FIXME: add period +#~ msgid "Mail bug reports and suggestions to <bug-wget@gnu.org>\n" +#~ msgstr "" +#~ "Rapporteer gebreken in het programma (of suggesties) aan <bug-wget@gnu." +#~ "org>;\n" +#~ "meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Bestand '%s' is reeds aanwezig -- wordt niet opgehaald.\n" + #~ msgid "Invalid UTF-8 sequence: %s\n" #~ msgstr "Ongeldige UTF-8-reeks: %s\n" -#, c-format #~ msgid "idn_decode failed (%d): %s\n" #~ msgstr "idn_decode() is mislukt (%d): %s\n" -#, c-format #~ msgid "" #~ "\n" #~ "%s received.\n" @@ -3715,21 +3601,9 @@ msgstr "" #~ "\n" #~ "%s ontvangen.\n" -# FIXME: add period -#~ msgid "Mail bug reports and suggestions to <bug-wget@gnu.org>\n" -#~ msgstr "" -#~ "Rapporteer gebreken in het programma (of suggesties) aan <bug-wget@gnu." -#~ "org>;\n" -#~ "meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n" - -#, c-format -#~ msgid "File `%s' already there; not retrieving.\n" -#~ msgstr "Bestand '%s' is reeds aanwezig -- wordt niet opgehaald.\n" - #~ msgid "Authorization failed.\n" #~ msgstr "Aanmelding is mislukt.\n" -#, fuzzy #~ msgid "" #~ " --retries specify the number of retries for a " #~ "file.\n" @@ -3740,11 +3614,9 @@ msgstr "" #~ " (optie is vereist bij '--metalink-" #~ "file')\n" -#, fuzzy #~ msgid " --jobs specify how many threads use.\n" #~ msgstr " --jobs dit AANTAL draden gebruiken\n" -#, fuzzy #~ msgid "" #~ "Username and password information not needed to be " #~ "specified when downloading from a metalink.\n" Binary files differ@@ -2,7 +2,7 @@ # Copyright (C) 2002, 2008, 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # Wojciech Kotwica <wkotwica@post.pl>, 2002 -# Jakub Bogusz <qboosh@pld-linux.org>, 2005-2022 +# Jakub Bogusz <qboosh@pld-linux.org>, 2005-2023 # based on unofficial translation of wget-1.6 by # Arkadiusz MiÅ›kiewicz <misiek@pld.ORG.PL>, 1998-2000. # Wojciech Kotwica <wkotwica@post.pl> 2002-03-20 11:12+01:00 @@ -11,10 +11,10 @@ # msgid "" msgstr "" -"Project-Id-Version: wget 1.21.3\n" +"Project-Id-Version: wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-02-27 20:30+0100\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-11 19:30+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "Language: pl\n" @@ -391,12 +391,12 @@ msgstr "Przerwano przesyÅ‚anie danych.\n" msgid "File %s already there; not retrieving.\n" msgstr "Plik %s już istnieje, bez pobierania.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(próba:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -405,7 +405,7 @@ msgstr "" "%s (%s) - zapisano na standardowe wyjÅ›cie %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -415,7 +415,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Usuwanie %s.\n" @@ -775,7 +775,7 @@ msgstr "Ponowne użycie poÅ‚Ä…czenia do %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Nie powiodÅ‚o siÄ™ odczytanie odpowiedzi proxy: %s.\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s BÅÄ„D %d: %s.\n" @@ -908,50 +908,50 @@ msgstr "DÅ‚ugość: " msgid "ignored" msgstr "zignorowano" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Ostrzeżenie: znaki globalne nie sÄ… obsÅ‚ugiwane w HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Tryb spider wÅ‚Ä…czony. Sprawdź czy zdalny plik istnieje.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nie można zapisać do %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "W odebranym nagłówku brak wymaganego atrybutu.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Uwierzytelnienie użytkownik/hasÅ‚o nie powiodÅ‚o siÄ™.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Nie można zapisać do pliku WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Nie można zapisać do tymczasowego pliku WARC.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Niemożliwe utworzenie poÅ‚Ä…czenia SSL.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Nie można usunąć %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "BÅÄ„D: Przekierowanie (%d) bez lokalizacji.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -959,23 +959,23 @@ msgstr "" "Nie udaÅ‚o siÄ™ odnaleźć danych Metalink w odpowiedzi HTTP. Pobieranie pliku " "przy użyciu HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Napotkano nagłówek Metalink. PrzeÅ‚Ä…czanie w tryb Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Zdalny plik nie istnieje -- zepsuty odnoÅ›nik!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Brak nagłówka Last-modified -- znaczniki czasu wyÅ‚Ä…czone.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "BÅ‚Ä™dny nagłówek Last-modified -- znacznik czasu zignorowany.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -984,16 +984,16 @@ msgstr "" "Plik po stronie serwera nie nowszy niż plik lokalny %s -- bez pobierania.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Rozmiary siÄ™ różniÄ… (lokalny %s) -- pobieranie.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Plik na zdalnym serwerze jest nowszy, pobieranie.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1002,7 +1002,7 @@ msgstr "" "Plik po stronie serwera istnieje i zawiera odnoÅ›niki do innych źródeÅ‚ -- " "pobieranie.\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1011,7 +1011,7 @@ msgstr "" "pobieram.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1021,7 +1021,7 @@ msgstr "" "jednak rekurencja jest wyÅ‚Ä…czona -- nie pobieram.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1029,12 +1029,12 @@ msgstr "" "Plik na zdalnym serwerze istnieje.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1043,7 +1043,7 @@ msgstr "" "%s (%s) - zapisano na standardowe wyjÅ›cie %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1052,27 +1052,27 @@ msgstr "" "%s (%s) - zapisano %s [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - PoÅ‚Ä…czenie zamkniÄ™te przy %s bajcie. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - BÅ‚Ä…d podczas odczytu przy bajcie %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - BÅ‚Ä…d podczas odczytu przy bajcie %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "NieobsÅ‚ugiwana jakość zabezpieczenia '%s'.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "NieobsÅ‚ugiwany algorytm '%s'.\n" @@ -1084,7 +1084,7 @@ msgid "" msgstr "" "%s: WGETRC wskazuje na %s, do którego nie ma dostÄ™pu z powodu bÅ‚Ä™du: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nie można odczytać %s (%s).\n" @@ -1415,16 +1415,12 @@ msgstr "" " poÅ‚Ä…czenia\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=BÅĘDY rozdzielona przecinkami lista bÅ‚Ä™dów\n" -" HTTP do wznowienia\n" +" --retry-on-host-error traktowanie bÅ‚Ä™dów hosta jako " +"niekrytycznych, przejÅ›ciowych\n" #: src/main.c:653 msgid "" @@ -3050,17 +3046,17 @@ msgstr "" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: uwaga: element %s pojawia siÄ™ przed każdÄ… nazwÄ… komputera\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: nieznany element (token) \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "SkÅ‚adnia: %s NETRC [NAZWA_HOSTA]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: nie można pobrać informacji o %s: %s\n" @@ -3091,14 +3087,13 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: nie zaimplementowana wartość opcji 'secure-protocol' %d\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "Użyta wersja OpenSSL jest zbyt stara, aby obsÅ‚użyć TLS 1.3\n" +msgstr "Użyta wersja OpenSSL nie obsÅ‚uguje opcji '%s'.\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "Przebudowanie Wgeta i/lub OpenSSL-a może pomóc w tej sytuacji.\n" # c-format #: src/openssl.c:341 @@ -3231,22 +3226,22 @@ msgstr "Nie można otworzyć %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Wczytywanie robots.txt; proszÄ™ zignorować bÅ‚Ä™dy.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "BÅ‚Ä…d podczas analizy skÅ‚adni URL-a proxy %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "BÅ‚Ä…d w URL-u proxy %s: Musi być HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "przekroczono %d przekierowaÅ„.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3254,7 +3249,7 @@ msgstr "" "Program nie może sobie poradzić.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3293,20 +3288,16 @@ msgid "No error" msgstr "Brak bÅ‚Ä™du" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "NieobsÅ‚ugiwany schemat %s" +msgstr "NieobsÅ‚ugiwany schemat" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "ObsÅ‚uga HTTPS nie zostaÅ‚a wkompilowana" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "ObsÅ‚uga HTTPS nie zostaÅ‚a wkompilowana" +msgstr "ObsÅ‚uga FTPS nie zostaÅ‚a wkompilowana" #: src/url.c:692 msgid "Scheme missing" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.21.2\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2021-09-10 06:55+0100\n" "Last-Translator: Pedro Albuquerque <pmra@protonmail.com>\n" "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n" @@ -391,12 +391,12 @@ msgstr "Transferência de dados abortada.\n" msgid "File %s already there; not retrieving.\n" msgstr "O ficheiro %s já existe; a não obter.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(tentativa:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -405,7 +405,7 @@ msgstr "" "%s (%s) - escrito em stdout %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -415,7 +415,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "A remover %s.\n" @@ -772,7 +772,7 @@ msgstr "A reutilizar ligação existente a %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Falha ao ler a resposta do proxy: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERRO %d: %s.\n" @@ -906,50 +906,50 @@ msgstr "Tamanho: " msgid "ignored" msgstr "ignorado" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Aviso: caracteres universais não são suportados em HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Modo de aranha activado. Verificar se o ficheiro remoto existe.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "ImpossÃvel escrever em %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Atributo requerido em falta no cabeçalho recebido.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Autenticação Utilizador/Senha falhou.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "ImpossÃvel escrever no ficheiro WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "ImpossÃvel escrever no ficheiro temporário WARC.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "ImpossÃvel estabelecer ligação SSL.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "ImpossÃvel desligar %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERRO: redireccionamento (%d) sem localização.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -957,23 +957,23 @@ msgstr "" "ImpossÃvel encontrar dados Metalink na resposta HTTP. A transferir ficheiro " "com HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Encontrados cabeçalhos Metalink. A mudar para modo Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "O ficheiro remoto não existe -- ligação quebrada!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Último cabeçalho modificado em falta -- carimbos desactivados.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Último cabeçalho modificado inválido -- carimbo ignorado.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -983,16 +983,16 @@ msgstr "" "obter.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Os tamanhos não coincidem (local %s) -- a obter.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "O ficheiro remoto é mais recente, a obter.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1002,7 +1002,7 @@ msgstr "" "obter.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1010,7 +1010,7 @@ msgstr "" "O ficheiro remoto existe mas não contém ligações -- a não obter.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1020,7 +1020,7 @@ msgstr "" "mas a recursividade está desactivada -- a não obter.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1028,12 +1028,12 @@ msgstr "" "O ficheiro remoto existe.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1042,7 +1042,7 @@ msgstr "" "%s (%s) - escrito em stdout %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1051,27 +1051,27 @@ msgstr "" "%s (%s) - %s gravado [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - ligação fechada no byte %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - erro de leitura no byte %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - erro de leitura no byte %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Qualidade de protecção \"%s\" não suportada.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritmo \"%s\" não suportado.\n" @@ -1083,7 +1083,7 @@ msgid "" msgstr "" "%s: WGETRC aponta para %s, o qual não pôde ser acedido devido a erro: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: impossÃvel ler %s (%s).\n" @@ -3032,17 +3032,17 @@ msgstr "ioctl() falhou. A socket não pôde ser definida como bloqueando.\n" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: aviso: a expressão %s aparece antes de um nome de máquina\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: expressão desconhecida \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uso: %s NETRC [NOME-DA-MÃQUINA]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: impossÃvel analisar %s: %s\n" @@ -3210,22 +3210,22 @@ msgstr "ImpossÃvel abrir %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "A carregar robots.txt; por favor, ignore erros.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Erro ao analisar URL do proxy %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Erro no URL do proxy %s: tem de ser HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redireccionamentos excedidos.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3233,7 +3233,7 @@ msgstr "" "A desistir.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo Binary files differindex 8f9926b..91565df 100644 --- a/po/pt_BR.gmo +++ b/po/pt_BR.gmo diff --git a/po/pt_BR.po b/po/pt_BR.po index a584d5e..e6855b2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -9,10 +9,10 @@ # msgid "" msgstr "" -"Project-Id-Version: wget-1.21.3\n" +"Project-Id-Version: wget-1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2023-04-21 20:26-0300\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-13 20:23-0300\n" "Last-Translator: Rodolfo Ribeiro Gomes <rodolforg@gmail.com>\n" "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge." "net>\n" @@ -415,13 +415,13 @@ msgid "File %s already there; not retrieving.\n" msgstr "O arquivo %s já existe, não será baixado.\n" # , c-format -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(tentativa:%2d)" # , c-format -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -431,7 +431,7 @@ msgstr "" "\n" # , c-format -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -442,7 +442,7 @@ msgstr "" # , c-format #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Removendo %s.\n" @@ -823,7 +823,7 @@ msgid "Failed reading proxy response: %s\n" msgstr "Falhou em ler a resposta do proxy: %s\n" # , c-format -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERRO %d: %s.\n" @@ -961,55 +961,55 @@ msgstr "Tamanho: " msgid "ignored" msgstr "ignorado" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Aviso: Não há suporte para caracteres coringa no HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "O modo aranha está habilitado. Verifique se o arquivo remoto existe.\n" # , c-format -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Não foi possÃvel escrever em %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Ausência de atributo obrigatório no cabeçalho recebido.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Autenticação de nome/senha falhou.\n" # , c-format -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Não foi possÃvel escrever em arquivo WARC.\n" # , c-format -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Não foi possÃvel escrever em arquivo WARC temporário.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Não foi possÃvel estabelecer conexão segura (SSL).\n" # , c-format -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Não foi possÃvel remover %s (%s).\n" # , c-format -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERRO: Redirecionamento (%d) sem Location.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1017,23 +1017,23 @@ msgstr "" "Não foi possÃvel localizar os dados de Metalink na resposta HTTP. Baixando " "arquivo usando HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Cabeçalhos de Metalink encontrados. Alternando para modo Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "O arquivo remoto não existe -- link quebrado!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Está faltando o cabeçalho Last-modified -- horários desligados.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "O cabeçalho Last-modified é inválido -- horário ignorado.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1042,16 +1042,16 @@ msgstr "" "O arquivo no servidor não é mais novo que o local %s -- ignorando.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Os tamanhos não coincidem (local %s) -- baixando.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "O arquivo remoto é mais novo, baixando.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1060,7 +1060,7 @@ msgstr "" "O arquivo remoto existe e pode conter links para outras fontes -- baixando.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1068,7 +1068,7 @@ msgstr "" "O arquivo remoto existe mas não contém link algum -- ignorando.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1078,7 +1078,7 @@ msgstr "" "mas a recursão está desabilitada -- ignorando.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1087,13 +1087,13 @@ msgstr "" "\n" # , c-format -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" # , c-format -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1103,7 +1103,7 @@ msgstr "" "\n" # , c-format -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1112,27 +1112,27 @@ msgstr "" "%s (%s) - %s salvo [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Conexão fechada no byte %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Erro de leitura no byte %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Erro de leitura no byte %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Não há suporte para a qualidade de proteção \"%s\".\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Não há suporte para o algoritmo \"%s\".\n" @@ -1144,7 +1144,7 @@ msgid "" msgstr "" "%s: WGETRC aponta para %s, que não pôde ser acessado devido a erro: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Não foi possÃvel ler %s (%s).\n" @@ -1477,17 +1477,13 @@ msgstr "" " recusada\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=ERROS lista separada por vÃrgula de erros " -"HTTP para\n" -" tentar de novo\n" +" --retry-on-host-error considera erros de máquina como não " +"fatais, erros\n" +" transitórios\n" #: src/main.c:653 msgid "" @@ -3165,19 +3161,19 @@ msgstr "" "%s: %s:%d: aviso: o termo %s aparece antes de qualquer nome de máquina\n" # , c-format -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: o termo \"%s\" é desconhecido\n" # , c-format -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uso: %s NETRC [NOME DA MÃQUINA]\n" # , c-format -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: não foi possÃvel acessar %s: %s\n" @@ -3210,14 +3206,13 @@ msgstr "" "OpenSSL: não há implementação para o valor da opção \"secure-protocol\" %d\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "Sua versão do OpenSSL é muito antiga para suportar TLS 1.3\n" +msgstr "Sua versão do OpenSSL não oferece suporte para opção \"%s\"\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "Recompilar Wget ou OpenSSL pode ajudar nesta situação.\n" #: src/openssl.c:341 #, c-format @@ -3355,24 +3350,24 @@ msgstr "Não é possÃvel abrir %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Carregando robots.txt; por favor ignore qualquer erro.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Erro ao analisar URL do proxy %s: %s\n" # , c-format -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Erro no URL do proxy %s: Tem que ser HTTP.\n" # , c-format -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "Excedeu os %d redirecionamentos.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3380,7 +3375,7 @@ msgstr "" "Desistindo.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3416,20 +3411,16 @@ msgid "No error" msgstr "Nenhum erro" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Não há suporte para o esquema %s" +msgstr "Não há suporte para este esquema" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "Compilado sem suporte a HTTPS" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "Compilado sem suporte a HTTPS" +msgstr "Compilado sem suporte a FTPS" #: src/url.c:692 msgid "Scheme missing" Binary files differ@@ -1,24 +1,32 @@ # Mesajele în limba română pentru pachetul wget. -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright © 2003, 2020, 2022, 2023 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # -# Traducere făcută de FM, pentru versiunea wget 1.21. +# Eugen Hoanca <eugenh@urban-grafx.ro>, 2003. +# Florentina MuÈ™at <florentina.musat.28@gmail.com>, 2020 - 2021. +# Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>, 2022 - 2023. +# +# Cronologia traducerii fiÈ™ierului „wgetâ€: +# Traducere iniÈ›ială, făcută de EH, pentru versiunea wget 1.9.1. +# Actualizare a traducerii pentru versiunea 1.20, făcută de FM, iun-2020. +# Actualizare a traducerii pentru versiunea 1.21, făcută de FM, ian-2021. # Actualizare a mesajelor, de la fiÈ™ierul „wget-1.21.2.potâ€. # Actualizare a algoritmului formelor de plural (de la „trei-vechi†la „trei-actualâ€). # NU È™i a mesajelor traduse (acestea au rămas neschimbate). # Eliminare a mesajelor ce-au dispărut în ultima versiune. -# -# Eugen Hoanca <eugenh@urban-grafx.ro>, 2003. -# Florentina MuÈ™at <florentina.musat.28@gmail.com>, 2020. # Actualizări realizate de Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>, 15.01.2022. -# Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>, 2022. +# Actualizare a traducerii pentru versiunea 1.21.2, făcută de R-GC, ian-2022. +# Actualizare a traducerii pentru versiunea 1.21.3, făcută de R-GC, mar-2022. +# Actualizare a traducerii pentru versiunea 1.21.4, făcută de R-GC, mai-2023. +# Corectare a unei greÈ™eli de dactilografiere prezentă din versiunea 1.21.3, făcută de R-GC, noi-2023. +# Actualizare a traducerii pentru versiunea Y, făcută de X, Z(luna-anul). # msgid "" msgstr "" -"Project-Id-Version: wget 1.21.3\n" +"Project-Id-Version: wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-03-06 15:46+0100\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-11-17 17:09+0100\n" "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" "Language: ro\n" @@ -28,7 +36,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.2.2\n" #: src/connect.c:201 #, c-format @@ -161,7 +169,7 @@ msgstr "Eroare la închiderea a %s: %s\n" #: src/ftp-ls.c:1045 msgid "Unsupported listing type, trying Unix listing parser.\n" -msgstr "Tip de listare nesuportat, se încearcă analizatorul de listări Unix.\n" +msgstr "Tip de listare neacceptat, se încearcă analizatorul de listări Unix.\n" #: src/ftp-ls.c:1096 src/ftp-ls.c:1098 #, c-format @@ -418,7 +426,7 @@ msgstr "%s tocmai a fost creat.\n" #: src/ftp.c:1601 #, c-format msgid "%s: %s, closing control connection.\n" -msgstr "%s: %s, se închide conexiunea de control.n\n" +msgstr "%s: %s, se închide conexiunea de control.\n" #: src/ftp.c:1613 #, c-format @@ -445,12 +453,12 @@ msgstr "Transferul de date a fost întrerupt.\n" msgid "File %s already there; not retrieving.\n" msgstr "FiÈ™ierul %s există deja; nu se recuperează.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(încercarea: %2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -459,7 +467,7 @@ msgstr "" "%s (%s) - scris la stdout %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -469,7 +477,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Se elimină %s.\n" @@ -537,7 +545,7 @@ msgstr "Se creează legătura simbolică %s -> %s\n" #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "" -"Legăturile simbolice nu sunt suportate, se omite legătura simbolică %s.\n" +"Legăturile simbolice nu sunt acceptate, se omite legătura simbolică %s.\n" #: src/ftp.c:2387 #, c-format @@ -639,7 +647,7 @@ msgstr "" #: src/gnutls.c:777 src/gnutls.c:841 msgid "Your GnuTLS version is too old to support TLS 1.3\n" -msgstr "Versiunea GnuTLS este prea veche pentru a suporta TLS 1.3\n" +msgstr "Versiunea GnuTLS este prea veche pentru a fi compatibilă cu TLS 1.3\n" #: src/gnutls.c:789 #, c-format @@ -866,7 +874,7 @@ msgstr "Nu s-a putut citi răspunsul proxy: %s\n" # R-GC, scrie: # iniÈ›ial, traducerea era aÈ™a: # „EROARE %s %d: %s.†-#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s EROARE %d: %s.\n" @@ -1008,51 +1016,51 @@ msgstr "ignorat" # R-GC, scrie: # am modificat traducerea iniÈ›ială: # „Avertisment: selecÈ›iile globale(wildcards) nu sunt permise în HTTP.†-#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Avertisment: metacaracterele nu sunt permise în HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "Modul păianjen activat. Verifică dacă fiÈ™ierul de la distanță există.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nu se poate scrie la %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Atributul necesar care lipseÈ™te din Antet a fost primit.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Autentificarea nume de utilizator/parolă a eÈ™uat.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Nu se poate scrie în fiÈ™ierul WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Nu se poate scrie în fiÈ™ierul temporar WARC.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Nu s-a putut stabili o conexiune SSL.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Nu se poate desface legătura %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "EROARE: RedirecÈ›ionare (%d) fără locaÈ›ie.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1060,25 +1068,25 @@ msgstr "" "Nu s-au putut găsi datele Metalink în răspunsul HTTP. Se descarcă fiÈ™ierul " "utilizând HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Antetele Metalink au fost găsite. Se comută la modul Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "FiÈ™ierul de la distanță nu există -- legătură deteriorată!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "LipseÈ™te antetul „Last-modified†-- marcările de timp au fost oprite.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Antetul „Last-modified†nu este valid -- marcajul de timp este ignorat.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1088,16 +1096,16 @@ msgstr "" "recuperează.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Dimensiunile nu se potrivesc (local %s) -- se recuperează.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "FiÈ™ierul de la distanță este mai nou, se aduce.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1107,7 +1115,7 @@ msgstr "" "resurse -- se recuperează.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1116,7 +1124,7 @@ msgstr "" "recuperează.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1126,7 +1134,7 @@ msgstr "" "dar recursivitatea este dezactivată -- nu se obÈ›ine.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1134,12 +1142,12 @@ msgstr "" "FiÈ™ierul de la distanță există.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1148,7 +1156,7 @@ msgstr "" "%s (%s) - scris la stdout %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1157,30 +1165,30 @@ msgstr "" "%s (%s) - %s salvat [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Conexiune închisă la octetul %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Eroare de citire la octetul %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Eroare de citire la octetul %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" -msgstr "Calitate nesuportată a protecÈ›iei „%sâ€.\n" +msgstr "Calitate neacceptată a protecÈ›iei „%sâ€.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" -msgstr "Algoritm nesuportat „%sâ€.\n" +msgstr "Algoritm neacceptat „%sâ€.\n" #: src/init.c:583 #, c-format @@ -1189,7 +1197,7 @@ msgid "" msgstr "" "%s: WGETRC arată către %s, care nu a putut fi accesat din cauza erorii: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nu s-a putut citi %s (%s).\n" @@ -1333,7 +1341,7 @@ msgstr "Codificarea %s nu este validă\n" #: src/iri.c:140 src/url.c:1612 #, c-format msgid "Conversion from %s to %s isn't supported\n" -msgstr "Conversia de la %s la %s nu este suportată\n" +msgstr "Conversia de la %s la %s nu este permisă\n" #: src/iri.c:180 src/url.c:1642 msgid "Incomplete or invalid multibyte sequence encountered\n" @@ -1527,16 +1535,12 @@ msgstr "" "este refuzată\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=ERORI listă separată prin virgule a erorilor " -"HTTP pentru care se încearcă din nou\n" +" --retry-on-host-error consideră erorile gazdei drept erori " +"tranzitorii nefatale\n" #: src/main.c:653 msgid "" @@ -2237,8 +2241,8 @@ msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -" --hsts-file calea bazei de date HSTS (va suprascrie " -"valoarea implicită)\n" +" --hsts-file ruta la baza de date HSTS (va " +"suprascrie valoarea implicită)\n" #: src/main.c:900 msgid "FTP options:\n" @@ -2327,8 +2331,8 @@ msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -" --ftps-fallback-to-ftp revine la FTP dacă FTPS nu este " -"suportat în serverul È›intă\n" +" --ftps-fallback-to-ftp revine la FTP dacă FTPS nu este admis " +"în serverul È›intă\n" #: src/main.c:936 msgid "WARC options:\n" @@ -3028,7 +3032,7 @@ msgstr "Cota de descărcare de %s, a fost DEPĂȘITÄ‚!\n" #: src/metalink.c:93 msgid "-O not supported for metalink download. Ignoring.\n" msgstr "" -"OpÈ›iunea „-O†nu este suportată pentru descărcarea metalink. Se ignoră.\n" +"OpÈ›iunea „-O†nu este acceptată pentru descărcarea metalink. Se ignoră.\n" #: src/metalink.c:172 #, c-format @@ -3076,7 +3080,7 @@ msgstr "Procesarea metaurl-urilor a terminat cu eroare.\n" #: src/metalink.c:386 #, c-format msgid "Resource type %s not supported, ignoring...\n" -msgstr "Tipul de resursă %s nu este suportat, se ignoră...\n" +msgstr "Tipul de resursă %s nu este acceptat, se ignoră...\n" #: src/metalink.c:507 msgid "Could not open downloaded file.\n" @@ -3232,17 +3236,17 @@ msgstr "" "%s: %s:%d: avertisment: cuvântul cheie %s apare înainte de oricare nume de " "maÈ™ină\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: cuvânt cheie necunoscut „%sâ€\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Utilizare: %s NETRC [NUME_HOST]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: nu se poate stabili starea lui %s: %s\n" @@ -3258,15 +3262,15 @@ msgstr "" #: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "Versiunea OpenSSL este prea veche pentru a suporta TLS 1.3\n" +msgstr "Versiunea OpenSSL este prea veche pentru a fi compatibilă cu TLS 1.3\n" #: src/openssl.c:278 msgid "Your OpenSSL version is too old to support TLSv1.1\n" -msgstr "Versiunea OpenSSL este prea veche pentru a suporta TLSv1.1\n" +msgstr "Versiunea OpenSSL este prea veche pentru a fi compatibilă cu TLSv1.1\n" #: src/openssl.c:282 msgid "Your OpenSSL version is too old to support TLSv1.2\n" -msgstr "Versiunea OpenSSL este prea veche pentru a suporta TLSv1.2\n" +msgstr "Versiunea OpenSSL este prea veche pentru a fi compatibilă cu TLSv1.2\n" #: src/openssl.c:288 #, c-format @@ -3274,14 +3278,13 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: valoare de opÈ›iune neimplementată „secure-protocol†%d\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "Versiunea OpenSSL este prea veche pentru a suporta TLS 1.3\n" +msgstr "Versiunea dvs. OpenSSL nu acceptă opÈ›iunea „%sâ€.\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "Reconstruirea Wget È™i/sau OpenSSL poate ajuta în această situaÈ›ie.\n" #: src/openssl.c:341 #, c-format @@ -3428,22 +3431,22 @@ msgstr "Nu se poate deschide %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Se încarcă robots.txt; ignoraÅ£i erorile.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Eroare la analizarea adresei URL proxy: %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Eroare în adresa URL proxy %s: Trebuie să fie HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redirecÈ›ionări depășite.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3451,7 +3454,7 @@ msgstr "" "RenunÅ£.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3499,20 +3502,16 @@ msgid "No error" msgstr "Nici o eroare" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Schemă nesuportată %s" +msgstr "Schemă neacceptată" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "Suportul HTTPS nu a fost compilat" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "Suportul HTTPS nu a fost compilat" +msgstr "Suportul FTPS nu a fost compilat" #: src/url.c:692 msgid "Scheme missing" @@ -3536,7 +3535,7 @@ msgstr "Adresă numerică IPv6 neterminată" #: src/url.c:697 msgid "IPv6 addresses not supported" -msgstr "Adresele IPv6 nu sunt suportate" +msgstr "Adresele IPv6 nu sunt acceptate" #: src/url.c:698 msgid "Invalid IPv6 numeric address" Binary files differ@@ -5,13 +5,13 @@ # Const Kaplinsky <const@ce.cctpu.edu.ru>, 1998, 1999, 2000, 2001. # Pavel Maryanov <acid_jack@ukr.net>, 2004, 2005, 2006, 2008, 2009. # Pavel Maryanov <acid@jack.kiev.ua>, 2010, 2011, 2012. -# Yuri Kozlov <yuray@komyakino.ru>, 2012, 2013, 2015, 2016, 2017, 2018, 2020, 2021, 2022. +# Yuri Kozlov <yuray@komyakino.ru>, 2012, 2013, 2015, 2016, 2017, 2018, 2020, 2021, 2022, 2023. msgid "" msgstr "" -"Project-Id-Version: wget 1.21.3\n" +"Project-Id-Version: wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-03-05 09:40+0300\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-20 11:41+0300\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <gnu@d07.ru>\n" "Language: ru\n" @@ -21,7 +21,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 20.12.0\n" +"X-Generator: Lokalize 22.12.3\n" #: src/connect.c:201 #, c-format @@ -389,12 +389,12 @@ msgstr "Передача данных прервана.\n" msgid "File %s already there; not retrieving.\n" msgstr "Файл %s уже ÑущеÑтвует; не загружаетÑÑ.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(попытка:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -403,7 +403,7 @@ msgstr "" "%s (%s) - запиÑан в stdout %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -413,7 +413,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "УдалÑетÑÑ %s.\n" @@ -771,7 +771,7 @@ msgstr "Повторное иÑпользование ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ %s msgid "Failed reading proxy response: %s\n" msgstr "Сбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð²ÐµÑ‚Ð° прокÑи: %s.\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ОШИБКР%d: %s.\n" @@ -903,50 +903,50 @@ msgstr "Длина: " msgid "ignored" msgstr "игнорируетÑÑ" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Предупреждение: в HTTP маÑки не поддерживаютÑÑ.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Включен режим робота. Проверка ÑущеÑÑ‚Ð²Ð¾Ð²Ð°Ð½Ð¸Ñ ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ð¾Ð³Ð¾ файла.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ðевозможно запиÑать в %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "ОбÑзательный атрибут отÑутÑтвует в принÑтом Заголовке.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Ошибка аутентификации пользователÑ/паролÑ.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Ðевозможно запиÑать в файл WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Ðевозможно запиÑать во временный файл WARC.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Ðе удаётÑÑ ÑƒÑтановить SSL-Ñоединение.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ðевозможно удалить %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ОШИБКÐ: перенаправление (%d) без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð°Ð´Ñ€ÐµÑа.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -954,24 +954,24 @@ msgstr "" "Ðевозможно найти данные Metalink в ответе HTTP. Файл ÑкачиваетÑÑ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ " "HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Ðайдены заголовки Metalink. Переходим в режим Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Удалённый файл не ÑущеÑтвует — Ð±Ð¸Ñ‚Ð°Ñ ÑÑылка!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "ОтÑутÑтвует заголовок last-modified — временные отметки выключены.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "ÐедопуÑтимый заголовок last-modified — временные отметки проигнорированы.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -980,16 +980,16 @@ msgstr "" "Файл на Ñервере не новее локального файла %s — не загружаетÑÑ.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Размеры файлов не Ñовпадают (локальный размер %s) — загружаетÑÑ.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Удалённый файл более новый, загружаетÑÑ.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -998,13 +998,13 @@ msgstr "" "Удалённый файл ÑущеÑтвует и может Ñодержать ÑÑылки на другие реÑурÑÑ‹ — " "загружаетÑÑ.\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "Удалённый файл ÑущеÑтвует, но не Ñодержит ÑÑылок — не загружаетÑÑ.\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1013,7 +1013,7 @@ msgstr "" "Удалённый файл ÑущеÑтвует и может Ñодержать дополнительные\n" "ÑÑылки, но рекурÑÐ¸Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð° — не загружаетÑÑ.\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1021,12 +1021,12 @@ msgstr "" "Удалённый файл ÑущеÑтвует.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1035,7 +1035,7 @@ msgstr "" "/%s (%s) - запиÑан в stdout %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1044,27 +1044,27 @@ msgstr "" "%s (%s) - %s Ñохранён [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Соединение закрыто, Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Ошибка чтениÑ, Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Ошибка чтениÑ, Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Ðеподдерживаемый атрибут защиты «%s».\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Ðеподдерживаемый алгоритм «%s».\n" @@ -1075,7 +1075,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC указывает на %s, доÑтуп к которому вызывает ошибку: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðевозможно прочитать %s (%s).\n" @@ -1394,17 +1394,12 @@ msgstr "" "отказано\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=ОШИБКИ\n" -" ÑпиÑок (через запÑтую) ошибок HTTP,\n" -" вызывающих повтор\n" +" --retry-on-host-error Ñчитать ошибки узла некритичными, " +"Ñлучайными\n" #: src/main.c:653 msgid "" @@ -2997,17 +2992,17 @@ msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: предупреждение: перед именем каждой машины вÑтречаетÑÑ Ð¼Ð°Ñ€ÐºÐµÑ€ %s\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: неизвеÑтный маркер «%s»\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "ИÑпользование: %s NETRC [ИМЯ_УЗЛÐ]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: невозможно выполнить stat Ð´Ð»Ñ %s: %s\n" @@ -3041,15 +3036,13 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: значение %d параметра «secure-protocol» не реализовано\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "" -"ВерÑÐ¸Ñ Ð²Ð°ÑˆÐµÐ¹ библиотеки OpenSSL Ñлишком ÑтараÑ, чтобы поддерживать TLS 1.3\n" +msgstr "ВерÑÐ¸Ñ Ð²Ð°ÑˆÐµÐ¹ библиотеки OpenSSL не поддерживает параметр «%s».\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "ПереÑборка Wget и/или OpenSSL может помочь иÑправить Ñто.\n" #: src/openssl.c:341 #, c-format @@ -3182,22 +3175,22 @@ msgstr "Ðе удалоÑÑŒ открыть %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "ЗагружаетÑÑ robots.txt; не обращайте внимание на ошибки.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Ошибка разбора URL прокÑи %s: %s\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Ошибка в URL прокÑи %s: Должен быть HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "Превышено чиÑло перенаправлений %d.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3205,7 +3198,7 @@ msgstr "" "Завершение.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3244,20 +3237,16 @@ msgid "No error" msgstr "Ðет ошибок" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "ÐÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ñхема %s" +msgstr "ÐÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ñхема" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "Программа Ñкомпилирована без поддержки HTTPS" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "Программа Ñкомпилирована без поддержки HTTPS" +msgstr "Программа Ñкомпилирована без поддержки FTPS" #: src/url.c:692 msgid "Scheme missing" Binary files differ@@ -1,15 +1,15 @@ # Slovak translations for GNU wget -# Copyright (C) 1999, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017, 2018, 2020, 2021, 2022 Free Software Foundation, Inc. +# Copyright (C) 1999, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017, 2018, 2020, 2021, 2022, 2023 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # Miroslav Vasko <vasko@debian.cz>, 1999. -# Marcel Telka <marcel@telka.sk>, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017, 2018, 2020, 2021, 2022. +# Marcel Telka <marcel@telka.sk>, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017, 2018, 2020, 2021, 2022, 2023. # msgid "" msgstr "" -"Project-Id-Version: GNU wget 1.21.3\n" +"Project-Id-Version: GNU wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-02-27 14:39+0100\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-11 17:01+0200\n" "Last-Translator: Marcel Telka <marcel@telka.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" "Language: sk\n" @@ -384,12 +384,12 @@ msgstr "Prenos dát bol predÄasne ukonÄený.\n" msgid "File %s already there; not retrieving.\n" msgstr "Súbor %s je už tam, nebude sa prenášaÅ¥.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(pokus:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -398,7 +398,7 @@ msgstr "" "%s (%s) - zapÃsané na Å¡tandardný výstup %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -408,7 +408,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Odstraňuje sa %s.\n" @@ -767,7 +767,7 @@ msgstr "Použije sa existujúce spojenie s %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Zlyhalo ÄÃtanie odpovede z proxy: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s CHYBA %d: %s.\n" @@ -898,50 +898,50 @@ msgstr "Dĺžka: " msgid "ignored" msgstr "ignorované" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Upozornenie: HTTP nepodporuje žolÃkové znaky.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Povolený režim pavúka. Skontrolujte, Äi vzdialený súbor existuje.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nie je možné zapÃsaÅ¥ do %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Prijatá hlaviÄka neobsahuje povinný prÃznak.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Zlyhalo overenie použÃvateľa/hesla.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Nie je možné zapÃsaÅ¥ do súboru WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Nie je možné zapÃsaÅ¥ do doÄasného súboru WARC.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Nepodarilo sa nadviazaÅ¥ SSL spojenie.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Nie je možné odstrániÅ¥ %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "CHYBA: Presmerovanie (%d) bez udanej novej adresy.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -949,23 +949,23 @@ msgstr "" "Nepodarilo sa v HTTP odpovedi nájsÅ¥ dáta Metalink. Súbor sa sÅ¥ahuje pomocou " "HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Nájdené hlaviÄky Metalink. Prepnutie do režimu Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Vzdialený súbor neexistuje -- poÅ¡kodený odkaz!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "HlaviÄka Last-modified chýba -- nebudú sa použÃvaÅ¥ Äasové znaÄky.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "HlaviÄka Last-modified je neplatná -- Äasové znaÄky ignorované.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -974,16 +974,16 @@ msgstr "" "Súbor na serveri nie je novÅ¡Ã ako miestny súbor %s -- neprenáša sa.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Veľkosti se nezhodujú (miestny %s) -- prenáša sa.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Vzdialený súbor je novÅ¡Ã, prenáša sa.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -993,7 +993,7 @@ msgstr "" "prenáša sa.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1001,7 +1001,7 @@ msgstr "" "Vzdialený súbor, ale neobsahuje žiadne odkazy -- neprenáša sa.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1011,7 +1011,7 @@ msgstr "" "ale rekurzia nie je povolená -- neprenáša sa.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1019,12 +1019,12 @@ msgstr "" "Vzdialený súbor existuje.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1033,7 +1033,7 @@ msgstr "" "%s (%s) - zapÃsané na Å¡tandardný výstup %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1042,27 +1042,27 @@ msgstr "" "%s (%s) - %s uložené [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Spojenie uzatvorené na bajte %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Chyba pri ÄÃtanà na bajte %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Chyba pri ÄÃtanà na bajte %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nepodporovaná kvalita ochrany '%s'.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nepodporovaný algoritmus '%s'.\n" @@ -1073,7 +1073,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC ukazuje na %s, ktorý je nedostupný kvôli chybe: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nie je možné preÄÃtaÅ¥ %s (%s).\n" @@ -1395,17 +1395,12 @@ msgstr "" "odmietnuté\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=CHYBY Äiarkou oddelený zoznam HTTP chýb, " -"pri ktorých\n" -" skúsiÅ¥ znova\n" +" --retry-on-host-error považovaÅ¥ chyby hostiteľa za nezávažné, " +"doÄasné\n" #: src/main.c:653 msgid "" @@ -3031,17 +3026,17 @@ msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: upozornenie: token %s je uvedený pred akýmkoľvek názvom poÄÃtaÄa\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: neznámy token \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Použitie: %s NETRC [NÃZOV_POÄŒÃTAÄŒA]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: volanie `stat %s' skonÄilo s chybou: %s\n" @@ -3072,14 +3067,14 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: neimplementovaná hodnota %d voľby 'secure-protocol'\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "VaÅ¡a verzia OpenSSL je prÃliÅ¡ stará, aby podporovala TLS 1.3\n" +msgstr "VaÅ¡a verzia OpenSSL nepodporuje voľbu '%s'.\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" msgstr "" +"Opätovné preloženie Wget a/alebo OpenSSL môže v tomto prÃpade pomôcÅ¥.\n" #: src/openssl.c:341 #, c-format @@ -3210,22 +3205,22 @@ msgstr "Nie je možné otvoriÅ¥ %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "NaÄÃtava sa robots.txt. Chybové hlásenia ignorujte, prosÃm.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Chyba pri analýze proxy URL %s: %s\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Chyba v proxy URL %s: Musà byÅ¥ HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "PrekroÄený limit %d presmerovanÃ.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3233,7 +3228,7 @@ msgstr "" "Nemá to zmysel.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3272,20 +3267,16 @@ msgid "No error" msgstr "Bez chyby" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Nepodporovaná schéma %s" +msgstr "Nepodporovaná schéma" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "Podpora pre HTTPS nie je zakompilovaná" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "Podpora pre HTTPS nie je zakompilovaná" +msgstr "Podpora pre FTPS nie je zakompilovaná" #: src/url.c:692 msgid "Scheme missing" Binary files differ@@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.12-pre7\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: 2010-11-17 20:05+0100\n" "Last-Translator: Andrej ®nidar¹iè <andrej.znidarsic@gmail.com>\n" "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n" @@ -404,12 +404,12 @@ msgstr "Prenos podatkov prekinjen.\n" msgid "File %s already there; not retrieving.\n" msgstr "Datoteka %s je ¾e tam; prejem preskoèen.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(posk:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -418,7 +418,7 @@ msgstr "" "%s (%s) - zapisan v stdout %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -428,7 +428,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Odstranjevanje %s.\n" @@ -796,7 +796,7 @@ msgstr "Ponovna uporaba povezave z %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Napaka med branjem odgovora posredni¹kega stre¾nika: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s NAPAKA %d: %s.\n" @@ -919,77 +919,77 @@ msgstr "Dol¾ina: " msgid "ignored" msgstr "prezrto" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Opozorilo: HTTP ne podpira nadomestnih znakov.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Omogoèen naèin pajka. Preverite, èe obstaja oddaljena datoteka.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "V %s ni mogoèe zapisovati (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4476 +#: src/http.c:4480 #, fuzzy #| msgid "Cannot write to %s (%s).\n" msgid "Cannot write to WARC file.\n" msgstr "V %s ni mogoèe zapisovati (%s).\n" -#: src/http.c:4482 +#: src/http.c:4486 #, fuzzy #| msgid "Cannot write to %s (%s).\n" msgid "Cannot write to temporary WARC file.\n" msgstr "V %s ni mogoèe zapisovati (%s).\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Povezave SSL ni bilo moè vzpostaviti.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, fuzzy, c-format #| msgid "Cannot write to %s (%s).\n" msgid "Cannot unlink %s (%s).\n" msgstr "V %s ni mogoèe zapisovati (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "NAPAKA: Preusmeritev (%d) brez nove lokacije.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Oddaljena datoteka ne obstaja -- pokvarjena povezava!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Glava ,Last-Modified` manjka - izklapljanje èasovnega ¾iga.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Neveljavna glava `Last-Modified' -- prezrtje èasovnega ¾iga.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -999,16 +999,16 @@ msgstr "" "preskoèeno.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Velikosti se ne ujemata (krajevna %s) -- prena¹anje.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Oddaljena datoteka je novej¹a, pridobivanje.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1018,7 +1018,7 @@ msgstr "" "pridobivanje.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1027,7 +1027,7 @@ msgstr "" "preskoèeno.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1037,7 +1037,7 @@ msgstr "" "povezave, vendar je rekurzija onemogoèena -- prejemanje preskoèeno.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1045,12 +1045,12 @@ msgstr "" "Oddaljena datoteka obstaja.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1059,7 +1059,7 @@ msgstr "" "%s (%s) - zapisano v stdout %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1068,27 +1068,27 @@ msgstr "" "%s (%s) - %s shranjeno [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Povezava zaprta na bajtu %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Napaka med branjem na bajtu %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Napaka med branjem na bajtu %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5115 +#: src/http.c:5119 #, fuzzy, c-format #| msgid "Unsupported scheme %s" msgid "Unsupported algorithm '%s'.\n" @@ -1101,7 +1101,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC ka¾e na %s, ki ne obstaja.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ni mogoèe prebrati %s (%s).\n" @@ -3330,17 +3330,17 @@ msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: opozorilo: ¾eton %s se pojavi pred vsakim imenom raèunalnika\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: neznan ¾eton \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uporaba: %s NETRC [IME GOSTITELJA]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: ni mogoèe napraviti stat na %s: %s\n" @@ -3516,22 +3516,22 @@ msgstr "Ni bilo mogoèe odpreti %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Nalaganje robots.txt; prosim, prezrite napake.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Napaka med razèlenjevanjem URL posredni¹kega stre¾nika %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Napaka v URL posredni¹kega stre¾nika %s: Mora biti HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d preusmeritev je bilo prekoraèenih.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3539,7 +3539,7 @@ msgstr "" "Opu¹èanje.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" Binary files differ@@ -2,14 +2,13 @@ # Copyright © 2020 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # Filip Miletić <f.miletic@ewi.tudelft.nl>, 2003. -# МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>, 2012–2022. -# +# МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>, 2012-2023. msgid "" msgstr "" -"Project-Id-Version: wget-1.21.3\n" +"Project-Id-Version: wget-1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-08-22 21:43+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-18 13:42+0200\n" "Last-Translator: МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" "Language: sr\n" @@ -18,6 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Virtaal 0.7.1\n" "X-Bugs: Report translation errors to the Language-Team address.\n" #: src/connect.c:201 @@ -387,12 +387,12 @@ msgstr "ÐŸÑ€ÐµÐ½Ð¾Ñ Ð¿Ð¾Ð´Ð°Ñ‚Ð°ÐºÐ° је прекинут.\n" msgid "File %s already there; not retrieving.\n" msgstr "Датотека „%s“ већ поÑтоји; нећу је преузети.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(пробајте:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -401,7 +401,7 @@ msgstr "" "%s (%s) — запиÑано у Ñтандардни излаз %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -411,7 +411,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Уклањам „%s“.\n" @@ -768,7 +768,7 @@ msgstr "Поново кориÑтим поÑтојећу везу Ñа %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "ÐиÑам уÑпео да прочитам одговор поÑредника: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ГРЕШКР%d: %s.\n" @@ -901,50 +901,50 @@ msgstr "Дужина: " msgid "ignored" msgstr "занемарено" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Упозорење: џокер знаци Ñе не кориÑте за ХТТП.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Укључен је режим паука. Проверавам да ли поÑтоји удаљена датотека.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ðе могу пиÑати у „%s“ (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Ðеопходан атрибут недоÑтаје у примљеном заглављу.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Ðије уÑпело потврђивање идентитета кориÑничког имена/лозинке.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Ðе могу да пишем у Ð’ÐРЦ датотеку.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Ðе могу да пишем у привремену Ð’ÐРЦ датотеку.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Ðе могу да уÑпоÑтавим ССЛ везу.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ðе могу да поништим везу „%s“ (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ГРЕШКÐ: ПреуÑмерење (%d) нема одредиште.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -952,26 +952,26 @@ msgstr "" "Ðе могу да пронађем податке мета везе у ХТТП одговору. Преузимам датотеку " "кориÑтећи „HTTP GET“.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Ðађох заглавља мета везе. Пребацујем на режим мета везе.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Удаљена датотека не поÑтоји -- оштећена веза!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Заглавље датума поÑледње измене недоÑтаје -- бележење времена је иÑкључено.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Заглавље датума поÑледње измене је неиÑправно -- бележење времена је " "занемарено.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -980,16 +980,16 @@ msgstr "" "Датотека на Ñерверу није новија од локалне датотеке „%s“ -- не преузимам.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Величине Ñе не поклапају (локална %s) -- преузимам.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Удаљена датотека је новија, преузимам.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -998,7 +998,7 @@ msgstr "" "Удаљена датотека поÑтоји и можда Ñадржи везе до других извора -- преузимам.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1006,7 +1006,7 @@ msgstr "" "Удаљена датотека поÑтоји али не Ñадржи ниједну везу -- не преузимам.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1016,7 +1016,7 @@ msgstr "" "али дубачење је иÑкључено -- не преузимам.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1024,12 +1024,12 @@ msgstr "" "Удаљена датотека поÑтоји.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s адреÑа: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1038,7 +1038,7 @@ msgstr "" "%s (%s) — запиÑано у Ñтандардни излаз %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1047,27 +1047,27 @@ msgstr "" "%s (%s) — %s је Ñачувано [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) — Веза је затворена при бајту %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) — Грешка читања при бајту %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) — Грешка читања при бајту %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Ðеподржан квалитет заштите „%s“.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Ðеподржан алгоритам „%s“.\n" @@ -1079,7 +1079,7 @@ msgid "" msgstr "" "%s: ВГЕТРЦ указује на „%s“, коме Ñе не може приÑтупити због грешке: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðе могу да прочитам %s (%s).\n" @@ -1408,16 +1408,12 @@ msgstr "" "одбијена\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=ГРЕШКЕ зарезом раздвојен ÑпиÑак ХТТП грешака " -"за поновно покушавање\n" +" --retry-on-host-error Ñматра грешке домаћина да ниÑу кобне, " +"прелазне грешке\n" #: src/main.c:653 msgid "" @@ -3043,17 +3039,17 @@ msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: упозорење: текÑÑ‚ „%s“ Ñе појављује пре било ког назива машине\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: непознат Ñимбол „%s“\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Употреба: %s NETRC [Ð ÐЧУÐÐÐ ]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: не могу да добавим податке за %s: %s\n" @@ -3084,14 +3080,13 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "ОпенССЛ: непримењена вредноÑÑ‚ %d опције „secure-protocol“\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "Ваше издање ОпенССЛ-а је превише Ñтаро да подржи ТЛС 1.3\n" +msgstr "Ваше издање ОпенССЛ-а не подржава опцију „%s“.\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "Поновна изградња Wget-а и/или ОпенССЛ-а може помоћи у овој прилици.\n" #: src/openssl.c:341 #, c-format @@ -3222,22 +3217,22 @@ msgstr "Ðе могу да отворим „%s“: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Учитавам „robots.txt“; молим занемарите грешке.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Грешка обраде адреÑе поÑредника „%s“: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Грешка у адреÑи поÑредника „%s“: мора бити ХТТП.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d премашених преуÑмеравања.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3245,7 +3240,7 @@ msgstr "" "ОдуÑтајем.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3284,20 +3279,16 @@ msgid "No error" msgstr "Ðема грешке" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Ðеподржана шема „%s“" +msgstr "Ðеподржана шема" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "ХТТПС подршка није уграђена" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "ХТТПС подршка није уграђена" +msgstr "ФТПС подршка није уграђена" #: src/url.c:692 msgid "Scheme missing" Binary files differ@@ -1,18 +1,18 @@ # Swedish messages for wget. -# Copyright © 2008, 2009, 2010, 2016, 2017, 2018, 2020, 2021, 2022 Free Software Foundation, Inc. +# Copyright © 2008, 2009, 2010, 2016, 2017, 2018, 2020, 2021, 2022, 2023 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # Christian Rose <menthos@menthos.com>, 1999, 2000, 2001, 2002, 2003. # Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010. # Luna Jernberg <droidbittin@gmail.com>, 2021 -# Göran Uddeborg <goeran@uddeborg.se>, 2016, 2017, 2018, 2020, 2021, 2022. +# Göran Uddeborg <goeran@uddeborg.se>, 2016, 2017, 2018, 2020, 2021, 2022, 2023. # -# $Revision: 1.15.1.4 $ +# $Revision: 1.15.1.6 $ msgid "" msgstr "" -"Project-Id-Version: wget 1.21.3\n" +"Project-Id-Version: wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-04-24 20:31+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-11 22:15+0200\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -22,7 +22,6 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -# bind? binda? FIXME. #: src/connect.c:201 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" @@ -387,12 +386,12 @@ msgstr "Dataöverföring avbruten.\n" msgid "File %s already there; not retrieving.\n" msgstr "Filen %s finns redan där; hämtar den inte.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(försök:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -401,7 +400,7 @@ msgstr "" "%s (%s) - skrevs till standard ut %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -411,7 +410,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Tar bort %s.\n" @@ -768,7 +767,7 @@ msgstr "Ã…teranvänder befintlig anslutning till %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Misslyckades med att läsa proxysvar: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s FEL %d: %s.\n" @@ -899,73 +898,73 @@ msgstr "Längd: " msgid "ignored" msgstr "ignorerad" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Varning: jokertecken stöds inte i HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Spindelläget aktiverat. Kontrollera om fjärrfilen finns.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Kan inte skriva till %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Det begärda attributet saknas i det mottagna huvudet.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Användarnamn-/lösenordsautentisering misslyckades.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Kan inte skriva till WARC-filen.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Kan inte skriva till en temporär WARC-fil.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Kan inte etablera en SSL-anslutning.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Kan inte ta bort %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "FEL: Omdirigering (%d) utan adress.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" "Hittade inte Metalink-data i HTTP-svaret. Hämtar filen med HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Metalink-huvuden hittade. Byter till Metalink-läge.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Fjärrfilen finns inte -- trasig länk!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "\"Last-modified\"-rubrik saknas -- tidsstämplar avstängda.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "\"Last-modified\"-rubriken är ogiltig -- tidsstämpel ignorerad.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -974,16 +973,16 @@ msgstr "" "Filen pÃ¥ servern är inte nyare än lokala filen %s -- hämtar den inte.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Storlekarna stämmer inte överens (lokal %s) -- hämtar.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Fjärrfilen är nyare, hämtar den.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -993,7 +992,7 @@ msgstr "" "den.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1001,7 +1000,7 @@ msgstr "" "Fjärrfilen finns men innehÃ¥ller ingen länk -- hämtar den inte.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1011,7 +1010,7 @@ msgstr "" "men rekursion är inaktiverat -- hämtar den inte.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1019,12 +1018,12 @@ msgstr "" "Fjärrfilen finns.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1033,7 +1032,7 @@ msgstr "" "%s (%s) - skrevs till standard ut %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1042,27 +1041,27 @@ msgstr "" "%s (%s) - %s sparades [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Anslutningen stängd vid byte %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Läsfel vid byte %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Läsfel vid byte %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Ej stödd skyddskvalitet â€%sâ€.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritmen â€%s†stödjs inte.\n" @@ -1074,7 +1073,7 @@ msgid "" msgstr "" "%s: WGETRC pekar pÃ¥ %s som inte gick att komma Ã¥t pÃ¥ grund av ett fel: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kan inte läsa %s (%s).\n" @@ -1395,16 +1394,12 @@ msgstr "" " --retry-connrefused försök igen även om anslutningen nekas\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=FEL kommaseparerad lista över HTTP-fel " -"att försöka igen vid\n" +" --retry-on-host-error betrakta värdfel som icke ödesdigra, " +"transienta fel\n" #: src/main.c:653 msgid "" @@ -3007,17 +3002,17 @@ msgstr "ioctl() misslyckades. Uttaget kunde inte sättas till blockerande.\n" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: varning: %s-märke förekommer framför alla maskinnamn\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: okänt märke \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Användning: %s NETRC [VÄRDDATORNAMN]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: kan inte ta status pÃ¥ %s: %s\n" @@ -3048,14 +3043,13 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: oimplementerat värde %d pÃ¥ alternativet â€secure-protocolâ€\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "Din OpenSSL-version är för gammal för att stödja TLS 1.3\n" +msgstr "Din OpenSSL-version stödjer inte alternativet â€%sâ€.\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "Att bygga om Wget och/eller OpenSSL kan hjälpa i denna situation.\n" #: src/openssl.c:341 #, c-format @@ -3184,22 +3178,22 @@ msgstr "Kan inte öppna %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Läser in robots.txt; ignorera fel.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Fel vid tolkning av proxy-URL %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Fel i proxy-URL %s: MÃ¥ste vara HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d omdirigeringar överskreds.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3207,7 +3201,7 @@ msgstr "" "Ger upp.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3243,20 +3237,16 @@ msgid "No error" msgstr "Inget fel" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Schemat %s stöds inte" +msgstr "Schema som inte stödjs" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "HTTPS-stöd är inte inkompilerat" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "HTTPS-stöd är inte inkompilerat" +msgstr "FTPS-stöd är inte inkompilerat" #: src/url.c:692 msgid "Scheme missing" Binary files differ@@ -6,14 +6,14 @@ # Volkan Gezer <vlkngzr@gmail.com>, 2013. # Alper Tekinalp <alper.tekinalp@gmail.com>, 2017. # Mesutcan Kurt <mesutcank@gmail.com>, 2017. -# Muhammet Kara <muhammetk@gmail.com>, 2016, 2017. +# Muhammet Kara <muhammetk@gmail.com>, 2016-2024. # msgid "" msgstr "" -"Project-Id-Version: wget 1.18.109\n" +"Project-Id-Version: wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2017-06-27 09:52+0300\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2024-02-14 00:16+0300\n" "Last-Translator: Muhammet Kara <muhammetk@gmail.com>\n" "Language-Team: Turkish <gnome-turk@gnome.org>\n" "Language: tr\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Gtranslator 2.91.7\n" +"X-Generator: Gtranslator 45.3\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-POOTLE-MTIME: 1494368779.000000\n" @@ -93,7 +93,7 @@ msgstr "birÅŸey yapılmadı.\n" #: src/convert.c:246 #, c-format msgid "%d.\n" -msgstr "" +msgstr "%d.\n" #: src/convert.c:252 src/convert.c:276 #, c-format @@ -204,10 +204,8 @@ msgid " (unauthoritative)\n" msgstr " (yetkin deÄŸil)\n" #: src/ftp.c:403 -#, fuzzy -#| msgid "Could not initialize SSL. It will be disabled." msgid "Could not initialize SSL. It will be disabled.\n" -msgstr "SSL ilklendirilemedi. Devre dışı bırakılacak." +msgstr "SSL ilklendirilemedi. Devre dışı bırakılacak.\n" #: src/ftp.c:485 #, c-format @@ -393,12 +391,12 @@ msgstr "Veri aktarımı kesildi.\n" msgid "File %s already there; not retrieving.\n" msgstr "%s dosyası zaten orada; indirilmiyor.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(deneme: %2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -407,7 +405,7 @@ msgstr "" "%s (%s) - ÅŸuraya yazıldı stdout %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -417,7 +415,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "%s kaldırılıyor.\n" @@ -517,13 +515,12 @@ msgstr "%s dışlandığı/dahil edilmediÄŸi için alçalmıyor.\n" #: src/ftp.c:2644 #, c-format msgid "Rejecting %s.\n" -msgstr "%s iptal ediliyor.\n" +msgstr "%s reddediliyor.\n" #: src/ftp.c:2654 -#, fuzzy, c-format -#| msgid "Rejecting %s.\n" +#, c-format msgid "Rejecting %s (Invalid Entry).\n" -msgstr "%s iptal ediliyor.\n" +msgstr "%s reddediliyor (Geçersiz Girdi).\n" #: src/ftp.c:2675 #, fuzzy, c-format @@ -780,7 +777,7 @@ msgstr "BaÄŸlantı tekrar kullanılıyor: %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Vekilin yanıtı okunamadı: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s HATA %d: %s.\n" @@ -911,73 +908,73 @@ msgstr "Uzunluk: " msgid "ignored" msgstr "yoksayıldı" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Uyarı: HTTP ile genel arama karakterleri kullanılamaz.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Örümcek kipi etkin. Uzak dosyanın mevcut olup olmadığını denetleyin.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "%s (%s) konumuna yazılamıyor.\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Alınan BaÅŸlıktan gerekli nitelik eksik.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "Kullanıcı Adı/Parola Kimlik DoÄŸrulaması BaÅŸarısız.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "WARC dosyasına yazılamıyor.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Geçici WARC dosyasına yazılamıyor.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "SSL baÄŸlantısı kurulamıyor.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "%s (%s) baÄŸlantısı kesilemiyor.\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "HATA: Yönlendirmede (%d) yer belirtilmemiÅŸ.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" "Metalink verisi HTTP yanıtında bulunamadı. Dosya HTTP GET ile indiriliyor.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Metalink baÅŸlıkları bulundu. Metalink moduna geçiliyor.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Uzak dosya bulunamıyor -- kırık adres!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified baÅŸlığı kayıp -- zaman damgası kapatıldı.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified baÅŸlığı geçersiz -- zaman damgası yoksayıldı.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -986,16 +983,16 @@ msgstr "" "Sunucudaki dosya yerel dosya %s ile aynı -- tekrar indirilmiyor.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Uzunlukları aynı deÄŸil (bizdeki %s), -- alınıyor.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Uzak dosya daha yeni, alınıyor.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1005,7 +1002,7 @@ msgstr "" "getiriliyor.\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1013,7 +1010,7 @@ msgstr "" "Uzak dosya buluntu fakat herhangi bir baÄŸlantı içermiyor -- alınamıyor.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1023,7 +1020,7 @@ msgstr "" "fakat önyineleme devredışı -- alınamıyor.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1031,12 +1028,12 @@ msgstr "" "Uzak dosya mevcut.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1045,7 +1042,7 @@ msgstr "" "%s (%s) - stdout %s[%s/%s] içine yazıldı\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1054,27 +1051,27 @@ msgstr "" "%s (%s) - %s kaydedildi [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - %s baytta baÄŸlantı kesildi. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - %s. baytta okuma hatası (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - %s/%s baytta okuma hatası (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Desteklenmeyen koruma kalitesi '%s'.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Desteklenmeyen algoritma '%s'.\n" @@ -1086,7 +1083,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC olmayan %s dosyasını gösteriyor.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: %s okunamadı (%s).\n" @@ -3030,17 +3027,17 @@ msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: uyarı: %s andacı herhangi bir makine adından önce görünüyor\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: bilinmeyen dizgecik \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Kullanım: %s NETRC [MAKÄ°NA-ADI]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: %s durumlanamadı: %s\n" @@ -3212,22 +3209,22 @@ msgstr "%s açılamıyor: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "robots.txt yükleniyor; lütfen hataları yoksayın.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Vekil URLsi %s çözümlenirken hata: %s\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Vekil URLsi %s: HTTP olmalı.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d yönlendirme geçildi.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3235,7 +3232,7 @@ msgstr "" "Vazgeçiliyor.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3554,51 +3551,39 @@ msgstr "" #~ msgid "Parameter string not correctly encoded" #~ msgstr "Parametre dizgesi doÄŸru bir ÅŸekilde kodlanmamış" -#, c-format #~ msgid "%s: option '%s' is ambiguous; possibilities:" #~ msgstr "%s: '%s' seçeneÄŸi belirsiz; olasılıklar:" -#, c-format #~ msgid "%s: option '%s' is ambiguous\n" #~ msgstr "%s: '%s' seçeneÄŸi belirsiz\n" -#, c-format #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s: '--%s' seçeneÄŸi bağımsız deÄŸiÅŸkene izin vermiyor\n" -#, c-format #~ msgid "%s: option '%c%s' doesn't allow an argument\n" #~ msgstr "%s: '%c%s' seçeneÄŸi bağımsız deÄŸiÅŸkene izin vermiyor\n" -#, c-format #~ msgid "%s: option '--%s' requires an argument\n" #~ msgstr "%s: '--%s' seçeneÄŸi bağımsız bir deÄŸiÅŸken gerektiriyor\n" -#, c-format #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: tanınmayan seçenek '--%s'\n" -#, c-format #~ msgid "%s: unrecognized option '%c%s'\n" #~ msgstr "%s: tanınmayan seçenek '%c%s'\n" -#, c-format #~ msgid "%s: invalid option -- '%c'\n" #~ msgstr "%s: geçersiz seçenek -- '%c'\n" -#, c-format #~ msgid "%s: option requires an argument -- '%c'\n" #~ msgstr "%s: seçenek bir bağımsız deÄŸiÅŸken gerektiriyor -- '%c'\n" -#, c-format #~ msgid "%s: option '-W %s' is ambiguous\n" #~ msgstr "%s: '-W %s' seçeneÄŸi belirsiz\n" -#, c-format #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: '-W %s' seçeneÄŸi bağımsız bir deÄŸiÅŸkene izin vermiyor\n" -#, c-format #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: '-W %s' seçeneÄŸi bağımsız bir deÄŸiÅŸken gerektiriyor\n" @@ -3662,27 +3647,21 @@ msgstr "" #~ msgid "No previous regular expression" #~ msgstr "Önceki düzenli ifade yok" -#, c-format #~ msgid "cannot create pipe" #~ msgstr "veriyolu oluÅŸturulamıyor" -#, c-format #~ msgid "%s subprocess failed" #~ msgstr "%s alt süreç baÅŸarısız" -#, c-format #~ msgid "_open_osfhandle failed" #~ msgstr "_open_osfhandle baÅŸarısız" -#, c-format #~ msgid "cannot restore fd %d: dup2 failed" #~ msgstr "fd geri yüklenemiyor %d: dup2 baÅŸarısız" -#, c-format #~ msgid "%s subprocess" #~ msgstr "%s alt süreç" -#, c-format #~ msgid "%s subprocess got fatal signal %d" #~ msgstr "%s alt süreci %d ölümcül sinyalini aldı" @@ -3693,7 +3672,6 @@ msgstr "" #~ msgstr "" #~ "Yazılım hatalarını ve önerilerinizi <bug-wget@gnu.org> adresine bildirin\n" -#, c-format #~ msgid "File `%s' already there; not retrieving.\n" #~ msgstr "`%s' dosyası zaten var; alınmayacak.\n" @@ -3,13 +3,13 @@ # This file is distributed under the same license as the wget package. # # Olexander Kunytsa <xakep@snark.ukma.kiev.ua>, 2004. -# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013, 2015, 2016, 2017, 2018, 2020, 2021, 2022. +# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013, 2015, 2016, 2017, 2018, 2020, 2021, 2022, 2023. msgid "" msgstr "" -"Project-Id-Version: wget 1.21.3\n" +"Project-Id-Version: wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-02-27 12:16+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-13 08:48+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n" "Language: uk\n" @@ -69,7 +69,7 @@ msgstr "помилка SO_REUSEADDR setsockopt: %s\n" #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" -"Відкрито надто багато файлових деÑкрипторів. Ðе можна викориÑтовувати вибір " +"Відкрито надто багато файлових деÑкрипторів. Ðе можна викориÑтовувати select " "Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð³Ð¾ деÑкриптора >= %d\n" #: src/convert.c:201 @@ -391,12 +391,12 @@ msgstr "Передачу даних перервано.\n" msgid "File %s already there; not retrieving.\n" msgstr "Файл %s вже Ñ” тут, не завантажуємо.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(Ñпроба:%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -405,7 +405,7 @@ msgstr "" "%s (%s) - запиÑаний до stdout %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -415,7 +415,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Ð’Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ %s.\n" @@ -786,7 +786,7 @@ msgstr "Повторне викориÑÑ‚Ð°Ð½Ð½Ñ Ð·Ð²'Ñзку з %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Ðе вдалоÑÑŒ прочитати відповідь від прокÑÑ–: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ПОМИЛКР%d: %s.\n" @@ -921,54 +921,54 @@ msgstr "Довжина: " msgid "ignored" msgstr "ігноруєтьÑÑ" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Увага: в HTTP не підтримуютьÑÑ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¸.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "Увімкнено режим «павука». Перевірка, чи Ñ–Ñнує файл на віддаленому " "комп'ютері.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Помилка запиÑу в %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "У отриманому заголовку не виÑтачає потрібного Ð´Ð»Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ атрибута.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "" "Спроба пройти Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ð²Ð°Ð½Ð½Ñ Ð·Ð° іменем кориÑтувача Ñ– паролем зазнала " "невдачі.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати дані до файла WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Ðе вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ð´Ð¾ тимчаÑового файла WARC.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Ðе вдалоÑÑ Ð²Ñтановити SSL-з'єднаннÑ.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "неможливо видалити %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ПОМИЛКÐ: ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ (%d) без Ð²ÐºÐ°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ð´Ñ€ÐµÑи.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -976,23 +976,23 @@ msgstr "" "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ дані Metalink у HTTP-відповіді. Отримуємо файл за " "допомогою GET HTTP.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "ВиÑвлено заголовки Metalink. ПеремикаємоÑÑ Ñƒ режим Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Віддалений файл не Ñ–Ñнує -- пошкоджене поÑиланнÑ!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "ВідÑутній заголовок last-modified -- мітки чаÑу вимкнено.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Ðекоректний заголовок last-modified -- ігноруємо мітки чаÑу.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1001,17 +1001,17 @@ msgstr "" "Локальний файл %s новіший -- не завантажуємо його.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Довжини файлів не збігаютьÑÑ (локальний %s) -- завантажуємо.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Файл новіший, ніж локальний, завантажуємо.\n" # Remote file is newer or sizes cannot be matched -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1023,7 +1023,7 @@ msgstr "" # Remote file is older, file sizes can be compared and # are both equal. -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1031,7 +1031,7 @@ msgstr "" "Віддалений файл Ñ–Ñнує, але не міÑтить поÑилань -- не завантажуємо.\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1041,7 +1041,7 @@ msgstr "" "але рекурÑÑ–ÑŽ вимкнено -- не завантажуємо.\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1049,12 +1049,12 @@ msgstr "" "Віддалений файл Ñ–Ñнує.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1063,7 +1063,7 @@ msgstr "" "%s (%s) - Ð·Ð°Ð¿Ð¸Ñ Ð´Ð¾ stdout %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1072,27 +1072,27 @@ msgstr "" "%s (%s) - %s збережено [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¾ в позиції %s байт. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð² позиції %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð² позиції %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Ðепідтримувана ÑкіÑÑ‚ÑŒ захиÑту «%s».\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Ðепідтримуваний алгоритм «%s».\n" @@ -1104,7 +1104,7 @@ msgid "" msgstr "" "%s: WGETRC вказує на %s, доÑтуп до Ñкого неможливий через таку помилку: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðеможливо прочитати %s (%s).\n" @@ -1432,16 +1432,12 @@ msgstr "" "відмовлено\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=ПОМИЛКИ ÑпиÑок відокремлених комами помилок " -"HTTP, Ñкі призводитимуть до повторних Ñпроб\n" +" --retry-on-host-error вважати помилки вузла некритичними, " +"тимчаÑовими помилками\n" #: src/main.c:653 msgid "" @@ -1499,8 +1495,8 @@ msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -" --progress=ТИП задати ТИП індикатора візуалізації\n" -" процеÑу роботи\n" +" --show-progress показувати Ñмужку поÑтупу у будь-Ñкому " +"докладному режимі\n" #: src/main.c:670 msgid "" @@ -1517,8 +1513,8 @@ msgid "" "get\n" " requests in timestamping mode\n" msgstr "" -" --no-if-modified-since не викориÑтовували умовні запити Ñкщо-" -"змінено-з\n" +" --no-if-modified-since не викориÑтовували умовні запити if-" +"modified-since\n" " у режимі чаÑових позначок\n" #: src/main.c:676 @@ -3074,17 +3070,17 @@ msgstr "Помилка ioctl(). Ðе вдалоÑÑ Ð²Ñтановити блоРmsgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: попередженнÑ: лекÑема %s перед назвою машини\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: невідома лекÑема \"%s\"\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "ВикориÑтаннÑ: %s NETRC [ÐÐЗВРВУЗЛÐ]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stat %s: %s\n" @@ -3125,16 +3121,14 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: не реалізоване Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «secure-protocol», %d\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "" -"Ваша верÑÑ–Ñ Ð±Ñ–Ð±Ð»Ñ–Ð¾Ñ‚ÐµÐºÐ¸ OpenSSL Ñ” надто Ñтарою, підтримку TLSv1.3 у ній не " -"реалізовано\n" +msgstr "У вашій верÑÑ–Ñ— OpenSSL не передбачено підтримки параметра «%s».\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" msgstr "" +"Повторне Ð·Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ Wget Ñ–/або OpenSSL може допомогти виправити помилку.\n" #: src/openssl.c:341 #, c-format @@ -3267,22 +3261,22 @@ msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Завантажуємо файл robots.txt; не зважайте на помилки.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Помилка розбору адреÑи прокÑÑ– %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Помилка в адреÑÑ– прокÑÑ–-Ñервера %s: має бути HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d зациклень - більше, ніж допуÑтимо.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3290,7 +3284,7 @@ msgstr "" "Ðварійне завершеннÑ.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3332,20 +3326,16 @@ msgid "No error" msgstr "Без помилок" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Схема %s не підтримуєтьÑÑ" +msgstr "Ðепідтримувана Ñхема" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "Підтримку HTTPS не Ñкомпільовано" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "Підтримку HTTPS не Ñкомпільовано" +msgstr "Підтримку FTPS не зібрано у" #: src/url.c:692 msgid "Scheme missing" Binary files differ@@ -5,14 +5,14 @@ # Phan Vinh Thinh <teppi82@gmail.com>, 2005. # Clytie Siddall <clytie@riverland.net.au>, 2007-2010. # Nguyá»…n Thái Ngá»c Duy <pclouds@gmail.com>, 2012. -# Trần Ngá»c Quân <vnwildman@gmail.com>, 2012-2013, 2015-2017, 2022. +# Trần Ngá»c Quân <vnwildman@gmail.com>, 2012-2013, 2015-2017, 2022-2023. # msgid "" msgstr "" -"Project-Id-Version: wget 1.21.3\n" +"Project-Id-Version: wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-02-28 13:47+0700\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-13 10:23+0700\n" "Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -387,12 +387,12 @@ msgstr "Truyá»n tải dữ liệu bị bãi bá».\n" msgid "File %s already there; not retrieving.\n" msgstr "Táºp tin %s đã có ở đó nên không nháºn nữa.\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(lần thá»: %2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -401,7 +401,7 @@ msgstr "" "%s (%s) — ghi và o đầu ra tiêu chuẩn %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -411,7 +411,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "Äang xóa %s.\n" @@ -769,7 +769,7 @@ msgstr "Dùng lại kết nối đã có tá»›i %s:%d.\n" msgid "Failed reading proxy response: %s\n" msgstr "Gặp lá»—i khi Ä‘á»c trả lá»i từ ủy nhiệm: %s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s Lá»–I %d: %s.\n" @@ -898,50 +898,50 @@ msgstr "KÃch thÆ°á»›c: " msgid "ignored" msgstr "bá» qua" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Cảnh báo: không há»— trợ ký tá»± đại diện trong HTTP.\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Äã báºt chế Ä‘á»™ nhện. Hãy kiểm tra táºp tin trên máy chủ tồn tại không.\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Không thể ghi và o %s (%s).\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "Thiếu thuá»™c tÃnh cần thiết từ Phần đầu nháºn được.\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "PhÆ°Æ¡ng thức xác thá»±c Tà i-khoản/Máºt_khẩu bị lá»—i.\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "Không thể ghi và o táºp tin WARC.\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "Không thể ghi và o táºp tin tạm thá»i WARC.\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "Không thiết láºp được kết nối SSL.\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Không thể hủy liên kết %s (%s).\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "Lá»–I: Chuyển hÆ°á»›ng (%d) mà không có vị trÃ.\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -949,23 +949,23 @@ msgstr "" "Không thể tìm thấy dữ liệu Metalink trong phần HTTP trả vá». Äang tải các táºp " "tin dùng HTTP GET.\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Tìm thấy phần đầu Metalink. Nên chuyển sang chế Ä‘á»™ Metalink.\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Táºp tin trên máy chủ không tồn tại -- liên kết há»ng!!!\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Thiếu phần đầu “Last-modified†-- time-stamp bị tắt.\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Sai phần đầu “Last-modified†-- time-stamp bị bá» qua.\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -974,16 +974,16 @@ msgstr "" "Táºp tin %s trên máy chủ không má»›i hÆ¡n táºp tin cục bá»™ -- không nháºn.\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "KÃch thÆ°á»›c táºp tin không tÆ°Æ¡ng ứng (cục bá»™ %s) - Ä‘ang nháºn.\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "Táºp tin trên máy chủ má»›i hÆ¡n, Ä‘ang nháºn.\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -993,7 +993,7 @@ msgstr "" "Ä‘ang lấy vá».\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1001,7 +1001,7 @@ msgstr "" "Táºp tin trên máy chủ tồn tại nhÆ°ng không chứa liên kết -- không lấy vá».\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1011,7 +1011,7 @@ msgstr "" "nhÆ°ng đệ quy bị tắt -- không lấy vá».\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1019,12 +1019,12 @@ msgstr "" "Táºp tin trên máy chủ đã sẵn có.\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1033,7 +1033,7 @@ msgstr "" "%s (%s) — ghi và o đầu ra chuẩn %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1042,27 +1042,27 @@ msgstr "" "%s (%s) — đã lÆ°u %s [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) — Äóng kết nối tại byte %s. " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) — Lá»—i Ä‘á»c tại byte %s (%s)." -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) — Lá»—i Ä‘á»c tại byte %s/%s (%s). " -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Không há»— trợ chất lượng bảo vệ “%sâ€.\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Không há»— trợ thuáºt toán “%sâ€.\n" @@ -1073,7 +1073,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC chỉ tá»›i %s, mà nó lại không thể truy cáºp bởi vì lá»—i: %s.\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Không Ä‘á»c được %s (%s).\n" @@ -1400,16 +1400,12 @@ msgid "" msgstr " --retry-connrefused cố tải dù kết nối bị từ chối.\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=CÃC_Lá»–I danh sách ngăn cách bằng dấu phẩy " -"các lá»—i HTTP để thá» lại\n" +" --retry-on-http-error= coi các lá»—i phÃa máy chủ không phải nghiêm " +"trá»ng, lá»—i tạm thá»i\n" #: src/main.c:653 msgid "" @@ -3013,17 +3009,17 @@ msgstr "ioctl() gặp lá»—i. á»” cắm không thể được đặt nhÆ° là ki msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: cảnh báo: hiệu bà i %s xuất hiện trÆ°á»›c bất kỳ tên máy nà o\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: không rõ hiệu bà i “%sâ€\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Cách dùng: %s NETRC [TÊN MÃY]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: không thể lấy thống kê (stat) %s: %s\n" @@ -3054,14 +3050,14 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: giá trị tùy chá»n “secure-protocol†chÆ°a được thá»±c hiện %d\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "Phiên bản OpenSSL của bạn quá cÅ© để há»— trợ TLS 1.3\n" +msgstr "Phiên bản OpenSSL của bạn quá cÅ© để há»— trợ tùy chá»n '%s'.\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" msgstr "" +"Xây dá»±ng lại Wget và /hoặc OpenSSL có thể hữu Ãch trong trÆ°á»ng hợp nà y.\n" #: src/openssl.c:341 #, c-format @@ -3191,22 +3187,22 @@ msgstr "Không thể mở %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Äang tải robots.txt; xin hãy bá» qua các thông báo lá»—i.\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Lá»—i phân tÃch URL của proxy %s: %s.\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Lá»—i trong URL của proxy %s: Phải là HTTP.\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "Vượt quá mức giá»›i hạn %d lần chuyển hÆ°á»›ng.\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3214,7 +3210,7 @@ msgstr "" "Chịu thua.\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3247,20 +3243,16 @@ msgid "No error" msgstr "Không có lá»—i" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "Lược đồ không được há»— trợ %s" +msgstr "Lược đồ không được há»— trợ" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "ChÆ°a biên dịch để há»— trợ HTTPS" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "ChÆ°a biên dịch để há»— trợ HTTPS" +msgstr "ChÆ°a biên dịch để há»— trợ FTPS" #: src/url.c:692 msgid "Scheme missing" diff --git a/po/wget.pot b/po/wget.pot index 075bff8..78ca948 100644 --- a/po/wget.pot +++ b/po/wget.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNU wget 1.21.4\n" +"Project-Id-Version: GNU wget 1.24.5\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -371,19 +371,19 @@ msgstr "" msgid "File %s already there; not retrieving.\n" msgstr "" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -391,7 +391,7 @@ msgid "" msgstr "" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "" @@ -736,7 +736,7 @@ msgstr "" msgid "Failed reading proxy response: %s\n" msgstr "" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "" @@ -855,153 +855,153 @@ msgstr "" msgid "ignored" msgstr "" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" "\n" msgstr "" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" msgstr "" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" "\n" msgstr "" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "" -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "" -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "" -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "" @@ -1012,7 +1012,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "" @@ -2635,17 +2635,17 @@ msgstr "" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "" @@ -2800,28 +2800,28 @@ msgstr "" msgid "Loading robots.txt; please ignore errors.\n" msgstr "" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" msgstr "" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo Binary files differindex d90be03..1afd59b 100644 --- a/po/zh_CN.gmo +++ b/po/zh_CN.gmo diff --git a/po/zh_CN.po b/po/zh_CN.po index 93d638d..44bfbbf 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,13 +9,14 @@ # Mingcong Bai <jeffbai@aosc.xyz>, 2015. # Mingye Wang <arthur200126@gmail.com>, 2015, 2017. # Boyuan Yang <073plan@gmail.com>, 2017, 2018, 2020. +# Wenbin Lv <wenbin816@gmail.com>, 2023. # msgid "" msgstr "" -"Project-Id-Version: wget 1.21.3\n" +"Project-Id-Version: wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-02-27 20:00+0800\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-11 23:06+0800\n" "Last-Translator: Wenbin Lv <wenbin816@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" "Language: zh_CN\n" @@ -24,7 +25,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.2.2\n" #: src/connect.c:201 #, c-format @@ -390,12 +391,12 @@ msgstr "æ•°æ®ä¼ 输已被ä¸æ¢ã€‚\n" msgid "File %s already there; not retrieving.\n" msgstr "文件 %s å·²å˜åœ¨ï¼›ä¸èŽ·å–。\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(å°è¯•æ¬¡æ•°ï¼š%2d)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -404,7 +405,7 @@ msgstr "" "%s (%s) - å·²å†™å…¥æ ‡å‡†è¾“å‡º %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -414,7 +415,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "æ£åœ¨åˆ 除 %s。\n" @@ -765,7 +766,7 @@ msgstr "å†æ¬¡ä½¿ç”¨å˜åœ¨çš„到 %s:%d 的连接。\n" msgid "Failed reading proxy response: %s\n" msgstr "æ— æ³•è¯»å–代ç†å“应：%s\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s 错误 %d：%s。\n" @@ -896,72 +897,72 @@ msgstr "长度：" msgid "ignored" msgstr "已忽略" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "è¦å‘Šï¼šHTTP ä¸æ”¯æŒé€šé…符。\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "打开 Spider 模å¼ã€‚检查是å¦å˜åœ¨è¿œç¨‹æ–‡ä»¶ã€‚\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "æ— æ³•å†™å…¥ %s (%s)。\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "接收的å“应头ä¸ç¼ºå°‘å¿…è¦çš„属性。\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "用户å/密ç 认è¯å¤±è´¥ã€‚\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "æ— æ³•å†™å…¥ WARC 文件。\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "æ— æ³•å†™å…¥ä¸´æ—¶ WARC 文件。\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "æ— æ³•å»ºç«‹ SSL 连接。\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "æ— æ³•æ¸…é™¤ %s 的链接 (%s)。\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "错误：é‡å®šå‘ (%d) 但没有指定ä½ç½®ã€‚\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "æ— æ³•ä»Ž HTTP å“应ä¸æ‰¾åˆ° Metalink æ•°æ®ã€‚使用 HTTP GET 下载文件。\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "å‘现 Metalink å“应头。将切æ¢åˆ° Metalink 模å¼ã€‚\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "远程文件ä¸å˜åœ¨ -- 链接失效ï¼ï¼ï¼\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "缺少“Last-modifiedâ€æ–‡ä»¶å¤´ -- å…³é—æ—¶é—´æˆ³æ ‡è®°ã€‚\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "æ— æ•ˆçš„â€œLast-modifiedâ€æ–‡ä»¶å¤´ -- å¿½ç•¥æ—¶é—´æˆ³æ ‡è®°ã€‚\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -970,16 +971,16 @@ msgstr "" "远程文件比本地文件 %s æ›´è€ -- ä¸èŽ·å–。\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "文件大å°ä¸ç¬¦ (本地文件 %s) -- 获å–。\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "远程文件较新，获å–。\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -988,7 +989,7 @@ msgstr "" "å˜åœ¨è¿œç¨‹æ–‡ä»¶ä¸”å¯èƒ½å«æœ‰åˆ°å…¶å®ƒèµ„æºçš„链接 -- 获å–。\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -996,7 +997,7 @@ msgstr "" "å˜åœ¨è¿œç¨‹æ–‡ä»¶ä½†ä¸å«ä»»ä½•é“¾æŽ¥ -- æ— æ³•èŽ·å–。\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1006,7 +1007,7 @@ msgstr "" "但ä¸èƒ½è¿›è¡Œé€’å½’æ“作 -- æ— æ³•èŽ·å–。\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1014,12 +1015,12 @@ msgstr "" "å˜åœ¨è¿œç¨‹æ–‡ä»¶ã€‚\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1028,7 +1029,7 @@ msgstr "" "%s (%s) - å·²å†™å…¥è‡³æ ‡å‡†è¾“å‡º %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1037,27 +1038,27 @@ msgstr "" "%s (%s) - å·²ä¿å˜ %s [%s/%s])\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - 在 %s å—节处连接关é—。" -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - 在 %s å—节处å‘生读å–错误 (%s)。" -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - 在 %s/%s å—节处å‘生读å–错误 (%s)。" -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "ä¸æ”¯æŒçš„ä¿æŠ¤è´¨é‡ '%s'。\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "ä¸æ”¯æŒçš„算法‘%s’。\n" @@ -1068,7 +1069,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC æŒ‡å‘ %sï¼Œä½†å®ƒå› ä¸ºé”™è¯¯è€Œæ— æ³•è®¿é—®ï¼š%s。\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%sï¼šæ— æ³•è¯»å– %s (%s)。\n" @@ -1372,16 +1373,10 @@ msgid "" msgstr " --retry-connrefused å³ä½¿æ‹’ç»è¿žæŽ¥ä¹Ÿæ˜¯é‡è¯•\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" -msgstr "" -" --retry-on-http-error=ERRORS æ供以逗å·åˆ†éš”的列表，列出é‡åˆ°æ—¶è¿›è¡Œé‡" -"试的 HTTP 错误\n" +msgstr " --retry-on-host-error 将主机错误视为éžè‡´å‘½çš„暂时性错误\n" #: src/main.c:653 msgid "" @@ -1393,7 +1388,7 @@ msgstr "" #: src/main.c:655 msgid " -O, --output-document=FILE write documents to FILE\n" -msgstr " -O, --output-document=文件 将文档写入 FILE\n" +msgstr " -O, --output-document=文件 将文档写入文件\n" #: src/main.c:657 msgid "" @@ -2835,17 +2830,17 @@ msgstr "调用 ioctl() 失败。套接å—ä¸å¯è®¾ä¸ºé˜»å¡žï¼ˆblocking）状æ€ã msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s：%s:%d：è¦å‘Š: %s æ ‡è®°å‡ºçŽ°åœ¨æœºå™¨å称å‰\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s：%s:%dï¼šæœªçŸ¥çš„æ ‡è®°â€œ%sâ€\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "用法：%s NETRC [主机å]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%sï¼šæ— æ³• stat %s：%s\n" @@ -2876,14 +2871,13 @@ msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL：未实现‘secure-protocol’选项值 %d\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "您的 OpenSSL 版本太旧，ä¸æ”¯æŒ TLS 1.3\n" +msgstr "您的 OpenSSL 版本ä¸æ”¯æŒé€‰é¡¹â€˜%s’。\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "é‡æ–°ç¼–译 Wget å’Œ/或 OpenSSL å¯èƒ½å¯ä»¥è§£å†³æ¤é—®é¢˜ã€‚\n" #: src/openssl.c:341 #, c-format @@ -3008,22 +3002,22 @@ msgstr "æ— æ³•æ‰“å¼€ %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "æ£åœ¨è½½å…¥ robots.txt；请忽略错误消æ¯ã€‚\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "解æžä»£ç†æœåŠ¡å™¨ URL %s æ—¶å‘生错误：%s。\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "代ç†æœåŠ¡å™¨ URL %s 错误：必须是 HTTP。\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "已超过 %d 次é‡å®šå‘。\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3031,7 +3025,7 @@ msgstr "" "放弃æ“作。\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3064,20 +3058,16 @@ msgid "No error" msgstr "没有错误" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "ä¸æ”¯æŒçš„å议类型 %s" +msgstr "ä¸æ”¯æŒçš„å议类型" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "未将 HTTPS 支æŒç¼–译到程åºä¸" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "未将 HTTPS 支æŒç¼–译到程åºä¸" +msgstr "未将 FTPS 支æŒç¼–译到程åºä¸" #: src/url.c:692 msgid "Scheme missing" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo Binary files differindex b122938..09ca817 100644 --- a/po/zh_TW.gmo +++ b/po/zh_TW.gmo diff --git a/po/zh_TW.po b/po/zh_TW.po index 60ed394..598c4f2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,14 +5,14 @@ # Pofeng Lee <pofeng.lee@ms7.url.com.tw>, 1998. # Jing-Jong Shyue <shyue@sonoma.com.tw>, 2000. # Abel Cheung <abelcheung@gmail.com>, 2001-2002, 2005. -# pan93412 <pan93412@gmail.com>, 2018, 2020. +# Yi-Jyun Pan <pan93412@gmail.com>, 2018, 2020, 2023. # msgid "" msgstr "" -"Project-Id-Version: wget 1.21.3\n" +"Project-Id-Version: wget 1.21.4\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2023-05-11 02:59+0200\n" -"PO-Revision-Date: 2022-02-27 19:17+0800\n" +"POT-Creation-Date: 2024-03-10 15:08+0100\n" +"PO-Revision-Date: 2023-05-23 12:55+0800\n" "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n" "Language: zh_TW\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.3.1\n" #: src/connect.c:201 #, c-format @@ -387,12 +387,12 @@ msgstr "å·²ä¸æ¢å‚³é€è³‡æ–™ã€‚\n" msgid "File %s already there; not retrieving.\n" msgstr "å·²å˜åœ¨æª”案「%sã€ï¼›é¸æ“‡ä¸æŽ¥æ”¶ã€‚\n" -#: src/ftp.c:1955 src/http.c:4360 +#: src/ftp.c:1955 src/http.c:4364 #, c-format msgid "(try:%2d)" msgstr "(嘗試第 %2d 次)" -#: src/ftp.c:2047 src/http.c:4790 +#: src/ftp.c:2047 src/http.c:4794 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -401,7 +401,7 @@ msgstr "" "%s (%s) - 寫入到 stdout %s[%s]\n" "\n" -#: src/ftp.c:2048 src/http.c:4791 +#: src/ftp.c:2048 src/http.c:4795 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -411,7 +411,7 @@ msgstr "" "\n" #: src/ftp.c:2108 src/main.c:2178 src/metalink.c:1133 src/recur.c:511 -#: src/recur.c:750 src/retr.c:1299 +#: src/recur.c:750 src/retr.c:1303 #, c-format msgid "Removing %s.\n" msgstr "刪除 %s。\n" @@ -764,7 +764,7 @@ msgstr "繼續使用和 %s:%d 的連線。\n" msgid "Failed reading proxy response: %s\n" msgstr "無法讀å–代ç†ä¼ºæœå™¨å›žæ‡‰: %s。\n" -#: src/http.c:2183 src/http.c:3460 src/http.c:4586 +#: src/http.c:2183 src/http.c:3460 src/http.c:4590 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s 錯誤 %d: %s。\n" @@ -895,72 +895,72 @@ msgstr "長度: " msgid "ignored" msgstr "忽略" -#: src/http.c:4268 +#: src/http.c:4272 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "è¦å‘Š: HTTP ä¸æ”¯æ´è¬ç”¨å—元。\n" -#: src/http.c:4350 +#: src/http.c:4354 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "已啟用蜘蛛模å¼ã€‚當é 端檔案å˜åœ¨æ™‚則檢查。\n" -#: src/http.c:4443 +#: src/http.c:4447 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "無法寫到 %s (%s)。\n" -#: src/http.c:4465 +#: src/http.c:4469 msgid "Required attribute missing from Header received.\n" msgstr "接收的標é 缺少所需屬性。\n" -#: src/http.c:4470 +#: src/http.c:4474 msgid "Username/Password Authentication Failed.\n" msgstr "ä½¿ç”¨è€…æˆ–å¯†ç¢¼æ ¸å°å¤±æ•—。\n" -#: src/http.c:4476 +#: src/http.c:4480 msgid "Cannot write to WARC file.\n" msgstr "無法寫到 WARC 檔案。\n" -#: src/http.c:4482 +#: src/http.c:4486 msgid "Cannot write to temporary WARC file.\n" msgstr "ç„¡æ³•å¯«åˆ°æš«å˜ WARC 檔案ä¸ã€‚\n" -#: src/http.c:4487 +#: src/http.c:4491 msgid "Unable to establish SSL connection.\n" msgstr "無法建立 SSL 連線。\n" -#: src/http.c:4493 +#: src/http.c:4497 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "無法å–æ¶ˆé€£çµ %s (%s)。\n" -#: src/http.c:4503 +#: src/http.c:4507 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "錯誤: é‡æ–°å°Žå‘ (%d) 但沒有指定ä½ç½®ã€‚\n" -#: src/http.c:4525 +#: src/http.c:4529 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "HTTP 回應ä¸æ‰¾ä¸åˆ° Metalink 資料。é¸æ“‡é€éŽ HTTP GET 下載檔案。\n" -#: src/http.c:4534 +#: src/http.c:4538 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "已找到 Metalink 標é 資料。é¸æ“‡åˆ‡æ›åˆ° Metalink 模å¼ã€‚\n" -#: src/http.c:4575 +#: src/http.c:4579 msgid "Remote file does not exist -- broken link!!!\n" msgstr "é 端檔案ä¸å˜åœ¨ -- 連çµæ壞ï¼\n" -#: src/http.c:4603 +#: src/http.c:4607 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "缺少了最後修改時間標é ─ 關閉時間標記。\n" -#: src/http.c:4611 +#: src/http.c:4615 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "無效的最後修改時間標é ─ 忽略時間標記。\n" -#: src/http.c:4641 +#: src/http.c:4645 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -969,16 +969,16 @@ msgstr "" "伺æœå™¨æª”案沒比本機檔案 %s æ–° -- é¸æ“‡ä¸æŽ¥æ”¶ã€‚\n" "\n" -#: src/http.c:4649 +#: src/http.c:4653 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "檔案大å°ä¸ç¬¦ (本機檔案為 %s) -- 會下載檔案。\n" -#: src/http.c:4658 +#: src/http.c:4662 msgid "Remote file is newer, retrieving.\n" msgstr "é 端檔案較新，會下載檔案。\n" -#: src/http.c:4676 +#: src/http.c:4680 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -987,7 +987,7 @@ msgstr "" "é 端檔案å˜åœ¨ï¼Œä¸”å¯èƒ½åŒ…å«å…¶ä»–資æºçš„é€£çµ -- é¸æ“‡æŽ¥æ”¶ã€‚\n" "\n" -#: src/http.c:4682 +#: src/http.c:4686 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -995,7 +995,7 @@ msgstr "" "é 端檔案å˜åœ¨ï¼Œä½†ä¸åŒ…å«ä»»ä½•é€£çµ -- é¸æ“‡ä¸æŽ¥æ”¶ã€‚\n" "\n" -#: src/http.c:4691 +#: src/http.c:4695 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1005,7 +1005,7 @@ msgstr "" "但éžè¿´ä¸‹è¼‰å·²ç¶“åœç”¨ -- é¸æ“‡ä¸æŽ¥æ”¶ã€‚\n" "\n" -#: src/http.c:4697 +#: src/http.c:4701 msgid "" "Remote file exists.\n" "\n" @@ -1013,12 +1013,12 @@ msgstr "" "é 端檔案å˜åœ¨ã€‚\n" "\n" -#: src/http.c:4706 +#: src/http.c:4710 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL：%s %2d %s\n" -#: src/http.c:4754 +#: src/http.c:4758 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1027,7 +1027,7 @@ msgstr "" "%s (%s) - 已輸出到 stdout %s[%s/%s]\n" "\n" -#: src/http.c:4755 +#: src/http.c:4759 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1036,27 +1036,27 @@ msgstr "" "%s (%s) - å·²å„²å˜ %s [%s/%s]\n" "\n" -#: src/http.c:4821 +#: src/http.c:4825 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - 在 %s ä½å…ƒçµ„後連線çªç„¶ä¸æ–·ã€‚ " -#: src/http.c:4844 +#: src/http.c:4848 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - 讀å–至 %s ä½å…ƒçµ„時發生錯誤 (%s)。" -#: src/http.c:4853 +#: src/http.c:4857 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - 讀å–至 %s/%s ä½å…ƒçµ„時發生錯誤 (%s)。" -#: src/http.c:5110 +#: src/http.c:5114 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "ä¸æ”¯æ´çš„「%sã€ä¿è·å“質。\n" -#: src/http.c:5115 +#: src/http.c:5119 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "ä¸æ”¯æ´çš„演算法「%sã€ã€‚\n" @@ -1067,7 +1067,7 @@ msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC å°æ‡‰åˆ° %s - 無法å˜å–ï¼Œå› ç‚ºè©²éŒ¯èª¤ï¼š%s。\n" -#: src/init.c:695 src/netrc.c:454 +#: src/init.c:695 src/netrc.c:456 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: ç„¡æ³•è®€å– %s (%s)。\n" @@ -1374,15 +1374,11 @@ msgid "" msgstr " --retry-connrefused å³ä½¿é€£ç·šè¢«æ‹’ä»æœƒä¸æ–·å˜—試\n" #: src/main.c:651 -#, fuzzy -#| msgid "" -#| " --retry-on-http-error=ERRORS comma-separated list of HTTP " -#| "errors to retry\n" msgid "" " --retry-on-host-error consider host errors as non-fatal, " "transient errors\n" msgstr "" -" --retry-on-http-error=錯誤 è¦é‡è©¦çš„ HTTP 錯誤的逗號分割列表。\n" +" --retry-on-host-error 將主機錯誤當作是éžè‡´å‘½ã€æš«æ™‚性的錯誤\n" #: src/main.c:653 msgid "" @@ -2843,17 +2839,17 @@ msgstr "ioctl() 失敗。Socket ä¸èƒ½è¨å®šç‚ºå°éŽ–狀態 (blocking)。\n" msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s：%s:%d：è¦å‘Šï¼š%s 令牌在機器å稱å‰å‡ºç¾\n" -#: src/netrc.c:414 +#: src/netrc.c:416 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: ä¸æ˜Žçš„標記「%sã€\n" -#: src/netrc.c:555 +#: src/netrc.c:557 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "用法: %s NETRC [主機å稱]\n" -#: src/netrc.c:573 +#: src/netrc.c:575 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s：無法 stat() %s：%s\n" @@ -2870,30 +2866,29 @@ msgstr "" #: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "您的 OpenSSL 版本舊到ä¸æ”¯æ´ TLS 1.3\n" +msgstr "您的 OpenSSL 版本éŽèˆŠï¼Œä¸æ”¯æ´ TLS 1.3\n" #: src/openssl.c:278 msgid "Your OpenSSL version is too old to support TLSv1.1\n" -msgstr "您的 OpenSSL 版本舊到ä¸æ”¯æ´ TLSv1.1\n" +msgstr "您的 OpenSSL 版本éŽèˆŠï¼Œä¸æ”¯æ´ TLSv1.1\n" #: src/openssl.c:282 msgid "Your OpenSSL version is too old to support TLSv1.2\n" -msgstr "您的 OpenSSL 版本舊到ä¸æ”¯æ´ TLSv1.2\n" +msgstr "您的 OpenSSL 版本éŽèˆŠï¼Œä¸æ”¯æ´ TLSv1.2\n" #: src/openssl.c:288 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" -msgstr "OpenSSL：未實åšçš„「secure-protocolã€é¸é …值 %d\n" +msgstr "OpenSSL：未實作的 “secure-protocol†é¸é …值 %d\n" #: src/openssl.c:295 -#, fuzzy, c-format -#| msgid "Your OpenSSL version is too old to support TLS 1.3\n" +#, c-format msgid "Your OpenSSL version does not support option '%s'.\n" -msgstr "您的 OpenSSL 版本舊到ä¸æ”¯æ´ TLS 1.3\n" +msgstr "您的 OpenSSL 版本ä¸æ”¯æ´ “%s†é¸é …。\n" #: src/openssl.c:296 msgid "Rebuilding Wget and/or OpenSSL may help in this situation.\n" -msgstr "" +msgstr "é‡æ–°çµ„建 Wget å’Œ/或 OpenSSL å¯èƒ½æœ‰åŠ©æ–¼è§£æ±ºé€™å€‹æƒ…æ³ã€‚\n" #: src/openssl.c:341 #, c-format @@ -3018,22 +3013,22 @@ msgstr "無法開啟 %s：%s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "æ£åœ¨è¼‰å…¥ robots.txt；請忽略錯誤訊æ¯ã€‚\n" -#: src/retr.c:921 +#: src/retr.c:925 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "分æžä»£ç†ä¼ºæœå™¨ URL %s 時發生錯誤: %s。\n" -#: src/retr.c:934 +#: src/retr.c:938 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "代ç†ä¼ºæœå™¨ URL %s 錯誤: å¿…é ˆæ˜¯ HTTP。\n" -#: src/retr.c:1063 +#: src/retr.c:1067 #, c-format msgid "%d redirections exceeded.\n" msgstr "å·²è¶…éŽ %d 次é‡æ–°å°Žå‘。\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Giving up.\n" "\n" @@ -3041,7 +3036,7 @@ msgstr "" "放棄。\n" "\n" -#: src/retr.c:1323 +#: src/retr.c:1327 msgid "" "Retrying.\n" "\n" @@ -3074,20 +3069,16 @@ msgid "No error" msgstr "沒有錯誤" #: src/url.c:689 -#, fuzzy -#| msgid "Unsupported scheme %s" msgid "Unsupported scheme" -msgstr "ä¸æ”¯æ´çš„æ¨£å¼ %s" +msgstr "ä¸æ”¯æ´çš„機制 (scheme)" #: src/url.c:690 msgid "HTTPS support not compiled in" msgstr "未編è¯é€² HTTPS 支æ´" #: src/url.c:691 -#, fuzzy -#| msgid "HTTPS support not compiled in" msgid "FTPS support not compiled in" -msgstr "未編è¯é€² HTTPS 支æ´" +msgstr "未編è¯é€² FTPS 支æ´" #: src/url.c:692 msgid "Scheme missing" diff --git a/src/Makefile.am b/src/Makefile.am index 4b56ac9..18ec622 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ # Makefile for `wget' utility -# Copyright (C) 1995-2011, 2015, 2018-2023 Free Software Foundation, +# Copyright (C) 1995-2011, 2015, 2018-2024 Free Software Foundation, # Inc. # This program is free software; you can redistribute it and/or modify diff --git a/src/Makefile.in b/src/Makefile.in index b080704..ecd293f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for `wget' utility -# Copyright (C) 1995-2011, 2015, 2018-2023 Free Software Foundation, +# Copyright (C) 1995-2011, 2015, 2018-2024 Free Software Foundation, # Inc. # This program is free software; you can redistribute it and/or modify @@ -138,7 +138,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 \ $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/base32.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 \ $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/clock_time.m4 \ @@ -186,7 +187,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \ $(top_srcdir)/m4/isblank.m4 $(top_srcdir)/m4/iswblank.m4 \ - $(top_srcdir)/m4/iswdigit.m4 $(top_srcdir)/m4/iswxdigit.m4 \ + $(top_srcdir)/m4/iswctype.m4 $(top_srcdir)/m4/iswdigit.m4 \ + $(top_srcdir)/m4/iswpunct.m4 $(top_srcdir)/m4/iswxdigit.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 \ @@ -200,15 +202,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbrtoc32.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ + $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -266,18 +269,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timegm.m4 $(top_srcdir)/m4/timespec.m4 \ $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tmpdir.m4 \ - $(top_srcdir)/m4/ungetc.m4 $(top_srcdir)/m4/unicase_h.m4 \ - $(top_srcdir)/m4/unictype_h.m4 $(top_srcdir)/m4/uninorm_h.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utime_h.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/uchar_h.m4 $(top_srcdir)/m4/ungetc.m4 \ + $(top_srcdir)/m4/unicase_h.m4 $(top_srcdir)/m4/unictype_h.m4 \ + $(top_srcdir)/m4/uninorm_h.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ + $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wctype_h.m4 \ $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ $(top_srcdir)/m4/wget_manywarnings.m4 \ $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/wmemchr.m4 \ @@ -543,6 +547,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ +CXX_HAS_CHAR8_TYPE = @CXX_HAS_CHAR8_TYPE@ +CXX_HAS_UCHAR_TYPES = @CXX_HAS_UCHAR_TYPES@ CYGPATH_W = @CYGPATH_W@ # The following line is losing on some versions of make! @@ -560,7 +566,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ @@ -582,7 +587,33 @@ GL_GNULIB_ALIGNED_ALLOC = @GL_GNULIB_ALIGNED_ALLOC@ GL_GNULIB_ALPHASORT = @GL_GNULIB_ALPHASORT@ GL_GNULIB_ATOLL = @GL_GNULIB_ATOLL@ GL_GNULIB_BIND = @GL_GNULIB_BIND@ +GL_GNULIB_BTOC32 = @GL_GNULIB_BTOC32@ GL_GNULIB_BTOWC = @GL_GNULIB_BTOWC@ +GL_GNULIB_C32ISALNUM = @GL_GNULIB_C32ISALNUM@ +GL_GNULIB_C32ISALPHA = @GL_GNULIB_C32ISALPHA@ +GL_GNULIB_C32ISBLANK = @GL_GNULIB_C32ISBLANK@ +GL_GNULIB_C32ISCNTRL = @GL_GNULIB_C32ISCNTRL@ +GL_GNULIB_C32ISDIGIT = @GL_GNULIB_C32ISDIGIT@ +GL_GNULIB_C32ISGRAPH = @GL_GNULIB_C32ISGRAPH@ +GL_GNULIB_C32ISLOWER = @GL_GNULIB_C32ISLOWER@ +GL_GNULIB_C32ISPRINT = @GL_GNULIB_C32ISPRINT@ +GL_GNULIB_C32ISPUNCT = @GL_GNULIB_C32ISPUNCT@ +GL_GNULIB_C32ISSPACE = @GL_GNULIB_C32ISSPACE@ +GL_GNULIB_C32ISUPPER = @GL_GNULIB_C32ISUPPER@ +GL_GNULIB_C32ISXDIGIT = @GL_GNULIB_C32ISXDIGIT@ +GL_GNULIB_C32RTOMB = @GL_GNULIB_C32RTOMB@ +GL_GNULIB_C32SNRTOMBS = @GL_GNULIB_C32SNRTOMBS@ +GL_GNULIB_C32SRTOMBS = @GL_GNULIB_C32SRTOMBS@ +GL_GNULIB_C32STOMBS = @GL_GNULIB_C32STOMBS@ +GL_GNULIB_C32SWIDTH = @GL_GNULIB_C32SWIDTH@ +GL_GNULIB_C32TOB = @GL_GNULIB_C32TOB@ +GL_GNULIB_C32TOLOWER = @GL_GNULIB_C32TOLOWER@ +GL_GNULIB_C32TOUPPER = @GL_GNULIB_C32TOUPPER@ +GL_GNULIB_C32WIDTH = @GL_GNULIB_C32WIDTH@ +GL_GNULIB_C32_APPLY_MAPPING = @GL_GNULIB_C32_APPLY_MAPPING@ +GL_GNULIB_C32_APPLY_TYPE_TEST = @GL_GNULIB_C32_APPLY_TYPE_TEST@ +GL_GNULIB_C32_GET_MAPPING = @GL_GNULIB_C32_GET_MAPPING@ +GL_GNULIB_C32_GET_TYPE_TEST = @GL_GNULIB_C32_GET_TYPE_TEST@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ @@ -689,6 +720,7 @@ GL_GNULIB_ISBLANK = @GL_GNULIB_ISBLANK@ GL_GNULIB_ISWBLANK = @GL_GNULIB_ISWBLANK@ GL_GNULIB_ISWCTYPE = @GL_GNULIB_ISWCTYPE@ GL_GNULIB_ISWDIGIT = @GL_GNULIB_ISWDIGIT@ +GL_GNULIB_ISWPUNCT = @GL_GNULIB_ISWPUNCT@ GL_GNULIB_ISWXDIGIT = @GL_GNULIB_ISWXDIGIT@ GL_GNULIB_LCHMOD = @GL_GNULIB_LCHMOD@ GL_GNULIB_LCHOWN = @GL_GNULIB_LCHOWN@ @@ -696,13 +728,15 @@ GL_GNULIB_LINK = @GL_GNULIB_LINK@ GL_GNULIB_LINKAT = @GL_GNULIB_LINKAT@ GL_GNULIB_LISTEN = @GL_GNULIB_LISTEN@ GL_GNULIB_LOCALECONV = @GL_GNULIB_LOCALECONV@ -GL_GNULIB_LOCALENAME = @GL_GNULIB_LOCALENAME@ +GL_GNULIB_LOCALENAME_UNSAFE = @GL_GNULIB_LOCALENAME_UNSAFE@ GL_GNULIB_LOCALTIME = @GL_GNULIB_LOCALTIME@ GL_GNULIB_LSEEK = @GL_GNULIB_LSEEK@ GL_GNULIB_LSTAT = @GL_GNULIB_LSTAT@ GL_GNULIB_MALLOC_GNU = @GL_GNULIB_MALLOC_GNU@ GL_GNULIB_MALLOC_POSIX = @GL_GNULIB_MALLOC_POSIX@ GL_GNULIB_MBRLEN = @GL_GNULIB_MBRLEN@ +GL_GNULIB_MBRTOC16 = @GL_GNULIB_MBRTOC16@ +GL_GNULIB_MBRTOC32 = @GL_GNULIB_MBRTOC32@ GL_GNULIB_MBRTOWC = @GL_GNULIB_MBRTOWC@ GL_GNULIB_MBSCASECMP = @GL_GNULIB_MBSCASECMP@ GL_GNULIB_MBSCASESTR = @GL_GNULIB_MBSCASESTR@ @@ -712,16 +746,20 @@ GL_GNULIB_MBSINIT = @GL_GNULIB_MBSINIT@ GL_GNULIB_MBSLEN = @GL_GNULIB_MBSLEN@ GL_GNULIB_MBSNCASECMP = @GL_GNULIB_MBSNCASECMP@ GL_GNULIB_MBSNLEN = @GL_GNULIB_MBSNLEN@ +GL_GNULIB_MBSNRTOC32S = @GL_GNULIB_MBSNRTOC32S@ GL_GNULIB_MBSNRTOWCS = @GL_GNULIB_MBSNRTOWCS@ GL_GNULIB_MBSPBRK = @GL_GNULIB_MBSPBRK@ GL_GNULIB_MBSPCASECMP = @GL_GNULIB_MBSPCASECMP@ GL_GNULIB_MBSRCHR = @GL_GNULIB_MBSRCHR@ +GL_GNULIB_MBSRTOC32S = @GL_GNULIB_MBSRTOC32S@ GL_GNULIB_MBSRTOWCS = @GL_GNULIB_MBSRTOWCS@ GL_GNULIB_MBSSEP = @GL_GNULIB_MBSSEP@ GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@ GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@ +GL_GNULIB_MBSTOC32S = @GL_GNULIB_MBSTOC32S@ GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@ GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@ +GL_GNULIB_MBSZERO = @GL_GNULIB_MBSZERO@ GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@ GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@ GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@ @@ -835,6 +873,7 @@ GL_GNULIB_PUTS = @GL_GNULIB_PUTS@ GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@ GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@ GL_GNULIB_RAISE = @GL_GNULIB_RAISE@ +GL_GNULIB_RAND = @GL_GNULIB_RAND@ GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@ GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@ GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@ @@ -897,6 +936,7 @@ GL_GNULIB_STRSEP = @GL_GNULIB_STRSEP@ GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@ GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@ GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@ +GL_GNULIB_STRTOF = @GL_GNULIB_STRTOF@ GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@ GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@ GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@ @@ -1010,6 +1050,9 @@ GL_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_H GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@ @@ -1035,6 +1078,7 @@ GL_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYP GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@ @@ -1110,6 +1154,7 @@ GL_GNULIB_WCTOMB = @GL_GNULIB_WCTOMB@ GL_GNULIB_WCTRANS = @GL_GNULIB_WCTRANS@ GL_GNULIB_WCTYPE = @GL_GNULIB_WCTYPE@ GL_GNULIB_WCWIDTH = @GL_GNULIB_WCWIDTH@ +GL_GNULIB_WGETCWD = @GL_GNULIB_WGETCWD@ GL_GNULIB_WMEMCHR = @GL_GNULIB_WMEMCHR@ GL_GNULIB_WMEMCMP = @GL_GNULIB_WMEMCMP@ GL_GNULIB_WMEMCPY = @GL_GNULIB_WMEMCPY@ @@ -1120,8 +1165,10 @@ GL_GNULIB_WRITE = @GL_GNULIB_WRITE@ GL_GNULIB__EXIT = @GL_GNULIB__EXIT@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIBHEADERS_OVERRIDE_CHAR16_T = @GNULIBHEADERS_OVERRIDE_CHAR16_T@ +GNULIBHEADERS_OVERRIDE_CHAR32_T = @GNULIBHEADERS_OVERRIDE_CHAR32_T@ +GNULIBHEADERS_OVERRIDE_CHAR8_T = @GNULIBHEADERS_OVERRIDE_CHAR8_T@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ @@ -1138,6 +1185,7 @@ HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C32RTOMB = @HAVE_C32RTOMB@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ @@ -1271,6 +1319,8 @@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOC16 = @HAVE_MBRTOC16@ +HAVE_MBRTOC32 = @HAVE_MBRTOC32@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ HAVE_MBSINIT = @HAVE_MBSINIT@ HAVE_MBSLEN = @HAVE_MBSLEN@ @@ -1361,6 +1411,7 @@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOF = @HAVE_STRTOF@ HAVE_STRTOL = @HAVE_STRTOL@ HAVE_STRTOLD = @HAVE_STRTOLD@ HAVE_STRTOLL = @HAVE_STRTOLL@ @@ -1394,6 +1445,7 @@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_UCHAR_H = @HAVE_UCHAR_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ @@ -1446,6 +1498,7 @@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ +HAVE_WORKING_MBRTOC32 = @HAVE_WORKING_MBRTOC32@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__EXIT = @HAVE__EXIT@ @@ -1465,6 +1518,10 @@ INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LCOV = @LCOV@ +LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@ +LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@ +LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@ +LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -1480,6 +1537,8 @@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPROXY_CFLAGS = @LIBPROXY_CFLAGS@ +LIBPROXY_LIBS = @LIBPROXY_LIBS@ LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ LIBPSL_LIBS = @LIBPSL_LIBS@ LIBPTHREAD = @LIBPTHREAD@ @@ -1576,6 +1635,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ +NEXT_AS_FIRST_DIRECTIVE_UCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_UCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ @@ -1615,6 +1675,7 @@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ +NEXT_UCHAR_H = @NEXT_UCHAR_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ @@ -1656,6 +1717,7 @@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ +REPLACE_C32RTOMB = @REPLACE_C32RTOMB@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ @@ -1682,6 +1744,7 @@ REPLACE_EXECVE = @REPLACE_EXECVE@ REPLACE_EXECVP = @REPLACE_EXECVP@ REPLACE_EXECVPE = @REPLACE_EXECVPE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ @@ -1739,6 +1802,7 @@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWPUNCT = @REPLACE_ISWPUNCT@ REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_ITOLD = @REPLACE_ITOLD@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ @@ -1752,6 +1816,8 @@ REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MALLOC_FOR_MALLOC_GNU = @REPLACE_MALLOC_FOR_MALLOC_GNU@ REPLACE_MALLOC_FOR_MALLOC_POSIX = @REPLACE_MALLOC_FOR_MALLOC_POSIX@ REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOC16 = @REPLACE_MBRTOC16@ +REPLACE_MBRTOC32 = @REPLACE_MBRTOC32@ REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ @@ -1763,6 +1829,7 @@ REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ +REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ @@ -1801,6 +1868,7 @@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_QSORT_R = @REPLACE_QSORT_R@ REPLACE_RAISE = @REPLACE_RAISE@ +REPLACE_RAND = @REPLACE_RAND@ REPLACE_RANDOM = @REPLACE_RANDOM@ REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ REPLACE_READ = @REPLACE_READ@ @@ -1843,6 +1911,7 @@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ +REPLACE_STRTOF = @REPLACE_STRTOF@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_STRTOL = @REPLACE_STRTOL@ @@ -1853,11 +1922,13 @@ REPLACE_STRTOULL = @REPLACE_STRTOULL@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ +REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ +REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1886,6 +1957,8 @@ REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ +REPLACE_WCTRANS = @REPLACE_WCTRANS@ +REPLACE_WCTYPE = @REPLACE_WCTYPE@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WMEMCMP = @REPLACE_WMEMCMP@ REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ @@ -1900,6 +1973,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ +SMALL_WCHAR_T = @SMALL_WCHAR_T@ STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ @@ -1976,6 +2050,8 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ diff --git a/src/config.h.in b/src/config.h.in index 15fe00b..7b922e4 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -4,9 +4,15 @@ #define _GL_CONFIG_H_INCLUDED 1 +/* Define if access does not correctly handle trailing slashes. */ +#undef ACCESS_TRAILING_SLASH_BUG + /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Define if no multithread safety and no multithreading is desired. */ +#undef AVOID_ANY_THREADS + /* Define to the number of bits in type 'ptrdiff_t'. */ #undef BITSIZEOF_PTRDIFF_T @@ -121,8 +127,8 @@ /* Define to 1 if this is a fuzzing build */ #undef FUZZING -/* Define to the type of elements in the array set by `getgroups'. Usually - this is either `int' or `gid_t'. */ +/* Define to the type of elements in the array argument to 'getgroups'. + Usually this is either 'int' or 'gid_t'. */ #undef GETGROUPS_T /* Define this to 1 if getgroups(0,NULL) does not return the number of groups. @@ -246,9 +252,60 @@ /* Define to 1 when the gnulib module bind should be tested. */ #undef GNULIB_TEST_BIND +/* Define to 1 when the gnulib module btoc32 should be tested. */ +#undef GNULIB_TEST_BTOC32 + /* Define to 1 when the gnulib module btowc should be tested. */ #undef GNULIB_TEST_BTOWC +/* Define to 1 when the gnulib module c32isalnum should be tested. */ +#undef GNULIB_TEST_C32ISALNUM + +/* Define to 1 when the gnulib module c32isalpha should be tested. */ +#undef GNULIB_TEST_C32ISALPHA + +/* Define to 1 when the gnulib module c32isblank should be tested. */ +#undef GNULIB_TEST_C32ISBLANK + +/* Define to 1 when the gnulib module c32iscntrl should be tested. */ +#undef GNULIB_TEST_C32ISCNTRL + +/* Define to 1 when the gnulib module c32isdigit should be tested. */ +#undef GNULIB_TEST_C32ISDIGIT + +/* Define to 1 when the gnulib module c32isgraph should be tested. */ +#undef GNULIB_TEST_C32ISGRAPH + +/* Define to 1 when the gnulib module c32islower should be tested. */ +#undef GNULIB_TEST_C32ISLOWER + +/* Define to 1 when the gnulib module c32isprint should be tested. */ +#undef GNULIB_TEST_C32ISPRINT + +/* Define to 1 when the gnulib module c32ispunct should be tested. */ +#undef GNULIB_TEST_C32ISPUNCT + +/* Define to 1 when the gnulib module c32isspace should be tested. */ +#undef GNULIB_TEST_C32ISSPACE + +/* Define to 1 when the gnulib module c32isupper should be tested. */ +#undef GNULIB_TEST_C32ISUPPER + +/* Define to 1 when the gnulib module c32isxdigit should be tested. */ +#undef GNULIB_TEST_C32ISXDIGIT + +/* Define to 1 when the gnulib module c32tolower should be tested. */ +#undef GNULIB_TEST_C32TOLOWER + +/* Define to 1 when the gnulib module c32width should be tested. */ +#undef GNULIB_TEST_C32WIDTH + +/* Define to 1 when the gnulib module c32_apply_type_test should be tested. */ +#undef GNULIB_TEST_C32_APPLY_TYPE_TEST + +/* Define to 1 when the gnulib module c32_get_type_test should be tested. */ +#undef GNULIB_TEST_C32_GET_TYPE_TEST + /* Define to 1 when the gnulib module calloc-gnu should be tested. */ #undef GNULIB_TEST_CALLOC_GNU @@ -418,9 +475,15 @@ /* Define to 1 when the gnulib module iswblank should be tested. */ #undef GNULIB_TEST_ISWBLANK +/* Define to 1 when the gnulib module iswctype should be tested. */ +#undef GNULIB_TEST_ISWCTYPE + /* Define to 1 when the gnulib module iswdigit should be tested. */ #undef GNULIB_TEST_ISWDIGIT +/* Define to 1 when the gnulib module iswpunct should be tested. */ +#undef GNULIB_TEST_ISWPUNCT + /* Define to 1 when the gnulib module iswxdigit should be tested. */ #undef GNULIB_TEST_ISWXDIGIT @@ -445,15 +508,24 @@ /* Define to 1 when the gnulib module malloc-posix should be tested. */ #undef GNULIB_TEST_MALLOC_POSIX +/* Define to 1 when the gnulib module mbrtoc32 should be tested. */ +#undef GNULIB_TEST_MBRTOC32 + /* Define to 1 when the gnulib module mbrtowc should be tested. */ #undef GNULIB_TEST_MBRTOWC /* Define to 1 when the gnulib module mbsinit should be tested. */ #undef GNULIB_TEST_MBSINIT +/* Define to 1 when the gnulib module mbsrtoc32s should be tested. */ +#undef GNULIB_TEST_MBSRTOC32S + /* Define to 1 when the gnulib module mbsrtowcs should be tested. */ #undef GNULIB_TEST_MBSRTOWCS +/* Define to 1 when the gnulib module mbszero should be tested. */ +#undef GNULIB_TEST_MBSZERO + /* Define to 1 when the gnulib module mbtowc should be tested. */ #undef GNULIB_TEST_MBTOWC @@ -709,6 +781,9 @@ /* Define to 1 when the gnulib module wcrtomb should be tested. */ #undef GNULIB_TEST_WCRTOMB +/* Define to 1 when the gnulib module wctype should be tested. */ +#undef GNULIB_TEST_WCTYPE + /* Define to 1 when the gnulib module wcwidth should be tested. */ #undef GNULIB_TEST_WCWIDTH @@ -754,7 +829,7 @@ /* Define to 1 if you have the <bp-sym.h> header file. */ #undef HAVE_BP_SYM_H -/* Define to 1 if you have the `btowc' function. */ +/* Define to 1 if you have the 'btowc' function. */ #undef HAVE_BTOWC /* Define to 1 if nanosleep mishandles large arguments. */ @@ -763,7 +838,7 @@ /* Define to 1 if you have the <byteswap.h> header file. */ #undef HAVE_BYTESWAP_H -/* Define to 1 if you have the `canonicalize_file_name' function. */ +/* Define to 1 if you have the 'canonicalize_file_name' function. */ #undef HAVE_CANONICALIZE_FILE_NAME /* Define to 1 if you have the `catgets' function. */ @@ -777,19 +852,19 @@ the CoreFoundation framework. */ #undef HAVE_CFPREFERENCESCOPYAPPVALUE -/* Define to 1 if you have the `clock_getres' function. */ +/* Define to 1 if you have the 'clock_getres' function. */ #undef HAVE_CLOCK_GETRES -/* Define to 1 if you have the `clock_gettime' function. */ +/* Define to 1 if you have the 'clock_gettime' function. */ #undef HAVE_CLOCK_GETTIME -/* Define to 1 if you have the `clock_settime' function. */ +/* Define to 1 if you have the 'clock_settime' function. */ #undef HAVE_CLOCK_SETTIME -/* Define to 1 if you have the `closedir' function. */ +/* Define to 1 if you have the 'closedir' function. */ #undef HAVE_CLOSEDIR -/* Define to 1 if you have the `confstr' function. */ +/* Define to 1 if you have the 'confstr' function. */ #undef HAVE_CONFSTR /* Define to 1 if you have the <crtdefs.h> header file. */ @@ -811,280 +886,280 @@ */ #undef HAVE_DCGETTEXT -/* Define to 1 if you have the declaration of `alarm', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'alarm', and to 0 if you don't. */ #undef HAVE_DECL_ALARM -/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if +/* Define to 1 if you have the declaration of 'clearerr_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_CLEARERR_UNLOCKED -/* Define to 1 if you have the declaration of `dirfd', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'dirfd', and to 0 if you don't. */ #undef HAVE_DECL_DIRFD -/* Define to 1 if you have the declaration of `ecvt', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'ecvt', and to 0 if you don't. */ #undef HAVE_DECL_ECVT -/* Define to 1 if you have the declaration of `execvpe', and to 0 if you +/* Define to 1 if you have the declaration of 'execvpe', and to 0 if you don't. */ #undef HAVE_DECL_EXECVPE -/* Define to 1 if you have the declaration of `fchdir', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'fchdir', and to 0 if you don't. */ #undef HAVE_DECL_FCHDIR -/* Define to 1 if you have the declaration of `fcloseall', and to 0 if you +/* Define to 1 if you have the declaration of 'fcloseall', and to 0 if you don't. */ #undef HAVE_DECL_FCLOSEALL -/* Define to 1 if you have the declaration of `fcvt', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'fcvt', and to 0 if you don't. */ #undef HAVE_DECL_FCVT -/* Define to 1 if you have the declaration of `fdopendir', and to 0 if you +/* Define to 1 if you have the declaration of 'fdopendir', and to 0 if you don't. */ #undef HAVE_DECL_FDOPENDIR -/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you +/* Define to 1 if you have the declaration of 'feof_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_FEOF_UNLOCKED -/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if +/* Define to 1 if you have the declaration of 'ferror_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_FERROR_UNLOCKED -/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if +/* Define to 1 if you have the declaration of 'fflush_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_FFLUSH_UNLOCKED -/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if +/* Define to 1 if you have the declaration of 'fgets_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_FGETS_UNLOCKED -/* Define to 1 if you have the declaration of `flockfile', and to 0 if you +/* Define to 1 if you have the declaration of 'flockfile', and to 0 if you don't. */ #undef HAVE_DECL_FLOCKFILE -/* Define to 1 if you have the declaration of `fpurge', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'fpurge', and to 0 if you don't. */ #undef HAVE_DECL_FPURGE -/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if +/* Define to 1 if you have the declaration of 'fputc_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_FPUTC_UNLOCKED -/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if +/* Define to 1 if you have the declaration of 'fputs_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_FPUTS_UNLOCKED -/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if +/* Define to 1 if you have the declaration of 'fread_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_FREAD_UNLOCKED -/* Define to 1 if you have the declaration of `freeaddrinfo', and to 0 if you +/* Define to 1 if you have the declaration of 'freeaddrinfo', and to 0 if you don't. */ #undef HAVE_DECL_FREEADDRINFO -/* Define to 1 if you have the declaration of `fseeko', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'fseeko', and to 0 if you don't. */ #undef HAVE_DECL_FSEEKO -/* Define to 1 if you have the declaration of `ftello', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'ftello', and to 0 if you don't. */ #undef HAVE_DECL_FTELLO -/* Define to 1 if you have the declaration of `funlockfile', and to 0 if you +/* Define to 1 if you have the declaration of 'funlockfile', and to 0 if you don't. */ #undef HAVE_DECL_FUNLOCKFILE -/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if +/* Define to 1 if you have the declaration of 'fwrite_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_FWRITE_UNLOCKED -/* Define to 1 if you have the declaration of `gai_strerror', and to 0 if you +/* Define to 1 if you have the declaration of 'gai_strerror', and to 0 if you don't. */ #undef HAVE_DECL_GAI_STRERROR -/* Define to 1 if you have the declaration of `gai_strerrorA', and to 0 if you +/* Define to 1 if you have the declaration of 'gai_strerrorA', and to 0 if you don't. */ #undef HAVE_DECL_GAI_STRERRORA -/* Define to 1 if you have the declaration of `gcvt', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'gcvt', and to 0 if you don't. */ #undef HAVE_DECL_GCVT -/* Define to 1 if you have the declaration of `getaddrinfo', and to 0 if you +/* Define to 1 if you have the declaration of 'getaddrinfo', and to 0 if you don't. */ #undef HAVE_DECL_GETADDRINFO -/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if +/* Define to 1 if you have the declaration of 'getchar_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_GETCHAR_UNLOCKED -/* Define to 1 if you have the declaration of `getcwd', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'getcwd', and to 0 if you don't. */ #undef HAVE_DECL_GETCWD -/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you +/* Define to 1 if you have the declaration of 'getc_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_GETC_UNLOCKED -/* Define to 1 if you have the declaration of `getdelim', and to 0 if you +/* Define to 1 if you have the declaration of 'getdelim', and to 0 if you don't. */ #undef HAVE_DECL_GETDELIM -/* Define to 1 if you have the declaration of `getdtablesize', and to 0 if you +/* Define to 1 if you have the declaration of 'getdtablesize', and to 0 if you don't. */ #undef HAVE_DECL_GETDTABLESIZE -/* Define to 1 if you have the declaration of `getline', and to 0 if you +/* Define to 1 if you have the declaration of 'getline', and to 0 if you don't. */ #undef HAVE_DECL_GETLINE -/* Define to 1 if you have the declaration of `getnameinfo', and to 0 if you +/* Define to 1 if you have the declaration of 'getnameinfo', and to 0 if you don't. */ #undef HAVE_DECL_GETNAMEINFO -/* Define to 1 if you have the declaration of `getw', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'getw', and to 0 if you don't. */ #undef HAVE_DECL_GETW -/* Define to 1 if you have the declaration of `h_errno', and to 0 if you +/* Define to 1 if you have the declaration of 'h_errno', and to 0 if you don't. */ #undef HAVE_DECL_H_ERRNO -/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you +/* Define to 1 if you have the declaration of 'inet_ntop', and to 0 if you don't. */ #undef HAVE_DECL_INET_NTOP -/* Define to 1 if you have the declaration of `isblank', and to 0 if you +/* Define to 1 if you have the declaration of 'isblank', and to 0 if you don't. */ #undef HAVE_DECL_ISBLANK -/* Define to 1 if you have the declaration of `iswblank', and to 0 if you +/* Define to 1 if you have the declaration of 'iswblank', and to 0 if you don't. */ #undef HAVE_DECL_ISWBLANK -/* Define to 1 if you have the declaration of `localtime_r', and to 0 if you +/* Define to 1 if you have the declaration of 'localtime_r', and to 0 if you don't. */ #undef HAVE_DECL_LOCALTIME_R -/* Define to 1 if you have the declaration of `mbrtowc', and to 0 if you +/* Define to 1 if you have the declaration of 'mbrtowc', and to 0 if you don't. */ #undef HAVE_DECL_MBRTOWC -/* Define to 1 if you have the declaration of `mbsinit', and to 0 if you +/* Define to 1 if you have the declaration of 'mbsinit', and to 0 if you don't. */ #undef HAVE_DECL_MBSINIT -/* Define to 1 if you have the declaration of `mbsrtowcs', and to 0 if you +/* Define to 1 if you have the declaration of 'mbsrtowcs', and to 0 if you don't. */ #undef HAVE_DECL_MBSRTOWCS -/* Define to 1 if you have the declaration of `memrchr', and to 0 if you +/* Define to 1 if you have the declaration of 'memrchr', and to 0 if you don't. */ #undef HAVE_DECL_MEMRCHR -/* Define to 1 if you have the declaration of `posix_spawn', and to 0 if you +/* Define to 1 if you have the declaration of 'posix_spawn', and to 0 if you don't. */ #undef HAVE_DECL_POSIX_SPAWN -/* Define to 1 if you have the declaration of `program_invocation_name', and +/* Define to 1 if you have the declaration of 'program_invocation_name', and to 0 if you don't. */ #undef HAVE_DECL_PROGRAM_INVOCATION_NAME -/* Define to 1 if you have the declaration of `program_invocation_short_name', +/* Define to 1 if you have the declaration of 'program_invocation_short_name', and to 0 if you don't. */ #undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME -/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if +/* Define to 1 if you have the declaration of 'putchar_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_PUTCHAR_UNLOCKED -/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you +/* Define to 1 if you have the declaration of 'putc_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_PUTC_UNLOCKED -/* Define to 1 if you have the declaration of `putw', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'putw', and to 0 if you don't. */ #undef HAVE_DECL_PUTW -/* Define to 1 if you have the declaration of `snprintf', and to 0 if you +/* Define to 1 if you have the declaration of 'snprintf', and to 0 if you don't. */ #undef HAVE_DECL_SNPRINTF -/* Define to 1 if you have the declaration of `strdup', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'strdup', and to 0 if you don't. */ #undef HAVE_DECL_STRDUP -/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you +/* Define to 1 if you have the declaration of 'strerror_r', and to 0 if you don't. */ #undef HAVE_DECL_STRERROR_R -/* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you +/* Define to 1 if you have the declaration of 'strncasecmp', and to 0 if you don't. */ #undef HAVE_DECL_STRNCASECMP -/* Define to 1 if you have the declaration of `strndup', and to 0 if you +/* Define to 1 if you have the declaration of 'strndup', and to 0 if you don't. */ #undef HAVE_DECL_STRNDUP -/* Define to 1 if you have the declaration of `strnlen', and to 0 if you +/* Define to 1 if you have the declaration of 'strnlen', and to 0 if you don't. */ #undef HAVE_DECL_STRNLEN -/* Define to 1 if you have the declaration of `strtok_r', and to 0 if you +/* Define to 1 if you have the declaration of 'strtok_r', and to 0 if you don't. */ #undef HAVE_DECL_STRTOK_R -/* Define to 1 if you have the declaration of `towlower', and to 0 if you +/* Define to 1 if you have the declaration of 'towlower', and to 0 if you don't. */ #undef HAVE_DECL_TOWLOWER -/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you +/* Define to 1 if you have the declaration of 'vsnprintf', and to 0 if you don't. */ #undef HAVE_DECL_VSNPRINTF -/* Define to 1 if you have the declaration of `wcrtomb', and to 0 if you +/* Define to 1 if you have the declaration of 'wcrtomb', and to 0 if you don't. */ #undef HAVE_DECL_WCRTOMB -/* Define to 1 if you have the declaration of `wcsdup', and to 0 if you don't. +/* Define to 1 if you have the declaration of 'wcsdup', and to 0 if you don't. */ #undef HAVE_DECL_WCSDUP -/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you +/* Define to 1 if you have the declaration of 'wcwidth', and to 0 if you don't. */ #undef HAVE_DECL_WCWIDTH -/* Define to 1 if you have the declaration of `_fseeki64', and to 0 if you +/* Define to 1 if you have the declaration of '_fseeki64', and to 0 if you don't. */ #undef HAVE_DECL__FSEEKI64 -/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you +/* Define to 1 if you have the declaration of '_snprintf', and to 0 if you don't. */ #undef HAVE_DECL__SNPRINTF -/* Define to 1 if you have the declaration of `__argv', and to 0 if you don't. +/* Define to 1 if you have the declaration of '__argv', and to 0 if you don't. */ #undef HAVE_DECL___ARGV -/* Define to 1 if you have the declaration of `__fsetlocking', and to 0 if you +/* Define to 1 if you have the declaration of '__fsetlocking', and to 0 if you don't. */ #undef HAVE_DECL___FSETLOCKING /* Define to 1 if you have the <dirent.h> header file. */ #undef HAVE_DIRENT_H -/* Define to 1 if you have the `dirfd' function. */ +/* Define to 1 if you have the 'dirfd' function. */ #undef HAVE_DIRFD /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the `drand48' function. */ +/* Define to 1 if you have the 'drand48' function. */ #undef HAVE_DRAND48 /* Define if you have the declaration of environ. */ @@ -1099,49 +1174,49 @@ /* Define to 1 if you have the `faccessat' function. */ #undef HAVE_FACCESSAT -/* Define to 1 if you have the `fchdir' function. */ +/* Define to 1 if you have the 'fchdir' function. */ #undef HAVE_FCHDIR -/* Define to 1 if you have the `fcntl' function. */ +/* Define to 1 if you have the 'fcntl' function. */ #undef HAVE_FCNTL -/* Define to 1 if you have the `fdopendir' function. */ +/* Define to 1 if you have the 'fdopendir' function. */ #undef HAVE_FDOPENDIR /* Define to 1 if you have the <features.h> header file. */ #undef HAVE_FEATURES_H -/* Define to 1 if you have the `flock' function. */ +/* Define to 1 if you have the 'flock' function. */ #undef HAVE_FLOCK -/* Define to 1 if you have the `flockfile' function. */ +/* Define to 1 if you have the 'flockfile' function. */ #undef HAVE_FLOCKFILE -/* Define to 1 if you have the `fmemopen' function. */ +/* Define to 1 if you have the 'fmemopen' function. */ #undef HAVE_FMEMOPEN -/* Define to 1 if you have the `fnmatch' function. */ +/* Define to 1 if you have the 'fnmatch' function. */ #undef HAVE_FNMATCH /* Define to 1 if you have the <fnmatch.h> header file. */ #undef HAVE_FNMATCH_H -/* Define to 1 if you have the `fpurge' function. */ +/* Define to 1 if you have the 'fpurge' function. */ #undef HAVE_FPURGE /* Define if the 'free' function is guaranteed to preserve errno. */ #undef HAVE_FREE_POSIX -/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +/* Define to 1 if fseeko (and ftello) are declared in stdio.h. */ #undef HAVE_FSEEKO -/* Define to 1 if you have the `fstatat' function. */ +/* Define to 1 if you have the 'fstatat' function. */ #undef HAVE_FSTATAT -/* Define to 1 if you have the `ftello' function. */ +/* Define to 1 if you have the 'ftello' function. */ #undef HAVE_FTELLO -/* Define to 1 if you have the `funlockfile' function. */ +/* Define to 1 if you have the 'funlockfile' function. */ #undef HAVE_FUNLOCKFILE /* Define to 1 if you have the `futimens' function. */ @@ -1156,7 +1231,7 @@ /* Define to 1 if getaddrinfo exists, or to 0 otherwise. */ #undef HAVE_GETADDRINFO -/* Define to 1 if you have the `getcwd' function. */ +/* Define to 1 if you have the 'getcwd' function. */ #undef HAVE_GETCWD /* Define to 1 if getcwd works, but with shorter paths than is generally @@ -1166,25 +1241,25 @@ /* Define to 1 if you have the `getdelim' function. */ #undef HAVE_GETDELIM -/* Define to 1 if you have the `getdtablesize' function. */ +/* Define to 1 if you have the 'getdtablesize' function. */ #undef HAVE_GETDTABLESIZE -/* Define to 1 if you have the `getegid' function. */ +/* Define to 1 if you have the 'getegid' function. */ #undef HAVE_GETEGID -/* Define to 1 if you have the `geteuid' function. */ +/* Define to 1 if you have the 'geteuid' function. */ #undef HAVE_GETEUID -/* Define to 1 if you have the `getexecname' function. */ +/* Define to 1 if you have the 'getexecname' function. */ #undef HAVE_GETEXECNAME -/* Define to 1 if you have the `getgid' function. */ +/* Define to 1 if you have the 'getgid' function. */ #undef HAVE_GETGID /* Define to 1 if your system has a working `getgroups' function. */ #undef HAVE_GETGROUPS -/* Define to 1 if you have the `gethostbyname' function. */ +/* Define to 1 if you have the 'gethostbyname' function. */ #undef HAVE_GETHOSTBYNAME /* Define to 1 if you have the `getline' function. */ @@ -1193,13 +1268,13 @@ /* Define to 1 if you have the <getopt.h> header file. */ #undef HAVE_GETOPT_H -/* Define to 1 if you have the `getopt_long_only' function. */ +/* Define to 1 if you have the 'getopt_long_only' function. */ #undef HAVE_GETOPT_LONG_ONLY -/* Define to 1 if you have the `getpagesize' function. */ +/* Define to 1 if you have the 'getpagesize' function. */ #undef HAVE_GETPAGESIZE -/* Define to 1 if you have the `getpass' function. */ +/* Define to 1 if you have the 'getpass' function. */ #undef HAVE_GETPASS /* Define to 1 if you have the `getprogname' function. */ @@ -1208,19 +1283,19 @@ /* Define to 1 if you have the `getrandom' function. */ #undef HAVE_GETRANDOM -/* Define to 1 if you have the `getservbyname' function. */ +/* Define to 1 if you have the 'getservbyname' function. */ #undef HAVE_GETSERVBYNAME /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT -/* Define to 1 if you have the `gettimeofday' function. */ +/* Define to 1 if you have the 'gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY -/* Define to 1 if you have the `getuid' function. */ +/* Define to 1 if you have the 'getuid' function. */ #undef HAVE_GETUID -/* Define to 1 if you have the `gnutls_priority_set_direct' function. */ +/* Define to 1 if you have the 'gnutls_priority_set_direct' function. */ #undef HAVE_GNUTLS_PRIORITY_SET_DIRECT /* Define if GPGME is available. */ @@ -1232,7 +1307,7 @@ /* Define to 1 if you have the <iconv.h> header file. */ #undef HAVE_ICONV_H -/* Define to 1 if you have the `inet_ntop' function. */ +/* Define to 1 if you have the 'inet_ntop' function. */ #undef HAVE_INET_NTOP /* Define to 1 if the compiler supports one of the keywords 'inline', @@ -1240,13 +1315,13 @@ */ #undef HAVE_INLINE -/* Define to 1 if the system has the type `int64_t'. */ +/* Define to 1 if the system has the type 'int64_t'. */ #undef HAVE_INT64_T /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */ #undef HAVE_INTMAX_T -/* Define to 1 if the system has the type `intptr_t'. */ +/* Define to 1 if the system has the type 'intptr_t'. */ #undef HAVE_INTPTR_T /* Define to 1 if you have the <inttypes.h> header file. */ @@ -1256,7 +1331,7 @@ declares uintmax_t. */ #undef HAVE_INTTYPES_H_WITH_UINTMAX -/* Define to 1 if you have the `ioctl' function. */ +/* Define to 1 if you have the 'ioctl' function. */ #undef HAVE_IOCTL /* Define to 1 if <sys/socket.h> defines AF_INET. */ @@ -1268,7 +1343,7 @@ /* Define to 1 if you have the 'isatty' function. */ #undef HAVE_ISATTY -/* Define to 1 if you have the `isblank' function. */ +/* Define to 1 if you have the 'isblank' function. */ #undef HAVE_ISBLANK /* Define to 1 if you have the `issetugid' function. */ @@ -1277,10 +1352,10 @@ /* Define to 1 if you have the `iswblank' function. */ #undef HAVE_ISWBLANK -/* Define to 1 if you have the `iswcntrl' function. */ +/* Define to 1 if you have the 'iswcntrl' function. */ #undef HAVE_ISWCNTRL -/* Define to 1 if you have the `iswctype' function. */ +/* Define to 1 if you have the 'iswctype' function. */ #undef HAVE_ISWCTYPE /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */ @@ -1292,10 +1367,10 @@ /* Define if libcares is available. */ #undef HAVE_LIBCARES -/* Define to 1 if you have the `dl' library (-ldl). */ +/* Define to 1 if you have the 'dl' library (-ldl). */ #undef HAVE_LIBDL -/* Define to 1 if you have the `eay32' library (-leay32). */ +/* Define to 1 if you have the 'eay32' library (-leay32). */ #undef HAVE_LIBEAY32 /* Define if you have the libgnutls library. */ @@ -1310,6 +1385,9 @@ /* Define if libpcre2 is available. */ #undef HAVE_LIBPCRE2 +/* Define if using libproxy. */ +#undef HAVE_LIBPROXY + /* PSL support enabled */ #undef HAVE_LIBPSL @@ -1334,19 +1412,19 @@ /* Define to 1 if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H -/* Define to 1 if you have the `link' function. */ +/* Define to 1 if you have the 'link' function. */ #undef HAVE_LINK /* Define to 1 if you have 'struct sockaddr_alg' defined. */ #undef HAVE_LINUX_IF_ALG_H -/* Define to 1 if you have the `localtime_r' function. */ +/* Define to 1 if you have the 'localtime_r' function. */ #undef HAVE_LOCALTIME_R /* Define to 1 if the system has the type 'long long int'. */ #undef HAVE_LONG_LONG_INT -/* Define to 1 if you have the `lstat' function. */ +/* Define to 1 if you have the 'lstat' function. */ #undef HAVE_LSTAT /* Define to 1 if you have the `lutimes' function. */ @@ -1362,25 +1440,25 @@ config.h and <sys/mman.h>. */ #undef HAVE_MAP_ANONYMOUS -/* Define to 1 if you have the `mbrtowc' function. */ +/* Define to 1 if you have the 'mbrtowc' function. */ #undef HAVE_MBRTOWC -/* Define to 1 if you have the `mbsinit' function. */ +/* Define to 1 if you have the 'mbsinit' function. */ #undef HAVE_MBSINIT -/* Define to 1 if you have the `mbsrtowcs' function. */ +/* Define to 1 if you have the 'mbsrtowcs' function. */ #undef HAVE_MBSRTOWCS /* Define to 1 if <wchar.h> declares mbstate_t. */ #undef HAVE_MBSTATE_T -/* Define to 1 if you have the `mbtowc' function. */ +/* Define to 1 if you have the 'mbtowc' function. */ #undef HAVE_MBTOWC /* Define to 1 if you have the `mempcpy' function. */ #undef HAVE_MEMPCPY -/* Define to 1 if you have the `memrchr' function. */ +/* Define to 1 if you have the 'memrchr' function. */ #undef HAVE_MEMRCHR /* Define if using metalink. */ @@ -1402,13 +1480,13 @@ /* Define to 1 if you have the `mkostemp' function. */ #undef HAVE_MKOSTEMP -/* Define to 1 if you have the `mkstemp' function. */ +/* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP -/* Define to 1 if you have a working `mmap' system call. */ +/* Define to 1 if you have a working 'mmap' system call. */ #undef HAVE_MMAP -/* Define to 1 if you have the `mprotect' function. */ +/* Define to 1 if you have the 'mprotect' function. */ #undef HAVE_MPROTECT /* Define to 1 on MSVC platforms that have the "invalid parameter handler" @@ -1427,10 +1505,10 @@ /* Define to 1 if you have the `nl_langinfo' function. */ #undef HAVE_NL_LANGINFO -/* Define to 1 if you have the `openat' function. */ +/* Define to 1 if you have the 'openat' function. */ #undef HAVE_OPENAT -/* Define to 1 if you have the `opendir' function. */ +/* Define to 1 if you have the 'opendir' function. */ #undef HAVE_OPENDIR /* Define to 1 if libcrypto is used for MD5. */ @@ -1455,13 +1533,13 @@ setting errno to ERANGE, ENAMETOOLONG, or ENOENT. */ #undef HAVE_PARTLY_WORKING_GETCWD -/* Define to 1 if you have the `pathconf' function. */ +/* Define to 1 if you have the 'pathconf' function. */ #undef HAVE_PATHCONF /* Define to 1 if you have the <paths.h> header file. */ #undef HAVE_PATHS_H -/* Define to 1 if you have the `pipe' function. */ +/* Define to 1 if you have the 'pipe' function. */ #undef HAVE_PIPE /* Define to 1 if you have the `pipe2' function. */ @@ -1470,10 +1548,10 @@ /* Define to 1 if you have the `posix_spawn' function. */ #undef HAVE_POSIX_SPAWN -/* Define to 1 if the system has the type `posix_spawnattr_t'. */ +/* Define to 1 if the system has the type 'posix_spawnattr_t'. */ #undef HAVE_POSIX_SPAWNATTR_T -/* Define to 1 if you have the `posix_spawn_file_actions_addchdir' function. +/* Define to 1 if you have the 'posix_spawn_file_actions_addchdir' function. */ #undef HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR @@ -1481,13 +1559,13 @@ function. */ #undef HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP -/* Define to 1 if the system has the type `posix_spawn_file_actions_t'. */ +/* Define to 1 if the system has the type 'posix_spawn_file_actions_t'. */ #undef HAVE_POSIX_SPAWN_FILE_ACTIONS_T -/* Define to 1 if you have the `pselect' function. */ +/* Define to 1 if you have the 'pselect' function. */ #undef HAVE_PSELECT -/* Define to 1 if you have the `psl_latest' function. */ +/* Define to 1 if you have the 'psl_latest' function. */ #undef HAVE_PSL_LATEST /* Define if you have the <pthread.h> header and the POSIX threads API. */ @@ -1509,76 +1587,76 @@ /* Define to 1 if you have the <pwd.h> header file. */ #undef HAVE_PWD_H -/* Define to 1 if you have the `raise' function. */ +/* Define to 1 if you have the 'raise' function. */ #undef HAVE_RAISE -/* Define to 1 if you have the `random' function. */ +/* Define to 1 if you have the 'random' function. */ #undef HAVE_RANDOM -/* Define to 1 if you have the `RAND_egd' function. */ +/* Define to 1 if you have the 'RAND_egd' function. */ #undef HAVE_RAND_EGD -/* Define to 1 if you have the `rawmemchr' function. */ +/* Define to 1 if you have the 'rawmemchr' function. */ #undef HAVE_RAWMEMCHR -/* Define to 1 if you have the `readdir' function. */ +/* Define to 1 if you have the 'readdir' function. */ #undef HAVE_READDIR -/* Define to 1 if you have the `readlink' function. */ +/* Define to 1 if you have the 'readlink' function. */ #undef HAVE_READLINK /* Define to 1 if you have the `reallocarray' function. */ #undef HAVE_REALLOCARRAY -/* Define to 1 if you have the `realpath' function. */ +/* Define to 1 if you have the 'realpath' function. */ #undef HAVE_REALPATH -/* Define to 1 if you have the `rewinddir' function. */ +/* Define to 1 if you have the 'rewinddir' function. */ #undef HAVE_REWINDDIR -/* Define to 1 if the system has the type `sa_family_t'. */ +/* Define to 1 if the system has the type 'sa_family_t'. */ #undef HAVE_SA_FAMILY_T /* Define to 1 if you have the <sched.h> header file. */ #undef HAVE_SCHED_H -/* Define to 1 if you have the `sched_setparam' function. */ +/* Define to 1 if you have the 'sched_setparam' function. */ #undef HAVE_SCHED_SETPARAM -/* Define to 1 if you have the `sched_setscheduler' function. */ +/* Define to 1 if you have the 'sched_setscheduler' function. */ #undef HAVE_SCHED_SETSCHEDULER /* Define to 1 if you have the <sdkddkver.h> header file. */ #undef HAVE_SDKDDKVER_H -/* Define to 1 if you have the `secure_getenv' function. */ +/* Define to 1 if you have the 'secure_getenv' function. */ #undef HAVE_SECURE_GETENV -/* Define to 1 if you have the `setdtablesize' function. */ +/* Define to 1 if you have the 'setdtablesize' function. */ #undef HAVE_SETDTABLESIZE -/* Define to 1 if you have the `setegid' function. */ +/* Define to 1 if you have the 'setegid' function. */ #undef HAVE_SETEGID -/* Define to 1 if you have the `seteuid' function. */ +/* Define to 1 if you have the 'seteuid' function. */ #undef HAVE_SETEUID -/* Define to 1 if you have the `shutdown' function. */ +/* Define to 1 if you have the 'shutdown' function. */ #undef HAVE_SHUTDOWN -/* Define to 1 if you have the `sigaction' function. */ +/* Define to 1 if you have the 'sigaction' function. */ #undef HAVE_SIGACTION -/* Define to 1 if you have the `sigaltstack' function. */ +/* Define to 1 if you have the 'sigaltstack' function. */ #undef HAVE_SIGALTSTACK -/* Define to 1 if you have the `sigblock' function. */ +/* Define to 1 if you have the 'sigblock' function. */ #undef HAVE_SIGBLOCK -/* Define to 1 if the system has the type `siginfo_t'. */ +/* Define to 1 if the system has the type 'siginfo_t'. */ #undef HAVE_SIGINFO_T -/* Define to 1 if you have the `siginterrupt' function. */ +/* Define to 1 if you have the 'siginterrupt' function. */ #undef HAVE_SIGINTERRUPT /* Define to 1 if 'sig_atomic_t' is a signed integer type. */ @@ -1590,19 +1668,19 @@ /* Define to 1 if 'wint_t' is a signed integer type. */ #undef HAVE_SIGNED_WINT_T -/* Define to 1 if you have the `sigsetjmp' function. */ +/* Define to 1 if you have the 'sigsetjmp' function. */ #undef HAVE_SIGSETJMP -/* Define to 1 if the system has the type `sigset_t'. */ +/* Define to 1 if the system has the type 'sigset_t'. */ #undef HAVE_SIGSET_T -/* Define to 1 if the system has the type `sig_atomic_t'. */ +/* Define to 1 if the system has the type 'sig_atomic_t'. */ #undef HAVE_SIG_ATOMIC_T -/* Define to 1 if you have the `sleep' function. */ +/* Define to 1 if you have the 'sleep' function. */ #undef HAVE_SLEEP -/* Define to 1 if you have the `snprintf' function. */ +/* Define to 1 if you have the 'snprintf' function. */ #undef HAVE_SNPRINTF /* Define if the return value of the snprintf function is the number of of @@ -1645,7 +1723,7 @@ /* Define to 1 if you have the `stpcpy' function. */ #undef HAVE_STPCPY -/* Define to 1 if you have the `strcasecmp' function. */ +/* Define to 1 if you have the 'strcasecmp' function. */ #undef HAVE_STRCASECMP /* Define to 1 if you have the `strchrnul' function. */ @@ -1663,82 +1741,82 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strlcpy' function. */ +/* Define to 1 if you have the 'strlcpy' function. */ #undef HAVE_STRLCPY -/* Define to 1 if you have the `strncasecmp' function. */ +/* Define to 1 if you have the 'strncasecmp' function. */ #undef HAVE_STRNCASECMP -/* Define to 1 if you have the `strndup' function. */ +/* Define to 1 if you have the 'strndup' function. */ #undef HAVE_STRNDUP -/* Define to 1 if you have the `strnlen' function. */ +/* Define to 1 if you have the 'strnlen' function. */ #undef HAVE_STRNLEN -/* Define to 1 if you have the `strpbrk' function. */ +/* Define to 1 if you have the 'strpbrk' function. */ #undef HAVE_STRPBRK -/* Define to 1 if you have the `strptime' function. */ +/* Define to 1 if you have the 'strptime' function. */ #undef HAVE_STRPTIME -/* Define to 1 if you have the `strtok_r' function. */ +/* Define to 1 if you have the 'strtok_r' function. */ #undef HAVE_STRTOK_R -/* Define to 1 if you have the `strtol' function. */ +/* Define to 1 if you have the 'strtol' function. */ #undef HAVE_STRTOL -/* Define to 1 if you have the `strtoll' function. */ +/* Define to 1 if you have the 'strtoll' function. */ #undef HAVE_STRTOLL -/* Define to 1 if the system has the type `struct addrinfo'. */ +/* Define to 1 if the system has the type 'struct addrinfo'. */ #undef HAVE_STRUCT_ADDRINFO -/* Define to 1 if `l_type' is a member of `struct flock'. */ +/* Define to 1 if 'l_type' is a member of 'struct flock'. */ #undef HAVE_STRUCT_FLOCK_L_TYPE -/* Define to 1 if `decimal_point' is a member of `struct lconv'. */ +/* Define to 1 if 'decimal_point' is a member of 'struct lconv'. */ #undef HAVE_STRUCT_LCONV_DECIMAL_POINT -/* Define to 1 if `int_p_cs_precedes' is a member of `struct lconv'. */ +/* Define to 1 if 'int_p_cs_precedes' is a member of 'struct lconv'. */ #undef HAVE_STRUCT_LCONV_INT_P_CS_PRECEDES -/* Define to 1 if `sa_sigaction' is a member of `struct sigaction'. */ +/* Define to 1 if 'sa_sigaction' is a member of 'struct sigaction'. */ #undef HAVE_STRUCT_SIGACTION_SA_SIGACTION -/* Define to 1 if the system has the type `struct sockaddr_in6'. */ +/* Define to 1 if the system has the type 'struct sockaddr_in6'. */ #undef HAVE_STRUCT_SOCKADDR_IN6 -/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */ +/* Define to 1 if 'sa_len' is a member of 'struct sockaddr'. */ #undef HAVE_STRUCT_SOCKADDR_SA_LEN -/* Define to 1 if the system has the type `struct sockaddr_storage'. */ +/* Define to 1 if the system has the type 'struct sockaddr_storage'. */ #undef HAVE_STRUCT_SOCKADDR_STORAGE -/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */ +/* Define to 1 if 'ss_family' is a member of 'struct sockaddr_storage'. */ #undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY -/* Define to 1 if `st_atimensec' is a member of `struct stat'. */ +/* Define to 1 if 'st_atimensec' is a member of 'struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIMENSEC -/* Define to 1 if `st_atimespec.tv_nsec' is a member of `struct stat'. */ +/* Define to 1 if 'st_atimespec.tv_nsec' is a member of 'struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC -/* Define to 1 if `st_atim.st__tim.tv_nsec' is a member of `struct stat'. */ +/* Define to 1 if 'st_atim.st__tim.tv_nsec' is a member of 'struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC -/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */ +/* Define to 1 if 'st_atim.tv_nsec' is a member of 'struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC -/* Define to 1 if `st_birthtimensec' is a member of `struct stat'. */ +/* Define to 1 if 'st_birthtimensec' is a member of 'struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC -/* Define to 1 if `st_birthtimespec.tv_nsec' is a member of `struct stat'. */ +/* Define to 1 if 'st_birthtimespec.tv_nsec' is a member of 'struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC -/* Define to 1 if `st_birthtim.tv_nsec' is a member of `struct stat'. */ +/* Define to 1 if 'st_birthtim.tv_nsec' is a member of 'struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC -/* Define to 1 if you have the `symlink' function. */ +/* Define to 1 if you have the 'symlink' function. */ #undef HAVE_SYMLINK /* Define to 1 if you have the <sys/bitypes.h> header file. */ @@ -1804,7 +1882,7 @@ /* Define to 1 if you have the <threads.h> header file. */ #undef HAVE_THREADS_H -/* Define to 1 if you have the `timegm' function. */ +/* Define to 1 if you have the 'timegm' function. */ #undef HAVE_TIMEGM /* Define if you have the timespec_get function. */ @@ -1813,13 +1891,16 @@ /* Define if struct tm has the tm_gmtoff member. */ #undef HAVE_TM_GMTOFF -/* Define to 1 if you have the `towlower' function. */ +/* Define to 1 if you have the 'towlower' function. */ #undef HAVE_TOWLOWER -/* Define to 1 if the system has the type `uint32_t'. */ +/* Define to 1 if you have the <uchar.h> header file. */ +#undef HAVE_UCHAR_H + +/* Define to 1 if the system has the type 'uint32_t'. */ #undef HAVE_UINT32_T -/* Define to 1 if the system has the type `uintptr_t'. */ +/* Define to 1 if the system has the type 'uintptr_t'. */ #undef HAVE_UINTPTR_T /* Define to 1 if you have the <unistd.h> header file. */ @@ -1831,10 +1912,10 @@ /* Define to 1 if the system has the type 'unsigned long long int'. */ #undef HAVE_UNSIGNED_LONG_LONG_INT -/* Define to 1 if you have the `usleep' function. */ +/* Define to 1 if you have the 'usleep' function. */ #undef HAVE_USLEEP -/* Define to 1 if you have the `utime' function. */ +/* Define to 1 if you have the 'utime' function. */ #undef HAVE_UTIME /* Define to 1 if you have the `utimensat' function. */ @@ -1849,23 +1930,23 @@ /* Define if you have a global __progname variable */ #undef HAVE_VAR___PROGNAME -/* Define to 1 if you have the `vasnprintf' function. */ +/* Define to 1 if you have the 'vasnprintf' function. */ #undef HAVE_VASNPRINTF -/* Define to 1 if you have the `vasprintf' function. */ +/* Define to 1 if you have the 'vasprintf' function. */ #undef HAVE_VASPRINTF -/* Define to 1 if you have the `vfork' function. */ +/* Define to 1 if you have the 'vfork' function. */ #undef HAVE_VFORK /* Define to 1 or 0, depending whether the compiler supports simple visibility declarations. */ #undef HAVE_VISIBILITY -/* Define to 1 if you have the `vsnprintf' function. */ +/* Define to 1 if you have the 'vsnprintf' function. */ #undef HAVE_VSNPRINTF -/* Define to 1 if you have the `waitid' function. */ +/* Define to 1 if you have the 'waitid' function. */ #undef HAVE_WAITID /* Define to 1 if you have the <wchar.h> header file. */ @@ -1874,16 +1955,16 @@ /* Define if you have the 'wchar_t' type. */ #undef HAVE_WCHAR_T -/* Define to 1 if you have the `wcrtomb' function. */ +/* Define to 1 if you have the 'wcrtomb' function. */ #undef HAVE_WCRTOMB -/* Define to 1 if you have the `wcslen' function. */ +/* Define to 1 if you have the 'wcslen' function. */ #undef HAVE_WCSLEN /* Define to 1 if you have the <wctype.h> header file. */ #undef HAVE_WCTYPE_H -/* Define to 1 if you have the `wcwidth' function. */ +/* Define to 1 if you have the 'wcwidth' function. */ #undef HAVE_WCWIDTH /* Define to 1 if the compiler and linker support weak declarations of @@ -1903,6 +1984,9 @@ 7.1. */ #undef HAVE_WORKING_FSTATAT_ZERO_FLAG +/* Define if the mbrtoc32 function basically works. */ +#undef HAVE_WORKING_MBRTOC32 + /* Define to 1 if O_NOATIME works. */ #undef HAVE_WORKING_O_NOATIME @@ -1918,16 +2002,16 @@ /* Define to 1 if you have the <xlocale.h> header file. */ #undef HAVE_XLOCALE_H -/* Define to 1 if the system has the type `_Bool'. */ +/* Define to 1 if the system has the type '_Bool'. */ #undef HAVE__BOOL -/* Define to 1 if you have the `_fseeki64' function. */ +/* Define to 1 if you have the '_fseeki64' function. */ #undef HAVE__FSEEKI64 -/* Define to 1 if you have the `_ftelli64' function. */ +/* Define to 1 if you have the '_ftelli64' function. */ #undef HAVE__FTELLI64 -/* Define to 1 if you have the `_set_invalid_parameter_handler' function. */ +/* Define to 1 if you have the '_set_invalid_parameter_handler' function. */ #undef HAVE__SET_INVALID_PARAMETER_HANDLER /* Define to 1 if the compiler supports __builtin_expect, @@ -2062,10 +2146,10 @@ /* Define to 1 if the compiler supports the keyword '__inline'. */ #undef HAVE___INLINE -/* Define to 1 if you have the `__secure_getenv' function. */ +/* Define to 1 if you have the '__secure_getenv' function. */ #undef HAVE___SECURE_GETENV -/* Define to 1 if you have the `__xpg_strerror_r' function. */ +/* Define to 1 if you have the '__xpg_strerror_r' function. */ #undef HAVE___XPG_STRERROR_R /* Define as const if the declaration of iconv() needs const. */ @@ -2084,6 +2168,14 @@ /* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */ #undef MAP_ANONYMOUS +/* Define if the mbrtoc32 function does not return (size_t) -2 for empty + input. */ +#undef MBRTOC32_EMPTY_INPUT_BUG + +/* Define if the mbrtoc32 function may signal encoding errors in the C locale. + */ +#undef MBRTOC32_IN_C_LOCALE_MAYBE_EILSEQ + /* Define if the mbrtowc function does not return (size_t) -2 for empty input. */ #undef MBRTOWC_EMPTY_INPUT_BUG @@ -2255,10 +2347,10 @@ 'sig_atomic_t'. */ #undef SIG_ATOMIC_T_SUFFIX -/* The size of `long', as computed by sizeof. */ +/* The size of 'long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of `off_t', as computed by sizeof. */ +/* The size of 'off_t', as computed by sizeof. */ #undef SIZEOF_OFF_T /* Define as the maximum value of type 'size_t', if the system doesn't define @@ -2279,10 +2371,10 @@ STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION -/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ +/* Define to 1 if the 'S_IS*' macros in <sys/stat.h> do not work properly. */ #undef STAT_MACROS_BROKEN -/* Define to 1 if all of the C90 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS @@ -2325,7 +2417,7 @@ weak. */ #undef USE_POSIX_THREADS_WEAK -/* Enable extensions on AIX 3, Interix. */ +/* Enable extensions on AIX, Interix, z/OS. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif @@ -2455,8 +2547,8 @@ # endif #endif -/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ +/* Define to 1 if 'lex' declares 'yytext' as a 'char *' by default, not a + 'char[]'. */ #undef YYTEXT_POINTER /* Number of bits in a file offset, on hosts where this is settable. */ @@ -2474,7 +2566,7 @@ /* Define to enable the declarations of ISO C 11 types and functions. */ #undef _ISOC11_SOURCE -/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +/* Define to 1 if necessary to make fseeko visible. */ #undef _LARGEFILE_SOURCE /* Define to 1 on platforms where this makes off_t a 64-bit type. */ @@ -2581,48 +2673,58 @@ /* Attributes. */ -#if (defined __has_attribute \ - && (!defined __clang_minor__ \ - || (defined __apple_build_version__ \ - ? 6000000 <= __apple_build_version__ \ - : 5 <= __clang_major__))) -# define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) -#else -# define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr -# define _GL_ATTR_alloc_size _GL_GNUC_PREREQ (4, 3) -# define _GL_ATTR_always_inline _GL_GNUC_PREREQ (3, 2) -# define _GL_ATTR_artificial _GL_GNUC_PREREQ (4, 3) -# define _GL_ATTR_cold _GL_GNUC_PREREQ (4, 3) -# define _GL_ATTR_const _GL_GNUC_PREREQ (2, 95) -# define _GL_ATTR_deprecated _GL_GNUC_PREREQ (3, 1) -# define _GL_ATTR_diagnose_if 0 -# define _GL_ATTR_error _GL_GNUC_PREREQ (4, 3) -# define _GL_ATTR_externally_visible _GL_GNUC_PREREQ (4, 1) -# define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) -# define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) -# define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) -# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) -# ifdef _ICC -# define _GL_ATTR_may_alias 0 +/* Define _GL_HAS_ATTRIBUTE only once, because on FreeBSD, with gcc < 5, if + <config.h> gets included once again after <sys/cdefs.h>, __has_attribute(x) + expands to 0 always, and redefining _GL_HAS_ATTRIBUTE would turn off all + attributes. */ +#ifndef _GL_HAS_ATTRIBUTE +# if (defined __has_attribute \ + && (!defined __clang_minor__ \ + || (defined __apple_build_version__ \ + ? 7000000 <= __apple_build_version__ \ + : 5 <= __clang_major__))) +# define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) # else -# define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) +# define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr +# define _GL_ATTR_alloc_size _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_always_inline _GL_GNUC_PREREQ (3, 2) +# define _GL_ATTR_artificial _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_cold _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_const _GL_GNUC_PREREQ (2, 95) +# define _GL_ATTR_deprecated _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_diagnose_if 0 +# define _GL_ATTR_error _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_externally_visible _GL_GNUC_PREREQ (4, 1) +# define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) +# define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) +# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) +# ifdef _ICC +# define _GL_ATTR_may_alias 0 +# else +# define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) +# endif +# define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) +# define _GL_ATTR_nothrow _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_packed _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_pure _GL_GNUC_PREREQ (2, 96) +# define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9) +# define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0) +# define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) # endif -# define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) -# define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) -# define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) -# define _GL_ATTR_nothrow _GL_GNUC_PREREQ (3, 3) -# define _GL_ATTR_packed _GL_GNUC_PREREQ (2, 7) -# define _GL_ATTR_pure _GL_GNUC_PREREQ (2, 96) -# define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9) -# define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0) -# define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7) -# define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) #endif -/* Disable GCC -Wpedantic if using __has_c_attribute and this is not C23+. */ -#if (defined __has_c_attribute && _GL_GNUC_PREREQ (4, 6) \ - && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710) -# pragma GCC diagnostic ignored "-Wpedantic" +/* Use __has_c_attribute if available. However, do not use with + pre-C23 GCC, which can issue false positives if -Wpedantic. */ +#if (defined __has_c_attribute \ + && ! (_GL_GNUC_PREREQ (4, 6) \ + && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710)) +# define _GL_HAVE___HAS_C_ATTRIBUTE 1 +#else +# define _GL_HAVE___HAS_C_ATTRIBUTE 0 #endif /* Define if, in a function declaration, the attributes in bracket syntax @@ -2746,7 +2848,7 @@ in C++ also: namespace, class, template specialization. */ #ifndef _GL_ATTRIBUTE_DEPRECATED # ifndef _GL_BRACKET_BEFORE_ATTRIBUTE -# ifdef __has_c_attribute +# if _GL_HAVE___HAS_C_ATTRIBUTE # if __has_c_attribute (__deprecated__) # define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] # endif @@ -2795,7 +2897,7 @@ /* Applies to: Empty statement (;), inside a 'switch' statement. */ /* Always expands to something. */ #ifndef _GL_ATTRIBUTE_FALLTHROUGH -# ifdef __has_c_attribute +# if _GL_HAVE___HAS_C_ATTRIBUTE # if __has_c_attribute (__fallthrough__) # define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] # endif @@ -2884,7 +2986,7 @@ # if !defined __apple_build_version__ && __clang_major__ >= 10 # define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] # endif -# elif defined __has_c_attribute +# elif _GL_HAVE___HAS_C_ATTRIBUTE # if __has_c_attribute (__maybe_unused__) # define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] # endif @@ -2915,7 +3017,7 @@ # if __clang_major__ >= 1000 # define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] # endif -# elif defined __has_c_attribute +# elif _GL_HAVE___HAS_C_ATTRIBUTE # if __has_c_attribute (__nodiscard__) # define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] # endif @@ -2970,11 +3072,25 @@ /* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions. */ /* Applies to: functions. */ +/* After a function's parameter list, this attribute must come first, before + other attributes. */ #ifndef _GL_ATTRIBUTE_NOTHROW -# if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus -# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +# if defined __cplusplus +# if _GL_GNUC_PREREQ (2, 8) || __clang_major >= 4 +# if __cplusplus >= 201103L +# define _GL_ATTRIBUTE_NOTHROW noexcept (true) +# else +# define _GL_ATTRIBUTE_NOTHROW throw () +# endif +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif # else -# define _GL_ATTRIBUTE_NOTHROW +# if _GL_HAS_ATTRIBUTE (nothrow) +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif # endif #endif @@ -3068,16 +3184,16 @@ #endif -/* Define to empty if `const' does not conform to ANSI C. */ +/* Define to empty if 'const' does not conform to ANSI C. */ #undef const /* Define as 'access' if you don't have the eaccess() function. */ #undef eaccess -/* Define to `int' if <sys/types.h> doesn't define. */ +/* Define as 'int' if <sys/types.h> doesn't define. */ #undef gid_t -/* Define to `__inline__' or `__inline' if that's what the C compiler +/* Define to '__inline__' or '__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus #undef inline @@ -3118,7 +3234,7 @@ /* Define to the real name of the mktime_internal function. */ #undef mktime_internal -/* Define to `int' if <sys/types.h> does not define. */ +/* Define to 'int' if <sys/types.h> does not define. */ #undef mode_t /* Define to the type of st_nlink in struct stat, or a supertype. */ @@ -3195,7 +3311,7 @@ accessed atomically even in the presence of asynchronous signals. */ #undef sig_atomic_t -/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* Define as 'unsigned int' if <stddef.h> doesn't define. */ #undef size_t /* type to use in place of socklen_t if not defined */ @@ -3204,7 +3320,7 @@ /* Define as a signed type of the same size as size_t. */ #undef ssize_t -/* Define to `int' if <sys/types.h> doesn't define. */ +/* Define as 'int' if <sys/types.h> doesn't define. */ #undef uid_t @@ -3223,12 +3339,14 @@ # endif -/* Define to empty if the keyword `volatile' does not work. Warning: valid - code using `volatile' can become incorrect without. Disable with care. */ +/* Define to empty if the keyword 'volatile' does not work. Warning: valid + code using 'volatile' can become incorrect without. Disable with care. */ #undef volatile -#if !defined HAVE_C_ALIGNASOF && __cplusplus < 201103 && !defined alignof -# if HAVE_STDALIGN_H +#if !defined HAVE_C_ALIGNASOF \ + && !(defined __cplusplus && 201103 <= __cplusplus) \ + && !defined alignof +# if defined HAVE_STDALIGN_H # include <stdalign.h> # endif @@ -3269,7 +3387,11 @@ # define _Alignof(type) alignof (type) # else template <class __t> struct __alignof_helper { char __a; __t __b; }; -# define _Alignof(type) offsetof (__alignof_helper<type>, __b) +# if (defined __GNUC__ && 4 <= __GNUC__) || defined __clang__ +# define _Alignof(type) __builtin_offsetof (__alignof_helper<type>, __b) +# else +# define _Alignof(type) offsetof (__alignof_helper<type>, __b) +# endif # define _GL_STDALIGN_NEEDS_STDDEF 1 # endif # else @@ -3325,7 +3447,7 @@ # define _Alignas(a) __declspec (align (a)) # endif # endif -# if !HAVE_STDALIGN_H +# if !defined HAVE_STDALIGN_H # if ((defined _Alignas \ && !(defined __cplusplus \ && (201103 <= __cplusplus || defined _MSC_VER))) \ @@ -3334,7 +3456,7 @@ # endif # endif -# if _GL_STDALIGN_NEEDS_STDDEF +# if defined _GL_STDALIGN_NEEDS_STDDEF # include <stddef.h> # endif #endif diff --git a/src/connect.c b/src/connect.c index 780de48..d00482f 100644 --- a/src/connect.c +++ b/src/connect.c @@ -1,5 +1,5 @@ /* Establishing and handling network connections. - Copyright (C) 1995-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1995-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/connect.h b/src/connect.h index d03a170..a48752d 100644 --- a/src/connect.h +++ b/src/connect.h @@ -1,5 +1,5 @@ /* Declarations for connect. - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/convert.c b/src/convert.c index b934d49..2e5bc22 100644 --- a/src/convert.c +++ b/src/convert.c @@ -1,5 +1,5 @@ /* Conversion of links to local files. - Copyright (C) 2003-2011, 2014-2015, 2018-2023 Free Software + Copyright (C) 2003-2011, 2014-2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -321,7 +321,7 @@ convert_links (const char *file, struct urlpos *links) link->refresh_timeout); DEBUGP (("TO_RELATIVE: %s to %s at position %d in %s.\n", - link->url->url, newname, link->pos, file)); + link->url->url, quoted_newname, link->pos, file)); xfree (newname); xfree (quoted_newname); @@ -342,7 +342,7 @@ convert_links (const char *file, struct urlpos *links) link->refresh_timeout); DEBUGP (("Converted file part only: %s to %s at position %d in %s.\n", - link->url->url, newname, link->pos, file)); + link->url->url, quoted_newname, link->pos, file)); xfree (newname); xfree (quoted_newname); @@ -365,7 +365,7 @@ convert_links (const char *file, struct urlpos *links) link->refresh_timeout); DEBUGP (("TO_COMPLETE: <something> to %s at position %d in %s.\n", - newlink, link->pos, file)); + quoted_newlink, link->pos, file)); xfree (quoted_newlink); ++to_url_count; @@ -731,7 +731,11 @@ find_fragment (const char *beg, int size, const char **bp, const char **ep) safe for both local and HTTP-served browsing. We always quote "#" as "%23", "%" as "%25" and ";" as "%3B" - because those characters have special meanings in URLs. */ + because those characters have special meanings in URLs. + + Additionally we always quote ' ' as "%20" since not quoting it + is illegal in CSS url()s and quoting it should not harm any + local browsing. */ static char * local_quote_string (const char *file, bool no_html_quote) @@ -741,7 +745,7 @@ local_quote_string (const char *file, bool no_html_quote) char buf[1024]; size_t tolen; - char *any = strpbrk (file, "?#%;"); + char *any = strpbrk (file, "?#%; "); if (!any) return no_html_quote ? strdup (file) : html_quote_string (file); @@ -771,6 +775,11 @@ local_quote_string (const char *file, bool no_html_quote) *to++ = '3'; *to++ = 'B'; break; + case ' ': + *to++ = '%'; + *to++ = '2'; + *to++ = '0'; + break; case '?': if (opt.adjust_extension) { diff --git a/src/convert.h b/src/convert.h index 6697aa7..47f8e95 100644 --- a/src/convert.h +++ b/src/convert.h @@ -1,5 +1,5 @@ /* Declarations for convert.c - Copyright (C) 2003-2006, 2009-2011, 2015, 2018-2023 Free Software + Copyright (C) 2003-2006, 2009-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/cookies.c b/src/cookies.c index 48ca9ee..f551ac8 100644 --- a/src/cookies.c +++ b/src/cookies.c @@ -1,5 +1,5 @@ /* Support for cookies. - Copyright (C) 2001-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2001-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/cookies.h b/src/cookies.h index e5d50cd..ce8fea3 100644 --- a/src/cookies.h +++ b/src/cookies.h @@ -1,5 +1,5 @@ /* Support for cookies. - Copyright (C) 2001-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2001-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/css-tokens.h b/src/css-tokens.h index 5981dc5..56f3025 100644 --- a/src/css-tokens.h +++ b/src/css-tokens.h @@ -1,5 +1,5 @@ /* Declarations for css.lex - Copyright (C) 2006, 2009-2011, 2015, 2018-2023 Free Software + Copyright (C) 2006, 2009-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/css-url.c b/src/css-url.c index 20abfec..78fc0dd 100644 --- a/src/css-url.c +++ b/src/css-url.c @@ -1,5 +1,5 @@ /* Collect URLs from CSS source. - Copyright (C) 1998, 2000-2003, 2009-2011, 2014-2015, 2018-2023 Free + Copyright (C) 1998, 2000-2003, 2009-2011, 2014-2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/css-url.h b/src/css-url.h index 6cf4cc0..bfa4c31 100644 --- a/src/css-url.h +++ b/src/css-url.h @@ -1,5 +1,5 @@ /* Declarations for css-url.c. - Copyright (C) 2006, 2009-2011, 2015, 2018-2023 Free Software + Copyright (C) 2006, 2009-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -2402,7 +2402,7 @@ char *yytext; #line 13 "css.l" /* Lex source for CSS tokenizing. Taken from http://www.w3.org/TR/CSS21/grammar.html#q2 - Copyright (C) 2006, 2009-2011, 2015, 2018-2023 Free Software + Copyright (C) 2006, 2009-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -12,7 +12,7 @@ %{ /* Lex source for CSS tokenizing. Taken from http://www.w3.org/TR/CSS21/grammar.html#q2 - Copyright (C) 2006, 2009-2011, 2015, 2018-2023 Free Software + Copyright (C) 2006, 2009-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -2403,7 +2403,7 @@ char *yytext; #line 13 "css.l" /* Lex source for CSS tokenizing. Taken from http://www.w3.org/TR/CSS21/grammar.html#q2 - Copyright (C) 2006, 2009-2011, 2015, 2018-2023 Free Software + Copyright (C) 2006, 2009-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/exits.c b/src/exits.c index 5c380a3..4e71825 100644 --- a/src/exits.c +++ b/src/exits.c @@ -1,5 +1,5 @@ /* Exit status handling. - Copyright (C) 2009-2012, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2009-2012, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/exits.h b/src/exits.h index 627a8df..fa5145c 100644 --- a/src/exits.h +++ b/src/exits.h @@ -1,5 +1,5 @@ /* Exit status related declarations. - Copyright (C) 2009-2012, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2009-2012, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/ftp-basic.c b/src/ftp-basic.c index d999027..8f7d19c 100644 --- a/src/ftp-basic.c +++ b/src/ftp-basic.c @@ -1,5 +1,5 @@ /* Basic FTP routines. - Copyright (C) 1996-2011, 2014-2015, 2018-2023 Free Software + Copyright (C) 1996-2011, 2014-2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/ftp-ls.c b/src/ftp-ls.c index 86f5bbd..7a18584 100644 --- a/src/ftp-ls.c +++ b/src/ftp-ls.c @@ -1,5 +1,5 @@ /* Parsing FTP `ls' output. - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/ftp-opie.c b/src/ftp-opie.c index d04876e..47ad0dd 100644 --- a/src/ftp-opie.c +++ b/src/ftp-opie.c @@ -1,5 +1,5 @@ /* Opie (s/key) support for FTP. - Copyright (C) 1998-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1998-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* File Transfer Protocol support. - Copyright (C) 1996-2011, 2014-2015, 2018-2023 Free Software + Copyright (C) 1996-2011, 2014-2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Declarations for FTP support. - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/gnutls.c b/src/gnutls.c index 689c9e4..cfcdf67 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -1,5 +1,5 @@ /* SSL support via GnuTLS library. - Copyright (C) 2005-2012, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2005-2012, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Hash tables. - Copyright (C) 2000-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2000-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Hash table declarations. - Copyright (C) 2000, 2007-2011, 2015, 2018-2023 Free Software + Copyright (C) 2000, 2007-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Host name resolution and matching. - Copyright (C) 1996-2012, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2012, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Declarations for host.c - Copyright (C) 1996-2012, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2012, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* HTTP Strict Transport Security (HSTS) support. - Copyright (C) 1996-2012, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2012, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -120,7 +120,6 @@ hsts_find_entry (hsts_store_t store, struct hsts_kh *k = NULL; struct hsts_kh_info *khi = NULL; enum hsts_kh_match match = NO_MATCH; - char *pos = NULL; char *org_ptr = NULL; k = (struct hsts_kh *) xnew (struct hsts_kh); @@ -137,14 +136,15 @@ hsts_find_entry (hsts_store_t store, goto end; } - while (match == NO_MATCH && - (pos = strchr (k->host, '.')) && pos - k->host > 0 && - strchr (pos + 1, '.')) + for (char *p = k->host; (p = strchr(p, '.')); ) { - k->host += (pos - k->host + 1); + k->host = ++p; khi = (struct hsts_kh_info *) hash_table_get (store->table, k); - if (khi) - match = SUPERDOMAIN_MATCH; + if (khi && khi->include_subdomains) + { + match = SUPERDOMAIN_MATCH; + break; + } } end: @@ -735,7 +735,7 @@ test_hsts_new_entry (void) mu_assert("Should've been no match", match == NO_MATCH); khi = hsts_find_entry (s, ".www.foo.com", MAKE_EXPLICIT_PORT (SCHEME_HTTPS, 443), &match, NULL); - mu_assert("Should've been no match", match == NO_MATCH); + mu_assert("Should've been no match", match == SUPERDOMAIN_MATCH); hsts_store_close (s); close_hsts_test_store (s); @@ -752,11 +752,15 @@ test_hsts_url_rewrite_superdomain (void) s = open_hsts_test_store (); mu_assert("Could not open the HSTS store", s != NULL); - created = hsts_store_entry (s, SCHEME_HTTPS, "www.foo.com", 443, 1234, true); + created = hsts_store_entry (s, SCHEME_HTTPS, "example.com", 443, 1234, true); + mu_assert("A new entry should've been created", created == true); + + created = hsts_store_entry (s, SCHEME_HTTPS, "rep.example.com", 443, 1234, false); mu_assert("A new entry should've been created", created == true); - TEST_URL_RW (s, "www.foo.com", 80); - TEST_URL_RW (s, "bar.www.foo.com", 80); + TEST_URL_RW (s, "example.com", 80); + TEST_URL_RW (s, "rep.example.com", 80); + TEST_URL_RW (s, "rep.rep.example.com", 80); hsts_store_close (s); close_hsts_test_store (s); @@ -1,5 +1,5 @@ /* Declarations for hsts.c - Copyright (C) 1996-2012, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2012, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/html-parse.c b/src/html-parse.c index 91a8c2b..d724384 100644 --- a/src/html-parse.c +++ b/src/html-parse.c @@ -1,5 +1,5 @@ /* HTML parser for Wget. - Copyright (C) 1998-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1998-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/html-parse.h b/src/html-parse.h index a7ad8c2..5450183 100644 --- a/src/html-parse.h +++ b/src/html-parse.h @@ -1,5 +1,5 @@ /* Declarations for html-parse.c. - Copyright (C) 1998-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1998-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/html-url.c b/src/html-url.c index 896d6fc..a4ba115 100644 --- a/src/html-url.c +++ b/src/html-url.c @@ -1,5 +1,5 @@ /* Collect URLs from HTML source. - Copyright (C) 1998-2012, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1998-2012, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -105,7 +105,7 @@ static struct known_tag { { TAG_FORM, "form", tag_handle_form }, { TAG_FRAME, "frame", tag_find_urls }, { TAG_IFRAME, "iframe", tag_find_urls }, - { TAG_IMG, "img", tag_handle_img }, + { TAG_IMG, "img", tag_handle_img }, // tag_find_urls() plus handling "srcset" { TAG_INPUT, "input", tag_find_urls }, { TAG_LAYER, "layer", tag_find_urls }, { TAG_LINK, "link", tag_handle_link }, @@ -118,7 +118,7 @@ static struct known_tag { { TAG_TH, "th", tag_find_urls }, { TAG_VIDEO, "video", tag_find_urls }, { TAG_AUDIO, "audio", tag_find_urls }, - { TAG_SOURCE, "source", tag_find_urls } + { TAG_SOURCE, "source", tag_handle_img } // tag_find_urls() plus handling "srcset" }; /* tag_url_attributes documents which attributes of which tags contain @@ -170,7 +170,7 @@ static struct { { TAG_VIDEO, "poster", ATTR_INLINE }, { TAG_AUDIO, "src", ATTR_INLINE }, { TAG_AUDIO, "poster", ATTR_INLINE }, - { TAG_SOURCE, "src", ATTR_INLINE } + { TAG_SOURCE, "src", ATTR_INLINE }, }; /* The lists of interesting tags and attributes are built dynamically, diff --git a/src/html-url.h b/src/html-url.h index 21f53ac..d415816 100644 --- a/src/html-url.h +++ b/src/html-url.h @@ -1,5 +1,5 @@ /* Declarations for html-url.c. - Copyright (C) 1995-1997, 2009-2011, 2015, 2018-2023 Free Software + Copyright (C) 1995-1997, 2009-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/http-ntlm.c b/src/http-ntlm.c index 072a01d..ee054e0 100644 --- a/src/http-ntlm.c +++ b/src/http-ntlm.c @@ -1,5 +1,5 @@ /* NTLM code. - Copyright (C) 2005-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2005-2011, 2015, 2018-2024 Free Software Foundation, Inc. Contributed by Daniel Stenberg. diff --git a/src/http-ntlm.h b/src/http-ntlm.h index cff1fd0..58e67fc 100644 --- a/src/http-ntlm.h +++ b/src/http-ntlm.h @@ -1,7 +1,7 @@ #ifndef __HTTP_NTLM_H #define __HTTP_NTLM_H /* Declarations for http_ntlm.c - Copyright (C) 1995-1997, 2000, 2007-2011, 2015, 2018-2023 Free + Copyright (C) 1995-1997, 2000, 2007-2011, 2015, 2018-2024 Free Software Foundation, Inc. Contributed by Daniel Stenberg. @@ -1,5 +1,5 @@ /* HTTP support. - Copyright (C) 1996-2012, 2014-2015, 2018-2023 Free Software + Copyright (C) 1996-2012, 2014-2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -4164,7 +4164,11 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs, err = open_output_stream (hs, count, &fp); if (err != RETROK) { + /* Make sure that errno doesn't get clobbered. + * This is the case for OpenSSL's SSL_shutdown(). */ + int tmp_errno = errno; CLOSE_INVALIDATE (sock); + errno = tmp_errno; retval = err; goto cleanup; } @@ -1,5 +1,5 @@ /* Declarations for HTTP. - Copyright (C) 2005-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2005-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Reading/parsing the initialization file. - Copyright (C) 1996-2012, 2014-2015, 2018-2023 Free Software + Copyright (C) 1996-2012, 2014-2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Declarations for init.c. - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* IRI related functions. - Copyright (C) 2008-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2008-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Internationalization related declarations. - Copyright (C) 2008-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2008-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Messages logging. - Copyright (C) 1998-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1998-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Declarations for log.c. - Copyright (C) 1998-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1998-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Command line parsing. - Copyright (C) 1996-2015, 2018-2023 Free Software Foundation, Inc. + Copyright (C) 1996-2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/metalink.c b/src/metalink.c index eca839c..de2439c 100644 --- a/src/metalink.c +++ b/src/metalink.c @@ -1,5 +1,5 @@ /* Metalink module. - Copyright (C) 2015, 2018-2023 Free Software Foundation, Inc. + Copyright (C) 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/metalink.h b/src/metalink.h index 956f972..bd8b99c 100644 --- a/src/metalink.h +++ b/src/metalink.h @@ -1,5 +1,5 @@ /* Declarations for metalink.c. - Copyright (C) 2015, 2018-2023 Free Software Foundation, Inc. + Copyright (C) 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/mswindows.c b/src/mswindows.c index b24ff3a..5b36856 100644 --- a/src/mswindows.c +++ b/src/mswindows.c @@ -1,5 +1,5 @@ /* mswindows.c -- Windows-specific support - Copyright (C) 1996-2011, 2014-2015, 2018-2023 Free Software + Copyright (C) 1996-2011, 2014-2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/mswindows.h b/src/mswindows.h index 1a0f350..3409e68 100644 --- a/src/mswindows.h +++ b/src/mswindows.h @@ -1,5 +1,5 @@ /* Declarations for windows - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/netrc.c b/src/netrc.c index 25a8393..285f595 100644 --- a/src/netrc.c +++ b/src/netrc.c @@ -1,5 +1,5 @@ /* Read and parse the .netrc file to get hosts, accounts, and passwords. - Copyright (C) 1996, 2007-2011, 2015, 2018-2023 Free Software + Copyright (C) 1996, 2007-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -388,7 +388,8 @@ parse_netrc_fp (const char *path, FILE *fp) else if (!strcmp (tok, "default")) maybe_add_to_list (¤t, &retval); - else if (!strcmp (tok, "login")) + /* fetchmail compatibility, "user" is an alias for "login" */ + else if (!strcmp (tok, "login") || !strcmp (tok, "user")) last_token = tok_login; else if (!strcmp (tok, "macdef")) @@ -397,7 +398,8 @@ parse_netrc_fp (const char *path, FILE *fp) else if (!strcmp (tok, "machine")) last_token = tok_machine; - else if (!strcmp (tok, "password")) + /* fetchmail compatibility, "passwd" is an alias for "password" */ + else if (!strcmp (tok, "password") || !strcmp (tok, "passwd")) last_token = tok_password; /* GNU extensions 'port' and 'force', not operational diff --git a/src/netrc.h b/src/netrc.h index e5e6e67..b7fc1b3 100644 --- a/src/netrc.h +++ b/src/netrc.h @@ -1,5 +1,5 @@ /* Declarations for netrc.c - Copyright (C) 1996, 1996-1997, 2007-2011, 2015, 2018-2023 Free + Copyright (C) 1996, 1996-1997, 2007-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/openssl.c b/src/openssl.c index b3f8baf..a970875 100644 --- a/src/openssl.c +++ b/src/openssl.c @@ -1,5 +1,5 @@ /* SSL support via OpenSSL library. - Copyright (C) 2000-2012, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2000-2012, 2015, 2018-2024 Free Software Foundation, Inc. Originally contributed by Christian Fraenkel. diff --git a/src/options.h b/src/options.h index f9c38cd..78fbceb 100644 --- a/src/options.h +++ b/src/options.h @@ -1,5 +1,5 @@ /* struct options. - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/progress.c b/src/progress.c index 4784c59..4ea30f4 100644 --- a/src/progress.c +++ b/src/progress.c @@ -1,5 +1,5 @@ /* Download progress. - Copyright (C) 2001-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2001-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/progress.h b/src/progress.h index b2df28a..5b69cd5 100644 --- a/src/progress.h +++ b/src/progress.h @@ -1,5 +1,5 @@ /* Download progress. - Copyright (C) 2001-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2001-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/ptimer.c b/src/ptimer.c index 6f70cc0..0e68881 100644 --- a/src/ptimer.c +++ b/src/ptimer.c @@ -1,5 +1,5 @@ /* Portable timers. - Copyright (C) 2005-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2005-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/ptimer.h b/src/ptimer.h index 9c2eb84..288bd0c 100644 --- a/src/ptimer.h +++ b/src/ptimer.h @@ -1,5 +1,5 @@ /* Declarations for ptimer.c. - Copyright (C) 2005-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2005-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/recur.c b/src/recur.c index c546dab..ba35f56 100644 --- a/src/recur.c +++ b/src/recur.c @@ -1,5 +1,5 @@ /* Handling of recursive HTTP retrieving. - Copyright (C) 1996-2012, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2012, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/recur.h b/src/recur.h index fc040c1..e5a3a84 100644 --- a/src/recur.h +++ b/src/recur.h @@ -1,5 +1,5 @@ /* Declarations for recur.c. - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Support for Robot Exclusion Standard (RES). - Copyright (C) 2001, 2006-2011, 2015, 2018-2023 Free Software + Copyright (C) 2001, 2006-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of Wget. @@ -1,5 +1,5 @@ /* Declarations for res.c. - Copyright (C) 2001, 2007-2011, 2015, 2018-2023 Free Software + Copyright (C) 2001, 2007-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of Wget. @@ -1,5 +1,5 @@ /* File retrieval. - Copyright (C) 1996-2011, 2014-2015, 2018-2023 Free Software + Copyright (C) 1996-2011, 2014-2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -44,6 +44,10 @@ as that of the covered work. */ # include <zlib.h> #endif +#ifdef HAVE_LIBPROXY +# include "proxy.h" +#endif + #include "exits.h" #include "utils.h" #include "retr.h" @@ -776,8 +780,8 @@ const char * retr_rate (wgint bytes, double secs) { static char res[20]; - static const char *rate_names[] = {"B/s", "KB/s", "MB/s", "GB/s" }; - static const char *rate_names_bits[] = {"b/s", "Kb/s", "Mb/s", "Gb/s" }; + static const char *rate_names[] = {"B/s", "KB/s", "MB/s", "GB/s", "TB/s" }; + static const char *rate_names_bits[] = {"b/s", "Kb/s", "Mb/s", "Gb/s", "Tb/s" }; int units; double dlrate = calc_rate (bytes, secs, &units); @@ -1489,7 +1493,39 @@ getproxy (struct url *u) break; } if (!proxy || !*proxy) +#ifdef HAVE_LIBPROXY + { + pxProxyFactory *pf = px_proxy_factory_new (); + if (!pf) + { + debug_logprintf ("Allocating memory for libproxy failed"); + return NULL; + } + + debug_logprintf ("asking libproxy about url '%s'\n", u->url); + char **proxies = px_proxy_factory_get_proxies (pf, u->url); + if (proxies) + { + if (proxies[0]) + { + debug_logprintf ("libproxy suggest to use '%s'\n", proxies[0]); + if (strcmp (proxies[0], "direct://") != 0) + { + proxy = xstrdup (proxies[0]); + debug_logprintf ("libproxy setting to use '%s'\n", proxy); + } + } + + px_proxy_factory_free_proxies (proxies); + } + px_proxy_factory_free (pf); + + if (!proxy || !*proxy) + return NULL; + } +#else return NULL; +#endif /* Handle shorthands. `rewritten_storage' is a kludge to allow getproxy() to return static storage. */ @@ -1555,3 +1591,33 @@ input_file_url (const char *input_file) else return false; } + +#ifdef TESTING + +#include <stdint.h> +#include "../tests/unit-tests.h" + +const char * +test_retr_rate(void) +{ + static const struct test { + wgint bytes; + double secs; + const char *expected; + } tests[] = { + { 0, 1, "0.00 B/s" }, + { INT64_MAX, 1, "100 TB/s" }, + }; + + for (struct test *t = tests; t < tests+countof(tests); t++) + { + const char *result = retr_rate (t->bytes, t->secs); + + if (strcmp(result,t->expected)) + return aprintf("%s: Expected '%s', got '%s'", __func__, t->expected, result); + } + + return NULL; +} + +#endif /* TESTING */ @@ -1,5 +1,5 @@ /* Declarations for retr.c. - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/spider.c b/src/spider.c index 726a7b3..95709d1 100644 --- a/src/spider.c +++ b/src/spider.c @@ -1,5 +1,5 @@ /* Keep track of visited URLs in spider mode. - Copyright (C) 2006-2011, 2015, 2019-2023 Free Software Foundation, + Copyright (C) 2006-2011, 2015, 2019-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/spider.h b/src/spider.h index 5001a8e..4626ccd 100644 --- a/src/spider.h +++ b/src/spider.h @@ -1,5 +1,5 @@ /* Declarations for spider.c - Copyright (C) 2006-2011, 2015, 2019-2023 Free Software Foundation, + Copyright (C) 2006-2011, 2015, 2019-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* SSL support. - Copyright (C) 2000-2012, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2000-2012, 2015, 2018-2024 Free Software Foundation, Inc. Originally contributed by Christian Fraenkel. diff --git a/src/sysdep.h b/src/sysdep.h index db6c364..fe59f7f 100644 --- a/src/sysdep.h +++ b/src/sysdep.h @@ -1,5 +1,5 @@ /* Dirty system-dependent hacks. - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* URL handling. - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -2525,6 +2525,33 @@ test_are_urls_equal(void) return NULL; } +const char * +test_uri_merge(void) +{ + static const struct test_data { + const char *url; + const char *link; + const char *expected; + } test_data[] = { + { "http://www.yoyodyne.com/path/", "somepage.html", "http://www.yoyodyne.com/path/somepage.html" }, + { "http://example.com/path/", "//other.com/somepage.html", "http://other.com/somepage.html" }, + { "https://example.com/path/", "//other.com/somepage.html", "https://other.com/somepage.html" }, + }; + + for (unsigned i = 0; i < countof(test_data); ++i) + { + const struct test_data *t = &test_data[i]; + char *result = uri_merge (t->url, t->link); + bool ok = strcmp (result, t->expected) == 0; + if (!ok) + return aprintf ("test_uri_merge [%u]: expected '%s', got '%s'", i, t->expected, result); + + xfree (result); + } + + return NULL; +} + #endif /* TESTING */ /* @@ -1,5 +1,5 @@ /* Declarations for url.c. - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/utils.c b/src/utils.c index 794d3a5..9caaf72 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,5 +1,5 @@ /* Various utility functions. - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/utils.h b/src/utils.h index 42e4c18..842782d 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,5 +1,5 @@ /* Declarations for utils.c. - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/version.h b/src/version.h index 2011f32..5a84474 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,5 @@ /* Extern declarations for printing version information - Copyright (C) 2013, 2015, 2018-2023 Free Software Foundation, Inc. + Copyright (C) 2013, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Utility functions for writing WARC files. - Copyright (C) 2011-2012, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2011-2012, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1,5 +1,5 @@ /* Miscellaneous declarations. - Copyright (C) 1996-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 1996-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/xattr.c b/src/xattr.c index b3bfea3..0a7ff82 100644 --- a/src/xattr.c +++ b/src/xattr.c @@ -1,6 +1,6 @@ /* xattr.h -- POSIX Extended Attribute support. - Copyright (C) 2016, 2018-2023 Free Software Foundation, Inc. + Copyright (C) 2016, 2018-2024 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/xattr.h b/src/xattr.h index 1f7eb9c..0ed873d 100644 --- a/src/xattr.h +++ b/src/xattr.h @@ -1,6 +1,6 @@ /* xattr.h -- POSIX Extended Attribute function mappings. - Copyright (C) 2016, 2018-2023 Free Software Foundation, Inc. + Copyright (C) 2016, 2018-2024 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/testenv/Makefile.am b/testenv/Makefile.am index b34dcf3..a592e90 100644 --- a/testenv/Makefile.am +++ b/testenv/Makefile.am @@ -1,5 +1,5 @@ # Makefile for `wget' utility -# Copyright (C) 2013, 2015, 2018-2023 Free Software Foundation, Inc. +# Copyright (C) 2013, 2015, 2018-2024 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,6 +44,7 @@ DEFAULT_TESTS = \ Test-condget.py \ Test-Content-disposition-2.py \ Test-Content-disposition.py \ + test_css_url.py \ Test--convert-links--content-on-error.py \ Test-cookie-401.py \ Test-cookie-domain-mismatch.py \ @@ -51,8 +52,10 @@ DEFAULT_TESTS = \ Test-cookie.py \ Test-Head.py \ Test-hsts.py \ + Test-https-k.py \ Test--https.py \ Test--https-crl.py \ + Test-k.py \ Test-missing-scheme-retval.py \ Test-O.py \ Test-pinnedpubkey-der-https.py \ diff --git a/testenv/Makefile.in b/testenv/Makefile.in index 8fcaf3f..2e6c8e2 100644 --- a/testenv/Makefile.in +++ b/testenv/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for `wget' utility -# Copyright (C) 2013, 2015, 2018-2023 Free Software Foundation, Inc. +# Copyright (C) 2013, 2015, 2018-2024 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -125,7 +125,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 \ $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/base32.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 \ $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/clock_time.m4 \ @@ -173,7 +174,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \ $(top_srcdir)/m4/isblank.m4 $(top_srcdir)/m4/iswblank.m4 \ - $(top_srcdir)/m4/iswdigit.m4 $(top_srcdir)/m4/iswxdigit.m4 \ + $(top_srcdir)/m4/iswctype.m4 $(top_srcdir)/m4/iswdigit.m4 \ + $(top_srcdir)/m4/iswpunct.m4 $(top_srcdir)/m4/iswxdigit.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 \ @@ -187,15 +189,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbrtoc32.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ + $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -253,18 +256,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timegm.m4 $(top_srcdir)/m4/timespec.m4 \ $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tmpdir.m4 \ - $(top_srcdir)/m4/ungetc.m4 $(top_srcdir)/m4/unicase_h.m4 \ - $(top_srcdir)/m4/unictype_h.m4 $(top_srcdir)/m4/uninorm_h.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utime_h.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/uchar_h.m4 $(top_srcdir)/m4/ungetc.m4 \ + $(top_srcdir)/m4/unicase_h.m4 $(top_srcdir)/m4/unictype_h.m4 \ + $(top_srcdir)/m4/uninorm_h.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ + $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wctype_h.m4 \ $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ $(top_srcdir)/m4/wget_manywarnings.m4 \ $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/wmemchr.m4 \ @@ -541,6 +545,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ +CXX_HAS_CHAR8_TYPE = @CXX_HAS_CHAR8_TYPE@ +CXX_HAS_UCHAR_TYPES = @CXX_HAS_UCHAR_TYPES@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -556,7 +562,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ @@ -578,7 +583,33 @@ GL_GNULIB_ALIGNED_ALLOC = @GL_GNULIB_ALIGNED_ALLOC@ GL_GNULIB_ALPHASORT = @GL_GNULIB_ALPHASORT@ GL_GNULIB_ATOLL = @GL_GNULIB_ATOLL@ GL_GNULIB_BIND = @GL_GNULIB_BIND@ +GL_GNULIB_BTOC32 = @GL_GNULIB_BTOC32@ GL_GNULIB_BTOWC = @GL_GNULIB_BTOWC@ +GL_GNULIB_C32ISALNUM = @GL_GNULIB_C32ISALNUM@ +GL_GNULIB_C32ISALPHA = @GL_GNULIB_C32ISALPHA@ +GL_GNULIB_C32ISBLANK = @GL_GNULIB_C32ISBLANK@ +GL_GNULIB_C32ISCNTRL = @GL_GNULIB_C32ISCNTRL@ +GL_GNULIB_C32ISDIGIT = @GL_GNULIB_C32ISDIGIT@ +GL_GNULIB_C32ISGRAPH = @GL_GNULIB_C32ISGRAPH@ +GL_GNULIB_C32ISLOWER = @GL_GNULIB_C32ISLOWER@ +GL_GNULIB_C32ISPRINT = @GL_GNULIB_C32ISPRINT@ +GL_GNULIB_C32ISPUNCT = @GL_GNULIB_C32ISPUNCT@ +GL_GNULIB_C32ISSPACE = @GL_GNULIB_C32ISSPACE@ +GL_GNULIB_C32ISUPPER = @GL_GNULIB_C32ISUPPER@ +GL_GNULIB_C32ISXDIGIT = @GL_GNULIB_C32ISXDIGIT@ +GL_GNULIB_C32RTOMB = @GL_GNULIB_C32RTOMB@ +GL_GNULIB_C32SNRTOMBS = @GL_GNULIB_C32SNRTOMBS@ +GL_GNULIB_C32SRTOMBS = @GL_GNULIB_C32SRTOMBS@ +GL_GNULIB_C32STOMBS = @GL_GNULIB_C32STOMBS@ +GL_GNULIB_C32SWIDTH = @GL_GNULIB_C32SWIDTH@ +GL_GNULIB_C32TOB = @GL_GNULIB_C32TOB@ +GL_GNULIB_C32TOLOWER = @GL_GNULIB_C32TOLOWER@ +GL_GNULIB_C32TOUPPER = @GL_GNULIB_C32TOUPPER@ +GL_GNULIB_C32WIDTH = @GL_GNULIB_C32WIDTH@ +GL_GNULIB_C32_APPLY_MAPPING = @GL_GNULIB_C32_APPLY_MAPPING@ +GL_GNULIB_C32_APPLY_TYPE_TEST = @GL_GNULIB_C32_APPLY_TYPE_TEST@ +GL_GNULIB_C32_GET_MAPPING = @GL_GNULIB_C32_GET_MAPPING@ +GL_GNULIB_C32_GET_TYPE_TEST = @GL_GNULIB_C32_GET_TYPE_TEST@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ @@ -685,6 +716,7 @@ GL_GNULIB_ISBLANK = @GL_GNULIB_ISBLANK@ GL_GNULIB_ISWBLANK = @GL_GNULIB_ISWBLANK@ GL_GNULIB_ISWCTYPE = @GL_GNULIB_ISWCTYPE@ GL_GNULIB_ISWDIGIT = @GL_GNULIB_ISWDIGIT@ +GL_GNULIB_ISWPUNCT = @GL_GNULIB_ISWPUNCT@ GL_GNULIB_ISWXDIGIT = @GL_GNULIB_ISWXDIGIT@ GL_GNULIB_LCHMOD = @GL_GNULIB_LCHMOD@ GL_GNULIB_LCHOWN = @GL_GNULIB_LCHOWN@ @@ -692,13 +724,15 @@ GL_GNULIB_LINK = @GL_GNULIB_LINK@ GL_GNULIB_LINKAT = @GL_GNULIB_LINKAT@ GL_GNULIB_LISTEN = @GL_GNULIB_LISTEN@ GL_GNULIB_LOCALECONV = @GL_GNULIB_LOCALECONV@ -GL_GNULIB_LOCALENAME = @GL_GNULIB_LOCALENAME@ +GL_GNULIB_LOCALENAME_UNSAFE = @GL_GNULIB_LOCALENAME_UNSAFE@ GL_GNULIB_LOCALTIME = @GL_GNULIB_LOCALTIME@ GL_GNULIB_LSEEK = @GL_GNULIB_LSEEK@ GL_GNULIB_LSTAT = @GL_GNULIB_LSTAT@ GL_GNULIB_MALLOC_GNU = @GL_GNULIB_MALLOC_GNU@ GL_GNULIB_MALLOC_POSIX = @GL_GNULIB_MALLOC_POSIX@ GL_GNULIB_MBRLEN = @GL_GNULIB_MBRLEN@ +GL_GNULIB_MBRTOC16 = @GL_GNULIB_MBRTOC16@ +GL_GNULIB_MBRTOC32 = @GL_GNULIB_MBRTOC32@ GL_GNULIB_MBRTOWC = @GL_GNULIB_MBRTOWC@ GL_GNULIB_MBSCASECMP = @GL_GNULIB_MBSCASECMP@ GL_GNULIB_MBSCASESTR = @GL_GNULIB_MBSCASESTR@ @@ -708,16 +742,20 @@ GL_GNULIB_MBSINIT = @GL_GNULIB_MBSINIT@ GL_GNULIB_MBSLEN = @GL_GNULIB_MBSLEN@ GL_GNULIB_MBSNCASECMP = @GL_GNULIB_MBSNCASECMP@ GL_GNULIB_MBSNLEN = @GL_GNULIB_MBSNLEN@ +GL_GNULIB_MBSNRTOC32S = @GL_GNULIB_MBSNRTOC32S@ GL_GNULIB_MBSNRTOWCS = @GL_GNULIB_MBSNRTOWCS@ GL_GNULIB_MBSPBRK = @GL_GNULIB_MBSPBRK@ GL_GNULIB_MBSPCASECMP = @GL_GNULIB_MBSPCASECMP@ GL_GNULIB_MBSRCHR = @GL_GNULIB_MBSRCHR@ +GL_GNULIB_MBSRTOC32S = @GL_GNULIB_MBSRTOC32S@ GL_GNULIB_MBSRTOWCS = @GL_GNULIB_MBSRTOWCS@ GL_GNULIB_MBSSEP = @GL_GNULIB_MBSSEP@ GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@ GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@ +GL_GNULIB_MBSTOC32S = @GL_GNULIB_MBSTOC32S@ GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@ GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@ +GL_GNULIB_MBSZERO = @GL_GNULIB_MBSZERO@ GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@ GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@ GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@ @@ -831,6 +869,7 @@ GL_GNULIB_PUTS = @GL_GNULIB_PUTS@ GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@ GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@ GL_GNULIB_RAISE = @GL_GNULIB_RAISE@ +GL_GNULIB_RAND = @GL_GNULIB_RAND@ GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@ GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@ GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@ @@ -893,6 +932,7 @@ GL_GNULIB_STRSEP = @GL_GNULIB_STRSEP@ GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@ GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@ GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@ +GL_GNULIB_STRTOF = @GL_GNULIB_STRTOF@ GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@ GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@ GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@ @@ -1006,6 +1046,9 @@ GL_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_H GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@ @@ -1031,6 +1074,7 @@ GL_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYP GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@ @@ -1106,6 +1150,7 @@ GL_GNULIB_WCTOMB = @GL_GNULIB_WCTOMB@ GL_GNULIB_WCTRANS = @GL_GNULIB_WCTRANS@ GL_GNULIB_WCTYPE = @GL_GNULIB_WCTYPE@ GL_GNULIB_WCWIDTH = @GL_GNULIB_WCWIDTH@ +GL_GNULIB_WGETCWD = @GL_GNULIB_WGETCWD@ GL_GNULIB_WMEMCHR = @GL_GNULIB_WMEMCHR@ GL_GNULIB_WMEMCMP = @GL_GNULIB_WMEMCMP@ GL_GNULIB_WMEMCPY = @GL_GNULIB_WMEMCPY@ @@ -1116,8 +1161,10 @@ GL_GNULIB_WRITE = @GL_GNULIB_WRITE@ GL_GNULIB__EXIT = @GL_GNULIB__EXIT@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIBHEADERS_OVERRIDE_CHAR16_T = @GNULIBHEADERS_OVERRIDE_CHAR16_T@ +GNULIBHEADERS_OVERRIDE_CHAR32_T = @GNULIBHEADERS_OVERRIDE_CHAR32_T@ +GNULIBHEADERS_OVERRIDE_CHAR8_T = @GNULIBHEADERS_OVERRIDE_CHAR8_T@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ @@ -1134,6 +1181,7 @@ HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C32RTOMB = @HAVE_C32RTOMB@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ @@ -1267,6 +1315,8 @@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOC16 = @HAVE_MBRTOC16@ +HAVE_MBRTOC32 = @HAVE_MBRTOC32@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ HAVE_MBSINIT = @HAVE_MBSINIT@ HAVE_MBSLEN = @HAVE_MBSLEN@ @@ -1357,6 +1407,7 @@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOF = @HAVE_STRTOF@ HAVE_STRTOL = @HAVE_STRTOL@ HAVE_STRTOLD = @HAVE_STRTOLD@ HAVE_STRTOLL = @HAVE_STRTOLL@ @@ -1390,6 +1441,7 @@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_UCHAR_H = @HAVE_UCHAR_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ @@ -1442,6 +1494,7 @@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ +HAVE_WORKING_MBRTOC32 = @HAVE_WORKING_MBRTOC32@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__EXIT = @HAVE__EXIT@ @@ -1461,6 +1514,10 @@ INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LCOV = @LCOV@ +LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@ +LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@ +LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@ +LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -1476,6 +1533,8 @@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPROXY_CFLAGS = @LIBPROXY_CFLAGS@ +LIBPROXY_LIBS = @LIBPROXY_LIBS@ LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ LIBPSL_LIBS = @LIBPSL_LIBS@ LIBPTHREAD = @LIBPTHREAD@ @@ -1572,6 +1631,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ +NEXT_AS_FIRST_DIRECTIVE_UCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_UCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ @@ -1611,6 +1671,7 @@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ +NEXT_UCHAR_H = @NEXT_UCHAR_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ @@ -1652,6 +1713,7 @@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ +REPLACE_C32RTOMB = @REPLACE_C32RTOMB@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ @@ -1678,6 +1740,7 @@ REPLACE_EXECVE = @REPLACE_EXECVE@ REPLACE_EXECVP = @REPLACE_EXECVP@ REPLACE_EXECVPE = @REPLACE_EXECVPE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ @@ -1735,6 +1798,7 @@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWPUNCT = @REPLACE_ISWPUNCT@ REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_ITOLD = @REPLACE_ITOLD@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ @@ -1748,6 +1812,8 @@ REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MALLOC_FOR_MALLOC_GNU = @REPLACE_MALLOC_FOR_MALLOC_GNU@ REPLACE_MALLOC_FOR_MALLOC_POSIX = @REPLACE_MALLOC_FOR_MALLOC_POSIX@ REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOC16 = @REPLACE_MBRTOC16@ +REPLACE_MBRTOC32 = @REPLACE_MBRTOC32@ REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ @@ -1759,6 +1825,7 @@ REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ +REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ @@ -1797,6 +1864,7 @@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_QSORT_R = @REPLACE_QSORT_R@ REPLACE_RAISE = @REPLACE_RAISE@ +REPLACE_RAND = @REPLACE_RAND@ REPLACE_RANDOM = @REPLACE_RANDOM@ REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ REPLACE_READ = @REPLACE_READ@ @@ -1839,6 +1907,7 @@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ +REPLACE_STRTOF = @REPLACE_STRTOF@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_STRTOL = @REPLACE_STRTOL@ @@ -1849,11 +1918,13 @@ REPLACE_STRTOULL = @REPLACE_STRTOULL@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ +REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ +REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1882,6 +1953,8 @@ REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ +REPLACE_WCTRANS = @REPLACE_WCTRANS@ +REPLACE_WCTYPE = @REPLACE_WCTYPE@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WMEMCMP = @REPLACE_WMEMCMP@ REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ @@ -1896,6 +1969,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ +SMALL_WCHAR_T = @SMALL_WCHAR_T@ STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ @@ -1972,6 +2046,8 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -2012,6 +2088,7 @@ DEFAULT_TESTS = \ Test-condget.py \ Test-Content-disposition-2.py \ Test-Content-disposition.py \ + test_css_url.py \ Test--convert-links--content-on-error.py \ Test-cookie-401.py \ Test-cookie-domain-mismatch.py \ @@ -2019,8 +2096,10 @@ DEFAULT_TESTS = \ Test-cookie.py \ Test-Head.py \ Test-hsts.py \ + Test-https-k.py \ Test--https.py \ Test--https-crl.py \ + Test-k.py \ Test-missing-scheme-retval.py \ Test-O.py \ Test-pinnedpubkey-der-https.py \ diff --git a/testenv/Test-https-k.py b/testenv/Test-https-k.py new file mode 100755 index 0000000..69b5cd3 --- /dev/null +++ b/testenv/Test-https-k.py @@ -0,0 +1,98 @@ +#!/usr/bin/env python3 + +import os +import platform +from sys import exit + +from test.base_test import HTTPS, SKIP_TEST +from test.http_test import HTTPTest +from misc.wget_file import WgetFile + +""" +Test that Wget handles the --convert-links (-k) option correctly. + +Ensure that when downloading, Wget retains the protocol of the host URL +if the link wasn't followed and an absolute link is to be added to the +local file. +""" + +if os.getenv('SSL_TESTS') is None: + exit(SKIP_TEST) + +############################## File Definitions ############################## + +index = """ +<html> + <head> + <title>Index</title> + </head> + <body> + <a href="sub.html">Site</a> + <a href="missing.xhtml">Missing</a> + <a href="//localhost:{{port}}/missing2.html">Missing2</a> + </body> +</html> +""" + +converted = """ +<html> + <head> + <title>Index</title> + </head> + <body> + <a href="sub.html">Site</a> + <a href="https://localhost:{{port}}/missing.xhtml">Missing</a> + <a href="https://localhost:{{port}}/missing2.html">Missing2</a> + </body> +</html> +""" + +site = """ +<html> + <head> + <title>Site</title> + </head> + <body> + Subsite + </body> +</html> +""" + +IndexPage = WgetFile("index.html", index) +SubSite = WgetFile("sub.html", site) +LocalIndexPage = WgetFile("index.html", converted) + +print(platform.system()) +restrict = "unix" if platform.system() in ["Linux", "Darwin"] else "windows" + +WGET_OPTIONS = "-k -r -nH --reject-regex '.*\\.xhtml' --no-check-certificate" +WGET_URLS = [["index.html"]] + +Files = [[IndexPage, SubSite]] + +Servers = [HTTPS] + +ExpectedReturnCode = 8 +ExpectedDownloadedFiles = [LocalIndexPage, SubSite] + +########################### Pre and Post Test Hooks ########################## +pre_test = { + "ServerFiles": Files, +} +test_options = { + "WgetCommands": WGET_OPTIONS, + "Urls": WGET_URLS +} +post_test = { + "ExpectedFiles": ExpectedDownloadedFiles, + "ExpectedRetcode": ExpectedReturnCode +} + +err = HTTPTest( + pre_hook=pre_test, + test_params=test_options, + post_hook=post_test, + protocols=Servers, +).begin() + +exit(err) diff --git a/testenv/Test-k.py b/testenv/Test-k.py new file mode 100755 index 0000000..342887c --- /dev/null +++ b/testenv/Test-k.py @@ -0,0 +1,85 @@ +#!/usr/bin/env python3 + +import platform +from sys import exit +from test.http_test import HTTPTest + +from misc.wget_file import WgetFile + +""" +Test that Wget handles the --convert-links (-k) option correctly. + +Also tests that the --restrict-file-names option works as expected by using a +filename with restricted characters and ensuring that it uses the correct +characterset based on the current OS +""" + +############################## File Definitions ############################## +index = """ +<html> + <head> + <title>Index</title> + </head> + <body> + <a href="site;sub:.html">Site</a> + </body> +</html> +""" + +converted = """ +<html> + <head> + <title>Index</title> + </head> + <body> + <a href="./site%3Bsub:.html">Site</a> + </body> +</html> +""" + +site = """ +<html> + <head> + <title>Site</title> + </head> + <body> + Subsite + </body> +</html> +""" + +IndexPage = WgetFile("index.html", index) +SubSite = WgetFile("site;sub:.html", site) +LocalIndexPage = WgetFile("index.html", converted) + +print(platform.system()) +restrict = "unix" if platform.system() in ["Linux", "Darwin"] else "windows" + +WGET_OPTIONS = f"-k -r -nH --restrict-file-names={restrict}" +WGET_URLS = [["index.html"]] + +Files = [[IndexPage, SubSite]] + +ExpectedReturnCode = 0 +ExpectedDownloadedFiles = [LocalIndexPage, SubSite] + +########################### Pre and Post Test Hooks ########################## +pre_test = { + "ServerFiles": Files, +} +test_options = { + "WgetCommands": WGET_OPTIONS, + "Urls": WGET_URLS +} +post_test = { + "ExpectedFiles": ExpectedDownloadedFiles, + "ExpectedRetcode": ExpectedReturnCode +} + +err = HTTPTest( + pre_hook=pre_test, + test_params=test_options, + post_hook=post_test, +).begin() + +exit(err) diff --git a/testenv/Test-recursive-include.py b/testenv/Test-recursive-include.py index 1fe33cd..d21b305 100755 --- a/testenv/Test-recursive-include.py +++ b/testenv/Test-recursive-include.py @@ -1,56 +1,77 @@ #!/usr/bin/env python3 from sys import exit from test.http_test import HTTPTest -from test.base_test import HTTP, HTTPS +from test.base_test import HTTP from misc.wget_file import WgetFile """ Basic test of --recursive. """ -############# File Definitions ############################################### +# File Definitions ############################################### File1 = """<html><body> <a href=\"/a/File2.html\">text</a> <a href=\"/b/File3.html\">text</a> +<picture> + Hey, a source <source type=\"image/svg+xml\" lolli=\"xxx\" srcset=\"/a/logo.svg\"/>. + Hey, a srcset <img src=\"/a/picture.png\" srcset=\"/a/picture1.png, /a/picture2.png 150w,/a/picture3.png 100x\"/>. +</picture> </body></html>""" File2 = "With lemon or cream?" File3 = "Surely you're joking Mr. Feynman" +File4 = "logosvg" +File5 = "picturepng" +File6 = "picture1png" +File7 = "picture2png" +File8 = "picture3png" -File1_File = WgetFile ("a/File1.html", File1) -File2_File = WgetFile ("a/File2.html", File2) -File3_File = WgetFile ("b/File3.html", File3) +File1_File = WgetFile("a/File1.html", File1) +File2_File = WgetFile("a/File2.html", File2) +File3_File = WgetFile("b/File3.html", File3) +File4_File = WgetFile("a/logo.svg", File4) +File5_File = WgetFile("a/picture.png", File5) +File6_File = WgetFile("a/picture1.png", File6) +File7_File = WgetFile("a/picture2.png", File7) +File8_File = WgetFile("a/picture3.png", File8) WGET_OPTIONS = "--recursive --no-host-directories --include-directories=a" WGET_URLS = [["a/File1.html"]] Servers = [HTTP] -Files = [[File1_File, File2_File, File3_File]] +Files = [[File1_File, File2_File, File3_File, File4_File, File5_File, File6_File, File7_File, File8_File]] Existing_Files = [] ExpectedReturnCode = 0 -ExpectedDownloadedFiles = [File1_File, File2_File] -Request_List = [["GET /a/File1.html", - "GET /a/File2.html"]] +ExpectedDownloadedFiles = [File1_File, File2_File, File4_File, File5_File, File6_File, File7_File, File8_File] +Request_List = [[ + "GET /a/File1.html", + "GET /a/File2.html", + "GET /a/logo.svg", + "GET /a/picture.png", + "GET /a/picture1.png", + "GET /a/picture2.png", + "GET /a/picture3.png", +]] -################ Pre and Post Test Hooks ##################################### +# Pre and Post Test Hooks ##################################### pre_test = { - "ServerFiles" : Files, - "LocalFiles" : Existing_Files + "ServerFiles": Files, + "LocalFiles": Existing_Files } test_options = { - "WgetCommands" : WGET_OPTIONS, - "Urls" : WGET_URLS + "WgetCommands": WGET_OPTIONS, + "Urls": WGET_URLS } post_test = { - "ExpectedFiles" : ExpectedDownloadedFiles, - "ExpectedRetcode" : ExpectedReturnCode + "ExpectedFiles": ExpectedDownloadedFiles, + "ExpectedRetcode": ExpectedReturnCode } -err = HTTPTest ( - pre_hook=pre_test, - test_params=test_options, - post_hook=post_test, - protocols=Servers -).begin () +err = HTTPTest( + pre_hook=pre_test, + test_params=test_options, + post_hook=post_test, + protocols=Servers +).begin() -exit (err) +exit(err) diff --git a/testenv/conf/expected_files.py b/testenv/conf/expected_files.py index 65adb70..e45a891 100644 --- a/testenv/conf/expected_files.py +++ b/testenv/conf/expected_files.py @@ -4,6 +4,7 @@ import sys from conf import hook from exc.test_failed import TestFailed + """ Post-Test Hook: ExpectedFiles This is a Post-Test hook that checks the test directory for the files it contains. A dictionary object is passed to it, which contains a mapping of @@ -22,18 +23,24 @@ class ExpectedFiles: @staticmethod def gen_local_fs_snapshot(): snapshot = {} - for parent, dirs, files in os.walk('.'): + for parent, dirs, files in os.walk("."): for name in files: - # pubring.gpg, pubring.kbx, dirmngr.conf, gpg.conf will be created by libgpgme + # pubring.gpg, pubring.kbx, common.conf, dirmngr.conf, gpg.conf will be created by libgpgme # if $HOME doesn't contain the .gnupg directory. # setting $HOME to CWD (in base_test.py) breaks two Metalink tests, so we skip this file here. - if name in [ 'pubring.gpg', 'pubring.kbx', 'dirmngr.conf', 'gpg.conf' ]: + if name in [ + "pubring.gpg", + "pubring.kbx", + "common.conf", + "dirmngr.conf", + "gpg.conf", + ]: continue - f = {'content': ''} + f = {"content": ""} file_path = os.path.join(parent, name) with open(file_path) as fp: - f['content'] = fp.read() + f["content"] = fp.read() snapshot[file_path[2:]] = f return snapshot @@ -44,15 +51,19 @@ class ExpectedFiles: if file.name in local_fs: local_file = local_fs.pop(file.name) formatted_content = test_obj._replace_substring(file.content) - if formatted_content != local_file['content']: - for line in unified_diff(local_file['content'], - formatted_content, - fromfile='Actual', - tofile='Expected'): - print(line, file=sys.stderr) - raise TestFailed('Contents of %s do not match' % file.name) + if formatted_content != local_file["content"]: + diff = "".join( + unified_diff( + local_file["content"].splitlines(1), + formatted_content.splitlines(1), + fromfile="Actual", + tofile="Expected", + ) + ) + print(diff, file=sys.stderr) + raise TestFailed("Contents of %s do not match" % file.name) else: - raise TestFailed('Expected file %s not found.' % file.name) + raise TestFailed("Expected file %s not found." % file.name) if local_fs: print(local_fs) - raise TestFailed('Extra files downloaded.') + raise TestFailed("Extra files downloaded.") diff --git a/testenv/server/http/http_server.py b/testenv/server/http/http_server.py index 2cc82fb..fd6121a 100644 --- a/testenv/server/http/http_server.py +++ b/testenv/server/http/http_server.py @@ -47,10 +47,10 @@ class HTTPSServer(StoppableHTTPServer): os.getenv('srcdir', '.'), 'certs', 'server-key.pem')) - self.socket = ssl.wrap_socket( + ctx = ssl.SSLContext(protocol=ssl.PROTOCOL_TLS_SERVER) + ctx.load_cert_chain(CERTFILE, KEYFILE) + self.socket = ctx.wrap_socket( sock=socket.socket(self.address_family, self.socket_type), - certfile=CERTFILE, - keyfile=KEYFILE, server_side=True ) self.server_bind() diff --git a/testenv/test_css_url.py b/testenv/test_css_url.py new file mode 100755 index 0000000..1c1c8f8 --- /dev/null +++ b/testenv/test_css_url.py @@ -0,0 +1,63 @@ +#!/usr/bin/env python3 + +"""Ensure that Wget correctly encodes url() parameters in CSS.""" + +from test.base_test import HTTP +from test.http_test import HTTPTest + +from misc.wget_file import WgetFile + +############################## File Definitions ############################### +FILE1 = """<html> + <head> +<style> +body { + background-image: url(image%201.html); +} +</style> + </head> + <body>Hello</body> +</html>""" + + +FILE2 = "This is an image" + +File1_File = WgetFile("index.html", FILE1) +File2_File = WgetFile("image 1.html", FILE2) +File2_ServerFile = WgetFile("image%201.html", FILE2) + +WGET_OPTIONS = "--recursive --convert-links --no-host-directories" +WGET_URLS = [[""]] + +Servers = [HTTP] + +Files = [[File1_File, File2_ServerFile]] +Existing_Files = [] + +ExpectedReturnCode = 0 +ExpectedDownloadedFiles = [File1_File, File2_File] +# Request_List = [["GET /", +# "GET /image 1.html"]] + +################ Pre and Post Test Hooks ##################################### +pre_test = { + "ServerFiles" : Files, + "LocalFiles" : Existing_Files +} +test_options = { + "WgetCommands" : WGET_OPTIONS, + "Urls" : WGET_URLS +} +post_test = { + "ExpectedFiles" : ExpectedDownloadedFiles, + "ExpectedRetcode" : ExpectedReturnCode +} + +err = HTTPTest ( + pre_hook=pre_test, + test_params=test_options, + post_hook=post_test, + protocols=Servers +).begin () + +exit (err) diff --git a/tests/Makefile.am b/tests/Makefile.am index 45c0b16..affb0f2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ # Makefile for `wget' utility -# Copyright (C) 1995-2011, 2015, 2018-2023 Free Software Foundation, +# Copyright (C) 1995-2011, 2015, 2018-2024 Free Software Foundation, # Inc. # This program is free software; you can redistribute it and/or modify @@ -44,11 +44,6 @@ cd ../lib && $(MAKE) $(AM_MAKEFLAGS) PX_TESTS = \ - Test-auth-basic.px \ - Test-auth-no-challenge.px \ - Test-auth-no-challenge-url.px \ - Test-auth-with-content-disposition.px \ - Test-auth-retcode.px \ Test-c-full.px \ Test-c-partial.px \ Test-c.px \ @@ -89,7 +84,6 @@ PX_TESTS = \ Test-iri-disabled.px \ Test-iri-forced-remote.px \ Test-iri-list.px \ - Test-k.px \ Test-meta-robots.px \ Test-N-current.px \ Test-N-HTTP-Content-Disposition.px \ @@ -156,7 +150,7 @@ AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) CLEANFILES = *~ *.bak core core.[0-9]* -TESTS = ./unit-tests$(EXEEXT) $(PX_TESTS) +TESTS = unit-tests$(EXEEXT) $(PX_TESTS) TEST_EXTENSIONS = .px PX_LOG_COMPILER = $(PERL) AM_PX_LOG_FLAGS = -I$(srcdir) diff --git a/tests/Makefile.in b/tests/Makefile.in index 72e793e..edbdca7 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for `wget' utility -# Copyright (C) 1995-2011, 2015, 2018-2023 Free Software Foundation, +# Copyright (C) 1995-2011, 2015, 2018-2024 Free Software Foundation, # Inc. # This program is free software; you can redistribute it and/or modify @@ -131,7 +131,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 \ $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/base32.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 \ $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/clock_time.m4 \ @@ -179,7 +180,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \ $(top_srcdir)/m4/isblank.m4 $(top_srcdir)/m4/iswblank.m4 \ - $(top_srcdir)/m4/iswdigit.m4 $(top_srcdir)/m4/iswxdigit.m4 \ + $(top_srcdir)/m4/iswctype.m4 $(top_srcdir)/m4/iswdigit.m4 \ + $(top_srcdir)/m4/iswpunct.m4 $(top_srcdir)/m4/iswxdigit.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 \ @@ -193,15 +195,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbrtoc32.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ + $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -259,18 +262,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timegm.m4 $(top_srcdir)/m4/timespec.m4 \ $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tmpdir.m4 \ - $(top_srcdir)/m4/ungetc.m4 $(top_srcdir)/m4/unicase_h.m4 \ - $(top_srcdir)/m4/unictype_h.m4 $(top_srcdir)/m4/uninorm_h.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utime_h.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/uchar_h.m4 $(top_srcdir)/m4/ungetc.m4 \ + $(top_srcdir)/m4/unicase_h.m4 $(top_srcdir)/m4/unictype_h.m4 \ + $(top_srcdir)/m4/uninorm_h.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ + $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wctype_h.m4 \ $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ $(top_srcdir)/m4/wget_manywarnings.m4 \ $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/wmemchr.m4 \ @@ -595,6 +599,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ +CXX_HAS_CHAR8_TYPE = @CXX_HAS_CHAR8_TYPE@ +CXX_HAS_UCHAR_TYPES = @CXX_HAS_UCHAR_TYPES@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -610,7 +616,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ @@ -632,7 +637,33 @@ GL_GNULIB_ALIGNED_ALLOC = @GL_GNULIB_ALIGNED_ALLOC@ GL_GNULIB_ALPHASORT = @GL_GNULIB_ALPHASORT@ GL_GNULIB_ATOLL = @GL_GNULIB_ATOLL@ GL_GNULIB_BIND = @GL_GNULIB_BIND@ +GL_GNULIB_BTOC32 = @GL_GNULIB_BTOC32@ GL_GNULIB_BTOWC = @GL_GNULIB_BTOWC@ +GL_GNULIB_C32ISALNUM = @GL_GNULIB_C32ISALNUM@ +GL_GNULIB_C32ISALPHA = @GL_GNULIB_C32ISALPHA@ +GL_GNULIB_C32ISBLANK = @GL_GNULIB_C32ISBLANK@ +GL_GNULIB_C32ISCNTRL = @GL_GNULIB_C32ISCNTRL@ +GL_GNULIB_C32ISDIGIT = @GL_GNULIB_C32ISDIGIT@ +GL_GNULIB_C32ISGRAPH = @GL_GNULIB_C32ISGRAPH@ +GL_GNULIB_C32ISLOWER = @GL_GNULIB_C32ISLOWER@ +GL_GNULIB_C32ISPRINT = @GL_GNULIB_C32ISPRINT@ +GL_GNULIB_C32ISPUNCT = @GL_GNULIB_C32ISPUNCT@ +GL_GNULIB_C32ISSPACE = @GL_GNULIB_C32ISSPACE@ +GL_GNULIB_C32ISUPPER = @GL_GNULIB_C32ISUPPER@ +GL_GNULIB_C32ISXDIGIT = @GL_GNULIB_C32ISXDIGIT@ +GL_GNULIB_C32RTOMB = @GL_GNULIB_C32RTOMB@ +GL_GNULIB_C32SNRTOMBS = @GL_GNULIB_C32SNRTOMBS@ +GL_GNULIB_C32SRTOMBS = @GL_GNULIB_C32SRTOMBS@ +GL_GNULIB_C32STOMBS = @GL_GNULIB_C32STOMBS@ +GL_GNULIB_C32SWIDTH = @GL_GNULIB_C32SWIDTH@ +GL_GNULIB_C32TOB = @GL_GNULIB_C32TOB@ +GL_GNULIB_C32TOLOWER = @GL_GNULIB_C32TOLOWER@ +GL_GNULIB_C32TOUPPER = @GL_GNULIB_C32TOUPPER@ +GL_GNULIB_C32WIDTH = @GL_GNULIB_C32WIDTH@ +GL_GNULIB_C32_APPLY_MAPPING = @GL_GNULIB_C32_APPLY_MAPPING@ +GL_GNULIB_C32_APPLY_TYPE_TEST = @GL_GNULIB_C32_APPLY_TYPE_TEST@ +GL_GNULIB_C32_GET_MAPPING = @GL_GNULIB_C32_GET_MAPPING@ +GL_GNULIB_C32_GET_TYPE_TEST = @GL_GNULIB_C32_GET_TYPE_TEST@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ @@ -739,6 +770,7 @@ GL_GNULIB_ISBLANK = @GL_GNULIB_ISBLANK@ GL_GNULIB_ISWBLANK = @GL_GNULIB_ISWBLANK@ GL_GNULIB_ISWCTYPE = @GL_GNULIB_ISWCTYPE@ GL_GNULIB_ISWDIGIT = @GL_GNULIB_ISWDIGIT@ +GL_GNULIB_ISWPUNCT = @GL_GNULIB_ISWPUNCT@ GL_GNULIB_ISWXDIGIT = @GL_GNULIB_ISWXDIGIT@ GL_GNULIB_LCHMOD = @GL_GNULIB_LCHMOD@ GL_GNULIB_LCHOWN = @GL_GNULIB_LCHOWN@ @@ -746,13 +778,15 @@ GL_GNULIB_LINK = @GL_GNULIB_LINK@ GL_GNULIB_LINKAT = @GL_GNULIB_LINKAT@ GL_GNULIB_LISTEN = @GL_GNULIB_LISTEN@ GL_GNULIB_LOCALECONV = @GL_GNULIB_LOCALECONV@ -GL_GNULIB_LOCALENAME = @GL_GNULIB_LOCALENAME@ +GL_GNULIB_LOCALENAME_UNSAFE = @GL_GNULIB_LOCALENAME_UNSAFE@ GL_GNULIB_LOCALTIME = @GL_GNULIB_LOCALTIME@ GL_GNULIB_LSEEK = @GL_GNULIB_LSEEK@ GL_GNULIB_LSTAT = @GL_GNULIB_LSTAT@ GL_GNULIB_MALLOC_GNU = @GL_GNULIB_MALLOC_GNU@ GL_GNULIB_MALLOC_POSIX = @GL_GNULIB_MALLOC_POSIX@ GL_GNULIB_MBRLEN = @GL_GNULIB_MBRLEN@ +GL_GNULIB_MBRTOC16 = @GL_GNULIB_MBRTOC16@ +GL_GNULIB_MBRTOC32 = @GL_GNULIB_MBRTOC32@ GL_GNULIB_MBRTOWC = @GL_GNULIB_MBRTOWC@ GL_GNULIB_MBSCASECMP = @GL_GNULIB_MBSCASECMP@ GL_GNULIB_MBSCASESTR = @GL_GNULIB_MBSCASESTR@ @@ -762,16 +796,20 @@ GL_GNULIB_MBSINIT = @GL_GNULIB_MBSINIT@ GL_GNULIB_MBSLEN = @GL_GNULIB_MBSLEN@ GL_GNULIB_MBSNCASECMP = @GL_GNULIB_MBSNCASECMP@ GL_GNULIB_MBSNLEN = @GL_GNULIB_MBSNLEN@ +GL_GNULIB_MBSNRTOC32S = @GL_GNULIB_MBSNRTOC32S@ GL_GNULIB_MBSNRTOWCS = @GL_GNULIB_MBSNRTOWCS@ GL_GNULIB_MBSPBRK = @GL_GNULIB_MBSPBRK@ GL_GNULIB_MBSPCASECMP = @GL_GNULIB_MBSPCASECMP@ GL_GNULIB_MBSRCHR = @GL_GNULIB_MBSRCHR@ +GL_GNULIB_MBSRTOC32S = @GL_GNULIB_MBSRTOC32S@ GL_GNULIB_MBSRTOWCS = @GL_GNULIB_MBSRTOWCS@ GL_GNULIB_MBSSEP = @GL_GNULIB_MBSSEP@ GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@ GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@ +GL_GNULIB_MBSTOC32S = @GL_GNULIB_MBSTOC32S@ GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@ GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@ +GL_GNULIB_MBSZERO = @GL_GNULIB_MBSZERO@ GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@ GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@ GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@ @@ -885,6 +923,7 @@ GL_GNULIB_PUTS = @GL_GNULIB_PUTS@ GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@ GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@ GL_GNULIB_RAISE = @GL_GNULIB_RAISE@ +GL_GNULIB_RAND = @GL_GNULIB_RAND@ GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@ GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@ GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@ @@ -947,6 +986,7 @@ GL_GNULIB_STRSEP = @GL_GNULIB_STRSEP@ GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@ GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@ GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@ +GL_GNULIB_STRTOF = @GL_GNULIB_STRTOF@ GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@ GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@ GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@ @@ -1060,6 +1100,9 @@ GL_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_H GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@ @@ -1085,6 +1128,7 @@ GL_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYP GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@ @@ -1160,6 +1204,7 @@ GL_GNULIB_WCTOMB = @GL_GNULIB_WCTOMB@ GL_GNULIB_WCTRANS = @GL_GNULIB_WCTRANS@ GL_GNULIB_WCTYPE = @GL_GNULIB_WCTYPE@ GL_GNULIB_WCWIDTH = @GL_GNULIB_WCWIDTH@ +GL_GNULIB_WGETCWD = @GL_GNULIB_WGETCWD@ GL_GNULIB_WMEMCHR = @GL_GNULIB_WMEMCHR@ GL_GNULIB_WMEMCMP = @GL_GNULIB_WMEMCMP@ GL_GNULIB_WMEMCPY = @GL_GNULIB_WMEMCPY@ @@ -1170,8 +1215,10 @@ GL_GNULIB_WRITE = @GL_GNULIB_WRITE@ GL_GNULIB__EXIT = @GL_GNULIB__EXIT@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIBHEADERS_OVERRIDE_CHAR16_T = @GNULIBHEADERS_OVERRIDE_CHAR16_T@ +GNULIBHEADERS_OVERRIDE_CHAR32_T = @GNULIBHEADERS_OVERRIDE_CHAR32_T@ +GNULIBHEADERS_OVERRIDE_CHAR8_T = @GNULIBHEADERS_OVERRIDE_CHAR8_T@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ @@ -1188,6 +1235,7 @@ HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C32RTOMB = @HAVE_C32RTOMB@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ @@ -1321,6 +1369,8 @@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOC16 = @HAVE_MBRTOC16@ +HAVE_MBRTOC32 = @HAVE_MBRTOC32@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ HAVE_MBSINIT = @HAVE_MBSINIT@ HAVE_MBSLEN = @HAVE_MBSLEN@ @@ -1411,6 +1461,7 @@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOF = @HAVE_STRTOF@ HAVE_STRTOL = @HAVE_STRTOL@ HAVE_STRTOLD = @HAVE_STRTOLD@ HAVE_STRTOLL = @HAVE_STRTOLL@ @@ -1444,6 +1495,7 @@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_UCHAR_H = @HAVE_UCHAR_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ @@ -1496,6 +1548,7 @@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ +HAVE_WORKING_MBRTOC32 = @HAVE_WORKING_MBRTOC32@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__EXIT = @HAVE__EXIT@ @@ -1515,6 +1568,10 @@ INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LCOV = @LCOV@ +LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@ +LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@ +LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@ +LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -1530,6 +1587,8 @@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPROXY_CFLAGS = @LIBPROXY_CFLAGS@ +LIBPROXY_LIBS = @LIBPROXY_LIBS@ LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ LIBPSL_LIBS = @LIBPSL_LIBS@ LIBPTHREAD = @LIBPTHREAD@ @@ -1626,6 +1685,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ +NEXT_AS_FIRST_DIRECTIVE_UCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_UCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ @@ -1665,6 +1725,7 @@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ +NEXT_UCHAR_H = @NEXT_UCHAR_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ @@ -1706,6 +1767,7 @@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ +REPLACE_C32RTOMB = @REPLACE_C32RTOMB@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ @@ -1732,6 +1794,7 @@ REPLACE_EXECVE = @REPLACE_EXECVE@ REPLACE_EXECVP = @REPLACE_EXECVP@ REPLACE_EXECVPE = @REPLACE_EXECVPE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ @@ -1789,6 +1852,7 @@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWPUNCT = @REPLACE_ISWPUNCT@ REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_ITOLD = @REPLACE_ITOLD@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ @@ -1802,6 +1866,8 @@ REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MALLOC_FOR_MALLOC_GNU = @REPLACE_MALLOC_FOR_MALLOC_GNU@ REPLACE_MALLOC_FOR_MALLOC_POSIX = @REPLACE_MALLOC_FOR_MALLOC_POSIX@ REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOC16 = @REPLACE_MBRTOC16@ +REPLACE_MBRTOC32 = @REPLACE_MBRTOC32@ REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ @@ -1813,6 +1879,7 @@ REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ +REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ @@ -1851,6 +1918,7 @@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_QSORT_R = @REPLACE_QSORT_R@ REPLACE_RAISE = @REPLACE_RAISE@ +REPLACE_RAND = @REPLACE_RAND@ REPLACE_RANDOM = @REPLACE_RANDOM@ REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ REPLACE_READ = @REPLACE_READ@ @@ -1893,6 +1961,7 @@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ +REPLACE_STRTOF = @REPLACE_STRTOF@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_STRTOL = @REPLACE_STRTOL@ @@ -1903,11 +1972,13 @@ REPLACE_STRTOULL = @REPLACE_STRTOULL@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ +REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ +REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1936,6 +2007,8 @@ REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ +REPLACE_WCTRANS = @REPLACE_WCTRANS@ +REPLACE_WCTYPE = @REPLACE_WCTYPE@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WMEMCMP = @REPLACE_WMEMCMP@ REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ @@ -1950,6 +2023,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ +SMALL_WCHAR_T = @SMALL_WCHAR_T@ STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ @@ -2026,6 +2100,8 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -2048,11 +2124,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ PX_TESTS = \ - Test-auth-basic.px \ - Test-auth-no-challenge.px \ - Test-auth-no-challenge-url.px \ - Test-auth-with-content-disposition.px \ - Test-auth-retcode.px \ Test-c-full.px \ Test-c-partial.px \ Test-c.px \ @@ -2093,7 +2164,6 @@ PX_TESTS = \ Test-iri-disabled.px \ Test-iri-forced-remote.px \ Test-iri-list.px \ - Test-k.px \ Test-meta-robots.px \ Test-N-current.px \ Test-N-HTTP-Content-Disposition.px \ @@ -2158,7 +2228,7 @@ AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \ AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) CLEANFILES = *~ *.bak core core.[0-9]* -TESTS = ./unit-tests$(EXEEXT) $(PX_TESTS) +TESTS = unit-tests$(EXEEXT) $(PX_TESTS) TEST_EXTENSIONS = .px PX_LOG_COMPILER = $(PERL) AM_PX_LOG_FLAGS = -I$(srcdir) @@ -2429,9 +2499,9 @@ recheck: all $(check_PROGRAMS) am__force_recheck=am--force-recheck \ TEST_LOGS="$$log_list"; \ exit $$? -./unit-tests.log: ./unit-tests$(EXEEXT) - @p='./unit-tests$(EXEEXT)'; \ - b='./unit-tests'; \ +unit-tests.log: unit-tests$(EXEEXT) + @p='unit-tests$(EXEEXT)'; \ + b='unit-tests'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ diff --git a/tests/Test-auth-basic.px b/tests/Test-auth-basic.px deleted file mode 100755 index ce9100d..0000000 --- a/tests/Test-auth-basic.px +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use warnings; - -use HTTPTest; - - -############################################################################### - -my $wholefile = "You're all authenticated.\n"; - -# code, msg, headers, content -my %urls = ( - '/needs-auth.txt' => { - auth_method => 'Basic', - user => 'fiddle-dee-dee', - passwd => 'Dodgson', - code => "200", - msg => "You want fries with that?", - headers => { - "Content-type" => "text/plain", - }, - content => $wholefile, - }, -); - -my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee --password=Dodgson" - . " http://localhost:{{port}}/needs-auth.txt"; - -my $expected_error_code = 0; - -my %expected_downloaded_files = ( - 'needs-auth.txt' => { - content => $wholefile, - }, -); - -############################################################################### - -my $the_test = HTTPTest->new (input => \%urls, - cmdline => $cmdline, - errcode => $expected_error_code, - output => \%expected_downloaded_files); -exit $the_test->run(); - -# vim: et ts=4 sw=4 diff --git a/tests/Test-auth-no-challenge-url.px b/tests/Test-auth-no-challenge-url.px deleted file mode 100755 index 204e9a0..0000000 --- a/tests/Test-auth-no-challenge-url.px +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use warnings; - -use HTTPTest; - - -############################################################################### - -my $wholefile = "You're all authenticated.\n"; - -# code, msg, headers, content -my %urls = ( - '/needs-auth.txt' => { - auth_no_challenge => 1, - auth_method => 'Basic', - user => 'fiddle-dee-dee', - passwd => 'Dodgson', - code => "200", - msg => "You want fries with that?", - headers => { - "Content-type" => "text/plain", - }, - content => $wholefile, - }, -); - -my $cmdline = $WgetTest::WGETPATH . " --auth-no-challenge " - . "http://fiddle-dee-dee:Dodgson\@localhost:{{port}}/needs-auth.txt"; - -my $expected_error_code = 0; - -my %expected_downloaded_files = ( - 'needs-auth.txt' => { - content => $wholefile, - }, -); - -############################################################################### - -my $the_test = HTTPTest->new (input => \%urls, - cmdline => $cmdline, - errcode => $expected_error_code, - output => \%expected_downloaded_files); -exit $the_test->run(); - -# vim: et ts=4 sw=4 diff --git a/tests/Test-auth-no-challenge.px b/tests/Test-auth-no-challenge.px deleted file mode 100755 index 0794ece..0000000 --- a/tests/Test-auth-no-challenge.px +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use warnings; - -use HTTPTest; - - -############################################################################### - -my $wholefile = "You're all authenticated.\n"; - -# code, msg, headers, content -my %urls = ( - '/needs-auth.txt' => { - auth_no_challenge => 1, - auth_method => 'Basic', - user => 'fiddle-dee-dee', - passwd => 'Dodgson', - code => "200", - msg => "You want fries with that?", - headers => { - "Content-type" => "text/plain", - }, - content => $wholefile, - }, -); - -my $cmdline = $WgetTest::WGETPATH . " --auth-no-challenge" - . " --user=fiddle-dee-dee --password=Dodgson" - . " http://localhost:{{port}}/needs-auth.txt"; - -my $expected_error_code = 0; - -my %expected_downloaded_files = ( - 'needs-auth.txt' => { - content => $wholefile, - }, -); - -############################################################################### - -my $the_test = HTTPTest->new (input => \%urls, - cmdline => $cmdline, - errcode => $expected_error_code, - output => \%expected_downloaded_files); -exit $the_test->run(); - -# vim: et ts=4 sw=4 diff --git a/tests/Test-auth-retcode.px b/tests/Test-auth-retcode.px deleted file mode 100755 index bc1ea8f..0000000 --- a/tests/Test-auth-retcode.px +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use warnings; - -use HTTPTest; - - -############################################################################### - -# code, msg, headers, content -my %urls = ( - '/dummy.txt' => { - code => "403", - msg => "Dontcare", - headers => { - "Content-type" => "text/plain", - "Last-Modified" => "Sat, 09 Oct 2004 08:30:00 GMT", - }, - }, -); - -my $cmdline = $WgetTest::WGETPATH . " -N http://localhost:{{port}}/dummy.txt"; - -my $expected_error_code = 8; - -my %expected_downloaded_files = (); - -############################################################################### - -my $the_test = HTTPTest->new (input => \%urls, - cmdline => $cmdline, - errcode => $expected_error_code, - output => \%expected_downloaded_files); -exit $the_test->run(); - -# vim: et ts=4 sw=4 diff --git a/tests/Test-auth-with-content-disposition.px b/tests/Test-auth-with-content-disposition.px deleted file mode 100755 index 7e252a3..0000000 --- a/tests/Test-auth-with-content-disposition.px +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use warnings; - -use HTTPTest; - - -############################################################################### - -my $wholefile = "You're all authenticated.\n"; - -# code, msg, headers, content -my %urls = ( - '/needs-auth.txt' => { - auth_method => 'Basic', - user => 'fiddle-dee-dee', - passwd => 'Dodgson', - code => "200", - msg => "You want fries with that?", - headers => { - "Content-type" => "text/plain", - "Content-Disposition" => "attachment; filename=\"Flubber\"", - }, - content => $wholefile, - }, -); - -my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee --password=Dodgson" - . " --content-disposition http://localhost:{{port}}/needs-auth.txt"; - -my $expected_error_code = 0; - -my %expected_downloaded_files = ( - 'Flubber' => { - content => $wholefile, - }, -); - -############################################################################### - -my $the_test = HTTPTest->new (input => \%urls, - cmdline => $cmdline, - errcode => $expected_error_code, - output => \%expected_downloaded_files); -exit $the_test->run(); - -# vim: et ts=4 sw=4 diff --git a/tests/Test-k.px b/tests/Test-k.px deleted file mode 100755 index ce114d7..0000000 --- a/tests/Test-k.px +++ /dev/null @@ -1,92 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use warnings; - -use HTTPTest; - - -############################################################################### -my $osname = $^O; -print "OS=$osname\n"; - -my $index = <<EOF; -<html> - <head> - <title>Index</title> - </head> - <body> - <a href="site;sub:.html">Site</a> - </body> -</html> -EOF - -my $converted = <<EOF; -<html> - <head> - <title>Index</title> - </head> - <body> - <a href="./site%3Bsub:.html">Site</a> - </body> -</html> -EOF - -my $site = <<EOF; -<html> - <head> - <title>Site</title> - </head> - <body> - Subsite - </body> -</html> -EOF - -# code, msg, headers, content -my %urls = ( - '/index.html' => { - code => "200", - msg => "Ok", - headers => { - "Content-type" => "text/html", - }, - content => $index, - }, - '/site;sub:.html' => { - code => "200", - msg => "Ok", - headers => { - "Content-type" => "text/html", - }, - content => $site, - }, -); - -my $restrict = "unix"; -if ($osname eq "MSWin32") { - $restrict = "windows"; -} - -my $cmdline = $WgetTest::WGETPATH . " -k -r -nH --restrict-file-names=$restrict http://localhost:{{port}}/index.html"; - -my $expected_error_code = 0; - -my %expected_downloaded_files = ( - 'index.html' => { - content => $converted, - }, - 'site;sub:.html' => { - content => $site, - }, -); - -############################################################################### - -my $the_test = HTTPTest->new (input => \%urls, - cmdline => $cmdline, - errcode => $expected_error_code, - output => \%expected_downloaded_files); -exit $the_test->run(); - -# vim: et ts=4 sw=4 diff --git a/tests/certs/interca.conf b/tests/certs/interca.conf index 7a51ab5..dd3bab5 100644 --- a/tests/certs/interca.conf +++ b/tests/certs/interca.conf @@ -6,7 +6,7 @@ issuerAltName=issuer:copy authorityKeyIdentifier=keyid:always [ myca ] - dir = /home/twoflower/Projects/wget/tests/certs + dir = /home/twoflower/workdir/gnuwget/wget/tests/certs new_certs_dir = ./ unique_subject = no certificate = interca.crt diff --git a/tests/certs/rootca.conf b/tests/certs/rootca.conf index 7b2585a..79407af 100644 --- a/tests/certs/rootca.conf +++ b/tests/certs/rootca.conf @@ -6,7 +6,7 @@ issuerAltName=issuer:copy authorityKeyIdentifier=keyid:always [ myca ] - dir = /home/twoflower/Projects/wget/tests/certs + dir = /home/twoflower/workdir/gnuwget/wget/tests/certs new_certs_dir = ./ unique_subject = no certificate = $dir/test-ca-cert.pem diff --git a/tests/unit-tests.c b/tests/unit-tests.c index 085a032..28b9328 100644 --- a/tests/unit-tests.c +++ b/tests/unit-tests.c @@ -1,5 +1,5 @@ /* Unit testing. - Copyright (C) 2005-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2005-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -58,6 +58,7 @@ all_tests(void) mu_run_test (test_path_simplify); mu_run_test (test_append_uri_pathel); mu_run_test (test_are_urls_equal); + mu_run_test (test_uri_merge); mu_run_test (test_is_robots_txt_url); #ifdef HAVE_HSTS mu_run_test (test_hsts_new_entry); @@ -66,6 +67,7 @@ all_tests(void) mu_run_test (test_hsts_read_database); #endif mu_run_test (test_parse_netrc); + mu_run_test (test_retr_rate); return NULL; } diff --git a/tests/unit-tests.h b/tests/unit-tests.h index 16573b1..44635f0 100644 --- a/tests/unit-tests.h +++ b/tests/unit-tests.h @@ -1,5 +1,5 @@ /* Unit testing declarations. - Copyright (C) 2005-2011, 2015, 2018-2023 Free Software Foundation, + Copyright (C) 2005-2011, 2015, 2018-2024 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -55,6 +55,7 @@ const char *test_is_robots_txt_url(void); const char *test_path_simplify (void); const char *test_append_uri_pathel(void); const char *test_are_urls_equal(void); +const char *test_uri_merge(void); const char *test_subdir_p(void); const char *test_dir_matches_p(void); const char *test_hsts_new_entry(void); @@ -62,6 +63,7 @@ const char *test_hsts_url_rewrite_superdomain(void); const char *test_hsts_url_rewrite_congruent(void); const char *test_hsts_read_database(void); const char *test_parse_netrc(void); +const char *test_retr_rate(void); #endif /* TEST_H */ diff --git a/util/Makefile.am b/util/Makefile.am index 4f846ac..f40cee2 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,5 +1,5 @@ # Makefile for `wget' utility -# Copyright (C) 1995-1997, 2007-2011, 2015, 2018-2023 Free Software +# Copyright (C) 1995-1997, 2007-2011, 2015, 2018-2024 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify diff --git a/util/Makefile.in b/util/Makefile.in index 161f5ae..a221290 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for `wget' utility -# Copyright (C) 1995-1997, 2007-2011, 2015, 2018-2023 Free Software +# Copyright (C) 1995-1997, 2007-2011, 2015, 2018-2024 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -128,7 +128,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 \ $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/base32.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 \ $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/clock_time.m4 \ @@ -176,7 +177,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \ $(top_srcdir)/m4/isblank.m4 $(top_srcdir)/m4/iswblank.m4 \ - $(top_srcdir)/m4/iswdigit.m4 $(top_srcdir)/m4/iswxdigit.m4 \ + $(top_srcdir)/m4/iswctype.m4 $(top_srcdir)/m4/iswdigit.m4 \ + $(top_srcdir)/m4/iswpunct.m4 $(top_srcdir)/m4/iswxdigit.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 \ @@ -190,15 +192,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbrtoc32.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ + $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -256,18 +259,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timegm.m4 $(top_srcdir)/m4/timespec.m4 \ $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tmpdir.m4 \ - $(top_srcdir)/m4/ungetc.m4 $(top_srcdir)/m4/unicase_h.m4 \ - $(top_srcdir)/m4/unictype_h.m4 $(top_srcdir)/m4/uninorm_h.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utime_h.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/uchar_h.m4 $(top_srcdir)/m4/ungetc.m4 \ + $(top_srcdir)/m4/unicase_h.m4 $(top_srcdir)/m4/unictype_h.m4 \ + $(top_srcdir)/m4/uninorm_h.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ + $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wctype_h.m4 \ $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ $(top_srcdir)/m4/wget_manywarnings.m4 \ $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/wmemchr.m4 \ @@ -342,6 +346,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ +CXX_HAS_CHAR8_TYPE = @CXX_HAS_CHAR8_TYPE@ +CXX_HAS_UCHAR_TYPES = @CXX_HAS_UCHAR_TYPES@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -357,7 +363,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ @@ -379,7 +384,33 @@ GL_GNULIB_ALIGNED_ALLOC = @GL_GNULIB_ALIGNED_ALLOC@ GL_GNULIB_ALPHASORT = @GL_GNULIB_ALPHASORT@ GL_GNULIB_ATOLL = @GL_GNULIB_ATOLL@ GL_GNULIB_BIND = @GL_GNULIB_BIND@ +GL_GNULIB_BTOC32 = @GL_GNULIB_BTOC32@ GL_GNULIB_BTOWC = @GL_GNULIB_BTOWC@ +GL_GNULIB_C32ISALNUM = @GL_GNULIB_C32ISALNUM@ +GL_GNULIB_C32ISALPHA = @GL_GNULIB_C32ISALPHA@ +GL_GNULIB_C32ISBLANK = @GL_GNULIB_C32ISBLANK@ +GL_GNULIB_C32ISCNTRL = @GL_GNULIB_C32ISCNTRL@ +GL_GNULIB_C32ISDIGIT = @GL_GNULIB_C32ISDIGIT@ +GL_GNULIB_C32ISGRAPH = @GL_GNULIB_C32ISGRAPH@ +GL_GNULIB_C32ISLOWER = @GL_GNULIB_C32ISLOWER@ +GL_GNULIB_C32ISPRINT = @GL_GNULIB_C32ISPRINT@ +GL_GNULIB_C32ISPUNCT = @GL_GNULIB_C32ISPUNCT@ +GL_GNULIB_C32ISSPACE = @GL_GNULIB_C32ISSPACE@ +GL_GNULIB_C32ISUPPER = @GL_GNULIB_C32ISUPPER@ +GL_GNULIB_C32ISXDIGIT = @GL_GNULIB_C32ISXDIGIT@ +GL_GNULIB_C32RTOMB = @GL_GNULIB_C32RTOMB@ +GL_GNULIB_C32SNRTOMBS = @GL_GNULIB_C32SNRTOMBS@ +GL_GNULIB_C32SRTOMBS = @GL_GNULIB_C32SRTOMBS@ +GL_GNULIB_C32STOMBS = @GL_GNULIB_C32STOMBS@ +GL_GNULIB_C32SWIDTH = @GL_GNULIB_C32SWIDTH@ +GL_GNULIB_C32TOB = @GL_GNULIB_C32TOB@ +GL_GNULIB_C32TOLOWER = @GL_GNULIB_C32TOLOWER@ +GL_GNULIB_C32TOUPPER = @GL_GNULIB_C32TOUPPER@ +GL_GNULIB_C32WIDTH = @GL_GNULIB_C32WIDTH@ +GL_GNULIB_C32_APPLY_MAPPING = @GL_GNULIB_C32_APPLY_MAPPING@ +GL_GNULIB_C32_APPLY_TYPE_TEST = @GL_GNULIB_C32_APPLY_TYPE_TEST@ +GL_GNULIB_C32_GET_MAPPING = @GL_GNULIB_C32_GET_MAPPING@ +GL_GNULIB_C32_GET_TYPE_TEST = @GL_GNULIB_C32_GET_TYPE_TEST@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ @@ -486,6 +517,7 @@ GL_GNULIB_ISBLANK = @GL_GNULIB_ISBLANK@ GL_GNULIB_ISWBLANK = @GL_GNULIB_ISWBLANK@ GL_GNULIB_ISWCTYPE = @GL_GNULIB_ISWCTYPE@ GL_GNULIB_ISWDIGIT = @GL_GNULIB_ISWDIGIT@ +GL_GNULIB_ISWPUNCT = @GL_GNULIB_ISWPUNCT@ GL_GNULIB_ISWXDIGIT = @GL_GNULIB_ISWXDIGIT@ GL_GNULIB_LCHMOD = @GL_GNULIB_LCHMOD@ GL_GNULIB_LCHOWN = @GL_GNULIB_LCHOWN@ @@ -493,13 +525,15 @@ GL_GNULIB_LINK = @GL_GNULIB_LINK@ GL_GNULIB_LINKAT = @GL_GNULIB_LINKAT@ GL_GNULIB_LISTEN = @GL_GNULIB_LISTEN@ GL_GNULIB_LOCALECONV = @GL_GNULIB_LOCALECONV@ -GL_GNULIB_LOCALENAME = @GL_GNULIB_LOCALENAME@ +GL_GNULIB_LOCALENAME_UNSAFE = @GL_GNULIB_LOCALENAME_UNSAFE@ GL_GNULIB_LOCALTIME = @GL_GNULIB_LOCALTIME@ GL_GNULIB_LSEEK = @GL_GNULIB_LSEEK@ GL_GNULIB_LSTAT = @GL_GNULIB_LSTAT@ GL_GNULIB_MALLOC_GNU = @GL_GNULIB_MALLOC_GNU@ GL_GNULIB_MALLOC_POSIX = @GL_GNULIB_MALLOC_POSIX@ GL_GNULIB_MBRLEN = @GL_GNULIB_MBRLEN@ +GL_GNULIB_MBRTOC16 = @GL_GNULIB_MBRTOC16@ +GL_GNULIB_MBRTOC32 = @GL_GNULIB_MBRTOC32@ GL_GNULIB_MBRTOWC = @GL_GNULIB_MBRTOWC@ GL_GNULIB_MBSCASECMP = @GL_GNULIB_MBSCASECMP@ GL_GNULIB_MBSCASESTR = @GL_GNULIB_MBSCASESTR@ @@ -509,16 +543,20 @@ GL_GNULIB_MBSINIT = @GL_GNULIB_MBSINIT@ GL_GNULIB_MBSLEN = @GL_GNULIB_MBSLEN@ GL_GNULIB_MBSNCASECMP = @GL_GNULIB_MBSNCASECMP@ GL_GNULIB_MBSNLEN = @GL_GNULIB_MBSNLEN@ +GL_GNULIB_MBSNRTOC32S = @GL_GNULIB_MBSNRTOC32S@ GL_GNULIB_MBSNRTOWCS = @GL_GNULIB_MBSNRTOWCS@ GL_GNULIB_MBSPBRK = @GL_GNULIB_MBSPBRK@ GL_GNULIB_MBSPCASECMP = @GL_GNULIB_MBSPCASECMP@ GL_GNULIB_MBSRCHR = @GL_GNULIB_MBSRCHR@ +GL_GNULIB_MBSRTOC32S = @GL_GNULIB_MBSRTOC32S@ GL_GNULIB_MBSRTOWCS = @GL_GNULIB_MBSRTOWCS@ GL_GNULIB_MBSSEP = @GL_GNULIB_MBSSEP@ GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@ GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@ +GL_GNULIB_MBSTOC32S = @GL_GNULIB_MBSTOC32S@ GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@ GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@ +GL_GNULIB_MBSZERO = @GL_GNULIB_MBSZERO@ GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@ GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@ GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@ @@ -632,6 +670,7 @@ GL_GNULIB_PUTS = @GL_GNULIB_PUTS@ GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@ GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@ GL_GNULIB_RAISE = @GL_GNULIB_RAISE@ +GL_GNULIB_RAND = @GL_GNULIB_RAND@ GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@ GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@ GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@ @@ -694,6 +733,7 @@ GL_GNULIB_STRSEP = @GL_GNULIB_STRSEP@ GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@ GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@ GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@ +GL_GNULIB_STRTOF = @GL_GNULIB_STRTOF@ GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@ GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@ GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@ @@ -807,6 +847,9 @@ GL_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_H GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@ @@ -832,6 +875,7 @@ GL_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYP GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@ +GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@ GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@ @@ -907,6 +951,7 @@ GL_GNULIB_WCTOMB = @GL_GNULIB_WCTOMB@ GL_GNULIB_WCTRANS = @GL_GNULIB_WCTRANS@ GL_GNULIB_WCTYPE = @GL_GNULIB_WCTYPE@ GL_GNULIB_WCWIDTH = @GL_GNULIB_WCWIDTH@ +GL_GNULIB_WGETCWD = @GL_GNULIB_WGETCWD@ GL_GNULIB_WMEMCHR = @GL_GNULIB_WMEMCHR@ GL_GNULIB_WMEMCMP = @GL_GNULIB_WMEMCMP@ GL_GNULIB_WMEMCPY = @GL_GNULIB_WMEMCPY@ @@ -917,8 +962,10 @@ GL_GNULIB_WRITE = @GL_GNULIB_WRITE@ GL_GNULIB__EXIT = @GL_GNULIB__EXIT@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIBHEADERS_OVERRIDE_CHAR16_T = @GNULIBHEADERS_OVERRIDE_CHAR16_T@ +GNULIBHEADERS_OVERRIDE_CHAR32_T = @GNULIBHEADERS_OVERRIDE_CHAR32_T@ +GNULIBHEADERS_OVERRIDE_CHAR8_T = @GNULIBHEADERS_OVERRIDE_CHAR8_T@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ @@ -935,6 +982,7 @@ HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C32RTOMB = @HAVE_C32RTOMB@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ @@ -1068,6 +1116,8 @@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOC16 = @HAVE_MBRTOC16@ +HAVE_MBRTOC32 = @HAVE_MBRTOC32@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ HAVE_MBSINIT = @HAVE_MBSINIT@ HAVE_MBSLEN = @HAVE_MBSLEN@ @@ -1158,6 +1208,7 @@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOF = @HAVE_STRTOF@ HAVE_STRTOL = @HAVE_STRTOL@ HAVE_STRTOLD = @HAVE_STRTOLD@ HAVE_STRTOLL = @HAVE_STRTOLL@ @@ -1191,6 +1242,7 @@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_UCHAR_H = @HAVE_UCHAR_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ @@ -1243,6 +1295,7 @@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ +HAVE_WORKING_MBRTOC32 = @HAVE_WORKING_MBRTOC32@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__EXIT = @HAVE__EXIT@ @@ -1262,6 +1315,10 @@ INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LCOV = @LCOV@ +LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@ +LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@ +LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@ +LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -1277,6 +1334,8 @@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPROXY_CFLAGS = @LIBPROXY_CFLAGS@ +LIBPROXY_LIBS = @LIBPROXY_LIBS@ LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ LIBPSL_LIBS = @LIBPSL_LIBS@ LIBPTHREAD = @LIBPTHREAD@ @@ -1373,6 +1432,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ +NEXT_AS_FIRST_DIRECTIVE_UCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_UCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ @@ -1412,6 +1472,7 @@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ +NEXT_UCHAR_H = @NEXT_UCHAR_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ @@ -1453,6 +1514,7 @@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ +REPLACE_C32RTOMB = @REPLACE_C32RTOMB@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ @@ -1479,6 +1541,7 @@ REPLACE_EXECVE = @REPLACE_EXECVE@ REPLACE_EXECVP = @REPLACE_EXECVP@ REPLACE_EXECVPE = @REPLACE_EXECVPE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ @@ -1536,6 +1599,7 @@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWPUNCT = @REPLACE_ISWPUNCT@ REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_ITOLD = @REPLACE_ITOLD@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ @@ -1549,6 +1613,8 @@ REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MALLOC_FOR_MALLOC_GNU = @REPLACE_MALLOC_FOR_MALLOC_GNU@ REPLACE_MALLOC_FOR_MALLOC_POSIX = @REPLACE_MALLOC_FOR_MALLOC_POSIX@ REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOC16 = @REPLACE_MBRTOC16@ +REPLACE_MBRTOC32 = @REPLACE_MBRTOC32@ REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ @@ -1560,6 +1626,7 @@ REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ +REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ @@ -1598,6 +1665,7 @@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_QSORT_R = @REPLACE_QSORT_R@ REPLACE_RAISE = @REPLACE_RAISE@ +REPLACE_RAND = @REPLACE_RAND@ REPLACE_RANDOM = @REPLACE_RANDOM@ REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ REPLACE_READ = @REPLACE_READ@ @@ -1640,6 +1708,7 @@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ +REPLACE_STRTOF = @REPLACE_STRTOF@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_STRTOL = @REPLACE_STRTOL@ @@ -1650,11 +1719,13 @@ REPLACE_STRTOULL = @REPLACE_STRTOULL@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ +REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ +REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1683,6 +1754,8 @@ REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ +REPLACE_WCTRANS = @REPLACE_WCTRANS@ +REPLACE_WCTYPE = @REPLACE_WCTYPE@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WMEMCMP = @REPLACE_WMEMCMP@ REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ @@ -1697,6 +1770,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ +SMALL_WCHAR_T = @SMALL_WCHAR_T@ STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ @@ -1773,6 +1847,8 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ diff --git a/util/rmold.pl b/util/rmold.pl index a546afd..eb61fda 100755 --- a/util/rmold.pl +++ b/util/rmold.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl -w -# Copyright (C) 1995-1997, 2007-2011, 2015, 2018-2023 Free Software +# Copyright (C) 1995-1997, 2007-2011, 2015, 2018-2024 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify |