X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/e7aea0c6f323c6bbf364093305e60bb78999a23f..131cef630544d733d13bb493a05ff6ae523a0538:/src/lbx.c diff --git a/src/lbx.c b/src/lbx.c index a2d3796..1198ebb 100644 --- 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 © 2006-2010, 2013 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 @@ -191,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; } @@ -221,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; } @@ -282,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)