/*
* 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 <locale.h>
#include <assert.h>
#include <stdarg.h>
+#include <inttypes.h>
#include <getopt.h>
#include <gettext.h>
#include "xtra.h"
#include "options.h"
#include "version.h"
+#include "getline.h"
#if HAVE_READLINE_READLINE_H
# include <readline/readline.h>
static int do_getline(char **linebuf, size_t *n)
{
- ssize_t rc;
+ int rc;
- if ((rc = getline(linebuf, n, stdin)) < 0) {
- if (ferror(stdin))
+ if ((rc = dx_getline(linebuf, n, stdin)) < 0) {
+ if (rc == DX_GETLINE_ENOMEM)
+ print_error("%s", _("failed to allocate memory"));
+ else
print_error("%s", strerror(errno));
return 0;
}
- if (rc-- && (*linebuf)[rc] == '\n')
- (*linebuf)[rc] = '\0';
- return 1;
+ return rc;
}
static int do_readline(char **linebuf, size_t *n, bool batch)
{
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);