X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=time_limit.c;h=75062f21b28879634fa191e86f0c66975284973b;hb=1a8e72c666b575c73e4d593d12631c4cc115aac9;hp=08f6c5590f61491d6b6ca1547d33fbedc7c74ec7;hpb=a4d53c2fe3dc1952c7c7d8a4283545389ba5aa64;p=tac_plus.git

diff --git a/time_limit.c b/time_limit.c
index 08f6c55..75062f2 100644
--- a/time_limit.c
+++ b/time_limit.c
@@ -1,7 +1,7 @@
-/* 		
+/*
 	These functions writen by Devrim SERAL <devrim@gazi.edu.tr>
 
-Applicable format is  : <day str><time str> [,|] <day str><time str> [,|] and so on  
+Applicable format is  : <day str><time str> [,|] <day str><time str> [,|] and so on
 
 The accept parameter for day str is:
 SU = Sunday
@@ -16,189 +16,233 @@ WD = For Week and
 AL = For All days
 
 And time str must be:
-Hourminute-Hourminute  
+Hourminute-Hourminute
 For example it's to be -> 0000-1200 or 1600-1700 or 1600-0800
 
-License: This code is free software; you can redistribute it and/or modify it 
-under the terms of the GNU General Public License as published by the Free 
+License: This code is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2, or (at your option) any later version.
-		
-*/	
 
-#include"time_limit.h"
+*/
+
+
 #include "tac_plus.h"
 
-int problem=0;
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <time.h>
 
-int 
-time_limit_process(str) 
-char *str;
+#include "time_limit.h"
+#include "report.h"
+#include "main.h"
+#include "utils.h"
+
+
+static int str_token_proc TAC_ARGS((char *str));
+static int process TAC_ARGS((char *str));
+static int time_calc TAC_ARGS((char *str, int lct));
+static int antoi TAC_ARGS((char *str, int n));
+
+
+static char* week_days[] = {"SU","MO","TU","WE","TH","FR","SA","WK","WD","AL"};
+static long week_day_val[] = {1, 2, 4, 8, 16, 32, 64, 62, 65, 127};
+
+static int problem = 0;
+
+
+int time_limit_process TAC_ARGS((const char *str));
+
+int
+time_limit_process(str)
+const char *str;
 {
-int ret=0;
-char *tmp_str;
-
-tmp_str=(char *)strtok(str,",|");
-while ( tmp_str != NULL) {
-	ret|=str_token_proc(tmp_str);
-	tmp_str=(char *)strtok(NULL,",");
-	}
-return (ret); 
+    int ret=0;
+    char *tmp_str, *str_copy;
+
+    str_copy = tac_strdup(str);
+    tmp_str = (char *) strtok(str_copy,",|");
+
+    while ( tmp_str != NULL) {
+	ret |= str_token_proc(tmp_str);
+	tmp_str = (char *) strtok(NULL,",");
+    }
+    free(str_copy);
+
+    return (ret);
 }
 
-int 
+static int str_token_proc TAC_ARGS((char *str));
+
+static int
 str_token_proc(str)
 char *str;
 {
-int inv=0,ret;
+    int inv = 0, ret;
 
-/* Pass space characters */ 
-while (isspace(*str)) str++;
+    /* Pass space characters */
+    while (isspace((int) *str))
+	str++;
 
-if (*str=='!') { 
-		inv=1;str++; 
-}
+    if (*str=='!') {
+	inv=1;
+	str++;
+    }
 
-ret=process(str);
+    ret=process(str);
 
-if (problem) {
+    if (problem) {
 	if ( debug & DEBUG_AUTHEN_FLAG )
-               report(LOG_DEBUG,"Timestamp format incorrect");
+	    report(LOG_DEBUG,"Timestamp format incorrect");
 	problem=0;
 	return(0);
-} 
+    }
 
-if (inv) 
+    if (inv)
 	ret=!ret;
-return(ret);	
+
+    return(ret);
 }
 
 
-int
+static void str_up TAC_ARGS((char *str));
+
+static void
+str_up(str)
+char *str;
+{
+    while (*str) {
+	if (islower((int) *str))
+	    *str = toupper((int) *str);
+	str++;
+    }
+}
+
+
+static int process TAC_ARGS((char *str));
+
+static int
 process(str)
 char *str;
 {
-int count=0,ret=0,i,j,localtm;
-char *head,*buf,*gec;
-long sec;
-struct tm *tms;
+    int count = 0, ret = 0, i, j, localtm;
+    char *head, *buf, *gec;
+    time_t sec;
+    struct tm *tms;
 
-/* Pass space characters  */
-while (isspace(*str)) str++;
+    /* Pass space characters  */
+    while (isspace((int) *str))
+	str++;
 
-head=str;
+    head=str;
 
-/* Count alphanumeric char */
-while (isalpha(*str)) { 
+    /* Count alphanumeric char */
+    while (isalpha((int) *str)) {
 	count++;
 	str++;
-}
+    }
 
-if ( count==0 || count%2 ) { 
+    if ( count==0 || count%2 ) {
 	problem++;
 	return 0;
+    }
+
+    buf = (char *) tac_malloc(count+1);
+    strncpy(buf, head, count);
+    gec = buf;
+    str_up(buf);
+
+    for (i=1; i<=(count/2); i++) {
+	for (j=0; j<NUM; j++)
+	    if(!strncmp(gec,week_days[j],2))
+		ret ^= week_day_val[j];
+	gec += 2;
+    }
+
+    /* We finished to use buffer so free it */
+    free(buf);
+
+    sec = time(NULL);
+    tms = localtime(&sec);
+    localtm = (tms->tm_hour)*60 + tms->tm_min;
+    ret = ( week_day_val[tms->tm_wday] & ret ) && time_calc(str,localtm);
+
+    if (ret>0)
+	return (1);
+    else
+	return (0);
 }
 
-buf=(char *)malloc(count+1);
-strncpy(buf,head,count);
-gec=buf;
-str_up(buf);
-
-for(i=1;i<=(count/2);i++) {
-	for (j=0;j<NUM;j++) {
-                if(!strncmp(gec,week_days[j],2)) {
-                        ret=ret^week_day_val[j];
-                }
-        }
-	gec+=2;
-}
-
-/* We finished to use buffer so free it */
-free(buf);
-
-sec=time(0);
-tms=localtime(&sec);
-localtm=(tms->tm_hour)*60+tms->tm_min;
-ret=( week_day_val[tms->tm_wday] & ret ) && time_calc(str,localtm);
-
-if (ret>0) 
-	return (1); 
-else 
-	return(0); 
-}
 
-str_up(str)
-char *str;
-{
-  while(*str) {
-	if(islower(*str)) *str=toupper(*str);
-	str++;
-  }
-}
+static int time_calc TAC_ARGS((char *str, int lct));
 
-int 
-time_calc(str,lct)
+static int
+time_calc(str, lct)
 char *str;
 int lct;
 {
-char *t1,*t2,*head;
-int say1,say2,count=0;
+    char *t1, *t2, *head;
+    int say1, say2, count=0;
 
-head=str;
+    head = str;
 
- while (isdigit(*head) || *head=='-') {
+    while (isdigit((int) *head) || *head=='-') {
         count++;
-	head++;	
- }
+	head++;
+    }
 
-if (*str=='\0' || count!= TPL ) {
-	problem++;	
+    if ( *str=='\0' || count!= TPL ) {
+	problem++;
 	return (0);
-}
+    }
 
-  t1=(char *) malloc(count);
-  strncpy(t1,str,count);	/*Put str value to t1*/
+    t1 = (char *) tac_malloc(count);
+    strncpy(t1, str, count);			/* Put str value to t1 */
 
-  t2=(char *) strstr(t1,"-"); /* Find next time part */
+    t2 = (char *) strstr(t1,"-");		/* Find next time part */
 
-if (t2==NULL) {
-   free(t1);
-   problem++;
-   return(0);
-}
-	
-*t2='\0';t2++;
-	
-if ( strlen(t1)<4 || strlen(t2)<4 ) {
+    if (t2==NULL) {
 	free(t1);
 	problem++;
 	return(0);
-}
-	say1=antoi(t1,2)*60+antoi(t1+2,2);
-	say2=antoi(t2,2)*60+antoi(t2+2,2);
+    }
 
-free(t1);
+    *t2++ = '\0';
 
-if (say1<=say2) { 
-	if( (lct>=say1) && (lct<=say2) ) return(1); 
-}
-else {
-	if( (lct>=say1) || (lct<=say2) ) return(1); 
+    if ( strlen(t1)<4 || strlen(t2)<4 ) {
+	free(t1);
+	problem++;
+	return(0);
+    }
+    say1 = antoi(t1,2)*60 + antoi(t1+2,2);
+    say2 = antoi(t2,2)*60 + antoi(t2+2,2);
+
+    free(t1);
+
+    if (say1 <= say2) {
+	if( (lct>=say1) && (lct<=say2) )
+	    return(1);
+    } else {
+	if( (lct>=say1) || (lct<=say2) )
+	    return(1);
+    }
+    return(0);
 }
-return(0);
 
-}
+static int antoi TAC_ARGS((char *str, int n));
 
-int 
-antoi(str,n)
-char *str;int n;
+static int
+antoi(str, n)
+char *str;
+int n;
 {
-char *buf;
-int ret;
+    char *buf;
+    int ret;
 
-  buf=(char *) malloc(n);
-  strncpy(buf,str,n);
-  ret=atoi(buf);
-  free(buf);
+    buf = (char *) tac_malloc(n);
+    strncpy(buf, str, n);
+    ret = atoi(buf);
+    free(buf);
 
-return(ret);
+    return(ret);
 }