embedtools/src/cfexec.c - diff

Return to cfexec.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedtools / src

Diff for /embedtools/src/cfexec.c between versions 1.1 and 1.1.1.1.2.3

version 1.1, 2009/11/12 10:35:55	version 1.1.1.1.2.3, 2009/11/12 11:51:50
Line 15 char szUser[MAX_STR], szMount[MAXPATHLEN], szDev[MAXPA	Line 15 char szUser[MAX_STR], szMount[MAXPATHLEN], szDev[MAXPA
szChroot[MAXPATHLEN], szSess[MAXPATHLEN], szConfig[MAXPATHLEN];	szChroot[MAXPATHLEN], szSess[MAXPATHLEN], szConfig[MAXPATHLEN];
extern char compiled[], compiledby[], compilehost[];	extern char compiled[], compiledby[], compilehost[];


static void Usage()	static void Usage()
{	{

Line 109 int main(int argc, char **argv)	Line 110 int main(int argc, char **argv)
// Load variables from config if exists	// Load variables from config if exists
if (!LoadConfig(szConfig, &cfg)) {	if (!LoadConfig(szConfig, &cfg)) {
cfg_LoadAttribute(&cfg, CFG("cfexec"), CFG("timeout"), CFG(szUser), MAX_STR, DEFAULT_TIMEOUT);	cfg_LoadAttribute(&cfg, CFG("cfexec"), CFG("timeout"), CFG(szUser), MAX_STR, DEFAULT_TIMEOUT);
Timeout = strtonum(szUser, 1, 3600, &err);	Timeout = strtonum(szUser, 0, 3600, &err);
if (!Timeout) {	if (!Timeout && err) {
printf("Error:: in seconds for timeout %s - %s\n", optarg, err);	printf("Error:: in seconds for timeout %s - %s\n", optarg, err);
UnloadConfig(&cfg);	UnloadConfig(&cfg);
return 1;	return 1;
Line 148 int main(int argc, char **argv)	Line 149 int main(int argc, char **argv)
strlcpy(szMount, optarg, MAXPATHLEN);	strlcpy(szMount, optarg, MAXPATHLEN);
break;	break;
case 't':	case 't':
Timeout = strtonum(optarg, 1, 3600, &err);	Timeout = strtonum(optarg, 0, 3600, &err);
if (!Timeout) {	if (!Timeout && err) {
printf("Error:: in seconds for timeout %s - %s\n",	printf("Error:: in seconds for timeout %s - %s\n",
optarg, err);	optarg, err);
return 1;	return 1;
Line 190 int main(int argc, char **argv)	Line 191 int main(int argc, char **argv)
if ((f = mkevent(&chg, &evt)) == -1)	if ((f = mkevent(&chg, &evt)) == -1)
return 5;	return 5;

memset(&ts, 0, sizeof ts);	if (Timeout) {
ts.tv_sec = Timeout;	memset(&ts, 0, sizeof ts);
switch (kevent(kq, &chg, 1, &evt, 1, &ts)) {	ts.tv_sec = Timeout;
	}
	switch (kevent(kq, &chg, 1, &evt, 1, !Timeout ? NULL : &ts)) {
case -1:	case -1:
printf("Error:: can`t execute safe mount #%d - %s\n",	printf("Error:: can`t execute safe mount #%d - %s\n",
errno, strerror(errno));	errno, strerror(errno));

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1
changed lines
	Added in v.1.1.1.1.2.3