From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 26 Jun 2023 16:55:14 +0000 (+0200)
Subject: sd-path: add support for XDG_STATE_HOME
X-Git-Tag: v254-rc1~84^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a653235d12a795a8bd6adf6289ea735ccae71af;p=thirdparty%2Fsystemd.git

sd-path: add support for XDG_STATE_HOME
---

diff --git a/man/sd_path_lookup.xml b/man/sd_path_lookup.xml
index eda43960e79..4c1346712b4 100644
--- a/man/sd_path_lookup.xml
+++ b/man/sd_path_lookup.xml
@@ -55,6 +55,7 @@
 
         <constant>SD_PATH_USER_CONFIGURATION</constant>,
         <constant>SD_PATH_USER_RUNTIME</constant>,
+        <constant>SD_PATH_USER_STATE_PRIVATE</constant>,
         <constant>SD_PATH_USER_STATE_CACHE</constant>,
 
         <constant>SD_PATH_USER</constant>,
diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
index 52074803601..36c4d89e062 100644
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -281,6 +281,9 @@ static int get_path(uint64_t type, char **buffer, const char **ret) {
         case SD_PATH_USER_STATE_CACHE:
                 return from_home_dir("XDG_CACHE_HOME", ".cache", buffer, ret);
 
+        case SD_PATH_USER_STATE_PRIVATE:
+                return from_home_dir("XDG_STATE_HOME", ".local/state", buffer, ret);
+
         case SD_PATH_USER:
                 r = get_home_dir(buffer);
                 if (r < 0)
diff --git a/src/path/path.c b/src/path/path.c
index 52662402474..1daa345ebea 100644
--- a/src/path/path.c
+++ b/src/path/path.c
@@ -41,6 +41,8 @@ static const char* const path_table[_SD_PATH_MAX] = {
         [SD_PATH_USER_CONFIGURATION]                          = "user-configuration",
         [SD_PATH_USER_RUNTIME]                                = "user-runtime",
         [SD_PATH_USER_STATE_CACHE]                            = "user-state-cache",
+        [SD_PATH_USER_STATE_PRIVATE]                          = "user-state-private",
+
         [SD_PATH_USER]                                        = "user",
         [SD_PATH_USER_DOCUMENTS]                              = "user-documents",
         [SD_PATH_USER_MUSIC]                                  = "user-music",
diff --git a/src/systemd/sd-path.h b/src/systemd/sd-path.h
index 0b61484f5e6..d3ee2eff6b5 100644
--- a/src/systemd/sd-path.h
+++ b/src/systemd/sd-path.h
@@ -53,9 +53,10 @@ enum {
         SD_PATH_USER_SHARED,
 
         /* User configuration, state, runtime ... */
-        SD_PATH_USER_CONFIGURATION, /* takes both actual configuration (like /etc) and state (like /var/lib) */
+        SD_PATH_USER_CONFIGURATION,
         SD_PATH_USER_RUNTIME,
         SD_PATH_USER_STATE_CACHE,
+        /* → SD_PATH_USER_STATE_PRIVATE is added at the bottom */
 
         /* User resources */
         SD_PATH_USER, /* $HOME itself */
@@ -116,6 +117,8 @@ enum {
         SD_PATH_SYSTEMD_SEARCH_SYSTEM_ENVIRONMENT_GENERATOR,
         SD_PATH_SYSTEMD_SEARCH_USER_ENVIRONMENT_GENERATOR,
 
+        SD_PATH_USER_STATE_PRIVATE,
+
         _SD_PATH_MAX
 };