diff options
| -rw-r--r-- | mail.c | 8 | ||||
| -rw-r--r-- | mail.h | 7 | ||||
| -rw-r--r-- | seti.c | 131 | ||||
| -rw-r--r-- | seti.h | 8 |
4 files changed, 21 insertions, 133 deletions
@@ -1,4 +1,4 @@ -/* $Id: mail.c,v 1.3 2001/02/21 04:48:13 reinelt Exp $ +/* $Id: mail.c,v 1.4 2001/03/08 09:02:04 reinelt Exp $ * * email specific functions * @@ -20,6 +20,10 @@ * * * $Log: mail.c,v $ + * Revision 1.4 2001/03/08 09:02:04 reinelt + * + * seti client cleanup + * * Revision 1.3 2001/02/21 04:48:13 reinelt * * big mailbox patch from Axel Ehnert @@ -86,7 +90,7 @@ int Mail (int index, int *num) /* Build the filename from the config */ - snprintf(buffer, 32, "Mailbox%d", index); + snprintf(buffer, sizeof(buffer), "Mailbox%d", index); fnp1=cfg_get(buffer); if (fnp1==NULL || *fnp1=='\0') { cfgmbx[index]=FALSE; // There is now entry for Mailbox #index @@ -1,4 +1,4 @@ -/* $Id: mail.h,v 1.1 2001/02/18 22:11:34 reinelt Exp $ +/* $Id: mail.h,v 1.2 2001/03/08 09:02:04 reinelt Exp $ * * email specific functions * @@ -20,6 +20,10 @@ * * * $Log: mail.h,v $ + * Revision 1.2 2001/03/08 09:02:04 reinelt + * + * seti client cleanup + * * Revision 1.1 2001/02/18 22:11:34 reinelt * *** empty log message *** * @@ -29,7 +33,6 @@ #define _MAIL_H_ #define MAILBOXES 9 -#define DEFMAILPOLLEXT 5 int Mail (int index, int *num); @@ -1,4 +1,4 @@ -/* $Id: seti.c,v 1.3 2001/02/19 00:15:46 reinelt Exp $ +/* $Id: seti.c,v 1.4 2001/03/08 09:02:04 reinelt Exp $ * * seti@home specific functions * @@ -20,6 +20,10 @@ * * * $Log: seti.c,v $ + * Revision 1.4 2001/03/08 09:02:04 reinelt + * + * seti client cleanup + * * Revision 1.3 2001/02/19 00:15:46 reinelt * * integrated mail and seti client @@ -44,8 +48,6 @@ * */ -#define FALSE 0 -#define TRUE 1 #define STATEFILE "state.sah" @@ -63,129 +65,6 @@ #include "debug.h" #include "seti.h" -int oldSeti (int *perc, int *cput) -{ - FILE *fstr; - static int err_marker=0; // Was there an erro before -> -2 - static time_t cnt; // Time of last calculation - static int retry_cnt=0; // Retry 10 times to find prog= - char *dirname; // Directory of Seti@HOME - char *fn; - char fn1[200]; - char *txt; - char txt1[100]; - int v1=0; - int i; - int l; - int found_perc; // Flag to show, if we allready found - int found_cpu; // Flag to show, if we allready found - int interv=-1; - char *cinterv; - - /* - * Was there an error before? Return any way - */ - if (err_marker == -2) { - return (-1); - } - /* - Interval set? - */ - if (interv < 0) { - cinterv = cfg_get("pollintseti"); - if ( cinterv == NULL ) { - interv=DEFSETIPOLLEXT; - } - else { - interv = atoi(cinterv); - } - } - /* - Is it time to look into the file? - */ - if (time(NULL)>cnt+interv-1) { - cnt=time(NULL); - } - else { - return 0; - } - /* - Reread pollext, because it could be changed due to reading a new conf file - */ - cinterv = cfg_get("pollintseti"); - if ( cinterv == NULL ) { - interv=DEFSETIPOLLEXT; - } - else { - interv = atoi(cinterv); - } - /* - Build the filename from the config - */ - dirname=cfg_get("SetiDir"); - if (dirname==NULL || *dirname=='\0') { - error ("%s: missing 'SetiDir' entry!\n", cfg_file()); - err_marker = -2; - return (-1); - } - - fn=&fn1[0]; - strcpy(fn, dirname); - strcat(fn, "/state.sah"); - /* - Open the file - */ - fstr=fopen(fn,"r"); - - if (fstr == NULL) { - error ("File %s could not be opened!\n", fn); - err_marker = -2; - return (-1); - } - /* - Read the file. Break the loop after we found all strings. - */ - found_perc=FALSE; - found_cpu=FALSE; - txt=&txt1[0]; - - while ( ( fgets ( txt1, 100, fstr ) ) != NULL ) { - if ( strncmp (txt1, "prog=", 5 ) == 0 ) { - txt=strncpy(txt,txt+7,4); - txt[4]='\0'; - debug ("Seti in text: %s", txt); - i=sscanf(txt, "%d", &v1); - debug ("Seti in numb: %d", v1); - *perc=v1; - found_perc=TRUE; - } - if ( strncmp (txt1, "cpu=", 4 ) == 0 ) { - l=strstr(txt+4,".")-txt-4; - txt=strncpy(txt,txt+4,l); - txt[l]='\0'; - i=sscanf(txt, "%d", &v1); - *cput=v1; - found_cpu=TRUE; - } - if (found_perc && found_cpu) { - retry_cnt = 0; // Reset retry counter. WE FOUND! - fclose(fstr); - return (0); - } - } - - retry_cnt++; - if ( retry_cnt < 10 ) { - error ("%s: prog= or cpu= not found in file! Retrying ...\n", fn); - return 0; - } - else { - error ("%s: prog= or cpu= not found in file!\n", fn); - err_marker = -2; - return (-1); - } -} - int Seti (double *perc, double *cput) { @@ -1,4 +1,4 @@ -/* $Id: seti.h,v 1.2 2001/02/19 00:15:46 reinelt Exp $ +/* $Id: seti.h,v 1.3 2001/03/08 09:02:04 reinelt Exp $ * * seti@home specific functions * @@ -20,6 +20,10 @@ * * * $Log: seti.h,v $ + * Revision 1.3 2001/03/08 09:02:04 reinelt + * + * seti client cleanup + * * Revision 1.2 2001/02/19 00:15:46 reinelt * * integrated mail and seti client @@ -34,8 +38,6 @@ #ifndef _SETI_H_ #define _SETI_H_ -#define DEFSETIPOLLEXT 10 - int Seti (double *perc, double *cput); #endif |