fe974de5e9ce0a6656ae862a851ff70967954a29 angie Fri Nov 11 18:42:01 2016 +0000 Added env var JKTRASH so that when running on command line, trashDir can be something other than current directory. diff --git src/lib/servcl.c src/lib/servcl.c index 0825d66..e877bf6 100644 --- src/lib/servcl.c +++ src/lib/servcl.c @@ -1,49 +1,53 @@ /* "Web Server" for command line execution. * * This file is copyright 2002 Jim Kent, but license is hereby * granted for all use - public, private or commercial. */ #include "common.h" #include "portable.h" #include "portimpl.h" #include "obscure.h" -static char *__trashDir = "."; +static char *_trashDir() +{ +static char *__trashDir = NULL; +if (__trashDir == NULL) + { + char *jktrashDir = getenv("JKTRASH"); + __trashDir = jktrashDir ? jktrashDir : "."; + } +return __trashDir; +} static void _makeTempName(struct tempName *tn, char *base, char *suffix) /* Figure out a temp name, and how CGI and HTML will access it. */ { -char *tname = rTempName(__trashDir, base, suffix); +char *tname = rTempName(_trashDir(), base, suffix); strcpy(tn->forCgi, tname); strcpy(tn->forHtml, tn->forCgi); } static char *_cgiDir() { char *jkwebDir; if ((jkwebDir = getenv("JKWEB")) == NULL) return ""; else return jkwebDir; } -static char *_trashDir() -{ -return __trashDir; -} - static double _speed() { return 1.0; } struct webServerSpecific wssCommandLine = { "commandLine", _makeTempName, _cgiDir, _speed, _trashDir, };