Deleted Added
sdiff udiff text old ( 165903 ) new ( 178287 )
full compact
findfp.c (165903) findfp.c (178287)
1/*-
2 * Copyright (c) 1990, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Chris Torek.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 */
32
33#if defined(LIBC_SCCS) && !defined(lint)
34static char sccsid[] = "@(#)findfp.c 8.2 (Berkeley) 1/4/94";
35#endif /* LIBC_SCCS and not lint */
36#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1990, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Chris Torek.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 */
32
33#if defined(LIBC_SCCS) && !defined(lint)
34static char sccsid[] = "@(#)findfp.c 8.2 (Berkeley) 1/4/94";
35#endif /* LIBC_SCCS and not lint */
36#include <sys/cdefs.h>
37__FBSDID("$FreeBSD: head/lib/libc/stdio/findfp.c 165903 2007-01-09 00:28:16Z imp $");
37__FBSDID("$FreeBSD: head/lib/libc/stdio/findfp.c 178287 2008-04-17 22:17:54Z jhb $");
38
39#include <sys/param.h>
40#include <machine/atomic.h>
41#include <unistd.h>
42#include <stdio.h>
43#include <stdlib.h>
44#include <string.h>
45
46#include <spinlock.h>
47
48#include "libc_private.h"
49#include "local.h"
50#include "glue.h"
51
52int __sdidinit;
53
54#define NDYNAMIC 10 /* add ten more whenever necessary */
55
56#define std(flags, file) \
38
39#include <sys/param.h>
40#include <machine/atomic.h>
41#include <unistd.h>
42#include <stdio.h>
43#include <stdlib.h>
44#include <string.h>
45
46#include <spinlock.h>
47
48#include "libc_private.h"
49#include "local.h"
50#include "glue.h"
51
52int __sdidinit;
53
54#define NDYNAMIC 10 /* add ten more whenever necessary */
55
56#define std(flags, file) \
57 {0,0,0,flags,file,{0},0,__sF+file,__sclose,__sread,__sseek,__swrite, \
58 {0}, __sFX + file}
57 {0,0,0,flags,file,{0},0,__sF+file,__sclose,__sread,__sseek,__swrite}
59 /* p r w flags file _bf z cookie close read seek write */
58 /* p r w flags file _bf z cookie close read seek write */
60 /* _ub _extra */
59
61 /* the usual - (stdin + stdout + stderr) */
62static FILE usual[FOPEN_MAX - 3];
60 /* the usual - (stdin + stdout + stderr) */
61static FILE usual[FOPEN_MAX - 3];
63static struct __sFILEX usual_extra[FOPEN_MAX - 3];
64static struct glue uglue = { NULL, FOPEN_MAX - 3, usual };
65
62static struct glue uglue = { NULL, FOPEN_MAX - 3, usual };
63
66static struct __sFILEX __sFX[3];
67
68/*
69 * We can't make this 'static' until 6.0-current due to binary
70 * compatibility concerns. This also means we cannot change the
71 * sizeof(FILE) until that time either and must continue to use the
72 * __sFILEX stuff to add to FILE.
73 */
74FILE __sF[3] = {
64static FILE __sF[3] = {
75 std(__SRD, STDIN_FILENO),
76 std(__SWR, STDOUT_FILENO),
77 std(__SWR|__SNBF, STDERR_FILENO)
78};
79
65 std(__SRD, STDIN_FILENO),
66 std(__SWR, STDOUT_FILENO),
67 std(__SWR|__SNBF, STDERR_FILENO)
68};
69
80/*
81 * The following kludge is done to ensure enough binary compatibility
82 * with future versions of libc. Or rather it allows us to work with
83 * libraries that have been built with a newer libc that defines these
84 * symbols and expects libc to provide them. We only have need to support
85 * i386 because it is the only "old" system we have deployed.
86 */
87FILE *__stdinp = &__sF[0];
88FILE *__stdoutp = &__sF[1];
89FILE *__stderrp = &__sF[2];
90
91struct glue __sglue = { &uglue, 3, __sF };
92static struct glue *lastglue = &uglue;
93
94static struct glue * moreglue(int);

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

104#endif
105
106static struct glue *
107moreglue(n)
108 int n;
109{
110 struct glue *g;
111 static FILE empty;
70FILE *__stdinp = &__sF[0];
71FILE *__stdoutp = &__sF[1];
72FILE *__stderrp = &__sF[2];
73
74struct glue __sglue = { &uglue, 3, __sF };
75static struct glue *lastglue = &uglue;
76
77static struct glue * moreglue(int);

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

87#endif
88
89static struct glue *
90moreglue(n)
91 int n;
92{
93 struct glue *g;
94 static FILE empty;
112 static struct __sFILEX emptyx;
113 FILE *p;
95 FILE *p;
114 struct __sFILEX *fx;
115
96
116 g = (struct glue *)malloc(sizeof(*g) + ALIGNBYTES + n * sizeof(FILE) +
117 n * sizeof(struct __sFILEX));
97 g = (struct glue *)malloc(sizeof(*g) + ALIGNBYTES + n * sizeof(FILE));
118 if (g == NULL)
119 return (NULL);
120 p = (FILE *)ALIGN(g + 1);
98 if (g == NULL)
99 return (NULL);
100 p = (FILE *)ALIGN(g + 1);
121 fx = (struct __sFILEX *)&p[n];
122 g->next = NULL;
123 g->niobs = n;
124 g->iobs = p;
101 g->next = NULL;
102 g->niobs = n;
103 g->iobs = p;
125 while (--n >= 0) {
126 *p = empty;
127 p->_extra = fx;
128 *p->_extra = emptyx;
129 p++, fx++;
130 }
104 while (--n >= 0)
105 *p++ = empty;
131 return (g);
132}
133
134/*
135 * Find a free FILE for fopen et al.
136 */
137FILE *
138__sfp()

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

170 fp->_lbfsize = 0; /* not line buffered */
171 fp->_file = -1; /* no file */
172/* fp->_cookie = <any>; */ /* caller sets cookie, _read/_write etc */
173 fp->_ub._base = NULL; /* no ungetc buffer */
174 fp->_ub._size = 0;
175 fp->_lb._base = NULL; /* no line buffer */
176 fp->_lb._size = 0;
177/* fp->_lock = NULL; */ /* once set always set (reused) */
106 return (g);
107}
108
109/*
110 * Find a free FILE for fopen et al.
111 */
112FILE *
113__sfp()

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

145 fp->_lbfsize = 0; /* not line buffered */
146 fp->_file = -1; /* no file */
147/* fp->_cookie = <any>; */ /* caller sets cookie, _read/_write etc */
148 fp->_ub._base = NULL; /* no ungetc buffer */
149 fp->_ub._size = 0;
150 fp->_lb._base = NULL; /* no line buffer */
151 fp->_lb._size = 0;
152/* fp->_lock = NULL; */ /* once set always set (reused) */
178 fp->_extra->orientation = 0;
179 memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t));
153 fp->_orientation = 0;
154 memset(&fp->_mbstate, 0, sizeof(mbstate_t));
180 return (fp);
181}
182
183/*
184 * XXX. Force immediate allocation of internal memory. Not used by stdio,
185 * but documented historically for certain applications. Bad applications.
186 */
187__warn_references(f_prealloc,

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

224}
225
226/*
227 * __sinit() is called whenever stdio's internal variables must be set up.
228 */
229void
230__sinit()
231{
155 return (fp);
156}
157
158/*
159 * XXX. Force immediate allocation of internal memory. Not used by stdio,
160 * but documented historically for certain applications. Bad applications.
161 */
162__warn_references(f_prealloc,

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

199}
200
201/*
202 * __sinit() is called whenever stdio's internal variables must be set up.
203 */
204void
205__sinit()
206{
232 int i;
233
207
234 THREAD_LOCK();
235 if (__sdidinit == 0) {
236 /* Set _extra for the usual suspects. */
237 for (i = 0; i < FOPEN_MAX - 3; i++)
238 usual[i]._extra = &usual_extra[i];
239
240 /* Make sure we clean up on exit. */
241 __cleanup = _cleanup; /* conservative */
242 __sdidinit = 1;
243 }
244 THREAD_UNLOCK();
208 /* Make sure we clean up on exit. */
209 __cleanup = _cleanup; /* conservative */
210 __sdidinit = 1;
245}
211}