From b9145eabe09db09a56c9daf3006426b08182d848 Mon Sep 17 00:00:00 2001 From: jbj Date: Sat, 30 Dec 2000 19:59:37 +0000 Subject: [PATCH] - (popt): fix float/double handling (#19701). - (popt): non-linux needs (#22732). CVS patchset: 4390 CVS date: 2000/12/30 19:59:37 --- CHANGES | 2 ++ configure.in | 3 +++ popt/configure.in | 2 +- popt/po/cs.po | 2 +- popt/po/da.po | 2 +- popt/po/de.po | 2 +- popt/po/es.po | 2 +- popt/po/fi.po | 2 +- popt/po/fr.po | 2 +- popt/po/gl.po | 2 +- popt/po/hu.po | 2 +- popt/po/id.po | 2 +- popt/po/is.po | 2 +- popt/po/it.po | 2 +- popt/po/ja.po | 2 +- popt/po/ko.po | 2 +- popt/po/no.po | 2 +- popt/po/pl.po | 2 +- popt/po/popt.pot | 2 +- popt/po/pt.po | 2 +- popt/po/pt_BR.po | 2 +- popt/po/ro.po | 2 +- popt/po/ru.po | 2 +- popt/po/sk.po | 2 +- popt/po/sl.po | 2 +- popt/po/sr.po | 2 +- popt/po/sv.po | 2 +- popt/po/tr.po | 2 +- popt/po/uk.po | 2 +- popt/po/wa.po | 2 +- popt/po/zh.po | 2 +- popt/po/zh_CN.GB2312.po | 2 +- popt/popt.c | 5 ++++- 33 files changed, 39 insertions(+), 31 deletions(-) diff --git a/CHANGES b/CHANGES index 86deb135b..6570e8da2 100644 --- a/CHANGES +++ b/CHANGES @@ -84,6 +84,8 @@ - rpmmodule.c(handleDbResult): return empty list when nothing matches. - (non-linux): move stubs.c to rpmio (#21132). - (python): bind initdb (#20988). + - (popt): fix float/double handling (#19701). + - (popt): non-linux needs (#22732). 3.0.6 -> 4.0 - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db. diff --git a/configure.in b/configure.in index cc391baa1..8c5c62efb 100644 --- a/configure.in +++ b/configure.in @@ -436,6 +436,9 @@ AC_CHECK_HEADERS(sys/mount.h sys/mntctl.h sys/param.h sys/vmount.h) AC_CHECK_HEADERS(bzlib.h libio.h zlib.h) AC_CHECK_HEADERS(err.h mcheck.h) +dnl popt w float/double needs. +AC_CHECK_HEADERS(float.h) + dnl whether or not we should try to build rpmgettext/rpmputtext. if test X"$USE_NLS" = Xyes; then BUILD_RPMNLSTOOLS="rpmgettext rpmputtext" diff --git a/popt/configure.in b/popt/configure.in index 9c6ddac22..b484c87ec 100755 --- a/popt/configure.in +++ b/popt/configure.in @@ -48,7 +48,7 @@ else fi AC_SUBST(TARGET) -AC_CHECK_HEADERS(alloca.h libintl.h mcheck.h unistd.h) +AC_CHECK_HEADERS(alloca.h float.h libintl.h mcheck.h unistd.h) AC_MSG_CHECKING(for /usr/ucblib in LIBS) if test -d /usr/ucblib ; then if test "$build" = "mips-sni-sysv4" ; then diff --git a/popt/po/cs.po b/popt/po/cs.po index 31b10cdbb..d81453bdf 100644 --- a/popt/po/cs.po +++ b/popt/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 2000-08-23 22:24+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" diff --git a/popt/po/da.po b/popt/po/da.po index 346a40345..ab784a524 100644 --- a/popt/po/da.po +++ b/popt/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 2000-03-07 05:17+01:00\n" "Last-Translator: K. Christiansen \n" "Language-Team: Danish/Dansk \n" diff --git a/popt/po/de.po b/popt/po/de.po index 4c4d98f9d..35c422612 100644 --- a/popt/po/de.po +++ b/popt/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/es.po b/popt/po/es.po index 4c4d98f9d..35c422612 100644 --- a/popt/po/es.po +++ b/popt/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/fi.po b/popt/po/fi.po index 4c4d98f9d..35c422612 100644 --- a/popt/po/fi.po +++ b/popt/po/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/fr.po b/popt/po/fr.po index 4c4d98f9d..35c422612 100644 --- a/popt/po/fr.po +++ b/popt/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/gl.po b/popt/po/gl.po index 9f5848411..989e96354 100644 --- a/popt/po/gl.po +++ b/popt/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 2000-01-06 20:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" diff --git a/popt/po/hu.po b/popt/po/hu.po index a3abdb364..22b953f0d 100644 --- a/popt/po/hu.po +++ b/popt/po/hu.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 2000-08-03 23:26+0200\n" "Last-Translator: László Németh \n" "Language-Team: Hungarian\n" diff --git a/popt/po/id.po b/popt/po/id.po index 4c4d98f9d..35c422612 100644 --- a/popt/po/id.po +++ b/popt/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/is.po b/popt/po/is.po index 2d9759fa3..2e582b259 100644 --- a/popt/po/is.po +++ b/popt/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 2000-06-16 02:12+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" diff --git a/popt/po/it.po b/popt/po/it.po index 4c4d98f9d..35c422612 100644 --- a/popt/po/it.po +++ b/popt/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/ja.po b/popt/po/ja.po index 4c4d98f9d..35c422612 100644 --- a/popt/po/ja.po +++ b/popt/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/ko.po b/popt/po/ko.po index 4c4d98f9d..35c422612 100644 --- a/popt/po/ko.po +++ b/popt/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/no.po b/popt/po/no.po index bf8e74265..4443b9847 100644 --- a/popt/po/no.po +++ b/popt/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 2000-06-21 16:11+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" diff --git a/popt/po/pl.po b/popt/po/pl.po index 4c4d98f9d..35c422612 100644 --- a/popt/po/pl.po +++ b/popt/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/popt.pot b/popt/po/popt.pot index b15489b25..4fb4a861d 100644 --- a/popt/po/popt.pot +++ b/popt/po/popt.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/pt.po b/popt/po/pt.po index 2bd6434d3..398e7f799 100644 --- a/popt/po/pt.po +++ b/popt/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 2000-06-22 01:02+01:00\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po index 4c4d98f9d..35c422612 100644 --- a/popt/po/pt_BR.po +++ b/popt/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/ro.po b/popt/po/ro.po index e374d86f6..cf36c526d 100644 --- a/popt/po/ro.po +++ b/popt/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 2000-06-14 23:23+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" diff --git a/popt/po/ru.po b/popt/po/ru.po index 60098eeff..692381b3a 100644 --- a/popt/po/ru.po +++ b/popt/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 2000-08-13 21:00+0300\n" "Last-Translator: Leon Kanter \n" "Language-Team: Black Cat Linux Team \n" diff --git a/popt/po/sk.po b/popt/po/sk.po index de2d3474a..1a7cf7a3b 100644 --- a/popt/po/sk.po +++ b/popt/po/sk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 1999-08-04 21:40+0200\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" diff --git a/popt/po/sl.po b/popt/po/sl.po index 293933171..35071edbe 100644 --- a/popt/po/sl.po +++ b/popt/po/sl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 2000-09-05 12:30+0200\n" "Last-Translator: Roman Maurer \n" "Language-Team: Slovenian \n" diff --git a/popt/po/sr.po b/popt/po/sr.po index 4c4d98f9d..35c422612 100644 --- a/popt/po/sr.po +++ b/popt/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/sv.po b/popt/po/sv.po index bd5f15728..32fd97d91 100644 --- a/popt/po/sv.po +++ b/popt/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 2000-06-20 00:07+0200\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" diff --git a/popt/po/tr.po b/popt/po/tr.po index 2e56a9163..8e5c43d3e 100644 --- a/popt/po/tr.po +++ b/popt/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 2000-01-06 13:01+0100\n" "Last-Translator: Görkem Çetin \n" "Language-Team: Gelecek A.Ţ \n" diff --git a/popt/po/uk.po b/popt/po/uk.po index b4ea03266..94d689028 100644 --- a/popt/po/uk.po +++ b/popt/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 1999-09-30 16:54+0200\n" "Last-Translator: Yuri Syrota \n" "Language-Team: Ukrainian \n" diff --git a/popt/po/wa.po b/popt/po/wa.po index d054d3982..8731d70fb 100644 --- a/popt/po/wa.po +++ b/popt/po/wa.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 1999-03-18 23:11+0100\n" "Last-Translator: Nobody yet\n" "Language-Team: walon \n" diff --git a/popt/po/zh.po b/popt/po/zh.po index 4c4d98f9d..35c422612 100644 --- a/popt/po/zh.po +++ b/popt/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po index 3e7a016c3..4459f615a 100644 --- a/popt/po/zh_CN.GB2312.po +++ b/popt/po/zh_CN.GB2312.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.1\n" -"POT-Creation-Date: 2000-12-19 18:05-0500\n" +"POT-Creation-Date: 2000-12-30 14:24-0500\n" "PO-Revision-Date: 1999-11-11 05:04+0800\n" "Last-Translator: Dillion Chen \n" "Language-Team: TLDN\n" diff --git a/popt/popt.c b/popt/popt.c index 6c4100cef..79bfdaaa0 100644 --- a/popt/popt.c +++ b/popt/popt.c @@ -10,6 +10,9 @@ #include "system.h" +#if HAVE_FLOAT_H +#include +#endif #include #include "findme.h" @@ -716,7 +719,7 @@ int poptGetNextOpt(poptContext con) case POPT_ARG_FLOAT: case POPT_ARG_DOUBLE: - { long aDouble; + { double aDouble; char *end; aDouble = strtod(con->os->nextArg, &end);