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 4709cb15ae69c6613746a9b915cdc322f3ede6b7..7fe7ff25e5b96683d683fec3a9fae4b41302d517 100644 (file)
--- 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 5e368937a2e1076af3ad16753c2058a9bc180704..804dbcb112a8be5d3e969c047ff1e750764f1894 100644 (file)
--- 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 4e6171e3c1ee912cc329df9a2d2985e723594e65..2e99af317bc2d7e77789a1f238ec0dfd39ec75ea 100644 (file)
--- 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 d8591d49e2a0ad028d546b360a2190dd11a83d65..d21c47af8b699182c2824797bd51dc351c1960f3 100644 (file)
--- 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',         '',        ['<sys/socket.h>'],       ],
-        ['arphrd', arphrd_sources, 'arphrd',     'ARPHRD_', ['<linux/if_arp.h>'],     ],
-        ['cap',    cap_sources,    'capability', '',        ['<linux/capability.h>'], ],
-        ['errno',  [],             'errno',      '',        ['<errno.h>'],            ],
+        # name,        source,             prefix,    headers
+        ['af',         af_sources,         '',        ['<sys/socket.h>'],       ],
+        ['arphrd',     arphrd_sources,     'ARPHRD_', ['<linux/if_arp.h>'],     ],
+        ['capability', capability_sources, '',        ['<linux/capability.h>'], ],
+        ['errno',      [],                 '',        ['<errno.h>'],            ],
 ]
 
         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 e273470c7aad628c44f65df0b2e6614ae28570d4..0157665c4a4fa775d0e505be2d8cb7af8ddc1d5b 100644 (file)
--- 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 c562a12b2a2fd9e51ac9b6866cf6df68594c6d10..a4de33baec6a0ea6bdcc2dff38c950a5f5bf13fe 100644 (file)
--- 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 8bc668045458a00e0f2417c6465d8949a09fdee7..4b7bfc772f02bc37825dc80c322035dce0dacaab 100644 (file)
--- 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 f27c7f7875448dbde0cad4a19235cfaac2b37f12..166e7a71bb8f93b92c8ed3f7501d1a1759105bad 100644 (file)
--- 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 8277574b4d93f7d84204170d63b89bc6dca8cf9d..90c8e0fdf8a6dafc67122e708d17bda64e4386f4 100644 (file)
--- 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 e9dade20905696abf96e008f4b19b472d3703ba3..f1ddd2b625ec83a192041556948515e9888c7a70 100644 (file)
--- 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 eb8aaff251c200a057f42c1f784c6bfcbe907ae8..9fc4231b9813b442165a8aee5cebc9a762af2693 100644 (file)
--- 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 86c5dc2b04859873b70c76a08781f72de136eb5a..476dad08eb8491452729aa9c51adb297a7b2a76c 100644 (file)
--- 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 f16a3b61b327fdbfeb0ddb0fb93ecb5c20c92b02..052ea03919a3acff7e0b6e392f8567e96a65eb6f 100644 (file)
--- 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 4ccfab8a88c3e591bfff75b0a1e78f0f1d066ce0..5e886e539135dcac7268588013985c9f8166bfbe 100644 (file)
--- 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 f5ea74f58243d4b41df51bc35e55adadd8136146..09986a607af336d4793fcd7de2beb7ff2544840f 100644 (file)
--- 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 1ba37bdab410c9056785c8f66b39a84c29689e3f..d3c9840f5a2d38d48fa92c4f0a6d4f33d9cbdb6e 100644 (file)
--- 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 25c38f374b6213c6b575b4793b1f9f705026d3c9..f493a2da8c505798e29ef7a2d10db99410421532 100644 (file)
--- 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 0dea12d4ca2cc1a9fda8d030d3a8f7c0b1e0f042..f6ce5cff772f3dbdd73c3b14292cc4bcedc1317a 100644 (file)
--- 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 dfe4379e9fd246ed4f3d1366a041b6ea30cbe2ae..b55875d6cef658ab9c9f11b7d1116b34eff4de05 100644 (file)
--- 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 5284dc13156f35e7e2b7aabd4fe804cd674d9d2e..87e54d2b05f3b68a977117b5d5690ce1aff38a0c 100644 (file)
--- 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 945c5ccec77061317abc4beae914759efe8be852..c72c241683ac134864472cdfd9c91afb9e395f00 100644 (file)
--- a/src/test/test-cap-list.c
+++ b/src/test/test-capability-list.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 
 #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