--- suX/src/sux.c 2015/06/15 15:52:34 1.5.2.1 +++ suX/src/sux.c 2015/06/17 14:01:33 1.5.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: sux.c,v 1.5.2.1 2015/06/15 15:52:34 misho Exp $ + * $Id: sux.c,v 1.5.2.2 2015/06/17 14:01:33 misho Exp $ * *************************************************************************/ #include "global.h" @@ -96,7 +96,7 @@ Usage() { printf( " -= suX =- suExecutor designed for web based applicaions\n" "(C)`11 AITNET ltd - Sofia/Bulgaria - \n\n" - " Syntax: %s [options] [arguments]\n" + " Syntax: %s [options] [arguments]\n" "\t-u \t\t\tUser for suID\n" "\t-g \t\t\tGroup for suID\n" "\t-p \t\tExecute with priority\n" @@ -124,7 +124,7 @@ setUIDGID(char flg, const char *name) uid = sb.st_uid; gid = sb.st_gid; } else { - pass = getpwnam(getenv("SUX_USER")); + pass = getpwnam(getenv("SUX_USER") ? getenv("SUX_USER") : DEFAULT_SUX_USER); if (!pass) { Err("Error:: User %s not found", getenv("SUX_USER")); endpwent(); @@ -238,7 +238,9 @@ Run(char **argv, char flg) if (!(aarg = array_From((const char***) &argv, 0))) { array_Destroy(&acmd); return -1; - } else if (*array(acmd, 0, char*) == '!') { + } + /* '!' exclude associated wrapper aka direct args execution */ + if (*array(acmd, 0, char*) == '!') { if (array_Grow(acmd, 0, 0)) { array_Destroy(&aarg); array_Destroy(&acmd); @@ -248,7 +250,7 @@ Run(char **argv, char flg) } else cmd = array(acmd, 0, char*); - if (array_Concat(acmd, aarg) == -1) { + if (!(flg & SUX_GET_STDIN) && array_Concat(acmd, aarg) == -1) { array_Destroy(&aarg); array_Destroy(&acmd); return -1; @@ -388,8 +390,12 @@ main(int argc, char **argv) return 1; } else AIT_SET_STR(&proc.proc_name, str); - } else + } else if (strcmp(*argv, "-")) AIT_SET_STR(&proc.proc_name, *argv); + else { + flg |= SUX_GET_STDIN; + AIT_SET_STR(&proc.proc_name, "-.stdin"); /* hack for associate to stdin */ + } Log(2, "Try to load config %s", szCfg); if (cfgLoadConfig(szCfg, &cfg)) { ELIBERR(cfg);