Use S_ISREG(), since S_IFMT and S_IFREG are apprarently missing on some

2004-11-15  Matthias Clasen  <mclasen@redhat.com>

	* glib/gkeyfile.c (g_key_file_load_from_fd): Use S_ISREG(), since
	S_IFMT and S_IFREG are apprarently missing on some systems (they
	are SUS, but not Posix).  (#158263)

diff --git a/ChangeLog b/ChangeLog
index 221305fe4fd21b8ac29e06318ffa8719c881a64b..ab6c69443ae2ce3c008c72cba5816e79b47c8f42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gkeyfile.c (g_key_file_load_from_fd): Use S_ISREG(), since
+       S_IFMT and S_IFREG are apprarently missing on some systems (they 
+       are SUS, but not Posix).  (#158263)
+
 2004-11-12  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 221305fe4fd21b8ac29e06318ffa8719c881a64b..ab6c69443ae2ce3c008c72cba5816e79b47c8f42 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gkeyfile.c (g_key_file_load_from_fd): Use S_ISREG(), since
+       S_IFMT and S_IFREG are apprarently missing on some systems (they 
+       are SUS, but not Posix).  (#158263)
+
 2004-11-12  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 221305fe4fd21b8ac29e06318ffa8719c881a64b..ab6c69443ae2ce3c008c72cba5816e79b47c8f42 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gkeyfile.c (g_key_file_load_from_fd): Use S_ISREG(), since
+       S_IFMT and S_IFREG are apprarently missing on some systems (they 
+       are SUS, but not Posix).  (#158263)
+
 2004-11-12  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 221305fe4fd21b8ac29e06318ffa8719c881a64b..ab6c69443ae2ce3c008c72cba5816e79b47c8f42 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gkeyfile.c (g_key_file_load_from_fd): Use S_ISREG(), since
+       S_IFMT and S_IFREG are apprarently missing on some systems (they 
+       are SUS, but not Posix).  (#158263)
+
 2004-11-12  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 221305fe4fd21b8ac29e06318ffa8719c881a64b..ab6c69443ae2ce3c008c72cba5816e79b47c8f42 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gkeyfile.c (g_key_file_load_from_fd): Use S_ISREG(), since
+       S_IFMT and S_IFREG are apprarently missing on some systems (they 
+       are SUS, but not Posix).  (#158263)
+
 2004-11-12  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version.

diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index ffa2fc8c1a9afc3799fe07612f4e07ce35bde841..397777f42db4333d7067a9400a2f88d1b8339501 100644 (file)
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -359,7 +359,7 @@ g_key_file_load_from_fd (GKeyFile       *key_file,
       return FALSE;
     }
 
-  if ((stat_buf.st_mode & S_IFMT) != S_IFREG)
+  if (!S_ISREG (stat_buf.st_mode))
     {
       g_set_error (error, G_KEY_FILE_ERROR,
                    G_KEY_FILE_ERROR_PARSE,