Updated WIN32 code specific sections. Changed header.

[idzebra-moved-to-github.git] / util / res.c

diff --git a/util/res.c b/util/res.c
index 5710648..d4522db 100644 (file)
--- a/util/res.c
+++ b/util/res.c
@@ -1,10 +1,16 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: res.c,v $
- * Revision 1.22  1998-01-12 15:04:32  adam
+ * Revision 1.24  1999-02-02 14:51:42  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.23  1998/10/28 15:18:55  adam
+ * Fix for DOS-formatted configuration files.
+ *
+ * Revision 1.22  1998/01/12 15:04:32  adam
  * Removed exit - call.
  *
  * Revision 1.21  1997/11/18 10:04:03  adam
@@ -76,7 +82,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -165,7 +171,7 @@ static void reread (Res r)
             val_size = 0;
             while (1)
             {
-                if (fr_buf[no] == '\0' || fr_buf[no] == '\n')
+                if (fr_buf[no] == '\0' || strchr("\n\r\f", fr_buf[no]))
                 {
                     while (val_size > 0 &&
                               (val_buf[val_size-1] == ' ' ||
@@ -178,7 +184,7 @@ static void reread (Res r)
                          resp->name, resp->value);
                     break;
                 }
-                else if (fr_buf[no] == '\\' && fr_buf[no+1] == '\n')
+                else if (fr_buf[no] == '\\' && strchr ("\n\r\f", fr_buf[no+1]))
                 {
                     line = fgets (fr_buf, sizeof(fr_buf)-1, fr);
                     if (!line)
@@ -212,7 +218,7 @@ static void reread (Res r)
 Res res_open (const char *name)
 {
     Res r;
-#ifdef WINDOWS
+#ifdef WIN32
     if (access (name, 4))
 #else
     if (access (name, R_OK))