diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-10-07 14:56:09 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-10-07 14:59:03 +0200 |
| commit | 145dfce5f04a3a74a49cc016f15b0aa6d9996662 (patch) | |
| tree | 919357d5a18934222741732c8444db7711421aa3 /lib | |
| parent | 7e1be3986b3b8229f0162431b6e02c24e04a5dba (diff) | |
Cleanup: move directory handling code to libcommon
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common/Makemodule.am | 1 | ||||
| -rw-r--r-- | lib/common/dirstack.c (renamed from lib/util/dirstack.c) | 6 | ||||
| -rw-r--r-- | lib/common/mkdir_p.c (renamed from lib/util/mkdir_p.c) | 6 | ||||
| -rw-r--r-- | lib/util/Makemodule.am | 6 |
4 files changed, 7 insertions, 12 deletions
diff --git a/lib/common/Makemodule.am b/lib/common/Makemodule.am index 75f771d..db366af 100644 --- a/lib/common/Makemodule.am +++ b/lib/common/Makemodule.am @@ -5,5 +5,6 @@ libcommon_a_SOURCES += lib/common/compress.c lib/common/comp_opt.c libcommon_a_SOURCES += lib/common/data_writer.c include/common.h libcommon_a_SOURCES += lib/common/get_path.c lib/common/io_stdin.c libcommon_a_SOURCES += lib/common/writer.c lib/common/perror.c +libcommon_a_SOURCES += lib/common/dirstack.c lib/common/mkdir_p.c noinst_LIBRARIES += libcommon.a diff --git a/lib/util/dirstack.c b/lib/common/dirstack.c index 20a89cc..8f73898 100644 --- a/lib/util/dirstack.c +++ b/lib/common/dirstack.c @@ -1,10 +1,10 @@ -/* SPDX-License-Identifier: LGPL-3.0-or-later */ +/* SPDX-License-Identifier: GPL-3.0-or-later */ /* * dirstack.c * * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at> */ -#include "config.h" +#include "common.h" #include <string.h> #include <stdlib.h> @@ -13,8 +13,6 @@ #include <fcntl.h> #include <stdio.h> -#include "util.h" - #define STACK_DEPTH 128 static int dirstack[STACK_DEPTH]; diff --git a/lib/util/mkdir_p.c b/lib/common/mkdir_p.c index 93d0f59..cb433b3 100644 --- a/lib/util/mkdir_p.c +++ b/lib/common/mkdir_p.c @@ -1,18 +1,16 @@ -/* SPDX-License-Identifier: LGPL-3.0-or-later */ +/* SPDX-License-Identifier: GPL-3.0-or-later */ /* * mkdir_p.c * * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at> */ -#include "config.h" +#include "common.h" #include <string.h> #include <alloca.h> #include <stdio.h> #include <errno.h> -#include "util.h" - int mkdir_p(const char *path) { size_t i, len; diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am index 5ba82bc..8dce70c 100644 --- a/lib/util/Makemodule.am +++ b/lib/util/Makemodule.am @@ -1,8 +1,6 @@ -libutil_la_SOURCES = lib/util/write_data.c include/util.h -libutil_la_SOURCES += lib/util/mkdir_p.c include/compat.h +libutil_la_SOURCES = lib/util/write_data.c include/util.h include/compat.h libutil_la_SOURCES += lib/util/str_table.c include/str_table.h -libutil_la_SOURCES += lib/util/dirstack.c lib/util/alloc.c -libutil_la_SOURCES += lib/util/canonicalize_name.c +libutil_la_SOURCES += lib/util/alloc.c lib/util/canonicalize_name.c libutil_la_CFLAGS = $(AM_CFLAGS) libutil_la_CPPFLAGS = $(AM_CPPFLAGS) |