X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/38a465378241d4c74b07fd7e4deaf2af09ff2bcb..c81b3f9cfa09bcf212214f006d879585774619e2:/src/lbximg.c diff --git a/src/lbximg.c b/src/lbximg.c index af59f5f..ff38c89 100644 --- a/src/lbximg.c +++ b/src/lbximg.c @@ -1,7 +1,7 @@ /* * 2ooM: The Master of Orion II Reverse Engineering Project * Simple command-line tool to convert an LBX image to a set of PNGs. - * Copyright (C) 2006-2010 Nick Bowler + * Copyright © 2006-2011, 2013 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 @@ -50,11 +50,6 @@ static void printhelp(void) puts("For now, see the man page for detailed help."); } -static const char *progname; -#define errmsg(fmt, ...) (\ - fprintf(stderr, "%s: " fmt, progname, __VA_ARGS__)\ -) - enum { MODE_NONE, MODE_DECODE, @@ -69,12 +64,12 @@ int parserange(unsigned frames, char *str, unsigned char *bits) start = strtoul(str, &endptr, 0); if (start >= frames) { - errmsg("frame %lu out of range.\n", start); + tool_err(-1, "frame %lu out of range.", start); return -1; } if (endptr == str) { - errmsg("invalid frame range: %s.\n", str); + tool_err(-1, "invalid frame range: %s.", str); return -1; } @@ -85,7 +80,7 @@ int parserange(unsigned frames, char *str, unsigned char *bits) case '-': end = strtoul(endptr+1, &endptr, 0); if (end >= frames) { - errmsg("frame %lu out of range.\n", end); + tool_err(-1, "frame %lu out of range.", end); return -1; } @@ -93,12 +88,12 @@ int parserange(unsigned frames, char *str, unsigned char *bits) end = frames - 1; break; default: - errmsg("invalid frame range: %s.\n", str); + tool_err(-1, "invalid frame range: %s.", str); return -1; } if (end < start) { - errmsg("invalid frame range: %s.\n", str); + tool_err(-1, "invalid frame range: %s.", str); return -1; } @@ -139,26 +134,25 @@ int outpng(unsigned int frameno, row = malloc(4 * width); if (!row) { - errmsg("failed to allocate row buffer: %s\n", strerror(errno)); + tool_err(0, "failed to allocate row buffer"); return -1; } of = fopen(name, "wb"); if (!of) { - errmsg("failed to open %s: %s.\n", name, strerror(errno)); - free(row); + tool_err(0, "failed to open %s", name); return -1; } png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!png) { - errmsg("failed to init libpng.\n", 0); + tool_err(-1, "failed to init libpng."); goto err; } info = png_create_info_struct(png); if (!info) { - errmsg("failed to init libpng.\n", 0); + tool_err(-1, "failed to init libpng."); png_destroy_write_struct(&png, NULL); goto err; } @@ -239,19 +233,19 @@ static int loadoverride(FILE *f, struct lbx_colour palette[static 256]) struct lbx_imginfo info; if (!overimg) { - errmsg("failed to open override image: %s\n", lbx_errmsg()); + tool_err(-1, "failed to open override image: %s", lbx_errmsg()); return -1; } lbx_img_getinfo(overimg, &info); if (!info.palettesz) { - errmsg("override image has no palette.\n", 0); + tool_err(-1, "override image has no palette."); lbx_img_close(overimg); return -1; } if (lbx_img_getpalette(overimg, palette) == -1) { - errmsg("error reading override palette: %s\n", lbx_errmsg()); + tool_err(-1, "error reading override palette: %s", lbx_errmsg()); lbx_img_close(overimg); return -1; } @@ -277,7 +271,7 @@ static int loadpalette(struct lbx_image *img, struct lbx_imginfo *info, /* For sanity. */ if (!palf && !info->palettesz && !override) { - errmsg("no palette available.\n", 0); + tool_err(-1, "no palette available."); return -1; } @@ -288,13 +282,13 @@ static int loadpalette(struct lbx_image *img, struct lbx_imginfo *info, /* Read the external palette, if any. */ if (palf && lbx_img_loadpalette(palf, &lbx_default_fops, palette) != 0) { - errmsg("error reading external palette: %s\n", lbx_errmsg()); + tool_err(-1, "error reading external palette: %s", lbx_errmsg()); return -1; } /* Read the embedded palette, if any. */ if (info->palettesz && lbx_img_getpalette(img, palette) == -1) { - errmsg("error reading embedded palette: %s\n", lbx_errmsg()); + tool_err(-1, "error reading embedded palette: %s", lbx_errmsg()); return -1; } @@ -345,7 +339,7 @@ int decode(struct lbx_image *img, FILE *palf, FILE *override, char **argv) data = lbx_img_getframe(img, i); if (!data) { - errmsg("error in frame %u: %s\n", i, lbx_errmsg()); + tool_err(-1, "error in frame %u: %s", i, lbx_errmsg()); continue; } @@ -357,7 +351,7 @@ int decode(struct lbx_image *img, FILE *palf, FILE *override, char **argv) } if (!extracted) { - errmsg("no frames extracted.\n", 0); + tool_err(-1, "no frames extracted."); goto err; } @@ -394,7 +388,7 @@ int main(int argc, char **argv) { 0 } }; - progname = "lbximg"; /* argv[0]; */ + tool_init("lbximg", argc, argv); while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { switch(opt) { case 'i': @@ -415,7 +409,7 @@ int main(int argc, char **argv) case 'p': palf = fopen(optarg, "rb"); if (!palf) { - errmsg("failed to open %s: %m\n", optarg); + tool_err(0, "failed to open %s", optarg); return EXIT_FAILURE; } @@ -423,12 +417,12 @@ int main(int argc, char **argv) case 'O': overf = fopen(optarg, "rb"); if (!overf) { - errmsg("failed to open %s: %m\n", optarg); + tool_err(0, "failed to open %s", optarg); return EXIT_FAILURE; } break; case 'V': - puts(VERSION_BOILERPLATE("lbximg")); + tool_version(); return EXIT_SUCCESS; case 'U': printusage(); @@ -443,7 +437,7 @@ int main(int argc, char **argv) } if (mode == MODE_NONE) { - errmsg("you must specify a mode.\n", 0); + tool_err(-1, "you must specify a mode."); return EXIT_FAILURE; } @@ -453,7 +447,7 @@ int main(int argc, char **argv) img = lbx_img_open(&stdin_handle, &lbx_pipe_fops, NULL); if (!img) { - errmsg("failed to open image: %s.\n", lbx_errmsg()); + tool_err(-1, "failed to open image: %s.", lbx_errmsg()); return EXIT_FAILURE; }