Ikeda/argp-standalone
0
0
Fork 0
Code Issues Pull requests Activity

Check for libintl header and add dgettext wrapper.

Browse source 
The dgettext_safe wrapper is used in the few situations where it wasn't
possible to immediatelly tell that the msgid parameter wasn't NULL.
We can probably add some debug printing code here at some point to try
and bring bugs upstream, if it makes sense.

Some inspiration from https://github.com/xhebox/libuargp
This commit is contained in:
Érico Rolim 2021-02-16 01:47:29 -03:00
parent da0206414d
commit e5fe9ad9e8
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
argp-help.c
View file

@ -56,9 +56,9 @@ char *alloca ();
#ifndef _ #ifndef _
/* This is for other GNU distributions with internationalized messages. */ /* This is for other GNU distributions with internationalized messages. */
# if defined HAVE_LIBINTL_H || defined _LIBC # if defined HAVE_LIBINTL_H || 0
# include <libintl.h> # include <libintl.h>
# ifdef _LIBC # if 0
# undef dgettext # undef dgettext
# define dgettext(domain, msgid) \ # define dgettext(domain, msgid) \
__dcgettext (domain, msgid, LC_MESSAGES) __dcgettext (domain, msgid, LC_MESSAGES)
@ -68,6 +68,9 @@ char *alloca ();
# endif # endif
#endif #endif
/* can't use macro due to double evaluation */
static char * dgettext_safe(const char *d, const char *m) { return m ? dgettext(d, m) : NULL; }
#include <argp.h> #include <argp.h>
#include <argp-fmtstream.h> #include <argp-fmtstream.h>
#include "argp-namefrob.h" #include "argp-namefrob.h"
@ -996,7 +999,7 @@ static void
print_header (const char *str, const struct argp *argp, print_header (const char *str, const struct argp *argp,
struct pentry_state *pest) struct pentry_state *pest)
{ {
const char *tstr = dgettext (argp->argp_domain, str); const char *tstr = dgettext_safe (argp->argp_domain, str);
const char *fstr = filter_doc (tstr, ARGP_KEY_HELP_HEADER, argp, pest->state); const char *fstr = filter_doc (tstr, ARGP_KEY_HELP_HEADER, argp, pest->state);
if (fstr) if (fstr)
@ -1150,7 +1153,7 @@ hol_entry_help (struct hol_entry *entry, const struct argp_state *state,
} }
else else
{ {
const char *tstr = real->doc ? dgettext (state == NULL ? NULL const char *tstr = real->doc ? dgettext_safe (state == NULL ? NULL
: state->root_argp->argp_domain, : state->root_argp->argp_domain,
real->doc) : 0; real->doc) : 0;
const char *fstr = filter_doc (tstr, real->key, entry->argp, state); const char *fstr = filter_doc (tstr, real->key, entry->argp, state);
@ -1387,7 +1390,7 @@ argp_args_usage (const struct argp *argp, const struct argp_state *state,
char *our_level = *levels; char *our_level = *levels;
int multiple = 0; int multiple = 0;
const struct argp_child *child = argp->children; const struct argp_child *child = argp->children;
const char *tdoc = dgettext (argp->argp_domain, argp->args_doc), *nl = 0; const char *tdoc = dgettext_safe (argp->argp_domain, argp->args_doc), *nl = 0;
const char *fdoc = filter_doc (tdoc, ARGP_KEY_HELP_ARGS_DOC, argp, state); const char *fdoc = filter_doc (tdoc, ARGP_KEY_HELP_ARGS_DOC, argp, state);
if (fdoc) if (fdoc)
@ -1452,7 +1455,7 @@ argp_doc (const struct argp *argp, const struct argp_state *state,
void *input = 0; void *input = 0;
int anything = 0; int anything = 0;
size_t inp_text_limit = 0; size_t inp_text_limit = 0;
const char *doc = dgettext (argp->argp_domain, argp->doc); const char *doc = dgettext_safe (argp->argp_domain, argp->doc);
const struct argp_child *child = argp->children; const struct argp_child *child = argp->children;
if (doc) if (doc)

2
configure.ac
View file

@ -26,7 +26,7 @@ fi
# Checks for header files. # Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS(limits.h malloc.h unistd.h) AC_CHECK_HEADERS(limits.h malloc.h unistd.h libintl.h)
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST AC_C_CONST