diff options
Diffstat (limited to 'www/tclhttpd/files/patch-ak')
| -rw-r--r-- | www/tclhttpd/files/patch-ak | 90 |
1 files changed, 34 insertions, 56 deletions
diff --git a/www/tclhttpd/files/patch-ak b/www/tclhttpd/files/patch-ak index 48137087c614..5f8e65a3899f 100644 --- a/www/tclhttpd/files/patch-ak +++ b/www/tclhttpd/files/patch-ak @@ -1,6 +1,15 @@ ---- src/limit.c Thu May 11 02:00:43 2000 -+++ src/limit.c Fri Dec 1 20:04:58 2000 -@@ -20,7 +20,6 @@ +--- src/limit.c Thu May 1 19:42:14 2003 ++++ src/limit.c Fri Nov 19 13:21:15 2004 +@@ -9,6 +9,5 @@ + + +-static int LimitCmd _ANSI_ARGS_((ClientData clientData, +- Tcl_Interp *interp, int argc, char *argv[])); ++Tcl_ObjCmdProc LimitCmd; + + #undef TCL_STORAGE_CLASS +@@ -29,9 +28,8 @@ + */ int -LimitCmd(ClientData data, Tcl_Interp *interp, int argc, char *argv[]) +LimitCmd(ClientData data, Tcl_Interp *interp, int argc, Tcl_Obj *CONST objv[]) @@ -10,66 +19,35 @@ struct rlimit limit; + Tcl_Obj *limObj[2]; Tcl_ResetResult(interp); -@@ -31,3 +30,4 @@ + if (getrlimit(RLIMIT_NOFILE, &limit) < 0) { +@@ -40,12 +38,18 @@ + } if (argc > 1) { -- Tcl_GetInt(interp, argv[1], (int *)&limit.rlim_cur); -+ if (Tcl_GetLongFromObj(interp, objv[1], (long *)&limit.rlim_cur) -+ != TCL_OK) return TCL_ERROR; +- Tcl_GetInt(interp, argv[1], (int *)&limit.rlim_cur); ++ long rlim_cur; ++ ++ if (Tcl_GetLongFromObj(interp, objv[1], &rlim_cur) != TCL_OK) ++ return TCL_ERROR; ++ limit.rlim_cur = rlim_cur; if (setrlimit(RLIMIT_NOFILE, &limit) < 0) { -@@ -37,3 +37,5 @@ +- Tcl_AppendResult(interp, "NOFILE: ", Tcl_PosixError(interp), NULL); +- return TCL_ERROR; +- } ++ Tcl_AppendResult(interp, "NOFILE: ", Tcl_PosixError(interp), NULL); ++ return TCL_ERROR; ++ } } + /* bad, bad style, direct writing to interp->result */ - sprintf(interp->result, "%d %d", limit.rlim_cur, limit.rlim_max); + limObj[0] = Tcl_NewLongObj((long)limit.rlim_cur); + limObj[1] = Tcl_NewLongObj((long)limit.rlim_max); + Tcl_SetObjResult(interp, Tcl_NewListObj(2, limObj)); return TCL_OK; -@@ -54,3 +56,3 @@ - { + } +@@ -71,5 +75,5 @@ + #endif + - Tcl_CreateCommand(interp, "limit", LimitCmd, NULL, NULL); + Tcl_CreateObjCommand(interp, "limit", LimitCmd, NULL, NULL); - Tcl_PkgProvide(interp, "limit", "1.0"); ---- src/setuid.c Tue Oct 6 20:12:11 1998 -+++ src/setuid.c Fri Dec 1 20:05:52 2000 -@@ -7,2 +7,3 @@ - #include <sys/types.h> -+#include <unistd.h> - ---- src/utime.c Tue Oct 6 20:12:11 1998 -+++ src/utime.c Fri Dec 1 20:14:21 2000 -@@ -20,13 +20,8 @@ - int --UtimeCmd(ClientData data, Tcl_Interp *interp, int argc, char *argv[]) -+UtimeCmd(ClientData data, Tcl_Interp *interp, int argc, Tcl_Obj *CONST objv[]) - { - struct utimbuf u = {0, 0}; -+ char *file; - - Tcl_ResetResult(interp); -- if (argc > 3) { -- Tcl_GetInt(interp, argv[3], &u.actime); /* new access time */ -- } -- if (argc > 2) { -- Tcl_GetInt(interp, argv[2], &u.modtime); /* new modify time */ -- } - if (argc > 4 || argc <= 1) { -@@ -35,4 +30,13 @@ - } -- if (utime(argv[1], &u) < 0) { -- Tcl_AppendResult(interp, "utime: ", argv[1], Tcl_PosixError(interp), NULL); -+ if (argc > 3) { -+ if (Tcl_GetLongFromObj(interp, objv[3], (long *)&u.actime) -+ != TCL_OK) return TCL_ERROR; /* new access time */ -+ } -+ if (argc > 2) { -+ if (Tcl_GetLongFromObj(interp, objv[2], (long *)&u.modtime) -+ != TCL_OK) return TCL_ERROR; /* new modify time */ -+ } -+ file = Tcl_GetString(objv[1]); -+ if (utime(file, &u) < 0) { -+ Tcl_AppendResult(interp, "utime: ", file, Tcl_PosixError(interp), NULL); - return TCL_ERROR; -@@ -55,3 +59,3 @@ - { -- Tcl_CreateCommand(interp, "utime", UtimeCmd, NULL, NULL); -+ Tcl_CreateObjCommand(interp, "utime", UtimeCmd, NULL, NULL); - Tcl_PkgProvide(interp, "utime", "1.0"); + code = Tcl_PkgProvide(interp, "limit", "1.0"); + if (code != TCL_OK) { |