head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.164 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.162 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.160 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.158 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.156 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.154 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.152 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.150 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.148 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.146 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.144 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.142 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.140 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.138 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.136 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.134 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.132 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.130 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.128 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.126 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.124 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.122 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.120 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.116 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.96 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.118 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.114 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.112 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.110 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.108 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.106 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.104 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.102 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.100 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.98 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.94 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.92 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.90 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.88 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.86 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.84 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.82 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.80 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.78 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.76 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.74 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.72 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.70 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.68 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.66 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.64 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.62 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.60 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.58 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.56 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.54 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.52 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.48 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.46 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.44 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.42 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.40 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.38 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.36 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.34 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.32 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.30 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.28 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.26 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.24 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.22 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.20 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.18 pkgsrc-2008Q1:1.3.0.16 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.14 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.12 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.12 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.10 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.8 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.6 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.3 date 2006.06.21.20.41.27; author joerg; state Exp; branches; next 1.2; 1.2 date 2004.11.09.12.30.40; author adam; state dead; branches; next 1.1; 1.1 date 2001.07.03.01.46.07; author jlam; state Exp; branches; next ; desc @@ 1.3 log @Add DragonFly support. @ text @$NetBSD$ --- src/FreeBSD/os.c.orig 2006-06-21 20:12:56.000000000 +0000 +++ src/FreeBSD/os.c @@@@ -125,16 +125,27 @@@@ GetStatus(ProcInfo *p) if (!active.allprocs) { #ifdef HAVE_REGEX if (active.match_regexp) { +#if defined(__DragonFly__) + int regmatch = regexec(&active.re_pat, + IDtouser(proc->kp_eproc.e_ucred.cr_ruid), + (size_t) NULL, (regmatch_t *) NULL, + REG_NOTBOL|REG_NOTEOL); +#else int regmatch = regexec(&active.re_pat, IDtouser(proc->kp_eproc.e_pcred.p_ruid), (size_t) NULL, (regmatch_t *) NULL, REG_NOTBOL|REG_NOTEOL); +#endif if (regmatch == REG_NOMATCH) { return False; } } else { #endif +#if defined(__DragonFly__) + if (active.uid_displayed != proc->kp_eproc.e_ucred.cr_ruid) +#else if (active.uid_displayed != proc->kp_eproc.e_pcred.p_ruid) +#endif return False; #ifdef HAVE_REGEX } @@@@ -166,8 +177,10 @@@@ GetStatus(ProcInfo *p) if (proc->kp_proc.p_pid == MyPid && !cmd_options.me_too) pstat = SSLEEP; +#if !defined(__DragonFly__) else if ((proc->kp_proc.p_flag & P_INMEM) == 0) pstat = SSWAP; +#endif else pstat = proc->kp_proc.p_stat; @@@@ -179,7 +192,11 @@@@ void GetProcName(ProcInfo *p, TREENODE *node) { ProcInfo proc = *p; +#if defined(__DragonFly__) + node->uid = proc->kp_eproc.e_ucred.cr_ruid; +#else node->uid = proc->kp_eproc.e_pcred.p_ruid; +#endif if (proc->kp_proc.p_stat == SZOMB) strcpy(node->label, "*zombie*"); @@@@ -196,9 +213,15 @@@@ GetProcName(ProcInfo *p, TREENODE *node) /* We've got a sleeping process. (Hopefully that's the majority of the processes. Assign a color based on userid. */ +#if defined(__DragonFly__) + node->color = GetUID_Color(proc->kp_eproc.e_ucred.cr_ruid); + + if ( (username=IDtouser(proc->kp_eproc.e_ucred.cr_ruid)) != NULL ) { +#else node->color = GetUID_Color(proc->kp_eproc.e_pcred.p_ruid); if ( (username=IDtouser(proc->kp_eproc.e_pcred.p_ruid)) != NULL ) { +#endif strcpy(node->label1, username); } else { strcpy(node->label1, UNKNOWN_USER); @@@@ -209,7 +232,11 @@@@ GetProcName(ProcInfo *p, TREENODE *node) #ifdef XPS_RECOLOR_LOGIN_PROCESSES for (i=0;ilabel, label_array[i]) == 0) { +#if defined(__DragonFly__) + strcpy(node->label, IDtouser(proc->kp_eproc.e_ucred.cr_ruid)); +#else strcpy(node->label, IDtouser(proc->kp_eproc.e_pcred.p_ruid)); +#endif strcpy(node->label1, label_array[i]); node->color = base.xterm; node->show_username = 1; @ 1.2 log @Changes 4.2: * Minor small improvements reported by users * Change to make autoheader shut up with its warnings * Include help headers in distribution @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2001/07/03 01:46:07 jlam Exp $ d3 31 a33 8 --- Makefile.in.orig Mon Jul 5 18:32:56 1999 +++ Makefile.in @@@@ -57,7 +57,7 @@@@ INCLUDES = -I. @@XINCLUDES@@ LIBS = @@LIBS@@ ALL_CFLAGS = $(CFLAGS) $(X_CFLAGS) $(INCLUDES) -ALL_LIBS = $(LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS) +ALL_LIBS = $(LDFLAGS) $(LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS) d35 8 a42 1 PERL = perl d44 40 @ 1.1 log @Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. @ text @d1 1 a1 1 $NetBSD$ @