diff options
Diffstat (limited to 'src/base64.c')
-rw-r--r-- | src/base64.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/base64.c b/src/base64.c index 83f0e9dac..0bb8b44db 100644 --- a/src/base64.c +++ b/src/base64.c @@ -25,6 +25,7 @@ #include <sys/types.h> #include "system.h" +#include "die.h" #include "error.h" #include "fadvise.h" #include "quote.h" @@ -135,7 +136,7 @@ wrap_write (const char *buffer, size_t len, { /* Simple write. */ if (fwrite (buffer, 1, len, stdout) < len) - error (EXIT_FAILURE, errno, _("write error")); + die (EXIT_FAILURE, errno, _("write error")); } else for (written = 0; written < len;) @@ -147,13 +148,13 @@ wrap_write (const char *buffer, size_t len, if (to_write == 0) { if (fputc ('\n', out) == EOF) - error (EXIT_FAILURE, errno, _("write error")); + die (EXIT_FAILURE, errno, _("write error")); *current_column = 0; } else { if (fwrite (buffer + written, 1, to_write, stdout) < to_write) - error (EXIT_FAILURE, errno, _("write error")); + die (EXIT_FAILURE, errno, _("write error")); *current_column += to_write; written += to_write; } @@ -194,10 +195,10 @@ do_encode (FILE *in, FILE *out, uintmax_t wrap_column) /* When wrapping, terminate last line. */ if (wrap_column && current_column > 0 && fputc ('\n', out) == EOF) - error (EXIT_FAILURE, errno, _("write error")); + die (EXIT_FAILURE, errno, _("write error")); if (ferror (in)) - error (EXIT_FAILURE, errno, _("read error")); + die (EXIT_FAILURE, errno, _("read error")); } static void @@ -234,7 +235,7 @@ do_decode (FILE *in, FILE *out, bool ignore_garbage) sum += n; if (ferror (in)) - error (EXIT_FAILURE, errno, _("read error")); + die (EXIT_FAILURE, errno, _("read error")); } while (sum < BASE_LENGTH (DEC_BLOCKSIZE) && !feof (in)); @@ -250,10 +251,10 @@ do_decode (FILE *in, FILE *out, bool ignore_garbage) ok = base_decode_ctx (&ctx, inbuf, (k == 0 ? sum : 0), outbuf, &n); if (fwrite (outbuf, 1, n, out) < n) - error (EXIT_FAILURE, errno, _("write error")); + die (EXIT_FAILURE, errno, _("write error")); if (!ok) - error (EXIT_FAILURE, 0, _("invalid input")); + die (EXIT_FAILURE, 0, _("invalid input")); } } while (!feof (in)); @@ -327,7 +328,7 @@ main (int argc, char **argv) { input_fh = fopen (infile, "rb"); if (input_fh == NULL) - error (EXIT_FAILURE, errno, "%s", quotef (infile)); + die (EXIT_FAILURE, errno, "%s", quotef (infile)); } fadvise (input_fh, FADVISE_SEQUENTIAL); @@ -340,9 +341,9 @@ main (int argc, char **argv) if (fclose (input_fh) == EOF) { if (STREQ (infile, "-")) - error (EXIT_FAILURE, errno, _("closing standard input")); + die (EXIT_FAILURE, errno, _("closing standard input")); else - error (EXIT_FAILURE, errno, "%s", quotef (infile)); + die (EXIT_FAILURE, errno, "%s", quotef (infile)); } return EXIT_SUCCESS; |