1.1 --- a/server/src/main.cc Thu Apr 30 22:51:06 2020 +0200
1.2 +++ b/server/src/main.cc Tue May 05 22:43:24 2020 +0200
1.3 @@ -82,7 +82,7 @@
1.4
1.5 /* Return a reference to any directly-accessed object. */
1.6
1.7 - char *path = fsdesc_get_name(fsobj);
1.8 + char *path = fsdesc_get_name(&fsobj->buffer);
1.9
1.10 if ((path != NULL) && !strlen(path))
1.11 {
1.12 @@ -99,7 +99,7 @@
1.13
1.14 /* Find the path within the selected filesystem. */
1.15
1.16 - strcpy(desc.cobj.buffer, fsobj->buffer);
1.17 + strcpy(desc.cobj.addr, fsobj->buffer.addr);
1.18
1.19 /* Propagate the message to the identified filesystem.
1.20 The L4_MSGTAG_PROPAGATE flag is not supported by Fiasco.OC, so this
1.21 @@ -130,7 +130,7 @@
1.22 {
1.23 /* Obtain the object's path. */
1.24
1.25 - char *path = fsdesc_get_name(fsobj);
1.26 + char *path = fsdesc_get_name(&fsobj->buffer);
1.27
1.28 if (path == NULL)
1.29 return -L4_EINVAL;
1.30 @@ -165,7 +165,7 @@
1.31
1.32 /* Find the path within the selected filesystem. */
1.33
1.34 - strcpy(desc.cobj.buffer, fsobj->buffer);
1.35 + strcpy(desc.cobj.addr, fsobj->buffer.addr);
1.36
1.37 /* Propagate the message to the identified filesystem.
1.38 The L4_MSGTAG_PROPAGATE flag is not supported by Fiasco.OC, so this
1.39 @@ -197,11 +197,11 @@
1.40
1.41 /* Initialise a descriptor for accessing a mounted filesystem. */
1.42
1.43 - long init_desc(file_descriptor_t *desc, fs_object_t *obj)
1.44 + long init_desc(file_descriptor_t *desc, fs_object_t *fsobj)
1.45 {
1.46 /* Match the path to a mountpoint. */
1.47
1.48 - char *path = fsdesc_get_name(obj);
1.49 + char *path = fsdesc_get_name(&fsobj->buffer);
1.50
1.51 if (path == NULL)
1.52 return -L4_EINVAL;