$NetBSD: patch-ad,v 1.6 1999/01/01 07:58:29 garbled Exp $ --- src/sd_listen.c.orig Wed Oct 7 04:18:56 1998 +++ src/sd_listen.c Thu Dec 31 22:59:57 1998 @@ -55,6 +55,9 @@ #include #include #endif +#ifdef HAVE_SYS_INTTYPES_H +#include +#endif #include #include #include @@ -484,10 +487,18 @@ } if (strncmp(k1, "k=", 2)==0) { +#ifdef HAVE_SYS_INTTYPES_H + if ((uintptr_t)k2>=(uintptr_t)k1+2) { + memcpy(key, k1+2, (uintptr_t)k2-((uintptr_t)k1+1)); + key[(uintptr_t)k2-((uintptr_t)k1+1)]='\0'; + } +#else if ((u_int)k2>=(u_int)k1+2) { memcpy(key, k1+2, (u_int)k2-((u_int)k1+1)); key[(u_int)k2-((u_int)k1+1)]='\0'; - } else { + } +#endif + else { key[0]='\0'; } p=strchr(k1, '\n')+1; @@ -1344,7 +1355,11 @@ if (cli) { init_cli(); inChannel = fileno(stdin); +#ifdef HAVE_SYS_INTTYPES_H + Tcl_CreateFileHandler(inChannel, TCL_READABLE, (Tcl_FileProc*)do_cli, (ClientData)(intptr_t) inChannel); +#else Tcl_CreateFileHandler(inChannel, TCL_READABLE, (Tcl_FileProc*)do_cli, (ClientData) inChannel); +#endif } #endif @@ -1509,7 +1524,11 @@ char buf[MAXADSIZE]; char debugbuf[MAXADSIZE]; +#ifdef HAVE_SYS_INTTYPES_H + intptr_t ix = rfd2sock[PTOI(fd)]; +#else int ix = rfd2sock[PTOI(fd)]; +#endif memset(new_data, 0, MAXADSIZE); memset(aid, 0, AIDLEN);