From d3f541e6dc80eac2359fe20e724f59aace27cadc Mon Sep 17 00:00:00 2001 From: Thibault Godouet Date: Mon, 20 Aug 2001 10:54:45 +0000 Subject: [PATCH] *** empty log message *** --- fcron.c | 10 +++++----- fileconf.c | 4 +++- global.h | 4 ++-- save.h | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/fcron.c b/fcron.c index 04ba9db..aac04db 100644 --- a/fcron.c +++ b/fcron.c @@ -21,11 +21,11 @@ * `LICENSE' that comes with the fcron source distribution. */ - /* $Id: fcron.c,v 1.54 2001-08-17 19:42:14 thib Exp $ */ + /* $Id: fcron.c,v 1.55 2001-08-20 10:54:45 thib Exp $ */ #include "fcron.h" -char rcs_info[] = "$Id: fcron.c,v 1.54 2001-08-17 19:42:14 thib Exp $"; +char rcs_info[] = "$Id: fcron.c,v 1.55 2001-08-20 10:54:45 thib Exp $"; void main_loop(void); void check_signal(void); @@ -151,9 +151,9 @@ print_schedule(void) for (cl = cf->cf_line_base; cl; cl = cl->cl_next) { ftime = localtime( &(cl->cl_nextexe) ); explain(" cmd %s next exec %d/%d/%d wday:%d %02d:%02d", - cl->cl_shell, (ftime->tm_mon + 1), ftime->tm_mday, - (ftime->tm_year + 1900), ftime->tm_wday, - ftime->tm_hour, ftime->tm_min); + cl->cl_shell, (ftime->tm_mon + 1), ftime->tm_mday, + (ftime->tm_year + 1900), ftime->tm_wday, + ftime->tm_hour, ftime->tm_min); } } diff --git a/fileconf.c b/fileconf.c index 7421a08..75ec21b 100644 --- a/fileconf.c +++ b/fileconf.c @@ -22,7 +22,7 @@ * `LICENSE' that comes with the fcron source distribution. */ - /* $Id: fileconf.c,v 1.50 2001-07-09 21:07:28 thib Exp $ */ + /* $Id: fileconf.c,v 1.51 2001-08-20 10:57:50 thib Exp $ */ #include "fcrontab.h" #include "fileconf.h" @@ -999,6 +999,8 @@ check_username(char *ptr, CF *cf, CL *cl) struct passwd *userpwent; /* check to see if next word is a username */ + /* we don't allow quotes, to be able to distinguish a user name from + * a command line (where quotes are allowed */ while ( isalnum( (int) ptr[indx]) ) indx++; if (indx > USER_NAME_LEN) indx = USER_NAME_LEN; strncpy(username, ptr, indx); diff --git a/global.h b/global.h index 3662d47..b7348be 100644 --- a/global.h +++ b/global.h @@ -21,7 +21,7 @@ * `LICENSE' that comes with the fcron source distribution. */ - /* $Id: global.h,v 1.31 2001-08-17 19:43:53 thib Exp $ */ + /* $Id: global.h,v 1.32 2001-08-20 10:58:07 thib Exp $ */ /* @@ -169,7 +169,7 @@ typedef struct CL { unsigned short cl_runfreq; /* Run once every n matches */ unsigned char cl_option[OPTION_SIZE]; /* line's option (see option.h) */ unsigned char cl_lavg[LAVG_SIZE];/*load averages needed (1,5,15 mins) */ - unsigned char cl_numexe; /* num of entries in lavg/serial queue */ + unsigned char cl_numexe; /* entries in queues & running processes */ char cl_nice; /* nice value to control priority */ /* see bitstring(3) man page for more details */ bitstr_t bit_decl(cl_mins, 60); /* 0-59 */ diff --git a/save.h b/save.h index 17e2cb3..07c2d90 100644 --- a/save.h +++ b/save.h @@ -21,7 +21,7 @@ * `LICENSE' that comes with the fcron source distribution. */ - /* $Id: save.h,v 1.2 2001-05-24 19:59:58 thib Exp $ */ + /* $Id: save.h,v 1.3 2001-08-20 11:01:18 thib Exp $ */ /* here is the format fcron(tab) uses to save the fcrontabs : @@ -55,7 +55,7 @@ /* line field types */ #define S_ENDLINE_T 2000 /* we need to know where a new line begin */ #define S_SHELL_T 2001 /* shell command of the line */ -#define S_NUMEXE_T 2002 /* number of entries in lavg/serial queue */ +#define S_NUMEXE_T 2002 /* num of entries in queues & running processes */ #define S_LAVG_T 2003 /* load averages needed (1, 5, 15 mins) */ #define S_UNTIL_T 2004 /* timeout of the wait for a lavg value */ #define S_NICE_T 2005 /* nice value to control priority */ -- 2.47.3