summaryrefslogtreecommitdiffstats
path: root/usr.bin/at
diff options
context:
space:
mode:
authorrobert <robert@FreeBSD.org>2002-07-22 11:32:16 +0000
committerrobert <robert@FreeBSD.org>2002-07-22 11:32:16 +0000
commitea42527996c15c30c7cd3b783bc16873c1c65f74 (patch)
treec20456c4105f6def1a70437831bde6b4a1883739 /usr.bin/at
parentc441264fcd19231a8a2512ac28e39749cc9dbfc0 (diff)
downloadFreeBSD-src-ea42527996c15c30c7cd3b783bc16873c1c65f74.zip
FreeBSD-src-ea42527996c15c30c7cd3b783bc16873c1c65f74.tar.gz
- Use MAXLOGNAME - 1 instead of UT_NAMESIZE.
- Do not pretend there is something like '/etc/utmp'.
Diffstat (limited to 'usr.bin/at')
-rw-r--r--usr.bin/at/at.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index 6756839..3eb3e74 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -56,13 +56,6 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <time.h>
#include <unistd.h>
-#include <utmp.h>
-
-#if (MAXLOGNAME-1) > UT_NAMESIZE
-#define LOGNAMESIZE UT_NAMESIZE
-#else
-#define LOGNAMESIZE (MAXLOGNAME-1)
-#endif
/* Local headers */
@@ -320,15 +313,15 @@ writefile(time_t runtimer, char queue)
if((fp = fdopen(fdes, "w")) == NULL)
panic("cannot reopen atjob file");
- /* Get the userid to mail to, first by trying getlogin(), which reads
- * /etc/utmp, then from LOGNAME, finally from getpwuid().
+ /* Get the userid to mail to, first by trying getlogin(),
+ * then from LOGNAME, finally from getpwuid().
*/
mailname = getlogin();
if (mailname == NULL)
mailname = getenv("LOGNAME");
if ((mailname == NULL) || (mailname[0] == '\0')
- || (strlen(mailname) > LOGNAMESIZE) || (getpwnam(mailname)==NULL))
+ || (strlen(mailname) >= MAXLOGNAME) || (getpwnam(mailname)==NULL))
{
pass_entry = getpwuid(real_uid);
if (pass_entry != NULL)
@@ -342,7 +335,8 @@ writefile(time_t runtimer, char queue)
perr("cannot open input file");
}
fprintf(fp, "#!/bin/sh\n# atrun uid=%ld gid=%ld\n# mail %*s %d\n",
- (long) real_uid, (long) real_gid, LOGNAMESIZE, mailname, send_mail);
+ (long) real_uid, (long) real_gid, MAXLOGNAME - 1, mailname,
+ send_mail);
/* Write out the umask at the time of invocation
*/
OpenPOWER on IntegriCloud