- fix: popt exec doesn't add '--', --target et al no longer need '='.

- fix: popt consume-next-arg "!#:+" w/o side effect (#41956).

32 files changed, 405 insertions, 385 deletions

diff --git a/po/cs.po b/po/cs.po
index 9d0f31e..b74c334 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 2001-04-02 02:50+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "neznámé èíslo chyby"
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "volba (%d) není v popt implementována\n"
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr "chybí argument"
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr "neznámá volba"
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr "po¾adovány vzájemnì výluèné logické operace"
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr "aliasy vnoøené pøíli¹ hluboko"
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr "chyba v quotování parametrù"
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr "chybná numerická hodnota"
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr "èíslo je pøíli¹ velké nebo pøíli¹ malé"
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr "neznámá chyba"
 
diff --git a/po/da.po b/po/da.po
index 6d08b78..d693658 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr "de ønskede handlinger udelukker hinanden"
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk værdi"
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr "ukendt fejl"
 
diff --git a/po/de.po b/po/de.po
index ecec0b2..3e9b66f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index ecec0b2..3e9b66f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/eu_ES.po b/po/eu_ES.po
index e5bea79..7d7c214 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index ecec0b2..3e9b66f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index ecec0b2..3e9b66f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/gl.po b/po/gl.po
index 21c781b..995371d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno descoñecido"
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opción (%d) non implementada en popt\n"
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr "opción descoñecida"
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr "solicitáronse operacións lóxicas mutuamente excluíntes"
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr "aliases aniñados a un nivel demasiado profundo"
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr "erro nas comiñas do parámetro"
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr "valor numérico non válido"
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr "número demasiado grande ou pequeno"
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr "erro descoñecido"
 
diff --git a/po/hu.po b/po/hu.po
index 8fe01c2..737c413 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: László Németh <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index ecec0b2..3e9b66f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/is.po b/po/is.po
index 5c5f3c5..586590c 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 2001-01-23 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "óþekkt villunúmer"
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rofagerðin (%d) er ekki studd í popt\n"
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr "vantar viðfang"
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr "óþekktur rofi"
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr "beðið um rofa sem slökkva hvor á öðrum"
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr "alíasar of flóknir"
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr "villa í viðföngum (gæsalappir og svo frv.)"
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr "ógilt tölulegt gildi"
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr "talan of stór eða smá"
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr "óþekkt villa"
 
diff --git a/po/it.po b/po/it.po
index ecec0b2..3e9b66f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index ecec0b2..3e9b66f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/ko.po b/po/ko.po
index d48ca88..cd27892 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.2\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 2001-05-10 13:53+0900\n"
 "Last-Translator: Jong-Hoon Ryu <queenrjh@chollian.net>\n"
 "Language-Team: Korean Linux Extension project <kle@kldp.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ùÄÚµå(errno) ÀÔ´Ï´Ù"
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "%d ¿É¼ÇÀº popt ¿¡¼­ »ç¿ëµÇ´Â ¿É¼ÇÀÌ ¾Æ´Õ´Ï´Ù\n"
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr "Àμö°ªÀÌ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr "¾Ë ¼ö ¾ø´Â ¿É¼ÇÀÔ´Ï´Ù"
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr "¾çÂÊ¿¡ ¹èŸÀû ³í¸® ¿¬»êÀÌ ÁöÁ¤µÇ¾ú½À´Ï´Ù"
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr "¿É¼Ç->Àμö°ªÀÌ NULL ·Î µÇ¾î¼­´Â ¾ÈµË´Ï´Ù"
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr "º°Äª(alias)ÀÌ º¹ÀâÇÏ°Ô ¼³Á¤µÇ¾ú½À´Ï´Ù"
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr "¸Å°³º¯¼öÀÇ °ª¿¡ ¿À·ù°¡ ÀÖ½À´Ï´Ù"
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr "À߸øµÈ ¼ýÀÚ°ª ÀÔ´Ï´Ù"
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr "¼ýÀÚ°ªÀÌ ³Ê¹« Å©°Å³ª, ³Ê¹« Àû½À´Ï´Ù"
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr "¸Þ¸ð¸® ÇÒ´ç¿¡ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ùÀÔ´Ï´Ù"
 
diff --git a/po/no.po b/po/no.po
index 0468e15..962e26a 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.2\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 2001-01-23 22:52+01:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype løkker"
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr "ukjent feil"
 
diff --git a/po/pl.po b/po/pl.po
index ecec0b2..3e9b66f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/popt.pot b/po/popt.pot
index e5bea79..7d7c214 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/pt.po b/po/pt.po
index 68aa02b..5f8692e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 2001-01-21 19:31+00:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opção (%d) não implementado no popt\n"
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr "opção desconhecida"
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas operações lógicas mutuamente exclusivas"
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de parâmetros"
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr "valor númerico inválido"
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr "número demasiado grando ou pequeno"
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr "erro desconhecido"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ecec0b2..3e9b66f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index 6955922..58bbb56 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -13,49 +13,49 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1024
+#: popt.c:1044
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
diff --git a/po/ru.po b/po/ru.po
index 4ca7a8e..5964438 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 2001-01-21 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÎÏÍÅÒ ÏÛÉÂËÉ"
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "ÏÂÒÁÂÏÔËÁ ÐÁÒÁÍÅÔÒÁ (%d) × popt ÎÅ ÐÒÅÄÕÓÍÏÔÒÅÎÁ\n"
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr "ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ"
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ"
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr "ÚÁÐÒÏÛÅÎÙ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÝÉÅ ÌÏÇÉÞÅÓËÉÅ ÏÐÅÒÁÃÉÉ"
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr "ÐÒÅ×ÙÛÅÎ ÕÒÏ×ÅÎØ ÄÏÐÕÓÔÉÍÏÊ ÒÅËÕÒÓÉÉ ÐÏÄÓÔÁÎÏ×ÏË"
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr "ÏÛÉÂËa ÐÏÍÅÝÅÎÉÑ ÐÁÒÁÍÅÔÒÏ× × ËÁ×ÙÞËÉ"
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ"
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr "ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ ÚÁ ÐÒÅÄÅÌÁÍÉ ÐÒÅÄÕÓÍÏÔÒÅÎÎÏÇÏ"
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ"
 
diff --git a/po/sk.po b/po/sk.po
index 1b30b81..df8785b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -17,48 +17,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index ba880c5..b2300e7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index ecec0b2..3e9b66f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index b955a5c..6c996f7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 2001-01-16 00:40+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "okänt felnummer"
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtypen (%d) är inte implementerad i popt\n"
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr "saknat argument"
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr "okänd flagga"
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr "ömsesidigt uteslutande logiska operationer begärdes"
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr "alias är nästlade för djupt"
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt värde"
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr "talet för stort eller för litet"
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr "okänt fel"
 
diff --git a/po/tr.po b/po/tr.po
index 3ca8aad..5c31761 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "seçenek türü (%d) popt için geçersiz\n"
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr "argüman eksik"
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr "bilinmeyen seçenek"
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini dýþlayan mantýksal iþlemler istendi"
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr "adlarda çok fazla içiçelikler"
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr "parametrelerde týrnak iþaretleme hatalý "
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr "sayýsal deðer geçersiz"
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr "sayý ya çok büyük ya da çok küçük"
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
diff --git a/po/uk.po b/po/uk.po
index c1e22e4..dc3fb06 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -17,48 +17,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/wa.po b/po/wa.po
index 018ea0c..711f8b3 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -21,48 +21,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/zh.po b/po/zh.po
index ecec0b2..3e9b66f 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index b404529..63491bc 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-05-29 08:54-0400\n"
+"POT-Creation-Date: 2001-05-29 15:54-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:851
+#: popt.c:871
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1014
+#: popt.c:1034
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1016
+#: popt.c:1036
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1018
+#: popt.c:1038
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1020
+#: popt.c:1040
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1022
+#: popt.c:1042
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1024
+#: popt.c:1044
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1026
+#: popt.c:1046
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1028
+#: popt.c:1048
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1030
+#: popt.c:1050
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1034
+#: popt.c:1054
 msgid "unknown error"
 msgstr ""
 
diff --git a/popt.c b/popt.c
index caae8b2..548cbd8 100644
--- a/popt.c
+++ b/popt.c
@@ -52,6 +52,7 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
 }
 
 static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
+	/*@modifies internalState@*/
 {
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
@@ -71,6 +72,7 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 }
 
 static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
+	/*@modifies internalState@*/
 {
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
@@ -93,6 +95,7 @@ static void invokeCallbacksOPTION(poptContext con,
 				  const struct poptOption * opt,
 				  const struct poptOption * myOpt,
 				  /*@null@*/ const void * myData, int shorty)
+	/*@modifies internalState@*/
 {
     const struct poptOption * cbopt = NULL;
 
@@ -168,14 +171,16 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
     if (name) {
 	char * t = malloc(strlen(name) + 1);
 	if (t) con->appName = strcpy(t, name);
-     }
+    }
 
     invokeCallbacksPRE(con, con->options);
 
     return con;
 }
 
-static void cleanOSE(struct optionStackEntry *os)
+static void cleanOSE(/*@special@*/ struct optionStackEntry *os)
+	/*@uses os @*/
+	/*@releases os->nextArg, os->argv, os->argb @*/
 {
     os->nextArg = _free(os->nextArg);
     os->argv = _free(os->argv);
@@ -214,9 +219,11 @@ void poptResetContext(poptContext con)
     /*@=nullstate@*/
 }
 
-/* Only one of longName, shortName may be set at a time */
-static int handleExec(poptContext con, /*@null@*/ const char * longName,
-		char shortName)
+/* Only one of longName, shortName should be set, not both. */
+static int handleExec(/*@special@*/ poptContext con,
+		/*@null@*/ const char * longName, char shortName)
+	/*@uses con->execs, con->numExecs, con->flags, con->doExec,
+		con->finalArgv, con->finalArgvAlloced, con->finalArgvCount @*/
 {
     int i;
 
@@ -268,9 +275,11 @@ static int handleExec(poptContext con, /*@null@*/ const char * longName,
 }
 
 /* Only one of longName, shortName may be set at a time */
-static int handleAlias(poptContext con,
+static int handleAlias(/*@special@*/ poptContext con,
 		/*@null@*/ const char * longName, char shortName,
 		/*@keep@*/ /*@null@*/ const char * nextCharArg)
+	/*@uses con->aliases, con->numAliases, con->optionStack,
+		con->os, con->os->currAlias, con->os->currAlias->longName @*/
 {
     int rc;
     int i;
@@ -359,7 +368,9 @@ static int execCommand(poptContext con)
     }
 
     if (con->leftovers != NULL && con->numLeftovers > 0) {
+#if 0
 	argv[argc++] = "--";
+#endif
 	memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers);
 	argc += con->numLeftovers;
     }
@@ -424,7 +435,7 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
 	    if (opt2 == NULL) continue;
 	    /* Sub-table data will be inheirited if no data yet. */
 	    if (!(callback && *callback)) return opt2;
-	    if (!(callbackData && *callback == NULL)) return opt2;
+	    if (!(callbackData && *callbackData == NULL)) return opt2;
 	    /*@-observertrans -dependenttrans @*/
 	    *callbackData = opt->descrip;
 	    /*@=observertrans =dependenttrans @*/
@@ -465,8 +476,10 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
     return opt;
 }
 
-static const char * findNextArg(poptContext con, unsigned argx, int delete)
-	/*@modifies con @*/
+static const char * findNextArg(/*@special@*/ poptContext con,
+		unsigned argx, int delete)
+	/*@uses con->optionStack, con->os,
+		con->os->next, con->os->argb, con->os->argc, con->os->argv @*/
 {
     struct optionStackEntry * os = con->os;
     const char * arg;
@@ -491,16 +504,16 @@ static const char * findNextArg(poptContext con, unsigned argx, int delete)
 	}
 	if (os > con->optionStack) os--;
     } while (arg == NULL);
-    /*@-compdef@*/	/* FIX: con->os->argv undefined */
     return arg;
-    /*@=compdef@*/
 }
 
 static /*@only@*/ /*@null@*/ const char *
-expandNextArg(poptContext con, const char * s)
+expandNextArg(/*@special@*/ poptContext con, const char * s)
+	/*@uses con->optionStack, con->os,
+		con->os->next, con->os->argb, con->os->argc, con->os->argv @*/
 	/*@modifies con @*/
 {
-    const char *a;
+    const char * a = NULL;
     size_t alen;
     char *t, *te;
     size_t tn = strlen(s) + 1;
@@ -518,8 +531,10 @@ expandNextArg(poptContext con, const char * s)
 	case '!':
 	    if (!(s[0] == '#' && s[1] == ':' && s[2] == '+'))
 		break;
-	    if ((a = findNextArg(con, 1, 1)) == NULL)
-		break;
+	    /* XXX Make sure that findNextArg deletes only next arg. */
+	    if (a == NULL) {
+		if ((a = findNextArg(con, 1, 1)) == NULL) break;
+	    }
 	    s += 3;
 
 	    alen = strlen(a);
@@ -541,6 +556,7 @@ expandNextArg(poptContext con, const char * s)
 }
 
 static void poptStripArg(poptContext con, int which)
+	/*@modifies con @*/
 {
     if (con->arg_strip == NULL)
 	con->arg_strip = PBM_ALLOC(con->optionStack[0].argc);
@@ -549,6 +565,7 @@ static void poptStripArg(poptContext con, int which)
 }
 
 static int poptSaveLong(const struct poptOption * opt, long aLong)
+	/*@modifies opt->arg @*/
 {
     if (opt->arg == NULL)
 	return POPT_ERROR_NULLARG;
@@ -576,6 +593,7 @@ static int poptSaveLong(const struct poptOption * opt, long aLong)
 }
 
 static int poptSaveInt(const struct poptOption * opt, long aLong)
+	/*@modifies opt->arg @*/
 {
     if (opt->arg == NULL)
 	return POPT_ERROR_NULLARG;
@@ -675,6 +693,7 @@ int poptGetNextOpt(poptContext con)
 		/* XXX aliases with arg substitution need "--alias=arg" */
 		if (handleAlias(con, optString, '\0', NULL))
 		    continue;
+
 		if (handleExec(con, optString, '\0'))
 		    continue;
 
@@ -708,15 +727,13 @@ int poptGetNextOpt(poptContext con)
 
 	/* Process next short option */
 	if (con->os->nextCharArg) {
-	    /*@-branchstate@*/		/* FIX: W2DO? */
 	    origOptString = con->os->nextCharArg;
 
 	    con->os->nextCharArg = NULL;
 
-	    if (handleAlias(con, NULL, *origOptString,
-			    origOptString + 1)) {
+	    if (handleAlias(con, NULL, *origOptString, origOptString + 1))
 		continue;
-	    }
+
 	    if (handleExec(con, NULL, *origOptString)) {
 		/* Restore rest of short options for further processing */
 		origOptString++;
@@ -732,6 +749,7 @@ int poptGetNextOpt(poptContext con)
 	    shorty = 1;
 
 	    origOptString++;
+	    /*@-branchstate@*/		/* FIX: W2DO? */
 	    if (*origOptString != '\0')
 		con->os->nextCharArg = origOptString;
 	    /*@=branchstate@*/
@@ -769,8 +787,10 @@ int poptGetNextOpt(poptContext con)
 			return POPT_ERROR_NOARG;
 		} else {
 
-		    /* make sure this isn't part of a short arg or the
-			result of an alias expansion */
+		    /*
+		     * Make sure this isn't part of a short arg or the
+		     * result of an alias expansion.
+		     */
 		    if (con->os == con->optionStack &&
 			(opt->argInfo & POPT_ARGFLAG_STRIP) &&
 			canstrip) {
@@ -778,10 +798,10 @@ int poptGetNextOpt(poptContext con)
 		    }
 		
 		    if (con->os->argv != NULL) {	/* XXX can't happen */
-			longArg =
-			    expandNextArg(con, con->os->argv[con->os->next]);
+			/* XXX watchout: subtle side-effects live here. */
+			longArg = con->os->argv[con->os->next++];
+			longArg = expandNextArg(con, longArg);
 			con->os->nextArg = longArg;
-			con->os->next++;
 		    }
 		}
 	    }
diff --git a/testit.sh b/testit.sh
index 46d6706..478613d 100755
--- a/testit.sh
+++ b/testit.sh
@@ -47,7 +47,7 @@ run test1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1
 run test1 "test1 - 19" "" --echo-args
 run test1 "test1 - 20" "--arg1" --echo-args --arg1
 run test1 "test1 - 21" "--arg2 something" -T something -e
-run test1 "test1 - 22" "--arg2 something -- more args" -T something -a more args
+run test1 "test1 - 22" "--arg2 something more args" -T something -a more args
 run test1 "test1 - 23" "--echo-args -a" --echo-args -e -a
 run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
 run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption