/*
* Command line utility for making sense of C declarations.
- * Copyright © 2011-2012, 2020-2023 Nick Bowler
+ * Copyright © 2011-2012, 2020-2024 Nick Bowler
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "xtra.h"
#include "options.h"
#include "version.h"
+#include "getline.h"
#if HAVE_READLINE_READLINE_H
# include <readline/readline.h>
{
va_list(ap);
- if (batch_mode)
- fprintf(stderr, "%s: ", progname);
- fprintf(stderr, "%s", _("error: "));
+ fprintf(stderr, batch_mode ? "%s: %s" : "%.0s%s",
+ progname, _("error: "));
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
help_print_option(opt, help.arg, help.desc, 20);
}
- putchar('\n');
- puts(_("For more information, see the cdecl99(1) man page."));
- putchar('\n');
+ printf("\n%s\n\n",
+ _("For more information, see the cdecl99(1) man page."));
/*
* TRANSLATORS: Please add *another line* indicating where users should
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
-static int do_getline(char **linebuf, size_t *n)
-{
- ssize_t rc;
-
- if ((rc = getline(linebuf, n, stdin)) < 0) {
- if (ferror(stdin))
- print_error("%s", strerror(errno));
- return 0;
- }
-
- if (rc-- && (*linebuf)[rc] == '\n')
- (*linebuf)[rc] = '\0';
- return 1;
-}
-
static int do_readline(char **linebuf, size_t *n, bool batch)
{
#if !HAVE_READLINE
{
char *line = NULL;
bool fail = 0;
- size_t n;
+ size_t n = 0;
while (do_readline(&line, &n, batch)) {
int rc = run_command(line, batch);
}
if (optind < argc) {
- fprintf(stderr, "%s: ", progname);
- fprintf(stderr, _("excess command-line arguments:"));
+ fprintf(stderr, "%s: %s", progname,
+ _("excess command-line arguments:"));
for (i = optind; i < argc; i++) {
fprintf(stderr, " %s", argv[i]);
}