head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.12 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.10 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.8 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.6 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.4 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.2 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.2.0.38 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.36 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.34 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.32 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.30 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.28 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.26 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.24 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.22 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.20 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.18 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.16 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.14 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.12 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.10 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.8 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.6 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.4 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.2 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.1.0.48 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.44 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.42 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.40 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.38 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.36 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.34 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.32 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.30 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.28 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.24 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.22 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.20 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.18 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.16 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.14 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.12 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.10 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.8 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.6 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.4 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.2 pkgsrc-2014Q3-base:1.1; locks; strict; comment @# @; 1.3 date 2024.10.10.17.55.25; author nia; state Exp; branches; next 1.2; commitid gwZNgU2jhNpWS8tF; 1.2 date 2019.12.31.13.55.14; author mef; state Exp; branches; next 1.1; commitid 8XMtRuONmwz1DRQB; 1.1 date 2014.07.22.08.20.24; author manu; state Exp; branches; next ; commitid 8OLhigT4Y2X7HlJx; desc @@ 1.3 log @pidof: Ensure all needed functions are defined. @ text @$NetBSD: patch-aa,v 1.2 2019/12/31 13:55:14 mef Exp $ Disable the NFS code --- src/killall5.c.orig 2019-09-11 17:43:12.000000000 +0000 +++ src/killall5.c @@@@ -44,12 +44,15 @@@@ #include #include #include +#ifdef linux #include +#endif #include #include #include #include #include +#include #include #include #include @@@@ -253,6 +256,7 @@@@ static inline int isnetfs(const char * t return 0; } +#ifdef linux /* * Remember all NFS typed partitions. */ @@@@ -318,6 +322,7 @@@@ void init_nfs(void) } endmntent(mnt); } +#endif /* linux */ static void clear_shadow(SHADOW *restrict shadow) { @@@@ -396,6 +401,7 @@@@ static int maxsymlinks(void) return v; } +#ifdef linux /* * Check path is located on a network based partition. */ @@@@ -465,6 +471,7 @@@@ int check4nfs(const char * path, char * return 0; } +#endif /* linux */ int readarg(FILE *fp, char *buf, int sz) { @@@@ -683,10 +690,12 @@@@ int readproc(int do_stat) p->nfs = 0; switch (do_stat) { +#ifdef linux case DO_NETFS: if ((p->nfs = check4nfs(path, buf))) goto link; /* else fall through */ +#endif case DO_STAT: if (stat(path, &st) != 0) { char * ptr; @@@@ -806,8 +815,10 @@@@ PIDQ_HEAD *pidof(char *prog) if (prog[0] == '/') { memset(&real[0], 0, sizeof(real)); +#ifdef linux if (check4nfs(prog, real)) nfs++; +#endif if (real[0] != '\0') prog = &real[0]; /* Binary located on network FS. */ @@@@ -1089,8 +1100,10 @@@@ int main_pidof(int argc, char **argv) } } +#ifdef linux if (flags & PIDOF_NETFS) init_nfs(); /* Which network based FS are online? */ +#endif /* Print out process-ID's one by one. */ readproc((flags & PIDOF_NETFS) ? DO_NETFS : DO_STAT); @ 1.2 log @(sysutils/pidof) Updated 2.88sdf to 2.96, ChangeLog lines to large, omitted. (..sysutils/pidof)% wc ChangeLog-2.88sdf-2.96 434 3459 22753 ChangeLog-2.88sdf-2.96 The last part is as below: sysvinit (2.96) released; urgency=low [ Jesse Smith ] * Added -z command line paramter to pidof which tells pidof to try to find processes in uninterruptable (D) or zombie (Z) states. This can cause pidof to hang, but produces a more complete process list. Closes Savannah bug #56534 * Reformatted init code to make if/while logic more clear. * Cleaned up some output from readbootlog. * Added -e flag to bootlogd. When -e is used, data saved to the boot log file does not have escape characters removed. This means colour and cursor movement codes stay in the log file. The may then look nicer when read with "less -R', but may appear cluttered or out of alignment when viewed with other, plain-text tools. When -e is not used, escape characters are removed/filtered. Closes Debian bug #672361. * Make sure src/Makefile cleans up all executable files when parent Makefile calls "make clean". @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2014/07/22 08:20:24 manu Exp $ d5 3 a7 3 --- src/killall5.c.orig 2019-09-12 02:43:12.000000000 +0900 +++ src/killall5.c 2019-12-31 22:43:43.093313776 +0900 @@@@ -44,7 +44,9 @@@@ d17 7 a23 1 @@@@ -253,6 +255,7 @@@@ static inline int isnetfs(const char * t d31 1 a31 1 @@@@ -318,6 +321,7 @@@@ void init_nfs(void) d39 1 a39 1 @@@@ -396,6 +400,7 @@@@ static int maxsymlinks(void) d47 1 a47 1 @@@@ -465,6 +470,7 @@@@ int check4nfs(const char * path, char * d55 1 a55 1 @@@@ -683,10 +689,12 @@@@ int readproc(int do_stat) d68 1 a68 1 @@@@ -806,8 +814,10 @@@@ PIDQ_HEAD *pidof(char *prog) d79 1 a79 1 @@@@ -1089,8 +1099,10 @@@@ int main_pidof(int argc, char **argv) @ 1.1 log @Missing patches subdirectory from perevious commit @ text @d1 1 a1 1 $NetBSD$ d5 3 a7 5 --- src/killall5.c.orig 2014-07-01 02:01:37.000000000 +0200 +++ src/killall5.c 2014-07-03 09:53:15.000000000 +0200 @@@@ -42,9 +42,11 @@@@ */ #include d10 1 d17 1 a17 3 #include @@@@ -236,8 +238,9 @@@@ } d25 1 a25 3 void init_nfs(void) @@@@ -301,8 +304,9 @@@@ } d33 2 a34 4 SHADOW *s, *n, *l; @@@@ -365,8 +369,9 @@@@ out: return 0; d41 1 a41 3 int check4nfs(const char * path, char * real) @@@@ -430,8 +435,9 @@@@ } d49 1 a49 3 int c = 0, f = 0; @@@@ -607,11 +613,13 @@@@ d56 2 a57 1 break; d60 3 a62 5 if (stat(path, &st) != 0) break; p->dev = st.st_dev; @@@@ -695,10 +703,12 @@@@ /* Try to stat the executable. */ d73 1 a73 3 @@@@ -926,10 +936,12 @@@@ exit(1); a83 1 @