From 6d9b0b8be2db1c5c6f4fd1e04ca198a4904786b4 Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Tue, 3 Feb 2004 12:26:55 +0000
Subject: [PATCH] Change CRLF -> CR when saving elogd.cfg under Unix

SVN revision: 739
---
 src/elogd.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/elogd.c b/src/elogd.c
index 0a12ba1b..47b4b401 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,9 @@
    Contents:     Web server program for Electronic Logbook ELOG
   
    $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
    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 fh, i, length;
@@ -7282,6 +7297,13 @@ int save_admin_config(LOGBOOK * lbs, char *section, char *buffer, char *error)
       return 0;
    }
 
+#ifdef OS_UNIX
+
+   /* under unix, convert CRLF to CR */
+   remove_crlf(buffer);
+
+#endif
+
    /* read previous contents */
    length = lseek(fh, 0, SEEK_END);
    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 */
+#ifdef OS_UNIX
+   sprintf(p1, "[%s]\r", section);
+   strcat(p1, buffer);
+   strcat(p1, "\r\r");
+#else
    sprintf(p1, "[%s]\r\n", section);
    strcat(p1, buffer);
    strcat(p1, "\r\n\r\n");
+#endif
+   
    if (p2) {
       strlcat(p1, buf2, length + strlen(buffer) + 1);
       free(buf2);