From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: Sami Kerola <kerolasa@iki.fi>
Subject: [PATCH 04/12] write: set atime value in term_chk() only if needed
Date: Mon, 9 May 2016 22:27:20 +0100 [thread overview]
Message-ID: <1462829248-6935-5-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1462829248-6935-1-git-send-email-kerolasa@iki.fi>
The atime comparison is done only in search_utmp(), the main does not use
this variable.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
term-utils/write.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/term-utils/write.c b/term-utils/write.c
index 4c6a25f..dd31f59 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -104,7 +104,8 @@ static int term_chk(char *tty, int *msgsokP, time_t * atimeP, int showerror)
*msgsokP = 1;
else
*msgsokP = (s.st_mode & S_IWGRP) && (getegid() == s.st_gid);
- *atimeP = s.st_atime;
+ if (atimeP)
+ *atimeP = s.st_atime;
return 0;
}
@@ -284,7 +285,6 @@ static void do_write(char *tty, char *mytty, uid_t myuid)
int main(int argc, char **argv)
{
- time_t atime;
uid_t myuid;
int msgsok = 0, myttyfd, c;
char tty[PATH_MAX], *mytty;
@@ -333,7 +333,7 @@ int main(int argc, char **argv)
*/
if (!strncmp(mytty, "/dev/", 5))
mytty += 5;
- if (term_chk(mytty, &msgsok, &atime, 1))
+ if (term_chk(mytty, &msgsok, NULL, 1))
exit(EXIT_FAILURE);
if (!msgsok)
errx(EXIT_FAILURE,
@@ -357,7 +357,7 @@ int main(int argc, char **argv)
errx(EXIT_FAILURE,
_("%s is not logged in on %s"),
argv[1], argv[2]);
- if (term_chk(argv[2], &msgsok, &atime, 1))
+ if (term_chk(argv[2], &msgsok, NULL, 1))
exit(EXIT_FAILURE);
if (myuid && !msgsok)
errx(EXIT_FAILURE,
--
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 ` Sami Kerola [this message]
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 ` [PATCH 09/12] write: remove unnecessary utmp variables Sami Kerola
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-5-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