diff options
author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-09-22 03:46:11 +0000 |
---|---|---|
committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-09-22 03:46:11 +0000 |
commit | 4dd29f9c7ea4162b9f0dc0693ad0f098437192c9 (patch) | |
tree | d0f441dd6fa605abb9c80cb80b70ff332cd41b30 /misc/orville-write/files/patch-amin.c | |
parent | - Switch to options helpers (diff) |
- Drop 8.x support
Approved by: portmgr blanket
Notes
Notes:
svn path=/head/; revision=397528
Diffstat (limited to 'misc/orville-write/files/patch-amin.c')
-rw-r--r-- | misc/orville-write/files/patch-amin.c | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/misc/orville-write/files/patch-amin.c b/misc/orville-write/files/patch-amin.c new file mode 100644 index 000000000000..c469459f5496 --- /dev/null +++ b/misc/orville-write/files/patch-amin.c @@ -0,0 +1,40 @@ +--- amin.c.orig 2010-02-02 23:04:35.773467035 -0800 ++++ amin.c 2010-02-02 23:06:45.674814831 -0800 +@@ -194,16 +194,16 @@ + + void locate_wrttmp(char *tty, struct wrttmp *wbuf, long *pos) + { +-struct utmp *ut; ++struct utmpx *ut; + + /* Find utmp entry */ +- if ((ut= find_utmp(tty)) == NULL || ut->ut_name[0] == '\0') ++ if ((ut= find_utmp(tty)) == NULL || ut->ut_user[0] == '\0') + { + printf("%s: Can't find your tty (%s) in utmp\n",progname,tty); + exit(1); + } + +- find_wrttmp(tty, ut->ut_time, wbuf, pos); ++ find_wrttmp(tty, ut->ut_tv.tv_sec, wbuf, pos); + } + + +@@ -230,7 +230,7 @@ + } + + /* Close utmp file */ +- endutent(); ++ endutxent(); + + /* Figure out name of program being exec'ed */ + if ((shortcmd= strrchr(fullcmd,'/')) == NULL) +@@ -241,7 +241,7 @@ + /* Fix my entry in wrttmp */ + newwrt= mywrt; + newwrt.wrt_what[0]= '!'; +- strncpy(newwrt.wrt_what+1, shortcmd, UT_NAMESIZE-1); ++ strncpy(newwrt.wrt_what+1, shortcmd, sizeof(((struct utmpx *)0)->ut_user)-2); + #ifndef TTYPERMS + if (tmp_mesg != 's') newwrt.wrt_mesg= tmp_mesg; + #endif |