Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openscap/patches/debug.c.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 01 Apr 2013 23:00:57 -0700
changeset 1243 cf247f5101ae
parent 1136 226e8d9d2ff0
child 1369 20813e08fff3
permissions -rw-r--r--
Added tag s12-19 for changeset f52d88cf6f9e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1136
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     1
 
--- openscap-0.8.1/src/common/debug.c.orig	2012-11-19 10:04:47.622821073 -0800
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     2
 
+++ openscap-0.8.1/src/common/debug.c	2012-11-19 09:58:03.173819234 -0800
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     3
 
@@ -150,7 +150,11 @@
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     4
 
 	else
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     5
 
 		f = file;
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     6
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     7
 
+#if defined(__SVR4) && defined (__sun)
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     8
 
+	if (lockf(fileno(__debuglog_fp), F_LOCK, 0L) == -1) {
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     9
 
+#else
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    10
 
 	if (flock(fileno(__debuglog_fp), LOCK_EX) == -1) {
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    11
 
+#endif
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    12
 
 		__UNLOCK_FP;
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    13
 
 		return;
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    14
 
 	}
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    15
 
@@ -178,7 +182,11 @@
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    16
 
 #endif
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    17
 
 	vfprintf(__debuglog_fp, fmt, ap);
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    18
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    19
 
+#if defined(__SVR4) && defined (__sun)
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    20
 
+	if (lockf(fileno(__debuglog_fp), F_ULOCK, 0L) == -1) {
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    21
 
+#else
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    22
 
 	if (flock(fileno(__debuglog_fp), LOCK_UN) == -1) {
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    23
 
+#endif
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    24
 
 		/* __UNLOCK_FP; */
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    25
 
 		abort();
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    26
 
 	}
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    27
 
@@ -232,8 +240,11 @@
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    28
 
                 fprintf (__debuglog_fp, "=============== LOG: %.24s ===============\n", st);
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    29
 
                 atexit(&__oscap_debuglog_close);
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    30
 
         }
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    31
 
-
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    32
 
+#if defined(__SVR4) && defined (__sun)
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    33
 
+        if (lockf (fileno (__debuglog_fp), F_LOCK, 0L) == -1) {
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    34
 
+#else
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    35
 
         if (flock (fileno (__debuglog_fp), LOCK_EX | LOCK_NB) == -1) {
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    36
 
+#endif
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    37
 
                 __UNLOCK_FP;
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    38
 
                 return;
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    39
 
         }
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    40
 
@@ -251,8 +262,11 @@
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    41
 
         }
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    42
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    43
 
         fprintf(__debuglog_fp, "\n-----------\n");
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    44
 
-
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    45
 
+#if defined(__SVR4) && defined (__sun)
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    46
 
+        if (lockf (fileno (__debuglog_fp), F_ULOCK, 0L) == -1) {
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    47
 
+#else
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    48
 
         if (flock (fileno (__debuglog_fp), LOCK_UN | LOCK_NB) == -1) {
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    49
 
+#endif
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    50
 
                 /* __UNLOCK_FP; */
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    51
 
                 abort ();
226e8d9d2ff0 16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    52
 
         }
upstream/oracle/userland-gate