Deleted Added
sdiff udiff text old ( 228690 ) new ( 236099 )
full compact
openpam_readline.c (228690) openpam_readline.c (236099)
1/*-
2 * Copyright (c) 2003 Networks Associates Technology, Inc.
3 * Copyright (c) 2004-2011 Dag-Erling Sm��rgrav
4 * All rights reserved.
5 *
6 * This software was developed for the FreeBSD Project by ThinkSec AS and
7 * Network Associates Laboratories, the Security Research Division of
8 * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035

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

27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
1/*-
2 * Copyright (c) 2003 Networks Associates Technology, Inc.
3 * Copyright (c) 2004-2011 Dag-Erling Sm��rgrav
4 * All rights reserved.
5 *
6 * This software was developed for the FreeBSD Project by ThinkSec AS and
7 * Network Associates Laboratories, the Security Research Division of
8 * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035

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

27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * $Id: openpam_readline.c 473 2011-11-03 10:48:25Z des $
35 * $Id: openpam_readline.c 596 2012-04-14 14:52:40Z des $
36 */
37
38#ifdef HAVE_CONFIG_H
39# include "config.h"
40#endif
41
42#include <ctype.h>
43#include <stdio.h>
44#include <stdlib.h>
45
46#include <security/pam_appl.h>
36 */
37
38#ifdef HAVE_CONFIG_H
39# include "config.h"
40#endif
41
42#include <ctype.h>
43#include <stdio.h>
44#include <stdlib.h>
45
46#include <security/pam_appl.h>
47
47#include "openpam_impl.h"
48
49#define MIN_LINE_LENGTH 128
50
51/*
52 * OpenPAM extension
53 *
54 * Read a line from a file.
55 */
56
57char *
58openpam_readline(FILE *f, int *lineno, size_t *lenp)
59{
60 char *line;
61 size_t len, size;
62 int ch;
63
48#include "openpam_impl.h"
49
50#define MIN_LINE_LENGTH 128
51
52/*
53 * OpenPAM extension
54 *
55 * Read a line from a file.
56 */
57
58char *
59openpam_readline(FILE *f, int *lineno, size_t *lenp)
60{
61 char *line;
62 size_t len, size;
63 int ch;
64
64 if ((line = malloc(MIN_LINE_LENGTH)) == NULL)
65 if ((line = malloc(size = MIN_LINE_LENGTH)) == NULL) {
66 openpam_log(PAM_LOG_ERROR, "malloc(): %m");
65 return (NULL);
67 return (NULL);
66 size = MIN_LINE_LENGTH;
68 }
67 len = 0;
69 len = 0;
68
69#define line_putch(ch) do { \
70 if (len >= size - 1) { \
71 char *tmp = realloc(line, size *= 2); \
72 if (tmp == NULL) \
73 goto fail; \
74 line = tmp; \
75 } \
76 line[len++] = ch; \
77 line[len] = '\0'; \
78} while (0)
79
80 for (;;) {
81 ch = fgetc(f);
82 /* strip comment */
83 if (ch == '#') {
84 do {
85 ch = fgetc(f);
86 } while (ch != EOF && ch != '\n');
87 }

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

100 /* continuation */
101 if (line[len - 1] == '\\') {
102 line[--len] = '\0';
103 continue;
104 }
105 /* done */
106 break;
107 }
70 for (;;) {
71 ch = fgetc(f);
72 /* strip comment */
73 if (ch == '#') {
74 do {
75 ch = fgetc(f);
76 } while (ch != EOF && ch != '\n');
77 }

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

90 /* continuation */
91 if (line[len - 1] == '\\') {
92 line[--len] = '\0';
93 continue;
94 }
95 /* done */
96 break;
97 }
108 /* whitespace */
109 if (isspace(ch)) {
110 /* ignore leading whitespace */
111 /* collapse linear whitespace */
112 if (len > 0 && line[len - 1] != ' ')
113 line_putch(' ');
114 continue;
115 }
116 /* anything else */
98 /* anything else */
117 line_putch(ch);
99 if (openpam_straddch(&line, &size, &len, ch) != 0)
100 goto fail;
118 }
101 }
119
120 /* remove trailing whitespace */
121 while (len > 0 && isspace((unsigned char)line[len - 1]))
122 --len;
123 line[len] = '\0';
124 if (len == 0)
125 goto fail;
126 if (lenp != NULL)
127 *lenp = len;
102 if (len == 0)
103 goto fail;
104 if (lenp != NULL)
105 *lenp = len;
106 openpam_log(PAM_LOG_LIBDEBUG, "returning '%s'", line);
128 return (line);
129fail:
130 FREE(line);
131 return (NULL);
132}
133
134/**
107 return (line);
108fail:
109 FREE(line);
110 return (NULL);
111}
112
113/**
114 * DEPRECATED openpam_readlinev
115 *
135 * The =openpam_readline function reads a line from a file, and returns it
116 * The =openpam_readline function reads a line from a file, and returns it
136 * in a NUL-terminated buffer allocated with =malloc.
117 * in a NUL-terminated buffer allocated with =!malloc.
137 *
138 * The =openpam_readline function performs a certain amount of processing
139 * on the data it reads:
140 *
118 *
119 * The =openpam_readline function performs a certain amount of processing
120 * on the data it reads:
121 *
141 * - Comments (introduced by a hash sign) are stripped, as is leading and
142 * trailing whitespace.
143 * - Any amount of linear whitespace is collapsed to a single space.
122 * - Comments (introduced by a hash sign) are stripped.
123 *
144 * - Blank lines are ignored.
124 * - Blank lines are ignored.
125 *
145 * - If a line ends in a backslash, the backslash is stripped and the
146 * next line is appended.
147 *
148 * If =lineno is not =NULL, the integer variable it points to is
149 * incremented every time a newline character is read.
150 *
151 * If =lenp is not =NULL, the length of the line (not including the
152 * terminating NUL character) is stored in the variable it points to.
153 *
154 * The caller is responsible for releasing the returned buffer by passing
126 * - If a line ends in a backslash, the backslash is stripped and the
127 * next line is appended.
128 *
129 * If =lineno is not =NULL, the integer variable it points to is
130 * incremented every time a newline character is read.
131 *
132 * If =lenp is not =NULL, the length of the line (not including the
133 * terminating NUL character) is stored in the variable it points to.
134 *
135 * The caller is responsible for releasing the returned buffer by passing
155 * it to =free.
136 * it to =!free.
137 *
138 * >openpam_readlinev
139 * >openpam_readword
156 */
140 */