tools: Add some smarter error printing routines.

[liblbx.git] / src / lbxtool.c

diff --git a/src/lbxtool.c b/src/lbxtool.c
index 1c32ef47758b0d8df68d75d4e7aca4c0c2941913..767c30925b26c5d564920dbc154107a36a9066dd 100644 (file)
--- a/src/lbxtool.c
+++ b/src/lbxtool.c
@@ -56,7 +56,7 @@ int filematch(char **argv, const char *name)
                case FNM_NOMATCH:
                        break;
                default:
-                       errmsg("error matching glob: %s.\n", argv[i]);
+                       tool_err(-1, "error matching glob: %s", argv[i]);
                        return 1;
                }
        }
@@ -102,8 +102,7 @@ int extract_file(LBXfile *f, const struct lbx_statbuf *stat)
 
        of = fopen(stat->name, "wb");
        if (!of) {
-               errmsg("%s: fopen: %s\n",
-                       stat->name, strerror(errno));
+               tool_err(0, "%s: fopen", stat->name);
                return -1;
        }
 
@@ -118,7 +117,7 @@ int extract_file(LBXfile *f, const struct lbx_statbuf *stat)
                }
 
                if (fwrite(buf, rc, 1, of) != 1) {
-                       errmsg("%s: fwrite: %s\n", stat->name, strerror(errno));
+                       tool_err(0, "%s: fwrite", stat->name);
                        break;
                }
 
@@ -130,7 +129,7 @@ int extract_file(LBXfile *f, const struct lbx_statbuf *stat)
        }
 
        if (fclose(of) == EOF) {
-               errmsg("%s: fclose: %s\n", stat->name, strerror(errno));
+               tool_err(0, "%s: fclose", stat->name);
                return -1;
        }
 
@@ -159,7 +158,7 @@ int extract(struct lbx *lbx, int verbose, char **argv)
 
                file = lbx_file_open(lbx, i);
                if (!file) {
-                       errmsg("%s: %s.\n", stat.name, lbx_errmsg());
+                       tool_err(-1, "%s: %s", stat.name, lbx_errmsg());
                        continue;
                }
 
@@ -233,7 +232,7 @@ int main(int argc, char **argv)
                lbx = lbx_open(&stdin_handle, &lbx_pipe_fops, NULL, "stdin");
 
        if (!lbx) {
-               errmsg("%s: %s.\n", file ? file : "stdin", lbx_errmsg());
+               tool_err(-1, "%s: %s", file ? file : "stdin", lbx_errmsg());
                return EXIT_FAILURE;
        }
 
@@ -245,7 +244,7 @@ int main(int argc, char **argv)
                rc = extract(lbx, verbose, &argv[optind]);
                break;
        default:
-               errmsg("you must specify a mode.\n", 0);
+               tool_err(-1, "no mode specified");
        }
 
        lbx_close(lbx);