add user warning facility via mariner for macos

[openafs.git] / src / afs / afs_warn.c

diff --git a/src/afs/afs_warn.c b/src/afs/afs_warn.c
index f7a566f..c1cf0f3 100644 (file)
--- a/src/afs/afs_warn.c
+++ b/src/afs/afs_warn.c
@@ -115,6 +115,9 @@ void
 afs_warnuser(char *fmt, ...)
 #endif
 {
+#if defined(AFS_WARNUSER_MARINER_ENV)
+    char buf[256];
+#endif
     AFS_STATCNT(afs_warnuser);
     if (afs_showflags & GAGUSER) {
 #if !defined(AFS_AIX_ENV)
@@ -122,22 +125,45 @@ afs_warnuser(char *fmt, ...)
 #endif
 #ifdef AFS_GLOBAL_SUNLOCK
        int haveGlock = ISAFS_GLOCK();
+#if defined(AFS_WARNUSER_MARINER_ENV)
+       /* gain GLOCK for mariner */
+       if (!haveGlock)
+           AFS_GLOCK();
+#else
+       /* drop GLOCK for uprintf */
        if (haveGlock)
            AFS_GUNLOCK();
+#endif
 #endif /* AFS_GLOBAL_SUNLOCK */
 
 #if defined(AFS_AIX_ENV)
        uprintf(fmt, a, b, c, d, e, f, g, h, i);
 #else
-
        va_start(ap, fmt);
+#if defined(AFS_WARNUSER_MARINER_ENV)
+       /* mariner log the warning */
+       snprintf(buf, sizeof(buf), "warn$");
+       vsnprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), fmt, ap);
+       afs_MarinerLog(buf, NULL);
+       va_end(ap);
+       va_start(ap, fmt);
+       vprintf(fmt, ap);
+#else
        afs_vprintf(fmt, ap);
+#endif
        va_end(ap);
 #endif
 
 #ifdef AFS_GLOBAL_SUNLOCK
+#if defined(AFS_WARNUSER_MARINER_ENV)
+       /* drop GLOCK we got for mariner */
+       if (!haveGlock)
+           AFS_GUNLOCK();
+#else
+       /* regain GLOCK we dropped for uprintf */
        if (haveGlock)
            AFS_GLOCK();
+#endif
 #endif /* AFS_GLOBAL_SUNLOCK */
     }
 }