components/openscap/patches/debug.c.patch
changeset 1136 226e8d9d2ff0
child 1369 20813e08fff3
equal deleted inserted replaced
1135:7f8ef38770aa 1136:226e8d9d2ff0
       
     1 --- openscap-0.8.1/src/common/debug.c.orig	2012-11-19 10:04:47.622821073 -0800
       
     2 +++ openscap-0.8.1/src/common/debug.c	2012-11-19 09:58:03.173819234 -0800
       
     3 @@ -150,7 +150,11 @@
       
     4  	else
       
     5  		f = file;
       
     6  
       
     7 +#if defined(__SVR4) && defined (__sun)
       
     8 +	if (lockf(fileno(__debuglog_fp), F_LOCK, 0L) == -1) {
       
     9 +#else
       
    10  	if (flock(fileno(__debuglog_fp), LOCK_EX) == -1) {
       
    11 +#endif
       
    12  		__UNLOCK_FP;
       
    13  		return;
       
    14  	}
       
    15 @@ -178,7 +182,11 @@
       
    16  #endif
       
    17  	vfprintf(__debuglog_fp, fmt, ap);
       
    18  
       
    19 +#if defined(__SVR4) && defined (__sun)
       
    20 +	if (lockf(fileno(__debuglog_fp), F_ULOCK, 0L) == -1) {
       
    21 +#else
       
    22  	if (flock(fileno(__debuglog_fp), LOCK_UN) == -1) {
       
    23 +#endif
       
    24  		/* __UNLOCK_FP; */
       
    25  		abort();
       
    26  	}
       
    27 @@ -232,8 +240,11 @@
       
    28                  fprintf (__debuglog_fp, "=============== LOG: %.24s ===============\n", st);
       
    29                  atexit(&__oscap_debuglog_close);
       
    30          }
       
    31 -
       
    32 +#if defined(__SVR4) && defined (__sun)
       
    33 +        if (lockf (fileno (__debuglog_fp), F_LOCK, 0L) == -1) {
       
    34 +#else
       
    35          if (flock (fileno (__debuglog_fp), LOCK_EX | LOCK_NB) == -1) {
       
    36 +#endif
       
    37                  __UNLOCK_FP;
       
    38                  return;
       
    39          }
       
    40 @@ -251,8 +262,11 @@
       
    41          }
       
    42  
       
    43          fprintf(__debuglog_fp, "\n-----------\n");
       
    44 -
       
    45 +#if defined(__SVR4) && defined (__sun)
       
    46 +        if (lockf (fileno (__debuglog_fp), F_ULOCK, 0L) == -1) {
       
    47 +#else
       
    48          if (flock (fileno (__debuglog_fp), LOCK_UN | LOCK_NB) == -1) {
       
    49 +#endif
       
    50                  /* __UNLOCK_FP; */
       
    51                  abort ();
       
    52          }