liblbx: Improve error handling in lbx_file_seek.

[liblbx.git] / src / lbx.c

diff --git a/src/lbx.c b/src/lbx.c
index 57a72b082e70158ff8abd6d2205f90cce4f13caa..1198ebbc2c0b13e08aa4cbb7c914ae431d4eb48c 100644 (file)
--- a/src/lbx.c
+++ b/src/lbx.c
@@ -1,7 +1,7 @@
 /*
  *  2ooM: The Master of Orion II Reverse Engineering Project
  *  Library for working with LBX archive files.
- *  Copyright (C) 2006-2010 Nick Bowler
+ *  Copyright © 2006-2010, 2013-2014 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
@@ -166,14 +166,17 @@ struct lbx *lbx_fopen(const char *file)
        FILE *f;
 
        f = fopen(file, "rb");
-       if (!f)
+       if (!f) {
+               lbx_error_raise(-errno);
                return NULL;
+       }
 
        if (fseek(f, 0, SEEK_CUR) == 0)
                return lbx_open(f, &lbx_default_fops, file_close, name);
 
        p = malloc(sizeof *p);
        if (!p) {
+               lbx_error_raise(LBX_ENOMEM);
                fclose(f);
                return NULL;
        }
@@ -188,7 +191,7 @@ int lbx_file_stat(struct lbx *pub, unsigned fileno, struct lbx_statbuf *buf)
        static char str[256]; /* FIXME */
 
        if (fileno >= lbx->pub.nfiles) {
-               lbx_error_raise(LBX_ENOENT);
+               lbx_error_raise(LBX_EINVAL);
                buf->name = NULL;
                return -1;
        }
@@ -218,7 +221,7 @@ struct lbx_file_state *lbx_file_open(struct lbx *pub, unsigned fileno)
        struct lbx_file_state *state;
 
        if (fileno >= lbx->pub.nfiles) {
-               lbx_error_raise(LBX_ENOENT);
+               lbx_error_raise(LBX_EINVAL);
                return NULL;
        }
 
@@ -279,10 +282,15 @@ int lbx_file_seek(struct lbx_file_state *f, long offset, int whence)
        case SEEK_END:
                pos = f->limit + offset;
                break;
+       default:
+               lbx_error_raise(LBX_EINVAL);
+               return -1;
        }
 
-       if (pos > f->limit)
+       if (pos > f->limit) {
+               lbx_error_raise(LBX_EINVAL);
                return -1;
+       }
 
        f->lbx->last_file = NULL;
        if (fops->seek(f->lbx->f, f->base + pos, SEEK_SET) != 0)