From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: Sami Kerola <kerolasa@iki.fi>
Subject: [PATCH 09/12] write: remove unnecessary utmp variables
Date: Mon, 9 May 2016 22:27:25 +0100 [thread overview]
Message-ID: <1462829248-6935-10-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1462829248-6935-1-git-send-email-kerolasa@iki.fi>
The getutent() calls are not thread safe, and reference documentation is
recommending to copy the context of the structures if information is wished
to be stored. But excessive copying does not seem to be relevant for single
threaded application.
Reference: http://www.gnu.org/software/libc/manual/html_node/Manipulating-the-Database.html
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
term-utils/write.c | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/term-utils/write.c b/term-utils/write.c
index 1ae3c82..403d4a7 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -126,17 +126,15 @@ static int check_tty(char *tty, int *mesg_allowed, time_t *tty_atime, int shower
*/
static int check_utmp(const struct write_control *ctl)
{
- struct utmp u;
- struct utmp *uptr;
+ struct utmp *u;
int res = 1;
utmpname(_PATH_UTMP);
setutent();
- while ((uptr = getutent())) {
- memcpy(&u, uptr, sizeof(u));
- if (strncmp(ctl->dst_login, u.ut_user, sizeof(u.ut_user)) == 0 &&
- strncmp(ctl->dst_tty, u.ut_line, sizeof(u.ut_line)) == 0) {
+ while ((u = getutent())) {
+ if (strncmp(ctl->dst_login, u->ut_user, sizeof(u->ut_user)) == 0 &&
+ strncmp(ctl->dst_tty, u->ut_line, sizeof(u->ut_line)) == 0) {
res = 0;
break;
}
@@ -159,38 +157,34 @@ static int check_utmp(const struct write_control *ctl)
*/
static void search_utmp(struct write_control *ctl)
{
- struct utmp u;
- struct utmp *uptr;
+ struct utmp *u;
time_t best_atime = 0, tty_atime;
int num_ttys = 0, valid_ttys = 0, mesg_allowed = 0, user_is_me = 0;
- char atty[sizeof(u.ut_line) + 1];
utmpname(_PATH_UTMP);
setutent();
- while ((uptr = getutent())) {
- memcpy(&u, uptr, sizeof(u));
- if (strncmp(ctl->dst_login, u.ut_user, sizeof(u.ut_user)) == 0) {
+ while ((u = getutent())) {
+ if (strncmp(ctl->dst_login, u->ut_user, sizeof(u->ut_user)) == 0) {
num_ttys++;
- xstrncpy(atty, u.ut_line, sizeof(atty));
- if (check_tty(atty, &mesg_allowed, &tty_atime, 0))
+ if (check_tty(u->ut_line, &mesg_allowed, &tty_atime, 0))
/* bad term? skip */
continue;
if (ctl->src_uid && !mesg_allowed)
/* skip ttys with msgs off */
continue;
- if (strcmp(atty, ctl->src_tty) == 0) {
+ if (strcmp(u->ut_line, ctl->src_tty) == 0) {
user_is_me = 1;
/* don't write to yourself */
continue;
}
- if (u.ut_type != USER_PROCESS)
+ if (u->ut_type != USER_PROCESS)
/* it's not a valid entry */
continue;
valid_ttys++;
if (tty_atime > best_atime) {
best_atime = tty_atime;
- xstrncpy(ctl->dst_tty, atty, sizeof(ctl->dst_tty));
+ xstrncpy(ctl->dst_tty, u->ut_line, sizeof(ctl->dst_tty));
}
}
}
--
2.8.2
next prev parent reply other threads:[~2016-05-09 21:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-09 21:27 [PATCH 00/12] pull: write(1) improvements Sami Kerola
2016-05-09 21:27 ` [PATCH 01/12] write: remove unused variable Sami Kerola
2016-05-09 21:27 ` [PATCH 02/12] write: get rid of function prototypes Sami Kerola
2016-05-09 21:27 ` [PATCH 03/12] write: remove pointless fileno(3) calls Sami Kerola
2016-05-09 21:27 ` [PATCH 04/12] write: set atime value in term_chk() only if needed Sami Kerola
2016-05-09 21:27 ` [PATCH 05/12] write: use xstrncpy() from strutils.h Sami Kerola
2016-05-09 21:27 ` [PATCH 06/12] write: run atexit() checks at the end of execution Sami Kerola
2016-05-09 21:27 ` [PATCH 07/12] write: add control structure to clarify what is going on Sami Kerola
2016-05-11 8:38 ` Karel Zak
2016-05-15 17:00 ` Sami Kerola
2016-05-09 21:27 ` [PATCH 08/12] write: improve variable names Sami Kerola
2016-05-09 21:27 ` Sami Kerola [this message]
2016-05-09 21:27 ` [PATCH 10/12] write: make timestamp to be obviously just a clock time Sami Kerola
2016-05-09 21:27 ` [PATCH 11/12] write: improve coding style Sami Kerola
2016-05-11 8:54 ` Karel Zak
2016-05-15 17:03 ` Sami Kerola
2016-05-09 21:27 ` [PATCH 12/12] write: tell when effective gid and tty path group mismatch Sami Kerola
2016-05-10 14:24 ` Benno Schulenberg
2016-05-10 19:37 ` Sami Kerola
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=1462829248-6935-10-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.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