diff options
Diffstat (limited to 'x11/kdebase11/files/patch-ao')
| -rw-r--r-- | x11/kdebase11/files/patch-ao | 69 |
1 files changed, 23 insertions, 46 deletions
diff --git a/x11/kdebase11/files/patch-ao b/x11/kdebase11/files/patch-ao index 21845750507c..62d11535357e 100644 --- a/x11/kdebase11/files/patch-ao +++ b/x11/kdebase11/files/patch-ao @@ -1,10 +1,9 @@ -*** kvt/utmp.c.orig Sun Aug 10 08:43:56 1997 ---- kvt/utmp.c Sun Sep 13 13:42:02 1998 +*** kvt/utmp.c.orig Wed Feb 17 19:54:08 1999 +--- kvt/utmp.c Wed Apr 21 18:37:34 1999 *************** -*** 60,65 **** ---- 60,70 ---- - #include <utmp.h> - #include <unistd.h> +*** 78,81 **** +--- 78,86 ---- + #endif + #define UTMP_SUPPORT 1 + #define HAVE_UTIL 1 @@ -13,12 +12,10 @@ + #ifdef HAVE_LASTLOG_H #include <lastlog.h> - #endif *************** -*** 73,78 **** ---- 78,95 ---- - #include <stdio.h> - #include <memory.h> +*** 95,98 **** +--- 100,115 ---- + #endif + #if USE_LASTLOG + # include <paths.h> @@ -34,67 +31,52 @@ + void cleanutent(void); void makeutent(char *); - *************** -*** 118,130 **** - **************************************************************************/ +*** 140,144 **** int utmp_pos; /* position of utmp-stamp */ - /* * on Sparcs login/logouts are logged at /var/adm/wtmp - * but talk(d)/finger only look at /etc/utmp +--- 157,160 ---- +*************** +*** 146,150 **** */ #ifndef UTMP ! #define UTMP "/etc/utmp" #endif - #ifndef USER_PROCESS ---- 135,146 ---- - **************************************************************************/ - int utmp_pos; /* position of utmp-stamp */ - - /* - * on Sparcs login/logouts are logged at /var/adm/wtmp - * but talk(d)/finger only look at /etc/utmp +--- 162,166 ---- */ #ifndef UTMP ! #define UTMP _PATH_UTMP #endif - #ifndef USER_PROCESS *************** -*** 143,148 **** ---- 159,166 ---- - *************************************************************************/ +*** 165,168 **** +--- 181,186 ---- #ifdef BSD + char global_ut_line[UT_LINESIZE]; + /************************************************************************** * get_tslot() - grabbed from xvt-1.0 - modified by David Perry - * *************** -*** 156,162 **** - char buf[200], name[200]; +*** 178,182 **** int i; ! if ((fs = fopen(TTYTAB,"r")) == NULL) return(-1); i = 1; - while (fgets(buf,200,fs) != NULL) ---- 174,180 ---- - char buf[200], name[200]; +--- 196,200 ---- int i; ! if ((fs = fopen(_PATH_TTYS,"r")) == NULL) return(-1); i = 1; - while (fgets(buf,200,fs) != NULL) *************** -*** 182,187 **** ---- 200,215 ---- - int write_utmp(char *ttyname, struct utmp * u) +*** 204,207 **** +--- 222,235 ---- { FILE *utmp; + #if USE_LASTLOG @@ -109,11 +91,9 @@ + if((utmp = fopen(UTMP,"r+")) == NULL) return -1; - utmp_pos = get_tslot(ttyname) * sizeof(struct utmp); *************** -*** 191,196 **** ---- 219,253 ---- - fwrite((char *)u, sizeof(struct utmp),1,utmp); +*** 213,216 **** +--- 241,273 ---- fclose(utmp); madeutent = 1; + @@ -147,14 +127,11 @@ + return(utmp_pos); } - *************** -*** 250,255 **** ---- 307,313 ---- - memset(&u,0,sizeof(u)); +*** 277,280 **** +--- 334,338 ---- fwrite((char *)&u,sizeof(struct utmp),1,ut); fclose(ut); + logwtmp(global_ut_line, "", ""); } - |