static const char *pname;
static char *finame;
static FILE *fi;
-static int verbose=0,tree=0;
+static int verbose=0,tree=0,doaverage=0;
static char *formtotal=DEF_FORMTOTAL;
static char buf[LINE_MAX];
static int line=0;
static enum { SORT_NO,SORT_TIMETOT,SORT_STORES } sortby=SORT_TIMETOT;
+static unsigned lifetime_days=0;
static void usage(void)
{
\n\
Usage: timeplan [-u|--unsort] [-s|--stores] [-T|--timetot] [-t|--tree]\n\
[-c|--condition <cond>] [-f|--formtotal <fmtstring>]\n\
+ [-r|--rule <ruleL>:<ruleR>]\n\
[-v|--verbose] [-h|--help] [-V|--version]\n\
\n\
-u, --unsort\t\tDon't sort the result in any way\n\
-s, --stores\t\tSort the result by stores count\n\
-T, --timetot\t\tSort the result by total time (default)\n\
-t, --tree\t\tOrganize data as hierarchy tree\n\
+ -a, --average\t\tDisplay all times as average-per-day value\n\
-c, --condition\tDefine condition variable\n\
-f, --formtotal\tFormat \"Total\" column (\"text *val/val:width text\")\n\
+ -r, --rule\t\tAdd to the end of .rc file this rule (':'->'\\t')\n\
-v, --verbose\t\tInform about phases of transfer\n\
-h, --help\t\tPrint a summary of the options\n\
-V, --version\t\tPrint the version number\n\
{"stores" ,0,0,'s'},
{"timetot" ,0,0,'T'},
{"tree" ,0,0,'t'},
+{"average" ,0,0,'a'},
{"condition",1,0,'c'},
{"formtotal",1,0,'f'},
+{"rule" ,1,0,'r'},
{"verbose" ,0,0,'v'},
{"help" ,0,0,'h'},
{"version" ,0,0,'V'}};
static int dumpaction(const struct action *action)
{
-int tot FAKEUSE,mins FAKEUSE,hours FAKEUSE,days FAKEUSE,origtot;
+int tot,mins FAKEUSE,hours FAKEUSE,days FAKEUSE,origtot;
char *s,fmt[]="%?d";
if (action) {
tot=(action->timetot+30)/60;
+ if (doaverage && lifetime_days)
+ tot/=lifetime_days;
mins=tot; hours=mins/60; days=hours/24;
mins%=60; hours%=24;
- origtot=tot;
}
- else origtot=0;
+ else tot=0;
+ origtot=tot;
for (s=formtotal;*s;s++)
switch (*s) {
case '*': case '/': {
else origtot++;
}
if (action)
- printf("=%02d/%02d:%02d\t%4d\t%s\n",days,hours,mins,
+ printf("=%03d/%02d:%02d %4d\t%s\n",days,hours,mins,
action->stores,action->what);
return(origtot);
}
int totalwidth=dumpaction(NULL);
while (totalwidth-->5) putchar(' ');
- puts("Total Da Hr Mi\tStor\tDescription");
+ puts("Total Day Hr Mi Stor\tDescription");
if (!(sorta=malloc(sizeof(*sorta)*hashtable_tot))) {
fprintf(ERRH1"malloc() of %d pointers"ERRNO1,ERRH2,hashtable_tot,ERRNO2);
exit(EXIT_FAILURE);
{
unsigned r=57;
- while (*s) r=r*7+11*(*s++);
+ while (*s) r=r*7+11*toupper(*s++);
return r;
}
*tail=&item->next;
}
-static struct textlist *modifies,**modifiestail=&modifies;
+static struct textlist *modifies,**modifiestail=&modifies,*modifiescmdl,**modifiescmdltail=&modifiescmdl;
static int modifies_tot;
static struct modistruct {
regex_t regex;
}
if (fclose(fi))
fprintf(ERRH1"fclose(3) \"%s\""ERRNO1,ERRH2,finame,ERRNO2);
+ *modifiestail=modifiescmdl; /* add all command-line arguments to the end */
if (!(modistructs=malloc(sizeof(*modistructs)*modifies_tot))) {
fprintf(ERRH1"malloc() of %d modistructs's"ERRNO1,ERRH2,modifies_tot,ERRNO2);
exit(EXIT_FAILURE);
exit(EXIT_FAILURE);
}
*s++='\0'; modistructs[m].dst=s;
- if (verbose) fprintf(stderr,"regcomp: %s -> %s\n",item->text,s);
+ if (verbose) printf("regcomp: %s -> %s\n",item->text,s);
if (regcomp(&modistructs[m].regex,item->text,REG_EXTENDED|REG_ICASE)) {
fprintf(ERRH1"regcomp() failed for \"%s\" (%s)"WHERE1,ERRH2,item->text,ERRNO2,WHERE2);
exit(EXIT_FAILURE);
int i,m;
static char modbuf1[sizeof(buf)],modbuf2[sizeof(modbuf1)];
char *src=what,*dstbase=modbuf1,*dst=dstbase;
-const char *start,*end,*patt;
+const char *start FAKEUSE,*end FAKEUSE,*patt;
const struct textlist *item;
if (verbose) printf("modify: %s\n",what);
modify_load();
for (m=0,item=modifies;item;m++,item=item->next) {
+enum { PATT_START,PATT_MID,PATT_END,PATT_TERM } pattpos;
+
i=regexec(&modistructs[m].regex,src,LENGTH(matches),matches,0);
if (i==REG_NOMATCH) continue;
if (i) {
fprintf(ERRH1"regexec() failed for \"%s\""ERRNO1,ERRH2,item->text,ERRNO2);
exit(EXIT_FAILURE);
}
- if (verbose) fprintf(stderr,"matched: %s -> %s\n",item->text,modistructs[m].dst);
- for (patt=modistructs[m].dst;*patt;patt++) {
- if (*patt=='@') {
- start=src; end=src+strlen(src);
- }
- else if (*patt>='0' && *patt<='9') {
+ if (verbose) printf("matched: %s -> %s\n",item->text,modistructs[m].dst);
+ pattpos=PATT_START; patt=NULL;
+ while (pattpos!=PATT_TERM) {
+ switch (pattpos) {
+ case PATT_START:
+ start=src;
+ end=src+matches->rm_so;
+ pattpos=PATT_MID; patt=modistructs[m].dst;
+ break;
+ case PATT_MID:
+ if (!*patt) {
+ pattpos=PATT_END; patt=NULL;
+ continue;
+ }
+ else if (*patt=='@') {
+ start=src; end=src+strlen(src);
+ }
+ else if (*patt>='0' && *patt<='9') {
regmatch_t *match=matches+(*patt-'0');
- if (match->rm_so==-1
- || match->rm_eo==-1) {
- fprintf(ERRH1"Trying to substitute '%c' but no \"matches\" entry not set for \"%s\""WHERE1,
- ERRH2,*patt,item->text,WHERE2);
- exit(EXIT_FAILURE);
- }
- if (match->rm_so>match->rm_eo) {
- fprintf(ERRH1"Trying to substitute '%c' start>end (%d>%d) for \"%s\""WHERE1,
- ERRH2,*patt,match->rm_so,match->rm_eo,item->text,WHERE2);
- exit(EXIT_FAILURE);
- }
- start=src+match->rm_so; end=src+match->rm_eo;
- }
- else {
- start=patt; end=patt+1;
+ if (match->rm_so==-1
+ || match->rm_eo==-1) {
+ fprintf(ERRH1"Trying to substitute '%c' but no \"matches\" entry not set for \"%s\""WHERE1,
+ ERRH2,*patt,item->text,WHERE2);
+ exit(EXIT_FAILURE);
+ }
+ if (match->rm_so>match->rm_eo) {
+ fprintf(ERRH1"Trying to substitute '%c' start>end (%d>%d) for \"%s\""WHERE1,
+ ERRH2,*patt,match->rm_so,match->rm_eo,item->text,WHERE2);
+ exit(EXIT_FAILURE);
+ }
+ start=src+match->rm_so; end=src+match->rm_eo;
+ }
+ else {
+ start=patt; end=patt+1;
+ }
+ patt++;
+ break;
+ case PATT_END:
+ start=src+matches->rm_eo;
+ end=src+strlen(src);
+ pattpos=PATT_TERM; /* assumed: patt=NULL; */
+ break;
+ default:
+ assert(0);
}
if ((dst-dstbase+(end-start))>=sizeof(modbuf1)) {
fprintf(ERRH1"Maximum buffer size exceeded during substition for \"%s\""WHERE1,
storeone(what,length);
}
-static void hit(time_t t)
+static void hit(time_t t,char *bufaction)
{
static time_t last=-1;
static char bufbackup[sizeof(buf)];
char *acts[ACTS_MAX],*s;
int timetot,acti,i;
- if (verbose) printf("hit: %ld: %s\n",t,buf+6);
+ if (verbose) printf("hit: %ld: %s\n",t,bufaction);
if (last!=-1) {
if (t<last) {
fprintf(ERRH1"Time goes backward"WHERE1,ERRH2,WHERE2);
t=last;
}
- acts[0]=bufbackup+6;
+ acts[0]=bufbackup;
acti=1;
while ((s=strchr(acts[acti-1],'+'))) {
*s='\0';
for (i=0;i<acti;i++)
store(acts[i],calctime(timetot,i,acti));
}
- strcpy(bufbackup,buf);
+ strcpy(bufbackup,bufaction);
last=t;
}
{
int optc;
time_t basetime=-1,currtime;
-int hour,min;
+int hour,min,sec;
pname=argv[0];
- while ((optc=getopt_long(argc,argv,"b:pw:qusTtc:f:vhV",longopts,NULL))!=EOF) switch (optc) {
+ while ((optc=getopt_long(argc,argv,"b:pw:qusTtac:f:r:vhV",longopts,NULL))!=EOF) switch (optc) {
case 'u':
sortby=SORT_NO;
case 't':
tree=1;
break;
+ case 'a':
+ doaverage=1;
+ break;
case 'c':
if (iscondition(optarg))
fprintf(ERRH1"Condition \"%s\" already set!\n",ERRH2,optarg);
case 'f':
formtotal=optarg;
break;
+ case 'r': {
+char *s,*dup;
+
+ if (!(s=strchr(optarg,':'))) {
+ fprintf(ERRH1"No delimiting ':'-character found in -r option \"%s\"!\n",ERRH2,optarg);
+ exit(EXIT_FAILURE);
+ }
+ if (!(dup=strdup(optarg))) {
+ fprintf(ERRH1"malloc() of \"%s\" string"ERRNO1,ERRH2,optarg,ERRNO2);
+ exit(EXIT_FAILURE);
+ }
+ dup[s-optarg]='\t';
+ addlist(&modifiescmdltail,dup,0);
+ modifies_tot++;
+ } break;
case 'v':
verbose=1;
break;
#undef WANTED
basetime=t;
store(MARK_DAY,0);
+ lifetime_days++;
continue;
}
- if (!isdigit(buf[0]) || !isdigit(buf[1]) || buf[2]!=':' || !isdigit(buf[3]) || !isdigit(buf[4]) || buf[5]!='-'
- || sscanf(buf,"%d:%d-",&hour,&min)!=2
+ if (!(isdigit(buf[0]) && isdigit(buf[1]) && buf[2]==':' && isdigit(buf[3]) && isdigit(buf[4])
+ && (buf[5]=='-' || (buf[5]==':' && isdigit(buf[6]) && isdigit(buf[7]) && buf[8]=='-'))
+ )
+ || (sec=0,sscanf(buf,(buf[5]=='-'?"%d:%d-":"%d:%d:%d-"),&hour,&min,&sec)!=2+(buf[5]==':'))
|| hour<0 || hour>23
|| min <0 || min >59
+ || sec <0 || sec >59
) {
fprintf(ERRH1"Incorrect day-time \"%s\""WHERE1,ERRH2,buf,WHERE2);
exit(EXIT_FAILURE);
fprintf(ERRH1"Day-time found but no basetime timestamp set"WHERE1,ERRH2,WHERE2);
exit(EXIT_FAILURE);
}
- currtime=basetime+(hour*60+min)*60;
- hit(currtime);
+ currtime=basetime+(hour*60+min)*60+sec;
+ hit(currtime,buf+(buf[5]=='-'?6:9));
}
if (!feof(fi) || ferror(fi)) {
git://git.jankratochvil.net / timeplan.git / blobdiff