From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH 16/52] login: Move gnu utmpx to default implementation
Date: Fri, 5 Mar 2021 17:14:42 -0300 [thread overview]
Message-ID: <20210305201518.798584-17-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20210305201518.798584-1-adhemerval.zanella@linaro.org>
It removes one indirection where generic implementation assumes that
utmp and utmpx might differ and allows the optimize the symbol alias
where getutmp is the same as getumpx.
Checked with make check run-built-tests=no on all afftected ABIs.
---
.../gnu/bits => bits/types}/struct_utmpx.h | 0
{sysdeps/gnu/bits => bits}/utmpx.h | 2 +-
include/utmpx.h | 1 +
login/Makefile | 2 +-
login/getutmp.c | 34 ++++++++++++++++--
login/getutmpx.c | 35 +------------------
login/updwtmp.c | 11 +++++-
{sysdeps/gnu => login}/utmpx.h | 0
sysdeps/gnu/getutmp.c | 34 ------------------
sysdeps/gnu/getutmpx.c | 1 -
sysdeps/gnu/updwtmp.c | 31 ----------------
.../unix/sysv/linux/s390/s390-32/getutmp.c | 21 ++++-------
.../unix/sysv/linux/s390/s390-32/updwtmp.c | 2 +-
13 files changed, 54 insertions(+), 120 deletions(-)
rename {sysdeps/gnu/bits => bits/types}/struct_utmpx.h (100%)
rename {sysdeps/gnu/bits => bits}/utmpx.h (98%)
create mode 100644 include/utmpx.h
rename {sysdeps/gnu => login}/utmpx.h (100%)
delete mode 100644 sysdeps/gnu/getutmp.c
delete mode 100644 sysdeps/gnu/getutmpx.c
delete mode 100644 sysdeps/gnu/updwtmp.c
diff --git a/sysdeps/gnu/bits/struct_utmpx.h b/bits/types/struct_utmpx.h
similarity index 100%
rename from sysdeps/gnu/bits/struct_utmpx.h
rename to bits/types/struct_utmpx.h
diff --git a/sysdeps/gnu/bits/utmpx.h b/bits/utmpx.h
similarity index 98%
rename from sysdeps/gnu/bits/utmpx.h
rename to bits/utmpx.h
index 26ec95603f..b2947b1c13 100644
--- a/sysdeps/gnu/bits/utmpx.h
+++ b/bits/utmpx.h
@@ -51,7 +51,7 @@ struct __exit_status
};
-#include <bits/struct_utmpx.h>
+#include <bits/types/struct_utmpx.h>
/* Values for the `ut_type' field of a `struct utmpx'. */
diff --git a/include/utmpx.h b/include/utmpx.h
new file mode 100644
index 0000000000..cfe9b7c054
--- /dev/null
+++ b/include/utmpx.h
@@ -0,0 +1 @@
+#include <login/utmpx.h>
diff --git a/login/Makefile b/login/Makefile
index f7059ac660..5e2cb1da06 100644
--- a/login/Makefile
+++ b/login/Makefile
@@ -26,7 +26,7 @@ include ../Makeconfig
headers := utmp.h bits/utmp.h lastlog.h pty.h \
bits/types/struct_lastlog.h \
bits/types/struct_utmp.h \
- bits/struct_utmpx.h
+ bits/types/struct_utmpx.h
routines := getlogin getlogin_r setlogin getlogin_r_chk \
getutent getutent_r getutid getutline getutid_r getutline_r \
diff --git a/login/getutmp.c b/login/getutmp.c
index 0401e041dd..60aafb5067 100644
--- a/login/getutmp.c
+++ b/login/getutmp.c
@@ -17,17 +17,47 @@
#include <string.h>
#include <utmp.h>
+#include <stddef.h>
+#define getutmpx __redirect_getutmpx
#include <utmpx.h>
+#undef getutmpx
+
+#define CHECK_SIZE_AND_OFFSET(field) \
+ _Static_assert (sizeof ((struct utmp){0}.field) \
+ == sizeof ((struct utmpx){0}.field), \
+ "sizeof ((struct utmp){0}." #field " != " \
+ "sizeof ((struct utmpx){0}" #field); \
+ _Static_assert (offsetof (struct utmp, field) \
+ == offsetof (struct utmpx, field), \
+ "offsetof (struct utmp, " #field ") != " \
+ "offsetof (struct utmpx, " #field ")");
+
+/* This ensure the getutmp to getutmpx alias is valid. */
+_Static_assert (sizeof (struct utmp) == sizeof (struct utmpx),
+ "sizeof (struct utmp) != sizeof (struct utmpx)");
+CHECK_SIZE_AND_OFFSET (ut_type)
+CHECK_SIZE_AND_OFFSET (ut_pid)
+CHECK_SIZE_AND_OFFSET (ut_line)
+CHECK_SIZE_AND_OFFSET (ut_user)
+CHECK_SIZE_AND_OFFSET (ut_id)
+CHECK_SIZE_AND_OFFSET (ut_host)
+CHECK_SIZE_AND_OFFSET (ut_tv)
+
/* Copy the information in UTMPX to UTMP. */
void
-getutmp (const struct utmpx *utmpx, struct utmp *utmp)
+__getutmp (const struct utmpx *utmpx, struct utmp *utmp)
{
+ memset (utmp, 0, sizeof (struct utmpx));
utmp->ut_type = utmpx->ut_type;
utmp->ut_pid = utmpx->ut_pid;
memcpy (utmp->ut_line, utmpx->ut_line, sizeof (utmp->ut_line));
memcpy (utmp->ut_user, utmpx->ut_user, sizeof (utmp->ut_user));
memcpy (utmp->ut_id, utmpx->ut_id, sizeof (utmp->ut_id));
memcpy (utmp->ut_host, utmpx->ut_host, sizeof (utmp->ut_host));
- utmp->ut_tv = utmpx->ut_tv;
+ utmp->ut_tv.tv_sec = utmpx->ut_tv.tv_sec;
+ utmp->ut_tv.tv_usec = utmpx->ut_tv.tv_usec;
}
+
+weak_alias (__getutmp, getutmp)
+strong_alias (__getutmp, getutmpx)
diff --git a/login/getutmpx.c b/login/getutmpx.c
index 228726a05a..839eb6826e 100644
--- a/login/getutmpx.c
+++ b/login/getutmpx.c
@@ -1,34 +1 @@
-/* Copyright (C) 1999-2021 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-#include <string.h>
-#include <utmp.h>
-#include <utmpx.h>
-
-/* Copy the information in UTMP to UTMPX. */
-void
-getutmpx (const struct utmp *utmp, struct utmpx *utmpx)
-{
- memset (utmpx, 0, sizeof (struct utmpx));
- utmpx->ut_type = utmp->ut_type;
- utmpx->ut_pid = utmp->ut_pid;
- memcpy (utmpx->ut_line, utmp->ut_line, sizeof (utmp->ut_line));
- memcpy (utmpx->ut_user, utmp->ut_user, sizeof (utmp->ut_user));
- memcpy (utmpx->ut_id, utmp->ut_id, sizeof (utmp->ut_id));
- memcpy (utmpx->ut_host, utmp->ut_host, sizeof (utmp->ut_host));
- utmpx->ut_tv = utmp->ut_tv;
-}
+/* Implemented by getutmp.c. */
diff --git a/login/updwtmp.c b/login/updwtmp.c
index 0558198464..ae67cfc10a 100644
--- a/login/updwtmp.c
+++ b/login/updwtmp.c
@@ -17,11 +17,20 @@
<https://www.gnu.org/licenses/>. */
#include <utmp.h>
+#include <string.h>
+#include <unistd.h>
#include "utmp-private.h"
#ifndef TRANSFORM_UTMP_FILE_NAME
-# define TRANSFORM_UTMP_FILE_NAME(file_name) (file_name)
+# define TRANSFORM_UTMP_FILE_NAME(file_name) \
+ ((strcmp (file_name, _PATH_UTMP "x") == 0 \
+ && __access (_PATH_UTMP "x", F_OK) != 0) \
+ ? _PATH_UTMP \
+ : ((strcmp (file_name, _PATH_WTMP "x") == 0 \
+ && __access (_PATH_WTMP "x", F_OK) != 0) \
+ ? _PATH_WTMP \
+ : file_name))
#endif
void
diff --git a/sysdeps/gnu/utmpx.h b/login/utmpx.h
similarity index 100%
rename from sysdeps/gnu/utmpx.h
rename to login/utmpx.h
diff --git a/sysdeps/gnu/getutmp.c b/sysdeps/gnu/getutmp.c
deleted file mode 100644
index 4ce9d65ce0..0000000000
--- a/sysdeps/gnu/getutmp.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 1999-2021 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-#include <assert.h>
-#include <string.h>
-#include <utmp.h>
-#ifndef _UTMPX_H
-/* This is an ugly hack but we must not see the getutmpx declaration. */
-# define getutmpx XXXgetutmpx
-# include <utmpx.h>
-# undef getutmpx
-#endif
-
-void
-getutmp (const struct utmpx *utmpx, struct utmp *utmp)
-{
- assert (sizeof (struct utmp) == sizeof (struct utmpx));
- memcpy (utmp, utmpx, sizeof (struct utmp));
-}
-strong_alias (getutmp, getutmpx)
diff --git a/sysdeps/gnu/getutmpx.c b/sysdeps/gnu/getutmpx.c
deleted file mode 100644
index f393734a63..0000000000
--- a/sysdeps/gnu/getutmpx.c
+++ /dev/null
@@ -1 +0,0 @@
-/* We don't need a separate version. it is the same as getutmp(). */
diff --git a/sysdeps/gnu/updwtmp.c b/sysdeps/gnu/updwtmp.c
deleted file mode 100644
index a1cb93d75d..0000000000
--- a/sysdeps/gnu/updwtmp.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 1998-2021 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1998.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-#include <string.h>
-#include <unistd.h>
-
-#define TRANSFORM_UTMP_FILE_NAME(file_name) \
- ((strcmp (file_name, _PATH_UTMP "x") == 0 \
- && __access (_PATH_UTMP "x", F_OK) != 0) \
- ? _PATH_UTMP \
- : ((strcmp (file_name, _PATH_WTMP "x") == 0 \
- && __access (_PATH_WTMP "x", F_OK) != 0) \
- ? _PATH_WTMP \
- : file_name))
-
-#include <login/updwtmp.c>
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutmp.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutmp.c
index 5820701f21..6ffea2a553 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/getutmp.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutmp.c
@@ -16,22 +16,15 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <string.h>
-#include <utmp.h>
-/* This is an ugly hack but we must not see the getutmpx declaration. */
-#define getutmpx XXXgetutmpx
-#include <utmpx.h>
-#undef getutmpx
+#undef weak_alias
+#define weak_alias(a, b)
+#undef strong_alias
+#define strong_alias(a, b)
-#include "utmp-compat.h"
+#include <login/getutmp.c>
-#undef weak_alias
-#define weak_alias(n,a)
-#define getutmp __getutmp
-#define getutmpx __getutmpx
-#include "sysdeps/gnu/getutmp.c"
-#undef getutmp
-#undef getutmpx
+#include "utmp-compat.h"
default_symbol_version (__getutmp, getutmp, UTMP_COMPAT_BASE);
+_strong_alias (__getutmp, __getutmpx)
default_symbol_version (__getutmpx, getutmpx, UTMP_COMPAT_BASE);
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/updwtmp.c b/sysdeps/unix/sysv/linux/s390/s390-32/updwtmp.c
index d4aa0ce2ac..7ef8e85c00 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/updwtmp.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/updwtmp.c
@@ -25,7 +25,7 @@
# undef weak_alias
# define weak_alias(n,a)
#endif
-#include "sysdeps/gnu/updwtmp.c"
+#include <login/updwtmp.c>
#if defined SHARED
default_symbol_version (__updwtmp, updwtmp, UTMP_COMPAT_BASE);
--
2.25.1
next prev parent reply other threads:[~2021-03-05 20:15 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-05 20:14 [PATCH 00/52] Add 64 bit time support on legacy ABIs Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 01/52] io: Use temporary directory and file for ftwtest-sh Adhemerval Zanella
2021-03-05 20:56 ` Andreas Schwab
2021-03-05 23:53 ` Joseph Myers
2021-03-08 13:00 ` Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 02/52] linux: Add futimes test Adhemerval Zanella
2021-03-05 20:30 ` Florian Weimer
2021-03-08 13:01 ` Adhemerval Zanella
2021-03-08 13:08 ` Florian Weimer
2021-03-08 13:26 ` Adhemerval Zanella
2021-03-08 13:30 ` Florian Weimer
2021-03-05 20:33 ` Florian Weimer
2021-03-08 13:02 ` Adhemerval Zanella
2021-03-08 13:23 ` Adhemerval Zanella
2021-03-06 0:02 ` Joseph Myers
2021-03-06 3:52 ` Paul Zimmermann
2021-03-08 13:03 ` Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 03/52] linux: Add lutimes test Adhemerval Zanella
2021-03-05 20:31 ` Florian Weimer
2021-03-06 0:02 ` Joseph Myers
2021-03-05 20:14 ` [PATCH 04/52] time: Add getitimer and setitimer basic tests Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 05/52] time: Add gmtime/gmtime_r tests Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 06/52] time: Add timegm/timelocal basic tests Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 07/52] time: Add basic timespec_get tests Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 08/52] time: Add 64 bit tests for getdate / getdate_r Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 09/52] io: Add basic tests for utimensat Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 10/52] posix: Add wait3 tests Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 11/52] linux: mips: Split libpthread.abilist in n32 and n64 Adhemerval Zanella
2021-03-05 20:39 ` Florian Weimer
2021-03-08 13:05 ` Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 12/52] linux: mips: Split librt.abilist " Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 13/52] linux: mips: Split libanl.abilist " Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 14/52] linux: s390: Add libanl.abilist in s390 and s390x Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 15/52] login: Consolidate utmp and utmpx headers Adhemerval Zanella
2021-03-05 20:14 ` Adhemerval Zanella [this message]
2021-03-05 20:14 ` [PATCH 17/52] Consolidate and simplify internal utmp definitions Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 18/52] support: Add 'touch' command Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 19/52] Add tests-container-internal rules Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 20/52] login: Add 64-bit time support to utmp/utmpx Adhemerval Zanella
2021-04-27 12:30 ` Florian Weimer
2021-04-27 13:58 ` Andreas Schwab
2021-04-27 14:18 ` Florian Weimer
2021-04-27 14:51 ` Andreas Schwab
2021-04-27 18:03 ` Joseph Myers
2021-04-30 10:03 ` Florian Weimer
2021-04-30 12:17 ` Andreas Schwab
2021-04-30 12:22 ` Florian Weimer
2021-04-30 14:11 ` Andreas Schwab
2021-03-05 20:14 ` [PATCH 21/52] linux: Add pwrite64_nocancel Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 22/52] login: Use 64-bit time on struct lastlog [BZ #25844] Adhemerval Zanella
2021-03-06 0:07 ` Joseph Myers
2021-03-08 13:05 ` Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 23/52] Remove __WORDSIZE_TIME64_COMPAT32 Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 24/52] linux: Add fallback for 64-bit time_t SO_{RCV, SND}TIMEO Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 25/52] linux: Add fallback for 64-bit time_t SO_TIMESTAMP{NS} Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 26/52] linux: Add recvvmsg " Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 27/52] y2038: Add __USE_TIME_BITS64 support for time_t Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 28/52] y2038: Add __USE_TIME_BITS64 support for struct timeval Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 29/52] y2038: Add __USE_TIME_BITS64 support for struct timespec Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 30/52] y2038: Add __USE_TIME_BITS64 support for struct utimbuf Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 31/52] y2038: linux: Add __USE_TIME_BITS64 support for struct timex Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 32/52] y2038: Use a common definition for stat Adhemerval Zanella
2021-03-05 20:14 ` [PATCH 33/52] y2038: Use a common definition for msqid_ds Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 34/52] y2038: Use a common definition for semid_ds Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 35/52] y2038: Use a common definition for shmid_ds Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 36/52] y2038: Add __USE_TIME_BITS64 support for socket-constants.h Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 37/52] time: Add 64 bit time support for getdate Adhemerval Zanella
2021-03-08 21:27 ` Lukasz Majewski
2021-03-05 20:15 ` [PATCH 38/52] y2038: Add support for 64 bit time on legacy ABIs Adhemerval Zanella
2021-03-08 21:27 ` Lukasz Majewski
2021-03-05 20:15 ` [PATCH 39/52] posix: Add glob64 with 64 bit time_t support Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 40/52] io: Add fts64 " Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 41/52] io: Add ftw64 " Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 42/52] libsupport: Add 64 bit time_t support for time functions Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 43/52] libsupport: Add 64 bit time_t support for stat functions Adhemerval Zanella
2021-03-05 20:42 ` Florian Weimer
2021-03-08 13:06 ` Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 44/52] y2038: Add test coverage Adhemerval Zanella
2021-03-06 0:13 ` Joseph Myers
2021-03-08 13:12 ` Adhemerval Zanella
2021-03-08 21:28 ` Lukasz Majewski
2021-03-05 20:15 ` [PATCH 45/52] Use 64 bit time_t stat internally Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 46/52] debug: build pcprofiledump with LFS and 64 bit time support Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 47/52] elf: Use LFS and 64 bit time_t for installed programs Adhemerval Zanella
2021-03-05 20:43 ` Florian Weimer
2021-03-08 13:14 ` Adhemerval Zanella
2021-03-08 15:26 ` Florian Weimer
2021-03-05 20:15 ` [PATCH 48/52] iconv: " Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 49/52] locale: " Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 50/52] nss: " Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 51/52] posix: " Adhemerval Zanella
2021-03-05 20:15 ` [PATCH 52/52] timezone: " Adhemerval Zanella
2021-03-05 23:57 ` [PATCH 00/52] Add 64 bit time support on legacy ABIs Joseph Myers
2021-03-08 13:18 ` Adhemerval Zanella
2021-03-07 10:42 ` Lukasz Majewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210305201518.798584-17-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).