Deleted Added
full compact
acl_from_text.c (75185) acl_from_text.c (75928)
1/*-
2 * Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/lib/libc/posix1e/acl_from_text.c 75185 2001-04-04 18:00:52Z tmm $
26 * $FreeBSD: head/lib/libc/posix1e/acl_from_text.c 75928 2001-04-24 22:45:41Z jedgar $
27 */
28/*
29 * acl_from_text: Convert a text-form ACL from a string to an acl_t.
30 */
31
32#include <sys/types.h>
33#include "namespace.h"
34#include <sys/acl.h>

--- 69 unchanged lines hidden (view full) ---

104/*
105 * acl_from_text -- Convert a string into an ACL.
106 * Postpone most validity checking until the end and call acl_valid() to do
107 * that.
108 */
109acl_t
110acl_from_text(const char *buf_p)
111{
27 */
28/*
29 * acl_from_text: Convert a text-form ACL from a string to an acl_t.
30 */
31
32#include <sys/types.h>
33#include "namespace.h"
34#include <sys/acl.h>

--- 69 unchanged lines hidden (view full) ---

104/*
105 * acl_from_text -- Convert a string into an ACL.
106 * Postpone most validity checking until the end and call acl_valid() to do
107 * that.
108 */
109acl_t
110acl_from_text(const char *buf_p)
111{
112 acl_tag_t t;
113 acl_perm_t p;
114 acl_t acl;
115 uid_t id;
116 char *mybuf_p, *line, *cur, *notcomment, *comment, *entry;
117 char *tag, *qualifier, *permission;
118 int error;
112 acl_tag_t t;
113 acl_perm_t p;
114 acl_t acl;
115 char *mybuf_p, *line, *cur, *notcomment, *comment, *entry;
116 char *tag, *qualifier, *permission;
117 int error;
118 uid_t id;
119
120 /* Local copy we can mess up. */
121 mybuf_p = strdup(buf_p);
122 if (!mybuf_p)
123 return(NULL);
124
125 acl = acl_init(3);
126 if (!acl) {

--- 107 unchanged lines hidden ---
119
120 /* Local copy we can mess up. */
121 mybuf_p = strdup(buf_p);
122 if (!mybuf_p)
123 return(NULL);
124
125 acl = acl_init(3);
126 if (!acl) {

--- 107 unchanged lines hidden ---