diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-12-05 16:43:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-09 11:56:41 +0000 |
commit | 5372e1acdd68367e64d13e19d1beb2d7b3e3c224 (patch) | |
tree | 63f2599e50aca15d201f43afce762c84caad6403 /meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch | |
parent | 66c86b13fb894659f978e8fc9fb8d0dda3962179 (diff) | |
download | openembedded-core-contrib-5372e1acdd68367e64d13e19d1beb2d7b3e3c224.tar.gz |
sysvinit: update 2.88dsf -> 2.96
Remove 0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch,
the problem has been fixed upstream.
Rebase the other patches.
License-Update: copyright years
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch')
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch | 64 |
1 files changed, 33 insertions, 31 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch b/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch index 5b5dfdc001..494aa0e012 100644 --- a/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch +++ b/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch @@ -1,4 +1,7 @@ -pidof: add -m option +From 6c490ea6579a132fabb7dbd25387bb521f820371 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 24 Jul 2013 17:07:22 +0800 +Subject: [PATCH] pidof: add -m option When used with -o, will also omit any processes that have the same argv[0] and argv[1] as any explicitly omitted process ids. This can be @@ -11,23 +14,25 @@ Upstream-Status: backport Imported patch from: https://bugzilla.redhat.com/attachment.cgi?id=658166 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- - man/pidof.8 | 6 ++++++ - src/killall5.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + man/pidof.8 | 6 +++++ + src/killall5.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/man/pidof.8 b/man/pidof.8 +index ebe5f55..2fdc4d3 100644 --- a/man/pidof.8 +++ b/man/pidof.8 -@@ -24,6 +24,7 @@ pidof -- find the process ID of a running program. - .RB [ \-c ] +@@ -25,6 +25,7 @@ pidof -- find the process ID of a running program. .RB [ \-n ] .RB [ \-x ] + .RB [ \-z ] +.RB [ \-m ] .RB [ \-o - .IR omitpid[,omitpid..] ] + .IR omitpid[,omitpid...] ] .RB [ \-o -@@ -63,6 +64,11 @@ shells running the named scripts. +@@ -76,6 +77,11 @@ is shown. The default separator is a space. Tells \fIpidof\fP to omit processes with that process id. The special pid \fB%PPID\fP can be used to name the parent process of the \fIpidof\fP program, in other words the calling shell or shell script. @@ -40,10 +45,10 @@ diff --git a/man/pidof.8 b/man/pidof.8 .TP .B 0 diff --git a/src/killall5.c b/src/killall5.c -index 5937d98..e73885e 100644 +index 8b5cb38..a664954 100644 --- a/src/killall5.c +++ b/src/killall5.c -@@ -118,6 +118,7 @@ typedef struct _s_nfs +@@ -126,6 +126,7 @@ typedef struct _s_nfs /* List of processes. */ PROC *plist; @@ -51,7 +56,7 @@ index 5937d98..e73885e 100644 /* List of processes to omit. */ OMIT *omit; -@@ -345,6 +346,20 @@ static void clear_mnt(void) +@@ -361,6 +362,20 @@ static void clear_mnt(void) } } @@ -70,9 +75,9 @@ index 5937d98..e73885e 100644 +} + /* - * Check if path is ia shadow off a NFS partition. + * Check if path is a shadow off a NFS partition. */ -@@ -452,6 +467,7 @@ int readproc(int do_stat) +@@ -486,6 +501,7 @@ int readproc(int do_stat) DIR *dir; FILE *fp; PROC *p, *n; @@ -80,7 +85,7 @@ index 5937d98..e73885e 100644 struct dirent *d; struct stat st; char path[PATH_MAX+1]; -@@ -624,6 +640,17 @@ int readproc(int do_stat) +@@ -733,6 +749,17 @@ int readproc(int do_stat) p->next = plist; plist = p; p->pid = pid; @@ -98,7 +103,7 @@ index 5937d98..e73885e 100644 } closedir(dir); -@@ -813,6 +840,26 @@ PIDQ_HEAD *pidof(char *prog) +@@ -944,6 +971,26 @@ PIDQ_HEAD *pidof(char *prog) return q; } @@ -125,42 +130,42 @@ index 5937d98..e73885e 100644 /* Give usage message and exit. */ void usage(void) { -@@ -845,6 +892,7 @@ void nsyslog(int pri, char *fmt, ...) - #define PIDOF_SINGLE 0x01 +@@ -994,6 +1041,7 @@ void nsyslog(int pri, char *fmt, ...) #define PIDOF_OMIT 0x02 #define PIDOF_NETFS 0x04 + #define PIDOF_QUIET 0x08 +#define PIDOF_OMIT_OMIT_MATCHES 0x08 /* * Pidof functionality. -@@ -861,6 +909,7 @@ int main_pidof(int argc, char **argv) - struct stat st; +@@ -1011,6 +1059,7 @@ int main_pidof(int argc, char **argv) char tmp[512]; + char sep = ' '; + olist = (PROC*)0; omit = (OMIT*)0; nlist = (NFS*)0; opterr = 0; -@@ -868,7 +917,7 @@ int main_pidof(int argc, char **argv) +@@ -1018,7 +1067,7 @@ int main_pidof(int argc, char **argv) if ((token = getenv("PIDOF_NETFS")) && (strcmp(token,"no") != 0)) flags |= PIDOF_NETFS; -- while ((opt = getopt(argc,argv,"hco:sxn")) != EOF) switch (opt) { -+ while ((opt = getopt(argc,argv,"hcmo:sxn")) != EOF) switch (opt) { +- while ((opt = getopt(argc,argv,"qhco:d:sxzn")) != EOF) switch (opt) { ++ while ((opt = getopt(argc,argv,"qhcmo:d:sxzn")) != EOF) switch (opt) { case '?': nsyslog(LOG_ERR,"invalid options on command line!\n"); closelog(); -@@ -907,6 +956,9 @@ int main_pidof(int argc, char **argv) - case 'x': - scripts_too++; - break; +@@ -1069,6 +1118,9 @@ int main_pidof(int argc, char **argv) + case 'z': + list_dz_processes = TRUE; + break; + case 'm': + flags |= PIDOF_OMIT_OMIT_MATCHES; + break; case 'n': flags |= PIDOF_NETFS; break; -@@ -938,10 +990,13 @@ int main_pidof(int argc, char **argv) +@@ -1100,10 +1152,13 @@ int main_pidof(int argc, char **argv) pid_t spid = 0; while ((p = get_next_from_pid_q(q))) { if ((flags & PIDOF_OMIT) && omit) { @@ -176,14 +181,11 @@ index 5937d98..e73885e 100644 } /* -@@ -977,6 +1032,7 @@ int main_pidof(int argc, char **argv) - if (!first) +@@ -1145,6 +1200,7 @@ int main_pidof(int argc, char **argv) printf("\n"); + } + clear_omit(); clear_mnt(); closelog(); --- -1.8.1.2 - |