INSTALL README.md
AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
- -DLOCALEDIR=\"$(localedir)\"
+ -I$(DX_BASEDIR)/src -DLOCALEDIR=\"$(localedir)\"
AM_CFLAGS = $(LIBGERBV_CFLAGS) $(CNEARTREE_CFLAGS)
bin_PROGRAMS = slotifier
-slotifier_SOURCES = src/slotifier.c src/options.h
+slotifier_SOURCES = src/slotifier.c src/options.h \
+ common/src/help.c common/src/help.h
slotifier_LDADD = $(LIBGERBV_LIBS) $(CNEARTREE_LIBS) libgnu.a \
$(LTLIBICONV) $(LTLIBINTL) $(HYPOT_LIBM)
$(slotifier_OBJECTS): $(gnulib_headers)
dnl This is free software: you are free to do what the fuck you want to.
dnl There is NO WARRANTY, to the extent permitted by law.
-AC_INIT([slotifier], [1.2], [nbowler@draconx.ca])
+AC_INIT([slotifier], [1.2a], [nbowler@draconx.ca])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects dist-xz])
#include <CNearTree.h>
#include <gerbv.h>
+#include "help.h"
+
#if !ENABLE_NLS
# undef ENABLE_NLS
# define ENABLE_NLS 0
progname);
}
-static int
-print_optstring(const struct option *opt, const struct lopt_help *help)
-{
- char optstring[100];
- int w;
-
- if (!ENABLE_NLS)
- goto no_translate;
-
- if (opt->has_arg) {
- w = snprintf(optstring, sizeof optstring,
- _(" -%c, --%s=%s"), opt->val, opt->name,
- pgettext_expr(opt->name, help->arg));
- } else {
- w = snprintf(optstring, sizeof optstring,
- _(" -%c, --%s"), opt->val, opt->name);
- }
-
- if (w < 0)
- goto no_translate;
-
- w = mbsnwidth(optstring, w, 0);
- printf("%s", optstring);
- goto out;
-
-no_translate:
- if (opt->has_arg) {
- w = printf(" -%c, --%s=%s", opt->val, opt->name, help->arg);
- } else {
- w = printf(" -%c, --%s", opt->val, opt->name);
- }
-out:
- if (w < 0 || w > 18) {
- putchar('\n');
- return 0;
- }
-
- return w;
-}
-
-/*
- * Print a string, with each line indented by i spaces. The first line
- * will be indented by w fewer spaces (to account for the cursor being in
- * some other column).
- */
-static void print_block(const char *s, int i, int w)
-{
- for (; *s; w = 0) {
- const char *nl = strchr(s, '\n');
- int n = (nl ? nl-s : -1);
-
- printf("%*s%.*s\n", i-w, "", n, s);
- if (!nl)
- break;
-
- s = nl+1;
- }
-}
-
static void print_help(void)
{
const struct option *opt;
puts(_("Options:"));
for (opt = lopts; opt->val; opt++) {
struct lopt_help help;
- int w;
if (!lopt_get_help(opt, &help))
continue;
- w = print_optstring(opt, &help);
-
- if (ENABLE_NLS)
- help.desc = pgettext_expr(opt->name, help.desc);
-
- print_block(help.desc, 20, w);
+ help_print_option(opt, help.arg, help.desc, 20);
}
putchar('\n');