1 --- texlive-20080816-source.orig/texk/afm2pl/afm2pl.c 2009-07-04 10:12:19.883158871 +0200
2 +++ texlive-20080816-source/texk/afm2pl/afm2pl.c 2009-07-04 10:58:24.613569483 +0200
5 /* read a line from infile into buffer and obuffer */
13 afmencoding->vec[i] = ".notdef";
14 afmencoding->name = "Unspecified";
16 - while (getline ()) {
17 + while (tl_getline ()) {
18 switch (interest (paramstring ())) {
20 fontname = paramnewstring ();
24 while (param == 0 || *param == 0) {
25 - if (getline () == 0)
26 + if (tl_getline () == 0)
27 error ("! premature end in encoding file");
29 if (param[0] == '%') {
32 openin (encfilename, kpse_enc_format, ".enc");
33 for (lig_it = 0; lig_it < 2; lig_it++) {
34 - while (getline ()) {
35 + while (tl_getline ()) {
36 /* search for (ligkern) comment in line */
37 for (p = buffer; *p; p++)
40 for (i = 0; i < ligfilenames->n; i++) {
41 ligfilename = openin (ligfilenames->names[i],
42 kpse_lig_format, ".lig");
44 + while (tl_getline ())
45 checkligkern (buffer, 0); /* 2nd param 0: lig file */
49 for (i = 0; i < Ligfilenames->n; i++) {
50 ligfilename = openin (Ligfilenames->names[i],
51 kpse_lig_format, ".lig");
53 + while (tl_getline ())
54 checkligkern (buffer, 0); /* 2nd param 0: lig file */
57 --- texlive-20080816-source.orig/texk/dvipsk/afm2tfm.c 2009-07-04 10:12:20.843158881 +0200
58 +++ texlive-20080816-source/texk/dvipsk/afm2tfm.c 2009-07-04 11:00:22.889536405 +0200
64 +tl_getline P1H(void) {
71 ai->adobename = "||" ; /* boundary character name */
73 + while (tl_getline()) {
74 switch(interest(paramstring())) {
76 fontname = paramnewstring() ;
80 while (param == 0 || *param == 0) {
82 + if (tl_getline() == 0)
83 error("! premature end in encoding file") ;
84 for (p=buffer; *p; p++)
89 error("! token 258 in encoding must be make-array (])") ;
91 + while (tl_getline()) {
92 for (p=buffer; *p; p++)
94 if (ignoreligkern == 0)
95 --- texlive-20080816-source.orig/texk/web2c/cpascal.h 2009-07-04 10:12:24.699825510 +0200
96 +++ texlive-20080816-source/texk/web2c/cpascal.h 2009-07-04 11:02:06.002863123 +0200
99 /* We must include this first, to resolve many C issues. */
101 +#define getline tl_getline
103 /* We only use getopt in the applications, not in web2c itself. */
104 #include <kpathsea/getopt.h>
105 --- texlive-20080816-source.orig/texk/web2c/mpware/mpto.c 2009-07-04 10:12:23.563158028 +0200
106 +++ texlive-20080816-source/texk/web2c/mpware/mpto.c 2009-07-04 11:03:43.946185385 +0200
113 { /* returns NULL on EOF or error, otherwise buf */
120 - if ((aa = getline()) == NULL)
121 + if ((aa = tl_getline()) == NULL)
122 err("btex section does not end");
124 if (getbta(aa) && *tt == 'e') {
126 postverb = troff_postverb;
128 printf("%s", predoc);
129 - while (getline() != NULL)
130 + while (tl_getline() != NULL)
132 printf("%s", postdoc);
134 --- texlive-20080816-source.orig/texk/web2c/tangleboot.p 2009-07-04 10:12:24.699825510 +0200
135 +++ texlive-20080816-source/texk/web2c/tangleboot.p 2009-07-04 12:21:16.892931576 +0200
137 if not inputln(webfile)then begin begin writeln(stdout);
138 write(stdout,'! WEB file ended during a change');error;end;
139 inputhasended:=true;goto 10;end;if linesdontmatch then n:=n+1;end;
140 -10:end;{:132}{135:}procedure getline;label 20;
141 +10:end;{:132}{135:}procedure tl_getline;label 20;
142 begin 20:if changing then{137:}begin line:=line+1;
143 if not inputln(changefile)then begin begin writeln(stdout);
144 write(stdout,'! Change file ended without @z');error;end;buffer[0]:=64;
145 @@ -604,13 +604,13 @@
146 60:controlcode:=135;61:controlcode:=2;92:controlcode:=3;
147 others:controlcode:=0 end;end;{:139}{140:}function skipahead:eightbits;
148 label 30;var c:eightbits;
149 -begin while true do begin if loc>limit then begin getline;
150 +begin while true do begin if loc>limit then begin tl_getline;
151 if inputhasended then begin c:=136;goto 30;end;end;buffer[limit+1]:=64;
152 while buffer[loc]<>64 do loc:=loc+1;if loc<=limit then begin loc:=loc+2;
153 c:=controlcode(buffer[loc-1]);if(c<>0)or(buffer[loc-1]=62)then goto 30;
154 end;end;30:skipahead:=c;end;{:140}{141:}procedure skipcomment;label 10;
155 var bal:eightbits;c:ASCIIcode;begin bal:=0;
156 -while true do begin if loc>limit then begin getline;
157 +while true do begin if loc>limit then begin tl_getline;
158 if inputhasended then begin begin writeln(stdout);
159 write(stdout,'! Input ended in mid-comment');error;end;goto 10;end;end;
160 c:=buffer[loc];loc:=loc+1;{142:}if c=64 then begin c:=buffer[loc];
162 then bal:=bal+1 else if c=125 then begin if bal=0 then goto 10;
163 bal:=bal-1;end{:142};end;10:end;{:141}{145:}function getnext:eightbits;
164 label 20,30,31;var c:eightbits;d:eightbits;j,k:0..longestname;
165 -begin 20:if loc>limit then begin getline;
166 +begin 20:if loc>limit then begin tl_getline;
167 if inputhasended then begin c:=136;goto 31;end;end;c:=buffer[loc];
169 if scanninghex then{146:}if((c>=48)and(c<=57))or((c>=65)and(c<=70))then
171 64:{150:}begin c:=controlcode(buffer[loc]);loc:=loc+1;
172 if c=0 then goto 20 else if c=13 then scanninghex:=true else if c=135
173 then{151:}begin{153:}k:=0;
174 -while true do begin if loc>limit then begin getline;
175 +while true do begin if loc>limit then begin tl_getline;
176 if inputhasended then begin begin writeln(stdout);
177 write(stdout,'! Input ended in section name');error;end;goto 30;end;end;
178 d:=buffer[loc];{154:}if d=64 then begin d:=buffer[loc+1];
179 --- texlive-20080816-source.orig/texk/dvi2tty/dvistuff.c 2009-07-04 10:12:21.486492239 +0200
180 +++ texlive-20080816-source/texk/dvi2tty/dvistuff.c 2009-07-04 12:34:19.938973989 +0200
182 void ruleaux P3H(long, long, char);
183 long horizontalmove P1H(long);
184 int skipnops P1H(void);
185 -linetype * getline P1H(void);
186 +linetype * tl_getline P1H(void);
187 linetype * findline P1H(void);
188 unsigned long num P1H(int);
191 void ruleaux (long, long, char);
192 long horizontalmove (long);
194 -linetype * getline (void);
195 +linetype * tl_getline (void);
196 linetype * findline (void);
197 unsigned long num (int);
201 long horizontalmove ();
203 -linetype * getline ();
204 +linetype * tl_getline ();
205 linetype * findline ();
206 unsigned long num ();
209 h = 0L; v = 0L; /* initialize coordinates */
210 x = 0L; w = 0L; y = 0L; z = 0L; /* initialize amounts */
211 sptr = 0; /* initialize stack */
212 - currentline = getline(); /* initialize list of lines */
213 + currentline = tl_getline(); /* initialize list of lines */
214 currentline->vv = 0L;
215 firstline = currentline;
216 lastline = currentline;
219 /*----------------------------------------------------------------------------*/
221 -linetype *getline() /* returns an initialized line-object */
222 +linetype *tl_getline() /* returns an initialized line-object */
225 register linetype *temp;
227 temp->text[i] = '\0';
233 /*----------------------------------------------------------------------------*/
237 if (v <= firstline->vv) { /* above first line */
238 if (firstline->vv - v > VERTICALEPSILON) {
240 + temp = tl_getline();
241 temp->next = firstline;
242 firstline->prev = temp;
246 if (v >= lastline->vv) { /* below last line */
247 if (v - lastline->vv > VERTICALEPSILON) {
249 + temp = tl_getline();
250 temp->prev = lastline;
251 lastline->next = temp;
256 /* no line fits suitable, generate a new one */
257 - currentline = getline();
258 + currentline = tl_getline();
259 currentline->next = temp->next;
260 currentline->prev = temp;
261 temp->next->prev = currentline;
262 --- texlive-20080816-source.orig/texk/ttf2pk/newobj.c 2009-07-04 10:12:21.579825377 +0200
263 +++ texlive-20080816-source/texk/ttf2pk/newobj.c 2009-07-04 13:24:44.943254190 +0200
268 -getline(char **bufferp, FILE *f)
269 +tl_getline(char **bufferp, FILE *f)
273 --- texlive-20080816-source.orig/texk/ttf2pk/newobj.h 2009-07-04 10:12:21.536492551 +0200
274 +++ texlive-20080816-source/texk/ttf2pk/newobj.h 2009-07-04 13:25:35.789915748 +0200
276 void *myrealloc(void *oldp, size_t len);
278 char *get_line(FILE *f);
279 -Boolean getline(char **bufferp, FILE *f);
280 +Boolean tl_getline(char **bufferp, FILE *f);
281 char *newstring(char *s);
283 ttfinfo *newchar(Font *fnt);
284 --- texlive-20080816-source.orig/texk/ttf2pk/parse.c 2009-07-04 10:12:21.576492082 +0200
285 +++ texlive-20080816-source/texk/ttf2pk/parse.c 2009-07-04 13:26:10.178664088 +0200
290 - if (getline(bufferp, f) == False)
291 + if (tl_getline(bufferp, f) == False)
292 oops("Premature end in encoding file.");
296 "Token 258 in encoding must be make-array (]).");
299 - while (getline(&buffer, enc_file))
300 + while (tl_getline(&buffer, enc_file))
302 for (p = buffer; *p; p++)
305 if (replacement_file == NULL)
306 oops("Cannot open replacement file `%s'.", real_replacement_name);
308 - while (getline(&buffer, replacement_file))
309 + while (tl_getline(&buffer, replacement_file))
311 for (p = buffer; *p; p++)
313 --- texlive-20080816-source.orig/libs/lua51/ldebug.c 2009-07-04 10:12:19.813158914 +0200
314 +++ texlive-20080816-source/libs/lua51/ldebug.c 2009-07-06 12:07:17.645671661 +0200
317 return -1; /* only active lua functions have current-line information */
319 - return getline(ci_func(ci)->l.p, pc);
320 + return tl_getline(ci_func(ci)->l.p, pc);
324 --- texlive-20080816-source.orig/libs/lua51/ldebug.h 2009-07-04 10:12:19.813158914 +0200
325 +++ texlive-20080816-source/libs/lua51/ldebug.h 2009-07-06 12:07:17.648962801 +0200
328 #define pcRel(pc, p) (cast(int, (pc) - (p)->code) - 1)
330 -#define getline(f,pc) (((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
331 +#define tl_getline(f,pc) (((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
333 #define resethookcount(L) (L->hookcount = L->basehookcount)
335 --- texlive-20080816-source.orig/libs/lua51/lvm.c 2009-07-04 10:12:19.816492277 +0200
336 +++ texlive-20080816-source/libs/lua51/lvm.c 2009-07-06 12:07:17.702572571 +0200
338 if (mask & LUA_MASKLINE) {
339 Proto *p = ci_func(L->ci)->l.p;
340 int npc = pcRel(pc, p);
341 - int newline = getline(p, npc);
342 + int newline = tl_getline(p, npc);
343 /* call linehook when enter a new function, when jump back (loop),
344 or when enter a new line */
345 - if (npc == 0 || pc <= oldpc || newline != getline(p, pcRel(oldpc, p)))
346 + if (npc == 0 || pc <= oldpc || newline != tl_getline(p, pcRel(oldpc, p)))
347 luaD_callhook(L, LUA_HOOKLINE, newline);
350 --- texlive-20080816-source.orig/libs/lua51/print.c 2009-07-04 10:12:19.813158914 +0200
351 +++ texlive-20080816-source/libs/lua51/print.c 2009-07-06 12:07:17.705304192 +0200
355 int sbx=GETARG_sBx(i);
356 - int line=getline(f,pc);
357 + int line=tl_getline(f,pc);
358 printf("\t%d\t",pc+1);
359 if (line>0) printf("[%d]\t",line); else printf("[-]\t");
360 printf("%-9s\t",luaP_opnames[o]);