1.1 --- a/conf/dstest_block_client.cfg Tue Mar 07 16:44:43 2023 +0100 1.2 +++ b/conf/dstest_block_client.cfg Tue Mar 07 19:10:40 2023 +0100 1.3 @@ -4,11 +4,11 @@ 1.4 1.5 local l = L4.default_loader; 1.6 1.7 -local server = l:new_channel(); 1.8 +local block_server = l:new_channel(); 1.9 1.10 l:startv({ 1.11 caps = { 1.12 - server = server:svr(), 1.13 + fsserver = block_server:svr(), 1.14 }, 1.15 log = { "server", "r" }, 1.16 }, 1.17 @@ -16,7 +16,7 @@ 1.18 1.19 l:startv({ 1.20 caps = { 1.21 - server = server, 1.22 + fsserver = block_server, 1.23 }, 1.24 log = { "client", "g" }, 1.25 },
2.1 --- a/conf/dstest_block_client_simple.cfg Tue Mar 07 16:44:43 2023 +0100 2.2 +++ b/conf/dstest_block_client_simple.cfg Tue Mar 07 19:10:40 2023 +0100 2.3 @@ -4,11 +4,11 @@ 2.4 2.5 local l = L4.default_loader; 2.6 2.7 -local server = l:new_channel(); 2.8 +local block_server = l:new_channel(); 2.9 2.10 l:startv({ 2.11 caps = { 2.12 - server = server:svr(), 2.13 + fsserver = block_server:svr(), 2.14 }, 2.15 log = { "server", "r" }, 2.16 }, 2.17 @@ -16,7 +16,7 @@ 2.18 2.19 l:startv({ 2.20 caps = { 2.21 - server = server, 2.22 + fsserver = block_server, 2.23 }, 2.24 log = { "client", "g" }, 2.25 },
3.1 --- a/conf/dstest_exec.cfg Tue Mar 07 16:44:43 2023 +0100 3.2 +++ b/conf/dstest_exec.cfg Tue Mar 07 19:10:40 2023 +0100 3.3 @@ -8,7 +8,7 @@ 3.4 3.5 l:startv({ 3.6 caps = { 3.7 - server = pipe_server:svr(), 3.8 + pipeserver = pipe_server:svr(), 3.9 }, 3.10 log = { "pipes", "r" }, 3.11 }, 3.12 @@ -18,35 +18,35 @@ 3.13 3.14 l:startv({ 3.15 caps = { 3.16 - server = block_server:svr(), 3.17 + fsserver = block_server:svr(), 3.18 }, 3.19 log = { "blocks", "r" }, 3.20 }, 3.21 "rom/block_server", "10"); 3.22 3.23 -local ext2svr = l:new_channel(); 3.24 +local ext2server = l:new_channel(); 3.25 3.26 l:startv({ 3.27 caps = { 3.28 - blocksvr = block_server, 3.29 - pipes = pipe_server, 3.30 - ext2svr = ext2svr:svr(), 3.31 + blockserver = block_server, 3.32 + pipeserver = pipe_server, 3.33 + fsserver = ext2server:svr(), 3.34 }, 3.35 log = { "ext2", "y" }, 3.36 }, 3.37 - "rom/ext2_server", "blocksvr", "rom/e2test.fs", "20", "ext2svr"); 3.38 + "rom/ext2_server", "blockserver", "rom/e2test.fs", "20", "fsserver"); 3.39 3.40 -- Obtain user filesystems with umask 0022 (18). 3.41 3.42 local open_for_user = 6; 3.43 -local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18); 3.44 +local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18); 3.45 3.46 local process_server = l:new_channel(); 3.47 3.48 l:startv({ 3.49 caps = { 3.50 - server = ext2svr_paulb, 3.51 - pserver = process_server:svr(), 3.52 + fsserver = ext2server_paulb, 3.53 + prserver = process_server:svr(), 3.54 }, 3.55 log = { "process", "y" }, 3.56 }, 3.57 @@ -54,8 +54,8 @@ 3.58 3.59 l:startv({ 3.60 caps = { 3.61 - server = ext2svr_paulb, 3.62 - pserver = process_server, 3.63 + fsserver = ext2server_paulb, 3.64 + prserver = process_server, 3.65 }, 3.66 log = { "client", "g" }, 3.67 },
4.1 --- a/conf/dstest_ext2.cfg Tue Mar 07 16:44:43 2023 +0100 4.2 +++ b/conf/dstest_ext2.cfg Tue Mar 07 19:10:40 2023 +0100 4.3 @@ -4,35 +4,35 @@ 4.4 4.5 local l = L4.default_loader; 4.6 4.7 -local blocksvr = l:new_channel(); 4.8 +local block_server = l:new_channel(); 4.9 4.10 l:startv({ 4.11 caps = { 4.12 - server = blocksvr:svr(), 4.13 + fsserver = block_server:svr(), 4.14 }, 4.15 log = { "blocksvr", "r" }, 4.16 }, 4.17 "rom/block_server", "10"); 4.18 4.19 -local ext2svr = l:new_channel(); 4.20 +local ext2server = l:new_channel(); 4.21 4.22 l:startv({ 4.23 caps = { 4.24 - blocksvr = blocksvr, 4.25 - ext2svr = ext2svr:svr(), 4.26 + blockserver = block_server, 4.27 + fsserver = ext2server:svr(), 4.28 }, 4.29 log = { "ext2svr", "y" }, 4.30 }, 4.31 - "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 4.32 + "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver"); 4.33 4.34 -- Obtain user filesystems with umask 0022 (18). 4.35 4.36 local open_for_user = 6; 4.37 -local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18); 4.38 +local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18); 4.39 4.40 l:startv({ 4.41 caps = { 4.42 - server = ext2svr_paulb, 4.43 + fsserver = ext2server_paulb, 4.44 }, 4.45 log = { "client", "g" }, 4.46 },
5.1 --- a/conf/dstest_ext2fs_client.cfg Tue Mar 07 16:44:43 2023 +0100 5.2 +++ b/conf/dstest_ext2fs_client.cfg Tue Mar 07 19:10:40 2023 +0100 5.3 @@ -4,11 +4,11 @@ 5.4 5.5 local l = L4.default_loader; 5.6 5.7 -local blocksvr = l:new_channel(); 5.8 +local block_server = l:new_channel(); 5.9 5.10 l:startv({ 5.11 caps = { 5.12 - server = blocksvr:svr(), 5.13 + fsserver = block_server:svr(), 5.14 }, 5.15 log = { "blocksvr", "r" }, 5.16 }, 5.17 @@ -16,8 +16,8 @@ 5.18 5.19 l:startv({ 5.20 caps = { 5.21 - server = blocksvr, 5.22 + fsserver = block_server, 5.23 }, 5.24 log = { "client", "g" }, 5.25 }, 5.26 - "rom/dstest_ext2fs_client", "server", "rom/e2test.fs"); 5.27 + "rom/dstest_ext2fs_client", "fsserver", "rom/e2test.fs");
6.1 --- a/conf/dstest_file_access.cfg Tue Mar 07 16:44:43 2023 +0100 6.2 +++ b/conf/dstest_file_access.cfg Tue Mar 07 19:10:40 2023 +0100 6.3 @@ -8,42 +8,42 @@ 6.4 6.5 l:startv({ 6.6 caps = { 6.7 - server = pipe_server:svr(), 6.8 + pipeserver = pipe_server:svr(), 6.9 }, 6.10 log = { "pipes", "r" }, 6.11 }, 6.12 "rom/pipe_server", "10"); 6.13 6.14 -local blocksvr = l:new_channel(); 6.15 +local block_server = l:new_channel(); 6.16 6.17 l:startv({ 6.18 caps = { 6.19 - server = blocksvr:svr(), 6.20 + fsserver = block_server:svr(), 6.21 }, 6.22 log = { "blocksvr", "r" }, 6.23 }, 6.24 "rom/block_server", "10"); 6.25 6.26 -local ext2svr = l:new_channel(); 6.27 +local ext2server = l:new_channel(); 6.28 6.29 l:startv({ 6.30 caps = { 6.31 - blocksvr = blocksvr, 6.32 - pipes = pipe_server, 6.33 - ext2svr = ext2svr:svr(), 6.34 + blockserver = block_server, 6.35 + pipeserver = pipe_server, 6.36 + fsserver = ext2server:svr(), 6.37 }, 6.38 log = { "ext2svr", "y" }, 6.39 }, 6.40 - "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 6.41 + "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver"); 6.42 6.43 -- Obtain user filesystems with umask 0022 (18). 6.44 6.45 local open_for_user = 6; 6.46 -local ext2svr_davidb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1001, 1001, 18); 6.47 +local ext2server_davidb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1001, 1001, 18); 6.48 6.49 l:startv({ 6.50 caps = { 6.51 - server = ext2svr_davidb, 6.52 + fsserver = ext2server_davidb, 6.53 }, 6.54 log = { "client", "g" }, 6.55 },
7.1 --- a/conf/dstest_file_client.cfg Tue Mar 07 16:44:43 2023 +0100 7.2 +++ b/conf/dstest_file_client.cfg Tue Mar 07 19:10:40 2023 +0100 7.3 @@ -4,35 +4,35 @@ 7.4 7.5 local l = L4.default_loader; 7.6 7.7 -local blocksvr = l:new_channel(); 7.8 +local block_server = l:new_channel(); 7.9 7.10 l:startv({ 7.11 caps = { 7.12 - server = blocksvr:svr(), 7.13 + fsserver = block_server:svr(), 7.14 }, 7.15 log = { "blocksvr", "r" }, 7.16 }, 7.17 "rom/block_server", "10"); 7.18 7.19 -local ext2svr = l:new_channel(); 7.20 +local ext2server = l:new_channel(); 7.21 7.22 l:startv({ 7.23 caps = { 7.24 - blocksvr = blocksvr, 7.25 - ext2svr = ext2svr:svr(), 7.26 + blockserver = block_server, 7.27 + fsserver = ext2server:svr(), 7.28 }, 7.29 log = { "ext2svr", "y" }, 7.30 }, 7.31 - "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 7.32 + "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver"); 7.33 7.34 -- Obtain user filesystems with umask 0022 (18). 7.35 7.36 local open_for_user = 6; 7.37 -local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18); 7.38 +local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18); 7.39 7.40 l:startv({ 7.41 caps = { 7.42 - server = ext2svr_paulb, 7.43 + fsserver = ext2server_paulb, 7.44 }, 7.45 log = { "client", "g" }, 7.46 },
8.1 --- a/conf/dstest_file_mapping.cfg Tue Mar 07 16:44:43 2023 +0100 8.2 +++ b/conf/dstest_file_mapping.cfg Tue Mar 07 19:10:40 2023 +0100 8.3 @@ -4,11 +4,11 @@ 8.4 8.5 local l = L4.default_loader; 8.6 8.7 -local server = l:new_channel(); 8.8 +local host_server = l:new_channel(); 8.9 8.10 l:startv({ 8.11 caps = { 8.12 - server = server:svr(), 8.13 + fsserver = host_server:svr(), 8.14 }, 8.15 log = { "server", "r" }, 8.16 }, 8.17 @@ -16,7 +16,7 @@ 8.18 8.19 l:startv({ 8.20 caps = { 8.21 - server = server, 8.22 + fsserver = host_server, 8.23 }, 8.24 log = { "client", "g" }, 8.25 },
9.1 --- a/conf/dstest_file_monitor.cfg Tue Mar 07 16:44:43 2023 +0100 9.2 +++ b/conf/dstest_file_monitor.cfg Tue Mar 07 19:10:40 2023 +0100 9.3 @@ -4,35 +4,35 @@ 9.4 9.5 local l = L4.default_loader; 9.6 9.7 -local blocksvr = l:new_channel(); 9.8 +local block_server = l:new_channel(); 9.9 9.10 l:startv({ 9.11 caps = { 9.12 - server = blocksvr:svr(), 9.13 + fsserver = block_server:svr(), 9.14 }, 9.15 log = { "blocksvr", "r" }, 9.16 }, 9.17 "rom/block_server", "10"); 9.18 9.19 -local ext2svr = l:new_channel(); 9.20 +local ext2server = l:new_channel(); 9.21 9.22 l:startv({ 9.23 caps = { 9.24 - blocksvr = blocksvr, 9.25 - ext2svr = ext2svr:svr(), 9.26 + blockserver = block_server, 9.27 + fsserver = ext2server:svr(), 9.28 }, 9.29 log = { "ext2svr", "y" }, 9.30 }, 9.31 - "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 9.32 + "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver"); 9.33 9.34 -- Obtain user filesystems with umask 0022 (18). 9.35 9.36 local open_for_user = 6; 9.37 -local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18); 9.38 +local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18); 9.39 9.40 l:startv({ 9.41 caps = { 9.42 - server = ext2svr_paulb, 9.43 + fsserver = ext2server_paulb, 9.44 }, 9.45 log = { "client", "g" }, 9.46 },
10.1 --- a/conf/dstest_file_readdir.cfg Tue Mar 07 16:44:43 2023 +0100 10.2 +++ b/conf/dstest_file_readdir.cfg Tue Mar 07 19:10:40 2023 +0100 10.3 @@ -8,7 +8,7 @@ 10.4 10.5 l:startv({ 10.6 caps = { 10.7 - server = pipe_server:svr(), 10.8 + pipeserver = pipe_server:svr(), 10.9 }, 10.10 log = { "pipes", "r" }, 10.11 }, 10.12 @@ -18,32 +18,32 @@ 10.13 10.14 l:startv({ 10.15 caps = { 10.16 - server = block_server:svr(), 10.17 + fsserver = block_server:svr(), 10.18 }, 10.19 log = { "blocksvr", "r" }, 10.20 }, 10.21 "rom/block_server", "10"); 10.22 10.23 -local ext2svr = l:new_channel(); 10.24 +local ext2server = l:new_channel(); 10.25 10.26 l:startv({ 10.27 caps = { 10.28 - blocksvr = block_server, 10.29 - pipes = pipe_server, 10.30 - ext2svr = ext2svr:svr(), 10.31 + blockserver = block_server, 10.32 + pipeserver = pipe_server, 10.33 + fsserver = ext2server:svr(), 10.34 }, 10.35 log = { "ext2svr", "y" }, 10.36 }, 10.37 - "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 10.38 + "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver"); 10.39 10.40 -- Obtain user filesystems with umask 0022 (18). 10.41 10.42 local open_for_user = 6; 10.43 -local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18); 10.44 +local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18); 10.45 10.46 l:startv({ 10.47 caps = { 10.48 - server = ext2svr_paulb, 10.49 + fsserver = ext2server_paulb, 10.50 }, 10.51 log = { "client", "g" }, 10.52 },
11.1 --- a/conf/dstest_file_readdir_concurrent.cfg Tue Mar 07 16:44:43 2023 +0100 11.2 +++ b/conf/dstest_file_readdir_concurrent.cfg Tue Mar 07 19:10:40 2023 +0100 11.3 @@ -8,7 +8,7 @@ 11.4 11.5 l:startv({ 11.6 caps = { 11.7 - server = pipe_server:svr(), 11.8 + pipeserver = pipe_server:svr(), 11.9 }, 11.10 log = { "pipes", "r" }, 11.11 }, 11.12 @@ -18,32 +18,32 @@ 11.13 11.14 l:startv({ 11.15 caps = { 11.16 - server = block_server:svr(), 11.17 + fsserver = block_server:svr(), 11.18 }, 11.19 log = { "blocksvr", "r" }, 11.20 }, 11.21 "rom/block_server", "10"); 11.22 11.23 -local ext2svr = l:new_channel(); 11.24 +local ext2server = l:new_channel(); 11.25 11.26 l:startv({ 11.27 caps = { 11.28 - blocksvr = block_server, 11.29 - pipes = pipe_server, 11.30 - ext2svr = ext2svr:svr(), 11.31 + blockserver = block_server, 11.32 + pipeserver = pipe_server, 11.33 + fsserver = ext2server:svr(), 11.34 }, 11.35 log = { "ext2svr", "y" }, 11.36 }, 11.37 - "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 11.38 + "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver"); 11.39 11.40 -- Obtain user filesystems with umask 0022 (18). 11.41 11.42 local open_for_user = 6; 11.43 -local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18); 11.44 +local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18); 11.45 11.46 l:startv({ 11.47 caps = { 11.48 - server = ext2svr_paulb, 11.49 + fsserver = ext2server_paulb, 11.50 }, 11.51 log = { "client", "g" }, 11.52 },
12.1 --- a/conf/dstest_file_remove.cfg Tue Mar 07 16:44:43 2023 +0100 12.2 +++ b/conf/dstest_file_remove.cfg Tue Mar 07 19:10:40 2023 +0100 12.3 @@ -8,7 +8,7 @@ 12.4 12.5 l:startv({ 12.6 caps = { 12.7 - server = pipe_server:svr(), 12.8 + pipeserver = pipe_server:svr(), 12.9 }, 12.10 log = { "pipes", "r" }, 12.11 }, 12.12 @@ -18,32 +18,32 @@ 12.13 12.14 l:startv({ 12.15 caps = { 12.16 - server = block_server:svr(), 12.17 + fsserver = block_server:svr(), 12.18 }, 12.19 log = { "blocksvr", "r" }, 12.20 }, 12.21 "rom/block_server", "10"); 12.22 12.23 -local ext2svr = l:new_channel(); 12.24 +local ext2server = l:new_channel(); 12.25 12.26 l:startv({ 12.27 caps = { 12.28 - blocksvr = block_server, 12.29 - pipes = pipe_server, 12.30 - ext2svr = ext2svr:svr(), 12.31 + blockserver = block_server, 12.32 + pipeserver = pipe_server, 12.33 + fsserver = ext2server:svr(), 12.34 }, 12.35 log = { "ext2svr", "y" }, 12.36 }, 12.37 - "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 12.38 + "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver"); 12.39 12.40 -- Obtain user filesystems with umask 0022 (18). 12.41 12.42 local open_for_user = 6; 12.43 -local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18); 12.44 +local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18); 12.45 12.46 l:startv({ 12.47 caps = { 12.48 - server = ext2svr_paulb, 12.49 + fsserver = ext2server_paulb, 12.50 }, 12.51 log = { "client", "g" }, 12.52 },
13.1 --- a/conf/dstest_file_rename.cfg Tue Mar 07 16:44:43 2023 +0100 13.2 +++ b/conf/dstest_file_rename.cfg Tue Mar 07 19:10:40 2023 +0100 13.3 @@ -8,7 +8,7 @@ 13.4 13.5 l:startv({ 13.6 caps = { 13.7 - server = pipe_server:svr(), 13.8 + pipeserver = pipe_server:svr(), 13.9 }, 13.10 log = { "pipes", "r" }, 13.11 }, 13.12 @@ -18,32 +18,32 @@ 13.13 13.14 l:startv({ 13.15 caps = { 13.16 - server = block_server:svr(), 13.17 + fsserver = block_server:svr(), 13.18 }, 13.19 log = { "blocksvr", "r" }, 13.20 }, 13.21 "rom/block_server", "10"); 13.22 13.23 -local ext2svr = l:new_channel(); 13.24 +local ext2server = l:new_channel(); 13.25 13.26 l:startv({ 13.27 caps = { 13.28 - blocksvr = block_server, 13.29 - pipes = pipe_server, 13.30 - ext2svr = ext2svr:svr(), 13.31 + blockserver = block_server, 13.32 + pipeserver = pipe_server, 13.33 + fsserver = ext2server:svr(), 13.34 }, 13.35 log = { "ext2svr", "y" }, 13.36 }, 13.37 - "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 13.38 + "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver"); 13.39 13.40 -- Obtain user filesystems with umask 0022 (18). 13.41 13.42 local open_for_user = 6; 13.43 -local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18); 13.44 +local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18); 13.45 13.46 l:startv({ 13.47 caps = { 13.48 - server = ext2svr_paulb, 13.49 + fsserver = ext2server_paulb, 13.50 }, 13.51 log = { "client", "g" }, 13.52 },
14.1 --- a/conf/dstest_fsaccess.cfg Tue Mar 07 16:44:43 2023 +0100 14.2 +++ b/conf/dstest_fsaccess.cfg Tue Mar 07 19:10:40 2023 +0100 14.3 @@ -8,7 +8,7 @@ 14.4 14.5 l:startv({ 14.6 caps = { 14.7 - server = pipe_server:svr(), 14.8 + pipeserver = pipe_server:svr(), 14.9 }, 14.10 log = { "pipes", "r" }, 14.11 }, 14.12 @@ -18,32 +18,32 @@ 14.13 14.14 l:startv({ 14.15 caps = { 14.16 - server = block_server:svr(), 14.17 + fsserver = block_server:svr(), 14.18 }, 14.19 log = { "blocksvr", "r" }, 14.20 }, 14.21 "rom/block_server", "10"); 14.22 14.23 -local ext2svr = l:new_channel(); 14.24 +local ext2server = l:new_channel(); 14.25 14.26 l:startv({ 14.27 caps = { 14.28 - blocksvr = block_server, 14.29 - pipes = pipe_server, 14.30 - ext2svr = ext2svr:svr(), 14.31 + blockserver = block_server, 14.32 + pipeserver = pipe_server, 14.33 + fsserver = ext2server:svr(), 14.34 }, 14.35 log = { "ext2svr", "y" }, 14.36 }, 14.37 - "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 14.38 + "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver"); 14.39 14.40 -- Obtain user filesystems with umask 0022 (18). 14.41 14.42 local open_for_user = 6; 14.43 -local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18); 14.44 +local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18); 14.45 14.46 l:startv({ 14.47 caps = { 14.48 - server = ext2svr_paulb, 14.49 + fsserver = ext2server_paulb, 14.50 }, 14.51 log = { "client", "g" }, 14.52 },
15.1 --- a/conf/dstest_host_client.cfg Tue Mar 07 16:44:43 2023 +0100 15.2 +++ b/conf/dstest_host_client.cfg Tue Mar 07 19:10:40 2023 +0100 15.3 @@ -4,11 +4,11 @@ 15.4 15.5 local l = L4.default_loader; 15.6 15.7 -local server = l:new_channel(); 15.8 +local host_server = l:new_channel(); 15.9 15.10 l:startv({ 15.11 caps = { 15.12 - server = server:svr(), 15.13 + fsserver = host_server:svr(), 15.14 }, 15.15 log = { "server", "r" }, 15.16 }, 15.17 @@ -16,7 +16,7 @@ 15.18 15.19 l:startv({ 15.20 caps = { 15.21 - server = server, 15.22 + fsserver = host_server, 15.23 }, 15.24 log = { "client", "g" }, 15.25 },
16.1 --- a/conf/dstest_host_readdir.cfg Tue Mar 07 16:44:43 2023 +0100 16.2 +++ b/conf/dstest_host_readdir.cfg Tue Mar 07 19:10:40 2023 +0100 16.3 @@ -8,7 +8,7 @@ 16.4 16.5 l:startv({ 16.6 caps = { 16.7 - server = pipe_server:svr(), 16.8 + pipeserver = pipe_server:svr(), 16.9 }, 16.10 log = { "pipes", "r" }, 16.11 }, 16.12 @@ -18,8 +18,8 @@ 16.13 16.14 l:startv({ 16.15 caps = { 16.16 - pipes = pipe_server, 16.17 - server = host_server:svr(), 16.18 + pipeserver = pipe_server, 16.19 + fsserver = host_server:svr(), 16.20 }, 16.21 log = { "server", "r" }, 16.22 }, 16.23 @@ -27,7 +27,7 @@ 16.24 16.25 l:startv({ 16.26 caps = { 16.27 - server = host_server, 16.28 + fsserver = host_server, 16.29 }, 16.30 log = { "client", "g" }, 16.31 },
17.1 --- a/conf/dstest_pipe_client.cfg Tue Mar 07 16:44:43 2023 +0100 17.2 +++ b/conf/dstest_pipe_client.cfg Tue Mar 07 19:10:40 2023 +0100 17.3 @@ -4,11 +4,11 @@ 17.4 17.5 local l = L4.default_loader; 17.6 17.7 -local server = l:new_channel(); 17.8 +local pipe_server = l:new_channel(); 17.9 17.10 l:startv({ 17.11 caps = { 17.12 - server = server:svr(), 17.13 + pipeserver = pipe_server:svr(), 17.14 }, 17.15 log = { "server", "r" }, 17.16 }, 17.17 @@ -16,7 +16,7 @@ 17.18 17.19 l:start({ 17.20 caps = { 17.21 - pipes = server, 17.22 + pipeserver = pipe_server, 17.23 }, 17.24 log = { "client", "g" }, 17.25 },
18.1 --- a/conf/dstest_test_client.cfg Tue Mar 07 16:44:43 2023 +0100 18.2 +++ b/conf/dstest_test_client.cfg Tue Mar 07 19:10:40 2023 +0100 18.3 @@ -4,11 +4,11 @@ 18.4 18.5 local l = L4.default_loader; 18.6 18.7 -local server = l:new_channel(); 18.8 +local test_server = l:new_channel(); 18.9 18.10 l:startv({ 18.11 caps = { 18.12 - server = server:svr(), 18.13 + fsserver = test_server:svr(), 18.14 }, 18.15 log = { "server", "r" }, 18.16 }, 18.17 @@ -16,7 +16,7 @@ 18.18 18.19 l:start({ 18.20 caps = { 18.21 - server = server, 18.22 + fsserver = test_server, 18.23 }, 18.24 log = { "client1", "g" }, 18.25 }, 18.26 @@ -24,7 +24,7 @@ 18.27 18.28 l:start({ 18.29 caps = { 18.30 - server = server, 18.31 + fsserver = test_server, 18.32 }, 18.33 log = { "client2", "b" }, 18.34 },
19.1 --- a/libext2fs_blockserver/lib/src/blockserver_io.c Tue Mar 07 16:44:43 2023 +0100 19.2 +++ b/libext2fs_blockserver/lib/src/blockserver_io.c Tue Mar 07 19:10:40 2023 +0100 19.3 @@ -1,7 +1,7 @@ 19.4 /* 19.5 * blockserver_io.c --- L4Re block server I/O manager. 19.6 * 19.7 - * Copyright (C) 2019, 2020, 2021, 2022 Paul Boddie <paul@boddie.org.uk> 19.8 + * Copyright (C) 2019, 2020, 2021, 2022, 2023 Paul Boddie <paul@boddie.org.uk> 19.9 * 19.10 * This library is free software; you can redistribute it and/or 19.11 * modify it under the terms of the GNU Library General Public 19.12 @@ -26,6 +26,7 @@ 19.13 19.14 #include <ext2fs/ext2fs.h> 19.15 #include <fsclient/client.h> 19.16 +#include <systypes/env.h> 19.17 19.18 19.19 19.20 @@ -40,7 +41,7 @@ 19.21 19.22 io_manager blockserver_io_manager; /* defined below */ 19.23 19.24 -const char *blockserver_default_cap = "server"; 19.25 +const char *blockserver_default_cap = ENV_FILESYSTEM_SERVER_NAME; 19.26 19.27 19.28
20.1 --- a/libfsclient/lib/src/client.cc Tue Mar 07 16:44:43 2023 +0100 20.2 +++ b/libfsclient/lib/src/client.cc Tue Mar 07 19:10:40 2023 +0100 20.3 @@ -26,6 +26,7 @@ 20.4 #include <stdlib.h> 20.5 #include <string.h> 20.6 20.7 +#include <systypes/env.h> 20.8 #include <systypes/fcntl.h> 20.9 20.10 #include "client.h" 20.11 @@ -209,7 +210,7 @@ 20.12 20.13 l4_cap_idx_t client_open_for_user(user_t user) 20.14 { 20.15 - l4_cap_idx_t server = l4re_env_get_cap("server"); 20.16 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME); 20.17 20.18 return client_open_for_user_using(user, server); 20.19 } 20.20 @@ -250,7 +251,7 @@ 20.21 20.22 file_t *client_open(const char *name, flags_t flags) 20.23 { 20.24 - l4_cap_idx_t server = l4re_env_get_cap("server"); 20.25 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME); 20.26 20.27 return client_open_using(name, flags, server); 20.28 } 20.29 @@ -279,7 +280,7 @@ 20.30 20.31 file_t *client_opendir(const char *name) 20.32 { 20.33 - l4_cap_idx_t server = l4re_env_get_cap("server"); 20.34 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME); 20.35 20.36 return client_opendir_using(name, server); 20.37 } 20.38 @@ -358,7 +359,7 @@ 20.39 20.40 long client_pipe(file_t **reader, file_t **writer, flags_t flags) 20.41 { 20.42 - l4_cap_idx_t server = l4re_env_get_cap("pipes"); 20.43 + l4_cap_idx_t server = l4re_env_get_cap(ENV_PIPE_SERVER_NAME); 20.44 20.45 return client_pipe_using(reader, writer, flags, server); 20.46 } 20.47 @@ -419,7 +420,7 @@ 20.48 20.49 long client_mkdir(const char *path, mode_t mode) 20.50 { 20.51 - l4_cap_idx_t server = l4re_env_get_cap("server"); 20.52 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME); 20.53 20.54 return client_mkdir_using(path, mode, server); 20.55 } 20.56 @@ -437,7 +438,7 @@ 20.57 20.58 long client_remove(const char *path) 20.59 { 20.60 - l4_cap_idx_t server = l4re_env_get_cap("server"); 20.61 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME); 20.62 20.63 return client_remove_using(path, server); 20.64 } 20.65 @@ -455,7 +456,7 @@ 20.66 20.67 long client_rename(const char *source, const char *target) 20.68 { 20.69 - l4_cap_idx_t server = l4re_env_get_cap("server"); 20.70 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME); 20.71 20.72 return client_rename_using(source, target, server); 20.73 } 20.74 @@ -473,7 +474,7 @@ 20.75 20.76 long client_stat(const char *path, struct stat *st) 20.77 { 20.78 - l4_cap_idx_t server = l4re_env_get_cap("server"); 20.79 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME); 20.80 20.81 return client_stat_using(path, st, server); 20.82 }
21.1 --- a/libfsclient/lib/src/process.cc Tue Mar 07 16:44:43 2023 +0100 21.2 +++ b/libfsclient/lib/src/process.cc Tue Mar 07 19:10:40 2023 +0100 21.3 @@ -21,6 +21,7 @@ 21.4 21.5 #include <ipc/cap_alloc.h> 21.6 #include <ipc/mem_ipc.h> 21.7 +#include <systypes/env.h> 21.8 21.9 #include <stdio.h> 21.10 #include <stdlib.h> 21.11 @@ -71,10 +72,10 @@ 21.12 21.13 long process_start(process_t *process, int argc, char *argv[]) 21.14 { 21.15 - l4_cap_idx_t server = l4re_env_get_cap("pserver"); 21.16 + l4_cap_idx_t server = l4re_env_get_cap(ENV_PROCESS_SERVER_NAME); 21.17 21.18 if (l4_is_invalid_cap(server)) 21.19 - return -L4_ENOMEM; 21.20 + return -L4_ENOENT; 21.21 21.22 /* Obtain a context for process creation. */ 21.23
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 22.2 +++ b/libsystypes/include/systypes/env.h Tue Mar 07 19:10:40 2023 +0100 22.3 @@ -0,0 +1,32 @@ 22.4 +/* 22.5 + * Common environment definitions. 22.6 + * 22.7 + * Copyright (C) 2023 Paul Boddie <paul@boddie.org.uk> 22.8 + * 22.9 + * This program is free software; you can redistribute it and/or 22.10 + * modify it under the terms of the GNU General Public License as 22.11 + * published by the Free Software Foundation; either version 2 of 22.12 + * the License, or (at your option) any later version. 22.13 + * 22.14 + * This program is distributed in the hope that it will be useful, 22.15 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 22.16 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 22.17 + * GNU General Public License for more details. 22.18 + * 22.19 + * You should have received a copy of the GNU General Public License 22.20 + * along with this program; if not, write to the Free Software 22.21 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, 22.22 + * Boston, MA 02110-1301, USA 22.23 + */ 22.24 + 22.25 +#pragma once 22.26 + 22.27 +EXTERN_C_BEGIN 22.28 + 22.29 +#define ENV_FILESYSTEM_SERVER_NAME "fsserver" 22.30 +#define ENV_PIPE_SERVER_NAME "pipeserver" 22.31 +#define ENV_PROCESS_SERVER_NAME "prserver" 22.32 + 22.33 +EXTERN_C_END 22.34 + 22.35 +// vim: tabstop=2 expandtab shiftwidth=2
23.1 --- a/servers/block_file_server.cc Tue Mar 07 16:44:43 2023 +0100 23.2 +++ b/servers/block_file_server.cc Tue Mar 07 19:10:40 2023 +0100 23.3 @@ -1,7 +1,7 @@ 23.4 /* 23.5 * A dataspace server exposing files each as a block of writable memory. 23.6 * 23.7 - * Copyright (C) 2020, 2021 Paul Boddie <paul@boddie.org.uk> 23.8 + * Copyright (C) 2020, 2021, 2023 Paul Boddie <paul@boddie.org.uk> 23.9 * 23.10 * This program is free software; you can redistribute it and/or 23.11 * modify it under the terms of the GNU General Public License as 23.12 @@ -31,6 +31,7 @@ 23.13 #include <fsserver/pages.h> 23.14 #include <fsserver/resource_server.h> 23.15 #include <fsserver/block_file_opener.h> 23.16 +#include <systypes/env.h> 23.17 23.18 23.19 23.20 @@ -71,7 +72,7 @@ 23.21 23.22 /* Register a server associating it with the given object. */ 23.23 23.24 - const char *server_name = (argc > 2) ? argv[2] : "server"; 23.25 + const char *server_name = (argc > 2) ? argv[2] : ENV_FILESYSTEM_SERVER_NAME; 23.26 23.27 ResourceServer server(&opener); 23.28 err = server.bind(server_name);
24.1 --- a/servers/client_file_server.cc Tue Mar 07 16:44:43 2023 +0100 24.2 +++ b/servers/client_file_server.cc Tue Mar 07 19:10:40 2023 +0100 24.3 @@ -2,7 +2,7 @@ 24.4 * A dataspace server exposing file contents accessed via the filesystem client 24.5 * interface. 24.6 * 24.7 - * Copyright (C) 2020, 2021 Paul Boddie <paul@boddie.org.uk> 24.8 + * Copyright (C) 2020, 2021, 2023 Paul Boddie <paul@boddie.org.uk> 24.9 * 24.10 * This program is free software; you can redistribute it and/or 24.11 * modify it under the terms of the GNU General Public License as 24.12 @@ -32,6 +32,7 @@ 24.13 #include <fsserver/pages.h> 24.14 #include <fsserver/resource_server.h> 24.15 #include <fsserver/client_file_opener.h> 24.16 +#include <systypes/env.h> 24.17 24.18 24.19 24.20 @@ -72,7 +73,7 @@ 24.21 24.22 /* Register a server associating it with the given object. */ 24.23 24.24 - const char *server_name = (argc > 2) ? argv[2] : "server"; 24.25 + const char *server_name = (argc > 2) ? argv[2] : ENV_FILESYSTEM_SERVER_NAME; 24.26 24.27 ResourceServer server(&opener); 24.28 err = server.bind(server_name);
25.1 --- a/servers/ext2_file_server.cc Tue Mar 07 16:44:43 2023 +0100 25.2 +++ b/servers/ext2_file_server.cc Tue Mar 07 19:10:40 2023 +0100 25.3 @@ -1,7 +1,7 @@ 25.4 /* 25.5 * A dataspace server exposing file contents from an Ext2-based filesystem. 25.6 * 25.7 - * Copyright (C) 2020, 2021 Paul Boddie <paul@boddie.org.uk> 25.8 + * Copyright (C) 2020, 2021, 2023 Paul Boddie <paul@boddie.org.uk> 25.9 * 25.10 * This program is free software; you can redistribute it and/or 25.11 * modify it under the terms of the GNU General Public License as 25.12 @@ -32,6 +32,7 @@ 25.13 #include <fsserver/resource_server.h> 25.14 #include <fsserver/ext2_filesystem.h> 25.15 #include <mem/memory_incremental.h> 25.16 +#include <systypes/env.h> 25.17 25.18 25.19 25.20 @@ -72,7 +73,7 @@ 25.21 if (argc > 3) 25.22 memory_pages = atoi(argv[3]); 25.23 25.24 - const char *server_name = (argc > 4) ? argv[4] : "server"; 25.25 + const char *server_name = (argc > 4) ? argv[4] : ENV_FILESYSTEM_SERVER_NAME; 25.26 25.27 /* Set the capability used to access the filesystem. */ 25.28
26.1 --- a/servers/host_file_server.cc Tue Mar 07 16:44:43 2023 +0100 26.2 +++ b/servers/host_file_server.cc Tue Mar 07 19:10:40 2023 +0100 26.3 @@ -1,7 +1,7 @@ 26.4 /* 26.5 * A dataspace server exposing "host" file contents. 26.6 * 26.7 - * Copyright (C) 2020, 2021 Paul Boddie <paul@boddie.org.uk> 26.8 + * Copyright (C) 2020, 2021, 2023 Paul Boddie <paul@boddie.org.uk> 26.9 * 26.10 * This program is free software; you can redistribute it and/or 26.11 * modify it under the terms of the GNU General Public License as 26.12 @@ -31,6 +31,7 @@ 26.13 #include <fsserver/pages.h> 26.14 #include <fsserver/resource_server.h> 26.15 #include <fsserver/host_file_opener.h> 26.16 +#include <systypes/env.h> 26.17 26.18 26.19 26.20 @@ -71,7 +72,7 @@ 26.21 26.22 /* Register a server associating it with the given object. */ 26.23 26.24 - const char *server_name = (argc > 2) ? argv[2] : "server"; 26.25 + const char *server_name = (argc > 2) ? argv[2] : ENV_FILESYSTEM_SERVER_NAME; 26.26 26.27 ResourceServer server(&opener); 26.28 err = server.bind(server_name);
27.1 --- a/servers/pipe_server.cc Tue Mar 07 16:44:43 2023 +0100 27.2 +++ b/servers/pipe_server.cc Tue Mar 07 19:10:40 2023 +0100 27.3 @@ -1,7 +1,7 @@ 27.4 /* 27.5 * A pipe server. 27.6 * 27.7 - * Copyright (C) 2020, 2021 Paul Boddie <paul@boddie.org.uk> 27.8 + * Copyright (C) 2020, 2021, 2022, 2023 Paul Boddie <paul@boddie.org.uk> 27.9 * 27.10 * This program is free software; you can redistribute it and/or 27.11 * modify it under the terms of the GNU General Public License as 27.12 @@ -29,6 +29,7 @@ 27.13 #include <mem/memory_incremental.h> 27.14 #include <fsserver/pipe_opener_resource.h> 27.15 #include <fsserver/resource_server.h> 27.16 +#include <systypes/env.h> 27.17 27.18 27.19 27.20 @@ -66,7 +67,7 @@ 27.21 27.22 /* Register a server associating it with the given object. */ 27.23 27.24 - const char *server_name = (argc > 2) ? argv[2] : "server"; 27.25 + const char *server_name = (argc > 2) ? argv[2] : ENV_PIPE_SERVER_NAME; 27.26 27.27 ResourceServer server(&opener); 27.28 err = server.bind(server_name);
28.1 --- a/servers/process_server.cc Tue Mar 07 16:44:43 2023 +0100 28.2 +++ b/servers/process_server.cc Tue Mar 07 19:10:40 2023 +0100 28.3 @@ -28,6 +28,7 @@ 28.4 28.5 #include <exec/process_creator_resource.h> 28.6 #include <fsserver/resource_server.h> 28.7 +#include <systypes/env.h> 28.8 28.9 28.10 28.11 @@ -42,7 +43,7 @@ 28.12 } 28.13 28.14 char *rm_filename = argv[1]; 28.15 - const char *server_name = (argc > 2) ? argv[2] : "pserver"; 28.16 + const char *server_name = (argc > 2) ? argv[2] : ENV_PROCESS_SERVER_NAME; 28.17 long err; 28.18 28.19 /* Introduce concurrency control. */
29.1 --- a/servers/test_file_server.cc Tue Mar 07 16:44:43 2023 +0100 29.2 +++ b/servers/test_file_server.cc Tue Mar 07 19:10:40 2023 +0100 29.3 @@ -1,7 +1,7 @@ 29.4 /* 29.5 * Test dataspace operations. 29.6 * 29.7 - * Copyright (C) 2020, 2021 Paul Boddie <paul@boddie.org.uk> 29.8 + * Copyright (C) 2020, 2021, 2023 Paul Boddie <paul@boddie.org.uk> 29.9 * 29.10 * This program is free software; you can redistribute it and/or 29.11 * modify it under the terms of the GNU General Public License as 29.12 @@ -32,6 +32,7 @@ 29.13 #include <fsserver/pages.h> 29.14 #include <fsserver/resource_server.h> 29.15 #include <fsserver/test_file_opener.h> 29.16 +#include <systypes/env.h> 29.17 29.18 29.19 29.20 @@ -70,7 +71,7 @@ 29.21 29.22 /* Register a server associating it with the given object. */ 29.23 29.24 - const char *server_name = (argc > 2) ? argv[2] : "server"; 29.25 + const char *server_name = (argc > 2) ? argv[2] : ENV_FILESYSTEM_SERVER_NAME; 29.26 29.27 ResourceServer server(&opener); 29.28 err = server.bind(server_name);
30.1 --- a/tests/dstest_block_client.cc Tue Mar 07 16:44:43 2023 +0100 30.2 +++ b/tests/dstest_block_client.cc Tue Mar 07 19:10:40 2023 +0100 30.3 @@ -1,7 +1,7 @@ 30.4 /* 30.5 * Test dataspace operations. 30.6 * 30.7 - * Copyright (C) 2020, 2021, 2022 Paul Boddie <paul@boddie.org.uk> 30.8 + * Copyright (C) 2020, 2021, 2022, 2023 Paul Boddie <paul@boddie.org.uk> 30.9 * 30.10 * This program is free software; you can redistribute it and/or 30.11 * modify it under the terms of the GNU General Public License as 30.12 @@ -22,6 +22,7 @@ 30.13 #include <l4/re/env.h> 30.14 #include <l4/sys/err.h> 30.15 30.16 +#include <systypes/env.h> 30.17 #include <systypes/fcntl.h> 30.18 #include <systypes/format.h> 30.19 30.20 @@ -96,7 +97,7 @@ 30.21 30.22 /* Obtain access to the filesystem. */ 30.23 30.24 - l4_cap_idx_t server = l4re_env_get_cap("server"); 30.25 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME); 30.26 30.27 /* Invoke the open method to receive the file reference. */ 30.28
31.1 --- a/tests/dstest_file_mapping.cc Tue Mar 07 16:44:43 2023 +0100 31.2 +++ b/tests/dstest_file_mapping.cc Tue Mar 07 19:10:40 2023 +0100 31.3 @@ -1,7 +1,7 @@ 31.4 /* 31.5 * Test manual mapping of dataspace content. 31.6 * 31.7 - * Copyright (C) 2020, 2021, 2022 Paul Boddie <paul@boddie.org.uk> 31.8 + * Copyright (C) 2020, 2021, 2022, 2023 Paul Boddie <paul@boddie.org.uk> 31.9 * 31.10 * This program is free software; you can redistribute it and/or 31.11 * modify it under the terms of the GNU General Public License as 31.12 @@ -22,6 +22,7 @@ 31.13 #include <l4/re/env.h> 31.14 #include <l4/sys/err.h> 31.15 31.16 +#include <systypes/env.h> 31.17 #include <systypes/fcntl.h> 31.18 31.19 #include <stdio.h> 31.20 @@ -55,7 +56,7 @@ 31.21 31.22 /* Obtain access to the filesystem. */ 31.23 31.24 - l4_cap_idx_t server = l4re_env_get_cap("server"); 31.25 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME); 31.26 31.27 /* Invoke the open method to receive the file reference. */ 31.28
32.1 --- a/tests/dstest_host_client.cc Tue Mar 07 16:44:43 2023 +0100 32.2 +++ b/tests/dstest_host_client.cc Tue Mar 07 19:10:40 2023 +0100 32.3 @@ -1,7 +1,7 @@ 32.4 /* 32.5 * Test dataspace operations. 32.6 * 32.7 - * Copyright (C) 2020, 2021, 2022 Paul Boddie <paul@boddie.org.uk> 32.8 + * Copyright (C) 2020, 2021, 2022, 2023 Paul Boddie <paul@boddie.org.uk> 32.9 * 32.10 * This program is free software; you can redistribute it and/or 32.11 * modify it under the terms of the GNU General Public License as 32.12 @@ -22,6 +22,7 @@ 32.13 #include <l4/re/env.h> 32.14 #include <l4/sys/err.h> 32.15 32.16 +#include <systypes/env.h> 32.17 #include <systypes/fcntl.h> 32.18 32.19 #include <stdio.h> 32.20 @@ -53,7 +54,7 @@ 32.21 32.22 /* Obtain access to the filesystem. */ 32.23 32.24 - l4_cap_idx_t server = l4re_env_get_cap("server"); 32.25 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME); 32.26 32.27 /* Invoke the open method to receive the file reference. */ 32.28
33.1 --- a/tests/dstest_test_client.cc Tue Mar 07 16:44:43 2023 +0100 33.2 +++ b/tests/dstest_test_client.cc Tue Mar 07 19:10:40 2023 +0100 33.3 @@ -1,7 +1,7 @@ 33.4 /* 33.5 * Test dataspace operations. 33.6 * 33.7 - * Copyright (C) 2020, 2021, 2022 Paul Boddie <paul@boddie.org.uk> 33.8 + * Copyright (C) 2020, 2021, 2022, 2023 Paul Boddie <paul@boddie.org.uk> 33.9 * 33.10 * This program is free software; you can redistribute it and/or 33.11 * modify it under the terms of the GNU General Public License as 33.12 @@ -22,6 +22,7 @@ 33.13 #include <l4/re/env.h> 33.14 #include <l4/sys/err.h> 33.15 33.16 +#include <systypes/env.h> 33.17 #include <systypes/fcntl.h> 33.18 #include <systypes/format.h> 33.19 33.20 @@ -185,7 +186,7 @@ 33.21 33.22 /* Obtain access to the filesystem. */ 33.23 33.24 - l4_cap_idx_t server = l4re_env_get_cap("server"); 33.25 + l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME); 33.26 33.27 /* Obtain opener contexts for the files. */ 33.28