Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-12 19:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove </ br> after [/code]

Browse Source 
SVN revision: 1447
This commit is contained in:
Stefan Ritt 2005-07-25 18:37:21 +00:00
parent a2158fe2c4
commit 9e681ae7b2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/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 1.718 2005/07/25 18:37:21 ritt
Remove </ br> after [/code]
Revision 1.717 2005/07/25 18:04:12 ritt Revision 1.717 2005/07/25 18:04:12 ritt
Applied pointer casting patch from Recai Applied pointer casting patch from Recai
@ -6384,7 +6387,9 @@ PATTERN_LIST pattern_list[] = {
{"[/size]", "</font>"}, {"[/size]", "</font>"},
{"[font=", "<font face=\"%s\">"}, {"[font=", "<font face=\"%s\">"},
{"[/font]", "</font>"}, {"[/font]", "</font>"},
{"\r\n[code]", "<code><pre>"},
{"[code]", "<code><pre>"}, {"[code]", "<code><pre>"},
{"[/code]\r\n", "</pre></code>"},
{"[/code]", "</pre></code>"}, {"[/code]", "</pre></code>"},
/* lists */ /* lists */
@ -6539,7 +6544,7 @@ void rsputs_elcode(LOGBOOK * lbs, const char *str)
for (l = 0; pattern_list[l].pattern[0]; l++) { for (l = 0; pattern_list[l].pattern[0]; l++) {
if (strnieq(str + i, pattern_list[l].pattern, strlen(pattern_list[l].pattern))) { if (strnieq(str + i, pattern_list[l].pattern, strlen(pattern_list[l].pattern))) {
if (stricmp(pattern_list[l].pattern, "[/code]") == 0) if (stristr(pattern_list[l].pattern, "[/code]"))
interprete_elcode = TRUE; interprete_elcode = TRUE;
if (interprete_elcode) { if (interprete_elcode) {
@ -6658,13 +6663,13 @@ void rsputs_elcode(LOGBOOK * lbs, const char *str)
} }
} // interprete_elcode } // interprete_elcode
if (stricmp(pattern_list[l].pattern, "[code]") == 0) if (stristr(pattern_list[l].pattern, "[code]"))
interprete_elcode = FALSE; interprete_elcode = FALSE;
break; break;
} }
} }
if ((interprete_elcode && pattern_list[l].pattern[0]) || stricmp(pattern_list[l].pattern, "[code]") == 0) if ((interprete_elcode && pattern_list[l].pattern[0]) || stristr(pattern_list[l].pattern, "[code]"))
continue; continue;
if (strnieq(str + i, "<br>", 4)) { if (strnieq(str + i, "<br>", 4)) {
@ -23468,7 +23473,7 @@ void server_loop(void)
if (status != -1) { // if no HUP signal is received if (status != -1) { // if no HUP signal is received
if (FD_ISSET(lsock, &readfds)) { if (FD_ISSET(lsock, &readfds)) {
len = sizeof(acc_addr); len = sizeof(acc_addr);
_sock = accept(lsock, (struct sockaddr *) &acc_addr, (socklen_t *) &len); _sock = accept(lsock, (struct sockaddr *) &acc_addr, (void *) &len);
/* find new entry in socket table */ /* find new entry in socket table */
for (i = 0; i < N_MAX_CONNECTION; i++) for (i = 0; i < N_MAX_CONNECTION; i++)
if (ka_sock[i] == 0) if (ka_sock[i] == 0)