Ticket #14761: compile-leopard.patch

pfind/Makefile

@@ -1 +1 @@
 PROG= pfind
 DPADD+= ../proctools/libproctools.a
-LDADD= -L${MAKEOBJDIR} -lproctools -lkvm
+LDADD= -L${MAKEOBJDIR} -lproctools
 CLEANFILES+= pfind.cat1
 
 .if defined(OLDKVM)

pgrep/Makefile

@@ -1 +1 @@
 PROG= pgrep
 DPADD+= ../proctools/libproctools.a
-LDADD= -L${MAKEOBJDIR} -lproctools -lkvm
+LDADD= -L${MAKEOBJDIR} -lproctools
 CLEANFILES+= pgrep.cat1
 
 .if defined(OLDKVM)

pkill/Makefile

@@ -1 +1 @@
 PROG=   pkill
 DPADD+= ../proctools/libproctools.a
-LDADD= -L${MAKEOBJDIR} -lproctools -lkvm
+LDADD= -L${MAKEOBJDIR} -lproctools
 CLEANFILES+= pkill.cat1
 
 .if defined(OLDKVM)

proctools/fmt.

@@ -7 +7 @@
 #include <sys/sysctl.h>
 #include <sys/user.h>
 
+#if defined(USE_KVM)
 #include <kvm.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -27 +30 @@
         return ((cp = strrchr(arg0, '/')) != NULL ? cp + 1 : arg0);
 }
 
+#if defined(USE_KVM)
 void
 fmt_argv(kd, ki)
         kvm_t *kd;
@@ -51 +55 @@
                 fmt_putc(')', &left);
         }
 }
+#endif
 
 void
 fmt_puts(s, leftp)

proctools/proctools.

@@ -5 +5 @@
 
 #include <sys/cdefs.h>
 #include <stdio.h>
+
+#if defined(USE_KVM)
 #include <kvm.h>
+#else
+#define USE_SYSCTL
+#endif
 
 #if !defined(USE_KVM) && !defined(USE_SYSCTL)
 #       if defined(KVM_NO_FILES)

proctools/proctools.

@@ -23 +23 @@
 
 extern char *cmdpart(char *);
 extern void  fmt_puts(char *, int *);
+
+#if defined(USE_KVM)
 extern void  fmt_argv(kvm_t *kd, struct kinfo_proc *ki);
+#endif
 
 static char  dbuf[DUMPBUFSZ];
 
@@ -919 +922 @@
                                                                 matched = !strcmp(name, pattern);
                                                 }
                                                 else {
-                                                        matched = regexec(&regex, name, 0, NULL, NULL) == 0;
+                                                        matched = regexec(&regex, name, 0, NULL, 0) == 0;
                                                 }
                                         }
                                         else {
@@ -960 +963 @@
                                                 }
                                         }
                                         else
-                                                if (regexec(&regex, name, 0, NULL, NULL) == 0)
+                                                if (regexec(&regex, name, 0, NULL, 0) == 0)
                                                         pushProcList(proctoolslist, kp);
                                 }
                                 else
@@ -995 +998 @@
                                                                 matched = !strcmp(name, pattern);
                                                 }
                                                 else {
-                                                        matched = regexec(&regex, name, 0, NULL, NULL) == 0;
+                                                        matched = regexec(&regex, name, 0, NULL, 0) == 0;
                                                 }
                                         }
                                         else {
@@ -1037 +1040 @@
                                                 }
                                         }
                                         else
-                                                if (regexec(&regex, name, 0, NULL, NULL) == REG_NOMATCH)
+                                                if (regexec(&regex, name, 0, NULL, 0) == REG_NOMATCH)
                                                         pushProcList(proctoolslist, kp);
                                 }
                                 else

pfind/pfind.

@@ -434 +434 @@
 PFIND_EVAL(pfind_pri_any)
 {
         int result;
-        result = !regexec(&(*expression)->optarg.re.r, proctoolslist->name, 0, NULL, NULL);
+        result = !regexec(&(*expression)->optarg.re.r, proctoolslist->name, 0, NULL, 0);
         if (!result) {
                 const char *args;
                 args = getProcArgs(baton, proctoolslist);
-                result = args && !regexec(&(*expression)->optarg.re.r, args, 0, NULL, NULL);
+                result = args && !regexec(&(*expression)->optarg.re.r, args, 0, NULL, 0);
                 /* do not free(args) */
         }
         (*expression)->parent->result = (*expression)->result = (*expression)->invert_after ^ result;
@@ -450 +450 @@
         const char *args;
         int result;
         args = getProcArgs(baton, proctoolslist);
-        result = args && !regexec(&(*expression)->optarg.re.r, args, 0, NULL, NULL);
+        result = args && !regexec(&(*expression)->optarg.re.r, args, 0, NULL, 0);
         (*expression)->parent->result = (*expression)->result = (*expression)->invert_after ^ result;
         /* do not free(args) */
         return 0;
@@ -490 +490 @@
                         (*expression)->parent->result = (*expression)->result = (*expression)->invert_after ^ !strcmp(proctoolslist->name, (*expression)->optarg.str);
         }
         else {
-                (*expression)->parent->result = (*expression)->result = (*expression)->invert_after ^ !regexec(&(*expression)->optarg.re.r, proctoolslist->name, 0, NULL, NULL);
+                (*expression)->parent->result = (*expression)->result = (*expression)->invert_after ^ !regexec(&(*expression)->optarg.re.r, proctoolslist->name, 0, NULL, 0);
         }
         return 0;
 }