diff options
| author | midipix <writeonce@midipix.org> | 2016-05-03 12:42:43 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-05-03 12:42:43 -0400 |
| commit | 3895afa953a49e842fa99fa08842268d6f58aae9 (patch) | |
| tree | 11038948722193d6edf0207f2e4dbf8636c1e470 /src/logic | |
| parent | 77a4b7c9b9108b8af21b3bb1ad5efb3249c55821 (diff) | |
| download | slibtool-3895afa953a49e842fa99fa08842268d6f58aae9.tar.bz2 slibtool-3895afa953a49e842fa99fa08842268d6f58aae9.tar.xz | |
internals: slbt_mkdir(): initial implementation and integration.
Diffstat (limited to 'src/logic')
| -rw-r--r-- | src/logic/slbt_exec_compile.c | 15 | ||||
| -rw-r--r-- | src/logic/slbt_exec_link.c | 15 |
2 files changed, 10 insertions, 20 deletions
diff --git a/src/logic/slbt_exec_compile.c b/src/logic/slbt_exec_compile.c index c5c3e70..4a75270 100644 --- a/src/logic/slbt_exec_compile.c +++ b/src/logic/slbt_exec_compile.c @@ -12,6 +12,7 @@ #include <slibtool/slibtool.h> #include "slibtool_spawn_impl.h" +#include "slibtool_mkdir_impl.h" static int slbt_exec_compile_remove_file( const struct slbt_driver_ctx * dctx, @@ -35,7 +36,6 @@ int slbt_exec_compile( struct slbt_exec_ctx * ectx) { int ret; - int fdlibs; FILE * fout; struct slbt_exec_ctx * actx = 0; const struct slbt_source_version * verinfo; @@ -57,16 +57,11 @@ int slbt_exec_compile( return -1; /* .libs directory */ - if (dctx->cctx->drvflags & SLBT_DRIVER_SHARED) { - if ((fdlibs = open(ectx->ldirname,O_DIRECTORY)) >= 0) - close(fdlibs); - else if ((errno != ENOENT) || mkdir(ectx->ldirname,0777)) { - if (errno != EEXIST) { - slbt_free_exec_ctx(actx); - return -1; - } + if (dctx->cctx->drvflags & SLBT_DRIVER_SHARED) + if (slbt_mkdir(ectx->ldirname)) { + slbt_free_exec_ctx(actx); + return -1; } - } /* compile mode */ ectx->program = ectx->compiler; diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c index 847bc95..d964df0 100644 --- a/src/logic/slbt_exec_link.c +++ b/src/logic/slbt_exec_link.c @@ -14,6 +14,7 @@ #include <slibtool/slibtool.h> #include "slibtool_spawn_impl.h" +#include "slibtool_mkdir_impl.h" #include "slibtool_readlink_impl.h" #include "slibtool_symlink_impl.h" @@ -995,7 +996,6 @@ int slbt_exec_link( struct slbt_exec_ctx * ectx) { int ret; - int fdlibs; const char * output; char * dot; FILE * fout; @@ -1062,16 +1062,11 @@ int slbt_exec_link( dot = strrchr(output,'.'); /* .libs directory */ - if (dctx->cctx->drvflags & SLBT_DRIVER_SHARED) { - if ((fdlibs = open(ectx->ldirname,O_DIRECTORY)) >= 0) - close(fdlibs); - else if ((errno != ENOENT) || mkdir(ectx->ldirname,0777)) { - if (errno != EEXIST) { - slbt_free_exec_ctx(actx); - return -1; - } + if (dctx->cctx->drvflags & SLBT_DRIVER_SHARED) + if (slbt_mkdir(ectx->ldirname)) { + slbt_free_exec_ctx(actx); + return -1; } - } /* non-pic libfoo.a */ if (dot && !strcmp(dot,".a")) |