summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--po/cs.po2
-rw-r--r--po/da.po2
-rw-r--r--po/de.po2
-rw-r--r--po/es.po2
-rw-r--r--po/eu_ES.po2
-rw-r--r--po/fi.po2
-rw-r--r--po/fr.po2
-rw-r--r--po/gl.po2
-rw-r--r--po/hu.po2
-rw-r--r--po/id.po2
-rw-r--r--po/is.po2
-rw-r--r--po/it.po2
-rw-r--r--po/ja.po2
-rw-r--r--po/ko.po2
-rw-r--r--po/no.po2
-rw-r--r--po/pl.po2
-rw-r--r--po/popt.pot2
-rw-r--r--po/pt.po2
-rw-r--r--po/pt_BR.po2
-rw-r--r--po/ro.po2
-rw-r--r--po/ru.po2
-rw-r--r--po/sk.po2
-rw-r--r--po/sl.po2
-rw-r--r--po/sr.po2
-rw-r--r--po/sv.po2
-rw-r--r--po/tr.po2
-rw-r--r--po/uk.po2
-rw-r--r--po/wa.po2
-rw-r--r--po/zh.po2
-rw-r--r--po/zh_CN.GB2312.po2
-rw-r--r--popthelp.c49
31 files changed, 73 insertions, 36 deletions
diff --git a/po/cs.po b/po/cs.po
index 95285b6..921f8c8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
"PO-Revision-Date: 2001-07-24 00:03+0100\n"
"Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 8db09dd..270c579 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/de.po b/po/de.po
index 736af41..b9a3f06 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/es.po b/po/es.po
index 2f08e70..2ba0de1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 736af41..b9a3f06 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/fi.po b/po/fi.po
index 736af41..b9a3f06 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/fr.po b/po/fr.po
index 736af41..b9a3f06 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/gl.po b/po/gl.po
index 52fb006..1a16940 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/hu.po b/po/hu.po
index c6495bb..b1f0bcd 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/id.po b/po/id.po
index 736af41..b9a3f06 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/is.po b/po/is.po
index eee26a0..7df805b 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
"PO-Revision-Date: 2001-06-08 01:35+0000\n"
"Last-Translator: Richard Allen <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 736af41..b9a3f06 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/ja.po b/po/ja.po
index 736af41..b9a3f06 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/ko.po b/po/ko.po
index bdcb332..59b1eca 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
"PO-Revision-Date: 2001-09-06 20:06+0900\n"
"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
"Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 50473e2..1249d2e 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
"PO-Revision-Date: 2001-06-27 11:05+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
"Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 736af41..b9a3f06 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/popt.pot b/po/popt.pot
index 1e7c603..2d3892e 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/pt.po b/po/pt.po
index 87c0065..59b5883 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
"PO-Revision-Date: 2002-02-13 18:32+0000\n"
"Last-Translator: Pedro Morais <morais@kde.org>\n"
"Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 736af41..b9a3f06 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/ro.po b/po/ro.po
index f4fd8c1..4d130b1 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/ru.po b/po/ru.po
index d3e7880..bc5a7c6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
"PO-Revision-Date: 2001-07-05 21:00-0500\n"
"Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 2690d92..8d7e5e9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/sl.po b/po/sl.po
index 0f97240..eb04365 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/sr.po b/po/sr.po
index 736af41..b9a3f06 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/sv.po b/po/sv.po
index 5a6f9ae..e6d8365 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
"PO-Revision-Date: 2001-07-12 22:26+0100\n"
"Last-Translator: Christian Rose <menthos@menthos.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 371eb50..6943953 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/uk.po b/po/uk.po
index a8b5f62..bfcacce 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/wa.po b/po/wa.po
index b48a4de..cae7721 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/zh.po b/po/zh.po
index 736af41..b9a3f06 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 6522f81..107e433 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.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-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"
diff --git a/popthelp.c b/popthelp.c
index 94af481..f40b740 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -101,7 +101,11 @@ getArgDescrip(const struct poptOption * opt,
switch (opt->argInfo & POPT_ARG_MASK) {
case POPT_ARG_NONE: return POPT_("NONE");
+#ifdef DYING
case POPT_ARG_VAL: return POPT_("VAL");
+#else
+ case POPT_ARG_VAL: return NULL;
+#endif
case POPT_ARG_INT: return POPT_("INT");
case POPT_ARG_LONG: return POPT_("LONG");
case POPT_ARG_STRING: return POPT_("STRING");
@@ -600,16 +604,29 @@ static int itemUsage(FILE * fp, int cursor, poptItem item, int nitems,
}
/**
+ * Keep track of option tables already processed.
+ */
+typedef struct poptDone_s {
+ int nopts;
+ int maxopts;
+/*@observer@*/
+ const void ** opts;
+} * poptDone;
+
+/**
* Display usage text for a table of options.
* @param con context
* @param fp output file handle
* @param cursor
* @param opt option(s)
* @param translation_domain translation domain
+ * @param done tables already processed
+ * @return
*/
static int singleTableUsage(poptContext con, FILE * fp,
int cursor, const struct poptOption * opt,
- /*@null@*/ const char * translation_domain)
+ /*@null@*/ const char * translation_domain,
+ poptDone done)
/*@globals fileSystem @*/
/*@modifies *fp, fileSystem @*/
{
@@ -619,9 +636,21 @@ static int singleTableUsage(poptContext con, FILE * fp,
if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN) {
translation_domain = (const char *)opt->arg;
} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
- if (opt->arg) /* XXX program error */
+ int i = 0;
+ if (done)
+ for (i = 0; i < done->nopts; i++) {
+ const void * that = done->opts[i];
+ if (that == NULL || that != opt->arg)
+ continue;
+ break;
+ }
+ /* Skip if this table has already been processed. */
+ if (opt->arg == NULL || i < done->nopts)
+ continue;
+ if (done->nopts < done->maxopts)
+ done->opts[done->nopts++] = (const void *) opt->arg;
cursor = singleTableUsage(con, fp, cursor, opt->arg,
- translation_domain);
+ translation_domain, done);
} else if ((opt->longName || opt->shortName) &&
!(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
cursor = singleOptionUsage(fp, cursor, opt, translation_domain);
@@ -634,6 +663,7 @@ static int singleTableUsage(poptContext con, FILE * fp,
/**
* Return concatenated short options for display.
+ * @todo Sub-tables should be recursed.
* @param opt option(s)
* @param fp output file handle
* @retval str concatenation of short options
@@ -674,13 +704,20 @@ static int showShortOptions(const struct poptOption * opt, FILE * fp,
void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
{
+ poptDone done = memset(alloca(sizeof(*done)), 0, sizeof(*done));
int cursor;
+ done->nopts = 0;
+ done->maxopts = 64;
+ cursor = done->maxopts * sizeof(*done->opts);
+ done->opts = memset(alloca(cursor), 0, cursor);
+ done->opts[done->nopts++] = (const void *) con->options;
+
cursor = showHelpIntro(con, fp);
cursor += showShortOptions(con->options, fp, NULL);
- (void) singleTableUsage(con, fp, cursor, con->options, NULL);
- (void) itemUsage(fp, cursor, con->aliases, con->numAliases, NULL);
- (void) itemUsage(fp, cursor, con->execs, con->numExecs, NULL);
+ cursor = singleTableUsage(con, fp, cursor, con->options, NULL, done);
+ cursor = itemUsage(fp, cursor, con->aliases, con->numAliases, NULL);
+ cursor = itemUsage(fp, cursor, con->execs, con->numExecs, NULL);
if (con->otherHelp) {
cursor += strlen(con->otherHelp) + 1;
View Lorry Controller Status