aboutsummaryrefslogtreecommitdiff
path: root/libcap/cap_text.c
diff options
context:
space:
mode:
authorAndrew Morgan <morgan@kernel.org>2007-07-10 20:52:44 -0700
committerAndrew Morgan <morgan@kernel.org>2007-07-10 20:52:44 -0700
commitdb06d797939c9874a96549df1101be41bcbec17b (patch)
treeaa864ae7f307b3813e74fd4afcdeccc516f9ebb0 /libcap/cap_text.c
parent2c9c0532daccfd300f0eb1401b15348ed19d0ce7 (diff)
downloadlibcap-db06d797939c9874a96549df1101be41bcbec17b.tar.gz
This is libcap-1.01
http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.2/libcap-1.01.tar.gz
Diffstat (limited to 'libcap/cap_text.c')
-rw-r--r--libcap/cap_text.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/libcap/cap_text.c b/libcap/cap_text.c
index 53b51d0..c17f89f 100644
--- a/libcap/cap_text.c
+++ b/libcap/cap_text.c
@@ -1,5 +1,5 @@
/*
- * $Id: cap_text.c,v 1.4 1998/05/24 22:54:09 morgan Exp $
+ * $Id: cap_text.c,v 1.2 1999/04/17 23:25:09 morgan Exp $
*
* Copyright (c) 1997-8 Andrew G Morgan <morgan@linux.kernel.org>
* Copyright (c) 1997 Andrew Main <zefram@dcs.warwick.ac.uk>
@@ -246,7 +246,7 @@ char *cap_to_text(cap_t caps, ssize_t *length_p)
int m, n, t;
/* Check arguments */
- if (!good_cap_t(caps) || length_p == NULL) {
+ if (!good_cap_t(caps)) {
errno = EINVAL;
return NULL;
}
@@ -302,12 +302,21 @@ char *cap_to_text(cap_t caps, ssize_t *length_p)
}
_cap_debug("%s", buf);
- *length_p = p - buf;
+ if (length_p) {
+ *length_p = p - buf;
+ }
+
return (strdup(buf));
}
/*
* $Log: cap_text.c,v $
+ * Revision 1.2 1999/04/17 23:25:09 morgan
+ * fixes from peeterj
+ *
+ * Revision 1.1.1.1 1999/04/17 22:16:31 morgan
+ * release 1.0 of libcap
+ *
* Revision 1.4 1998/05/24 22:54:09 morgan
* updated for 2.1.104
*