Display message ID's

SVN revision: 109
This commit is contained in:
Stefan Ritt 2002-06-12 07:48:56 +00:00
parent 2b518284b4
commit d2e851d248

49
elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 2.10 2002/06/12 07:48:56 midas
Display message ID's
Revision 2.9 2002/06/11 12:01:56 midas Revision 2.9 2002/06/11 12:01:56 midas
Added 'download' command Added 'download' command
@ -230,7 +233,7 @@ int tcp_port = 80;
#define MAX_N_ATTR 50 #define MAX_N_ATTR 50
#define VALUE_SIZE 256 #define VALUE_SIZE 256
#define PARAM_LENGTH 256 #define PARAM_LENGTH 256
#define TEXT_SIZE 50000 #define TEXT_SIZE 100000
#define MAX_PATH_LENGTH 256 #define MAX_PATH_LENGTH 256
char _param[MAX_PARAM][PARAM_LENGTH]; char _param[MAX_PARAM][PARAM_LENGTH];
@ -1250,7 +1253,7 @@ char c, test;
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
INT ss_file_find(char * path, char * pattern, char **plist) INT ss_file_find(char *path, char *pattern, char **plist)
/********************************************************************\ /********************************************************************\
Routine: ss_file_find Routine: ss_file_find
@ -1262,42 +1265,43 @@ INT ss_file_find(char * path, char * pattern, char **plist)
char *pattern pattern string (wildcard allowed) char *pattern pattern string (wildcard allowed)
Output: Output:
char **plist pointer to the lfile list char **plist pointer to the file list
Function value: Function value:
int Number of files matching request int Number of files matching request
\********************************************************************/ \********************************************************************/
{ {
int i;
#ifdef OS_UNIX #ifdef OS_UNIX
DIR *dir_pointer; int i, j, n;
struct dirent *dp; struct dirent **namelist;
if ((dir_pointer = opendir(path)) == NULL) n = scandir(path, &namelist, 0, alphasort);
if (n <= 0)
return 0; return 0;
*plist = (char *) malloc(MAX_PATH_LENGTH); *plist = (char *) malloc(MAX_PATH_LENGTH);
i = 0;
for (dp = readdir(dir_pointer); dp != NULL; dp = readdir(dir_pointer)) for (i=j=0 ; i<n ; i++)
{ {
if (fnmatch1(pattern, dp->d_name) == 0) if (fnmatch1(pattern, namelist[i]->d_name) == 0)
{ {
*plist = (char *)realloc(*plist, (i+1)*MAX_PATH_LENGTH); *plist = (char *)realloc(*plist, (j+1)*MAX_PATH_LENGTH);
strncpy(*plist+(i*MAX_PATH_LENGTH), dp->d_name, strlen(dp->d_name)); strncpy(*plist+(j*MAX_PATH_LENGTH), namelist[i]->d_name, strlen(namelist[i]->d_name));
*(*plist+(i*MAX_PATH_LENGTH)+strlen(dp->d_name)) = '\0'; *(*plist+(j*MAX_PATH_LENGTH)+strlen(namelist[i]->d_name)) = '\0';
i++; j++;
seekdir(dir_pointer, telldir(dir_pointer));
} }
} }
closedir(dir_pointer); free(namelist);
return j;
#endif #endif
#ifdef OS_WINNT #ifdef OS_WINNT
HANDLE pffile; HANDLE pffile;
LPWIN32_FIND_DATA lpfdata; LPWIN32_FIND_DATA lpfdata;
char str[255]; char str[255];
int first; int i, first;
strcpy(str,path); strcpy(str,path);
strcat(str,"\\"); strcat(str,"\\");
@ -1322,8 +1326,8 @@ INT ss_file_find(char * path, char * pattern, char **plist)
i++; i++;
} }
free(lpfdata); free(lpfdata);
#endif
return i; return i;
#endif
} }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
@ -5660,7 +5664,7 @@ skip:
void submit_elog(LOGBOOK *lbs) void submit_elog(LOGBOOK *lbs)
{ {
char str[256], mail_to[256], mail_from[256], file_name[256], error[1000], char str[256], mail_to[256], mail_from[256], file_name[256], error[1000],
mail_text[10000], mail_list[MAX_N_LIST][NAME_LENGTH], list[10000], smtp_host[256], mail_text[TEXT_SIZE+1000], mail_list[MAX_N_LIST][NAME_LENGTH], list[10000], smtp_host[256],
subject[256], attrib[MAX_N_ATTR][NAME_LENGTH], subst_str[256], in_reply_to[80]; subject[256], attrib[MAX_N_ATTR][NAME_LENGTH], subst_str[256], in_reply_to[80];
char *buffer[MAX_ATTACHMENTS], mail_param[1000]; char *buffer[MAX_ATTACHMENTS], mail_param[1000];
char att_file[MAX_ATTACHMENTS][256]; char att_file[MAX_ATTACHMENTS][256];
@ -6782,6 +6786,11 @@ BOOL first;
if (i>0) if (i>0)
rsprintf("</tr>\n"); rsprintf("</tr>\n");
/*---- display message ID ----*/
rsprintf("<tr><td nowrap bgcolor=%s width=10%%><b>%s:</b></td><td bgcolor=%s>%d</td></tr>\n\n",
gt("Categories bgcolor1"), loc("Message ID"), gt("Categories bgcolor2"), message_id);
/*---- display date ----*/ /*---- display date ----*/
if (getcfg(lbs->name, "Date format", format)) if (getcfg(lbs->name, "Date format", format))