1.1 --- a/libfsclient/lib/src/client.cc Tue Mar 07 16:44:43 2023 +0100
1.2 +++ b/libfsclient/lib/src/client.cc Tue Mar 07 19:10:40 2023 +0100
1.3 @@ -26,6 +26,7 @@
1.4 #include <stdlib.h>
1.5 #include <string.h>
1.6
1.7 +#include <systypes/env.h>
1.8 #include <systypes/fcntl.h>
1.9
1.10 #include "client.h"
1.11 @@ -209,7 +210,7 @@
1.12
1.13 l4_cap_idx_t client_open_for_user(user_t user)
1.14 {
1.15 - l4_cap_idx_t server = l4re_env_get_cap("server");
1.16 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
1.17
1.18 return client_open_for_user_using(user, server);
1.19 }
1.20 @@ -250,7 +251,7 @@
1.21
1.22 file_t *client_open(const char *name, flags_t flags)
1.23 {
1.24 - l4_cap_idx_t server = l4re_env_get_cap("server");
1.25 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
1.26
1.27 return client_open_using(name, flags, server);
1.28 }
1.29 @@ -279,7 +280,7 @@
1.30
1.31 file_t *client_opendir(const char *name)
1.32 {
1.33 - l4_cap_idx_t server = l4re_env_get_cap("server");
1.34 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
1.35
1.36 return client_opendir_using(name, server);
1.37 }
1.38 @@ -358,7 +359,7 @@
1.39
1.40 long client_pipe(file_t **reader, file_t **writer, flags_t flags)
1.41 {
1.42 - l4_cap_idx_t server = l4re_env_get_cap("pipes");
1.43 + l4_cap_idx_t server = l4re_env_get_cap(ENV_PIPE_SERVER_NAME);
1.44
1.45 return client_pipe_using(reader, writer, flags, server);
1.46 }
1.47 @@ -419,7 +420,7 @@
1.48
1.49 long client_mkdir(const char *path, mode_t mode)
1.50 {
1.51 - l4_cap_idx_t server = l4re_env_get_cap("server");
1.52 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
1.53
1.54 return client_mkdir_using(path, mode, server);
1.55 }
1.56 @@ -437,7 +438,7 @@
1.57
1.58 long client_remove(const char *path)
1.59 {
1.60 - l4_cap_idx_t server = l4re_env_get_cap("server");
1.61 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
1.62
1.63 return client_remove_using(path, server);
1.64 }
1.65 @@ -455,7 +456,7 @@
1.66
1.67 long client_rename(const char *source, const char *target)
1.68 {
1.69 - l4_cap_idx_t server = l4re_env_get_cap("server");
1.70 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
1.71
1.72 return client_rename_using(source, target, server);
1.73 }
1.74 @@ -473,7 +474,7 @@
1.75
1.76 long client_stat(const char *path, struct stat *st)
1.77 {
1.78 - l4_cap_idx_t server = l4re_env_get_cap("server");
1.79 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
1.80
1.81 return client_stat_using(path, st, server);
1.82 }