Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change CRLF -> CR when saving elogd.cfg under Unix

Browse Source 
SVN revision: 739
This commit is contained in:
Stefan Ritt 2004-02-03 12:26:55 +00:00
parent 100cd09000
commit 6d9b0b8be2
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
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.230 2004/02/03 12:26:55 midas
Change CRLF -> CR when saving elogd.cfg under Unix
Revision 1.229 2004/02/03 10:36:17 midas Revision 1.229 2004/02/03 10:36:17 midas
Do not renumber and entries if they are already identical Do not renumber and entries if they are already identical
@ -7267,6 +7270,18 @@ void show_admin_page(LOGBOOK * lbs, char *top_group)
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
void remove_crlf(char *buffer)
{
char *p;
p = buffer;
while ((p = strstr(p, "\r\n")) != NULL) {
strcpy(p+1, p+2);
}
}
/*------------------------------------------------------------------*/
int save_admin_config(LOGBOOK * lbs, char *section, char *buffer, char *error) int save_admin_config(LOGBOOK * lbs, char *section, char *buffer, char *error)
{ {
int fh, i, length; int fh, i, length;
@ -7282,6 +7297,13 @@ int save_admin_config(LOGBOOK * lbs, char *section, char *buffer, char *error)
return 0; return 0;
} }
#ifdef OS_UNIX
/* under unix, convert CRLF to CR */
remove_crlf(buffer);
#endif
/* read previous contents */ /* read previous contents */
length = lseek(fh, 0, SEEK_END); length = lseek(fh, 0, SEEK_END);
lseek(fh, 0, SEEK_SET); lseek(fh, 0, SEEK_SET);
@ -7302,9 +7324,16 @@ int save_admin_config(LOGBOOK * lbs, char *section, char *buffer, char *error)
} }
/* combine old and new config */ /* combine old and new config */
#ifdef OS_UNIX
sprintf(p1, "[%s]\r", section);
strcat(p1, buffer);
strcat(p1, "\r\r");
#else
sprintf(p1, "[%s]\r\n", section); sprintf(p1, "[%s]\r\n", section);
strcat(p1, buffer); strcat(p1, buffer);
strcat(p1, "\r\n\r\n"); strcat(p1, "\r\n\r\n");
#endif
if (p2) { if (p2) {
strlcat(p1, buf2, length + strlen(buffer) + 1); strlcat(p1, buf2, length + strlen(buffer) + 1);
free(buf2); free(buf2);