Ticket #22716: macports.patch

src/macports1.0/sysctl.c

@@ -41 +41 @@
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
+#include <sys/cdefs.h>
+
 #include "sysctl.h"
 
 /*
+ * Work around for linux
+ */
+int
+sysctlbyname(const char *name, void *oldp, size_t *oldlenp, void *newp, size_t newlen)
+{
+        int name2oid_oid[2];
+        int real_oid[CTL_MAXNAME+2];
+        int error;
+        size_t oidlen;
+
+        name2oid_oid[0] = 0;    /* This is magic & undocumented! */
+        name2oid_oid[1] = 3;
+
+        oidlen = sizeof(real_oid);
+        error = sysctl(name2oid_oid, 2, real_oid, &oidlen, (void *)name, 
+                                   strlen(name));
+        if (error < 0) 
+                return error;
+        oidlen /= sizeof (int);
+        error = sysctl(real_oid, oidlen, oldp, oldlenp, newp, newlen);
+        return (error);
+}
+
+/*
  * Read-only wrapper for sysctlbyname(3). Only works for values of type CTLTYPE_INT and CTLTYPE_QUAD.
  */
 int SysctlCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])

src/pextlib1.0/tracelib.c

@@ -46 +46 @@
 #include <pthread.h>
 #include <limits.h>
 #include "tracelib.h"
+#include <sys/cdefs.h>
 
 static char * name;
 static char * sandbox;
@@ -73 +74 @@
 
 #define MAX_SOCKETS ((FD_SETSIZE)-1)
 
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t strlcpy(dst, src, siz)
+        char *dst;
+        const char *src;
+        size_t siz;
+{
+        char *d = dst;
+        const char *s = src;
+        size_t n = siz;
+
+        /* Copy as many bytes as will fit */
+        if (n != 0 && --n != 0) {
+                do {
+                        if ((*d++ = *s++) == 0)
+                                break;
+                } while (--n != 0);
+        }
+
+        /* Not enough room in dst, add NUL and traverse rest of src */
+        if (n == 0) {
+                if (siz != 0)
+                        *d = '\0';/* NUL-terminate dst */
+                        while (*s++)
+                                ;
+        }
+
+        return(s - src - 1);/* count does not include NUL */
+}
+
 static int TracelibSetNameCmd(Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])
 {
         if (objc != 3)