head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.4 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.2 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.3.0.106 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.104 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.102 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.100 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.98 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.96 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.94 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.92 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.90 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.88 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.86 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.84 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.82 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.80 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.78 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.76 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.74 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.72 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.70 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.68 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.66 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.62 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.42 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.64 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.60 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.58 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.56 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.54 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.52 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.50 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.48 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.46 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.44 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.40 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.38 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.36 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.34 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.32 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.30 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.28 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.26 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.24 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.22 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.20 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.18 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.16 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.14 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.12 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.10 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.8 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.6 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.4 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.2 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.2.0.62 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.60 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.58 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.56 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.54 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.52 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.50 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.48 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.46 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.44 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.42 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.40 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.38 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.36 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.34 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.32 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.30 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.28 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.26 pkgsrc-2008Q1:1.2.0.24 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.22 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.20 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.18 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.16 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.14 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.12 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.10 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.8 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.6 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.4 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.0.2 pkgsrc-2005Q1-base:1.1; locks; strict; comment @# @; 1.4 date 2025.10.20.18.32.10; author vins; state Exp; branches; next 1.3; commitid pqZKxJZNUbSE1lfG; 1.3 date 2012.07.09.19.06.22; author joerg; state Exp; branches; next 1.2; 1.2 date 2005.06.16.10.47.43; author hira; state Exp; branches; next 1.1; 1.1 date 2005.01.16.22.00.26; author christos; state Exp; branches; next ; desc @@ 1.4 log @x11/rxvt: fix build with GCC14 Fix a number of warnings to allow it to compile with recent compilers. Tested with NetBSD 10.1 and pkgsrc's GCC14. Revision bumped. @ text @$NetBSD$ * Try to get term name from terminal slaves. * Use ut_session only when it is available in struct utmpx. * If updwtmpx is not available, use pututxline instead. --- src/logging.c.orig 2002-12-16 00:33:04.000000000 +0000 +++ src/logging.c @@@@ -82,7 +82,8 @@@@ rxvt_makeutent(rxvt_t *r, const char *pt else if (sscanf(pty, "pts/%d", &i) == 1) sprintf(ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ #endif - else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) { + else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) && + STRNCMP(pty, "pts/", 4)) { rxvt_print_error("can't parse tty name \"%s\"", pty); return; } @@@@ -137,7 +138,9 @@@@ rxvt_makeutent(rxvt_t *r, const char *pt STRNCPY(utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", sizeof(utx->ut_user)); STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id)); +# ifdef HAVE_UTMPX_SESSION utx->ut_session = getsid(0); +# endif utx->ut_tv.tv_sec = time(NULL); utx->ut_tv.tv_usec = 0; utx->ut_pid = r->h->cmd_pid; @@@@ -203,7 +206,11 @@@@ rxvt_makeutent(rxvt_t *r, const char *pt # endif # endif # ifdef HAVE_STRUCT_UTMPX +# ifdef HAVE_UPDWTMPX updwtmpx(RXVT_WTMPX_FILE, utx); +# else + pututxline(utx); +# endif # endif } #endif @@@@ -254,7 +261,9 @@@@ rxvt_cleanutent(rxvt_t *r) if ((tmputx = getutxid(utx))) /* position to entry in utmp file */ utx = tmputx; utx->ut_type = DEAD_PROCESS; +# ifdef HAVE_UTMPX_SESSION utx->ut_session = getsid(0); +# endif utx->ut_tv.tv_sec = time(NULL); utx->ut_tv.tv_usec = 0; #endif @@@@ -275,7 +284,11 @@@@ rxvt_cleanutent(rxvt_t *r) # endif # endif # ifdef HAVE_STRUCT_UTMPX +# ifdef HAVE_UPDWTMPX updwtmpx(RXVT_WTMPX_FILE, utx); +# else + pututxline(utx); +# endif # endif } #endif @@@@ -327,7 +340,7 @@@@ rxvt_write_bsd_utmp(int utmp_pos, struct /* * Update a BSD style wtmp entry */ -#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) +#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) /* INTPROTO */ void rxvt_update_wtmp(const char *fname, const struct utmp *putmp) @ 1.3 log @Merge patch-ai into patch-ak. Don't remove __attribute__(). @ text @d1 5 a5 1 $NetBSD: patch-ak,v 1.2 2005/06/16 10:47:43 hira Exp $ d9 1 a9 15 @@@@ -66,9 +66,7 @@@@ rxvt_makeutent(rxvt_t *r, const char *pt #ifdef HAVE_STRUCT_UTMPX struct utmpx *utx = &(r->h->utx); #endif -#ifdef HAVE_UTMP_PID int i; -#endif char ut_id[5]; struct passwd *pwent = getpwuid(getuid()); @@@@ -78,10 +76,8 @@@@ rxvt_makeutent(rxvt_t *r, const char *pt if (!STRNCMP(pty, "pty", 3) || !STRNCMP(pty, "tty", 3)) { STRNCPY(ut_id, (pty + 3), sizeof(ut_id)); } -#ifdef HAVE_UTMP_PID d12 4 a15 2 -#endif else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) { d18 2 a19 1 @@@@ -137,7 +133,9 @@@@ rxvt_makeutent(rxvt_t *r, const char *pt d29 1 a29 1 @@@@ -203,7 +201,11 @@@@ rxvt_makeutent(rxvt_t *r, const char *pt d41 1 a41 1 @@@@ -254,7 +256,9 @@@@ rxvt_cleanutent(rxvt_t *r) d51 1 a51 1 @@@@ -275,7 +279,11 @@@@ rxvt_cleanutent(rxvt_t *r) d63 1 a63 1 @@@@ -327,7 +335,7 @@@@ rxvt_write_bsd_utmp(int utmp_pos, struct @ 1.2 log @ Fix typo ($NeBSD$ -> $NetBSD$). @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- src/logging.c.orig 2005-01-16 16:33:20.000000000 -0500 +++ src/logging.c 2005-01-16 16:55:25.000000000 -0500 @@@@ -66,9 +66,7 @@@@ d15 1 a15 1 @@@@ -78,10 +76,8 @@@@ d26 53 @ 1.1 log @If we have UTMPPID or not is unrelated to pty names. Remove wrong test. @ text @d1 1 a1 1 $NeBSD$ @