LU-2446 build: Update Whamcloud copyright messages for Intel

[fs/lustre-release.git] / libcfs / libcfs / user-prim.c

diff --git a/libcfs/libcfs/user-prim.c b/libcfs/libcfs/user-prim.c
index 0d8afc6..2c03cb7 100644 (file)
--- a/libcfs/libcfs/user-prim.c
+++ b/libcfs/libcfs/user-prim.c
@@ -125,7 +125,7 @@ void cfs_waitq_wait(struct cfs_waitlink *link, cfs_task_state_t state)
         (void)link;
 
         /* well, wait for something to happen */
-        cfs_call_wait_handler(0);
+       call_wait_handler(0);
 }
 
 int64_t cfs_waitq_timedwait(struct cfs_waitlink *link, cfs_task_state_t state,
@@ -133,7 +133,7 @@ int64_t cfs_waitq_timedwait(struct cfs_waitlink *link, cfs_task_state_t state,
 {
         LASSERT(link != NULL);
         (void)link;
-        cfs_call_wait_handler(timeout);
+       call_wait_handler(timeout);
         return 0;
 }
 
@@ -276,6 +276,20 @@ size_t strlcpy(char *tgt, const char *src, size_t tgt_len)
 }
 #endif
 
+#ifndef HAVE_STRLCAT /* not in glibc for RHEL 5.x, remove when obsolete */
+size_t strlcat(char *tgt, const char *src, size_t size)
+{
+       size_t tgt_len = strlen(tgt);
+
+       if (size > tgt_len) {
+               strncat(tgt, src, size - tgt_len - 1);
+               tgt[size - 1] = '\0';
+       }
+
+       return tgt_len + strlen(src);
+}
+#endif
+
 /* Read the environment variable of current process specified by @key. */
 int cfs_get_environ(const char *key, char *value, int *val_len)
 {