shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

path-lookup: move from basic/ to libsystemd/

Browse Source 
So that sd_path_lookup() can be utilized to replace
duplicate functions.
This commit is contained in:
Mike Yuan 2024-09-15 20:57:03 +02:00
parent feae34d64e
commit f005e267bc
No known key found for this signature in database
GPG Key ID: 417471C0A40F58B3
5 changed files with 60 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -2092,6 +2092,7 @@ libsystemd_includes = [basic_includes, include_directories(
'src/libsystemd/sd-json', 'src/libsystemd/sd-json',
'src/libsystemd/sd-netlink', 'src/libsystemd/sd-netlink',
'src/libsystemd/sd-network', 'src/libsystemd/sd-network',
'src/libsystemd/sd-path',
'src/libsystemd/sd-resolve', 'src/libsystemd/sd-resolve',
'src/libsystemd/sd-varlink')] 'src/libsystemd/sd-varlink')]

1
src/basic/meson.build
View File

@ -70,7 +70,6 @@ basic_sources = files(
'ordered-set.c', 'ordered-set.c',
'os-util.c', 'os-util.c',
'parse-util.c', 'parse-util.c',
'path-lookup.c',
'path-util.c', 'path-util.c',
'percent-util.c', 'percent-util.c',
'pidref.c', 'pidref.c',

89
src/libsystemd/meson.build
View File

@ -44,7 +44,7 @@ sd_journal_sources += [audit_type_to_name]
############################################################ ############################################################
id128_sources = files( sd_id128_sources = files(
'sd-id128/id128-util.c', 'sd-id128/id128-util.c',
'sd-id128/sd-id128.c', 'sd-id128/sd-id128.c',
) )
@ -62,6 +62,41 @@ sd_event_sources = files(
############################################################ ############################################################
sd_bus_sources = files(
'sd-bus/bus-common-errors.c',
'sd-bus/bus-container.c',
'sd-bus/bus-control.c',
'sd-bus/bus-convenience.c',
'sd-bus/bus-creds.c',
'sd-bus/bus-dump.c',
'sd-bus/bus-error.c',
'sd-bus/bus-internal.c',
'sd-bus/bus-introspect.c',
'sd-bus/bus-kernel.c',
'sd-bus/bus-match.c',
'sd-bus/bus-message.c',
'sd-bus/bus-objects.c',
'sd-bus/bus-signature.c',
'sd-bus/bus-slot.c',
'sd-bus/bus-socket.c',
'sd-bus/bus-track.c',
'sd-bus/bus-type.c',
'sd-bus/sd-bus.c',
)
############################################################
sd_device_sources = files(
'sd-device/device-enumerator.c',
'sd-device/device-filter.c',
'sd-device/device-monitor.c',
'sd-device/device-private.c',
'sd-device/device-util.c',
'sd-device/sd-device.c',
)
############################################################
sd_login_sources = files('sd-login/sd-login.c') sd_login_sources = files('sd-login/sd-login.c')
############################################################ ############################################################
@ -83,33 +118,14 @@ sd_varlink_sources = files(
############################################################ ############################################################
libsystemd_sources = files( sd_path_sources = files(
'sd-bus/bus-common-errors.c', 'sd-path/path-lookup.c',
'sd-bus/bus-container.c', 'sd-path/sd-path.c',
'sd-bus/bus-control.c', )
'sd-bus/bus-convenience.c',
'sd-bus/bus-creds.c', ############################################################
'sd-bus/bus-dump.c',
'sd-bus/bus-error.c', sd_netlink_sources = files(
'sd-bus/bus-internal.c',
'sd-bus/bus-introspect.c',
'sd-bus/bus-kernel.c',
'sd-bus/bus-match.c',
'sd-bus/bus-message.c',
'sd-bus/bus-objects.c',
'sd-bus/bus-signature.c',
'sd-bus/bus-slot.c',
'sd-bus/bus-socket.c',
'sd-bus/bus-track.c',
'sd-bus/bus-type.c',
'sd-bus/sd-bus.c',
'sd-device/device-enumerator.c',
'sd-device/device-filter.c',
'sd-device/device-monitor.c',
'sd-device/device-private.c',
'sd-device/device-util.c',
'sd-device/sd-device.c',
'sd-hwdb/sd-hwdb.c',
'sd-netlink/netlink-genl.c', 'sd-netlink/netlink-genl.c',
'sd-netlink/netlink-message-nfnl.c', 'sd-netlink/netlink-message-nfnl.c',
'sd-netlink/netlink-message-rtnl.c', 'sd-netlink/netlink-message-rtnl.c',
@ -122,11 +138,24 @@ libsystemd_sources = files(
'sd-netlink/netlink-types.c', 'sd-netlink/netlink-types.c',
'sd-netlink/netlink-util.c', 'sd-netlink/netlink-util.c',
'sd-netlink/sd-netlink.c', 'sd-netlink/sd-netlink.c',
)
############################################################
sd_network_sources = files(
'sd-network/network-util.c', 'sd-network/network-util.c',
'sd-network/sd-network.c', 'sd-network/sd-network.c',
'sd-path/sd-path.c', )
############################################################
libsystemd_sources = files(
'sd-hwdb/sd-hwdb.c',
'sd-resolve/sd-resolve.c', 'sd-resolve/sd-resolve.c',
) + sd_journal_sources + id128_sources + sd_daemon_sources + sd_event_sources + sd_login_sources + sd_json_sources + sd_varlink_sources ) + sd_journal_sources + sd_id128_sources + sd_daemon_sources \
+ sd_event_sources + sd_bus_sources + sd_device_sources \
+ sd_login_sources + sd_json_sources + sd_varlink_sources \
+ sd_path_sources + sd_netlink_sources + sd_network_sources
libsystemd_c_args = ['-fvisibility=default'] libsystemd_c_args = ['-fvisibility=default']

0
src/basic/path-lookup.c → src/libsystemd/sd-path/path-lookup.c
View File

0
src/basic/path-lookup.h → src/libsystemd/sd-path/path-lookup.h
View File