From: Yu Watanabe Date: Fri, 11 Jul 2025 07:42:39 +0000 (+0900) Subject: basic: rename cap-list.c -> capability-list.c X-Git-Tag: v258-rc1~94 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2bdabb167babebe6caad71128a62a14f64faf0de;p=thirdparty%2Fsystemd.git basic: rename cap-list.c -> capability-list.c This also renames relevant files in the same way. Addresses https://github.com/systemd/systemd/pull/37904#discussion_r2191950396 --- diff --git a/src/analyze/analyze-capability.c b/src/analyze/analyze-capability.c index 4709cb15ae6..7fe7ff25e5b 100644 --- a/src/analyze/analyze-capability.c +++ b/src/analyze/analyze-capability.c @@ -2,7 +2,7 @@ #include "analyze.h" #include "analyze-capability.h" -#include "cap-list.h" +#include "capability-list.h" #include "capability-util.h" #include "format-table.h" #include "log.h" diff --git a/src/basic/cap-list.c b/src/basic/capability-list.c similarity index 98% rename from src/basic/cap-list.c rename to src/basic/capability-list.c index 5e368937a2e..804dbcb112a 100644 --- a/src/basic/cap-list.c +++ b/src/basic/capability-list.c @@ -4,7 +4,7 @@ #include "alloc-util.h" #include "bitfield.h" -#include "cap-list.h" +#include "capability-list.h" #include "capability-util.h" #include "extract-word.h" #include "log.h" @@ -14,8 +14,8 @@ static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len); -#include "cap-from-name.inc" -#include "cap-to-name.inc" +#include "capability-from-name.inc" +#include "capability-to-name.inc" const char* capability_to_name(int id) { if (id < 0) diff --git a/src/basic/cap-list.h b/src/basic/capability-list.h similarity index 100% rename from src/basic/cap-list.h rename to src/basic/capability-list.h diff --git a/src/basic/cap-to-name.awk b/src/basic/capability-to-name.awk similarity index 100% rename from src/basic/cap-to-name.awk rename to src/basic/capability-to-name.awk diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c index 4e6171e3c1e..2e99af317bc 100644 --- a/src/basic/capability-util.c +++ b/src/basic/capability-util.c @@ -8,7 +8,7 @@ #include "alloc-util.h" #include "bitfield.h" -#include "cap-list.h" +#include "capability-list.h" #include "capability-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/basic/generate-cap-list.sh b/src/basic/generate-capability-list.sh similarity index 100% rename from src/basic/generate-cap-list.sh rename to src/basic/generate-capability-list.sh diff --git a/src/basic/meson.build b/src/basic/meson.build index d8591d49e2a..d21c47af8b6 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -14,7 +14,7 @@ basic_sources = files( 'build.c', 'build-path.c', 'bus-label.c', - 'cap-list.c', + 'capability-list.c', 'capability-util.c', 'capsule-util.c', 'cgroup-util.c', @@ -122,11 +122,11 @@ sources += basic_sources generated_gperf_headers = [] foreach item : [ - # name, source, struct name, prefix, headers - ['af', af_sources, 'af', '', [''], ], - ['arphrd', arphrd_sources, 'arphrd', 'ARPHRD_', [''], ], - ['cap', cap_sources, 'capability', '', [''], ], - ['errno', [], 'errno', '', [''], ], + # name, source, prefix, headers + ['af', af_sources, '', [''], ], + ['arphrd', arphrd_sources, 'ARPHRD_', [''], ], + ['capability', capability_sources, '', [''], ], + ['errno', [], '', [''], ], ] fname = '@0@-list.txt'.format(item[0]) @@ -141,7 +141,7 @@ foreach item : [ gperf_file = custom_target( input : list_txt, output : fname, - command : [generate_gperfs, item[2], item[3], '@INPUT@'] + item[4], + command : [generate_gperfs, item[0], item[2], '@INPUT@'] + item[3], capture : true) fname = '@0@-from-name.inc'.format(item[0]) @@ -150,8 +150,8 @@ foreach item : [ output : fname, command : [gperf, '-L', 'ANSI-C', '-t', '--ignore-case', - '-N', 'lookup_@0@'.format(item[2]), - '-H', 'hash_@0@_name'.format(item[2]), + '-N', 'lookup_@0@'.format(item[0]), + '-H', 'hash_@0@_name'.format(item[0]), '-p', '-C', '@INPUT@'], capture : true) diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index e273470c7aa..0157665c4a4 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -9,7 +9,7 @@ #include "bpf-restrict-fs.h" #include "bus-get-properties.h" #include "bus-unit-util.h" -#include "cap-list.h" +#include "capability-list.h" #include "cpu-set-util.h" #include "creds-util.h" #include "dbus-execute.h" diff --git a/src/core/execute.c b/src/core/execute.c index c562a12b2a2..a4de33baec6 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -14,7 +14,7 @@ #include "alloc-util.h" #include "async.h" #include "bitfield.h" -#include "cap-list.h" +#include "capability-list.h" #include "capability-util.h" #include "cgroup-setup.h" #include "coredump-util.h" diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 8bc66804545..4b7bfc772f0 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -17,7 +17,7 @@ #include "bpf-restrict-fs.h" #include "bus-error.h" #include "calendarspec.h" -#include "cap-list.h" +#include "capability-list.h" #include "capability-util.h" #include "cgroup-setup.h" #include "condition.h" diff --git a/src/home/homectl.c b/src/home/homectl.c index f27c7f78754..166e7a71bb8 100644 --- a/src/home/homectl.c +++ b/src/home/homectl.c @@ -12,7 +12,7 @@ #include "bus-error.h" #include "bus-locator.h" #include "bus-util.h" -#include "cap-list.h" +#include "capability-list.h" #include "capability-util.h" #include "cgroup-util.h" #include "creds-util.h" diff --git a/src/include/meson.build b/src/include/meson.build index 8277574b4d9..90c8e0fdf8a 100644 --- a/src/include/meson.build +++ b/src/include/meson.build @@ -13,7 +13,7 @@ arphrd_sources = files( ) # Source files that provides CAP_XYZ -cap_sources = files( +capability_sources = files( 'uapi/linux/capability.h', ) diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c index e9dade20905..f1ddd2b625e 100644 --- a/src/libsystemd/sd-bus/bus-dump.c +++ b/src/libsystemd/sd-bus/bus-dump.c @@ -8,7 +8,7 @@ #include "bus-internal.h" #include "bus-message.h" #include "bus-type.h" -#include "cap-list.h" +#include "capability-list.h" #include "capability-util.h" #include "fileio.h" #include "format-util.h" diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c index eb8aaff251c..9fc4231b981 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -22,7 +22,7 @@ #include "bus-error.h" #include "bus-internal.h" #include "bus-locator.h" -#include "cap-list.h" +#include "capability-list.h" #include "capability-util.h" #include "cgroup-setup.h" #include "chase.h" diff --git a/src/nspawn/nspawn-oci.c b/src/nspawn/nspawn-oci.c index 86c5dc2b048..476dad08eb8 100644 --- a/src/nspawn/nspawn-oci.c +++ b/src/nspawn/nspawn-oci.c @@ -8,7 +8,7 @@ #include "alloc-util.h" #include "bus-util.h" -#include "cap-list.h" +#include "capability-list.h" #include "cgroup-util.h" #include "cpu-set-util.h" #include "device-util.h" diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c index f16a3b61b32..052ea03919a 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -3,7 +3,7 @@ #include "sd-bus.h" #include "alloc-util.h" -#include "cap-list.h" +#include "capability-list.h" #include "conf-parser.h" #include "cpu-set-util.h" #include "extract-word.h" diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 4ccfab8a88c..5e886e53913 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -32,7 +32,7 @@ #include "bus-error.h" #include "bus-locator.h" #include "bus-util.h" -#include "cap-list.h" +#include "capability-list.h" #include "capability-util.h" #include "cgroup-setup.h" #include "cgroup-util.h" diff --git a/src/shared/bus-print-properties.c b/src/shared/bus-print-properties.c index f5ea74f5824..09986a607af 100644 --- a/src/shared/bus-print-properties.c +++ b/src/shared/bus-print-properties.c @@ -4,7 +4,7 @@ #include "alloc-util.h" #include "bus-print-properties.h" -#include "cap-list.h" +#include "capability-list.h" #include "cgroup-util.h" #include "escape.h" #include "log.h" diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index 1ba37bdab41..d3c9840f5a2 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -11,7 +11,7 @@ #include "bus-locator.h" #include "bus-unit-util.h" #include "bus-util.h" -#include "cap-list.h" +#include "capability-list.h" #include "cgroup-setup.h" #include "cgroup-util.h" #include "condition.h" diff --git a/src/shared/condition.c b/src/shared/condition.c index 25c38f374b6..f493a2da8c5 100644 --- a/src/shared/condition.c +++ b/src/shared/condition.c @@ -16,7 +16,7 @@ #include "battery-util.h" #include "bitfield.h" #include "blockdev-util.h" -#include "cap-list.h" +#include "capability-list.h" #include "capability-util.h" #include "cgroup-util.h" #include "compare-operator.h" diff --git a/src/shared/user-record-show.c b/src/shared/user-record-show.c index 0dea12d4ca2..f6ce5cff772 100644 --- a/src/shared/user-record-show.c +++ b/src/shared/user-record-show.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" -#include "cap-list.h" +#include "capability-list.h" #include "format-util.h" #include "glyph-util.h" #include "hashmap.h" diff --git a/src/shared/user-record.c b/src/shared/user-record.c index dfe4379e9fd..b55875d6cef 100644 --- a/src/shared/user-record.c +++ b/src/shared/user-record.c @@ -4,7 +4,7 @@ #include "alloc-util.h" #include "bitfield.h" -#include "cap-list.h" +#include "capability-list.h" #include "cgroup-util.h" #include "dns-domain.h" #include "glyph-util.h" diff --git a/src/test/meson.build b/src/test/meson.build index 5284dc13156..87e54d2b05f 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -249,11 +249,11 @@ executables += [ 'type' : 'manual', }, test_template + { - 'sources' : files('test-cap-list.c'), + 'sources' : files('test-capability-list.c'), 'dependencies' : libcap, }, test_template + { - 'sources' : files('test-capability.c'), + 'sources' : files('test-capability-util.c'), 'dependencies' : libcap, }, test_template + { diff --git a/src/test/test-cap-list.c b/src/test/test-capability-list.c similarity index 99% rename from src/test/test-cap-list.c rename to src/test/test-capability-list.c index 945c5ccec77..c72c241683a 100644 --- a/src/test/test-cap-list.c +++ b/src/test/test-capability-list.c @@ -3,7 +3,7 @@ #include #include "alloc-util.h" -#include "cap-list.h" +#include "capability-list.h" #include "capability-util.h" #include "parse-util.h" #include "random-util.h" diff --git a/src/test/test-capability.c b/src/test/test-capability-util.c similarity index 100% rename from src/test/test-capability.c rename to src/test/test-capability-util.c