- tangleboot.p, dvistuff.c patching

Changed files:
    texlive-getline.patch -> 1.2

diff --git a/texlive-getline.patch b/texlive-getline.patch
index eb8ff98448a1e86e311998c1880015028337cb7f..d495d32d125e9cdd0b37a3ce5a7e2e3087e19282 100644 (file)
--- a/texlive-getline.patch
+++ b/texlive-getline.patch
@@ -131,3 +131,131 @@
        do_line();
      printf("%s", postdoc);
      exit(0);
+--- texlive-20080816-source.orig/texk/web2c/tangleboot.p       2009-07-04 10:12:24.699825510 +0200
++++ texlive-20080816-source/texk/web2c/tangleboot.p    2009-07-04 12:21:16.892931576 +0200
+@@ -577,7 +577,7 @@
+ if not inputln(webfile)then begin begin writeln(stdout);
+ write(stdout,'! WEB file ended during a change');error;end;
+ inputhasended:=true;goto 10;end;if linesdontmatch then n:=n+1;end;
+-10:end;{:132}{135:}procedure getline;label 20;
++10:end;{:132}{135:}procedure tl_getline;label 20;
+ begin 20:if changing then{137:}begin line:=line+1;
+ if not inputln(changefile)then begin begin writeln(stdout);
+ write(stdout,'! Change file ended without @z');error;end;buffer[0]:=64;
+@@ -604,13 +604,13 @@
+ 60:controlcode:=135;61:controlcode:=2;92:controlcode:=3;
+ others:controlcode:=0 end;end;{:139}{140:}function skipahead:eightbits;
+ label 30;var c:eightbits;
+-begin while true do begin if loc>limit then begin getline;
++begin while true do begin if loc>limit then begin tl_getline;
+ if inputhasended then begin c:=136;goto 30;end;end;buffer[limit+1]:=64;
+ while buffer[loc]<>64 do loc:=loc+1;if loc<=limit then begin loc:=loc+2;
+ c:=controlcode(buffer[loc-1]);if(c<>0)or(buffer[loc-1]=62)then goto 30;
+ end;end;30:skipahead:=c;end;{:140}{141:}procedure skipcomment;label 10;
+ var bal:eightbits;c:ASCIIcode;begin bal:=0;
+-while true do begin if loc>limit then begin getline;
++while true do begin if loc>limit then begin tl_getline;
+ if inputhasended then begin begin writeln(stdout);
+ write(stdout,'! Input ended in mid-comment');error;end;goto 10;end;end;
+ c:=buffer[loc];loc:=loc+1;{142:}if c=64 then begin c:=buffer[loc];
+@@ -622,7 +622,7 @@
+ then bal:=bal+1 else if c=125 then begin if bal=0 then goto 10;
+ bal:=bal-1;end{:142};end;10:end;{:141}{145:}function getnext:eightbits;
+ label 20,30,31;var c:eightbits;d:eightbits;j,k:0..longestname;
+-begin 20:if loc>limit then begin getline;
++begin 20:if loc>limit then begin tl_getline;
+ if inputhasended then begin c:=136;goto 31;end;end;c:=buffer[loc];
+ loc:=loc+1;
+ if scanninghex then{146:}if((c>=48)and(c<=57))or((c>=65)and(c<=70))then
+@@ -647,7 +647,7 @@
+ 64:{150:}begin c:=controlcode(buffer[loc]);loc:=loc+1;
+ if c=0 then goto 20 else if c=13 then scanninghex:=true else if c=135
+ then{151:}begin{153:}k:=0;
+-while true do begin if loc>limit then begin getline;
++while true do begin if loc>limit then begin tl_getline;
+ if inputhasended then begin begin writeln(stdout);
+ write(stdout,'! Input ended in section name');error;end;goto 30;end;end;
+ d:=buffer[loc];{154:}if d=64 then begin d:=buffer[loc+1];
+--- texlive-20080816-source.orig/texk/dvi2tty/dvistuff.c       2009-07-04 10:12:21.486492239 +0200
++++ texlive-20080816-source/texk/dvi2tty/dvistuff.c    2009-07-04 12:34:19.938973989 +0200
+@@ -123,7 +123,7 @@
+ void            ruleaux         P3H(long, long, char);
+ long            horizontalmove  P1H(long);
+ int             skipnops        P1H(void);
+-linetype    *   getline         P1H(void);
++linetype    *   tl_getline         P1H(void);
+ linetype    *   findline        P1H(void);
+ unsigned long   num             P1H(int);
+ long            snum            P1H(int);
+@@ -149,7 +149,7 @@
+ void            ruleaux         (long, long, char);
+ long            horizontalmove  (long);
+ int             skipnops        (void);
+-linetype    *   getline         (void);
++linetype    *   tl_getline         (void);
+ linetype    *   findline        (void);
+ unsigned long   num             (int);
+ long            snum            (int);
+@@ -174,7 +174,7 @@
+ void            ruleaux         ();
+ long            horizontalmove  ();
+ int             skipnops        ();
+-linetype    *   getline         ();
++linetype    *   tl_getline         ();
+ linetype    *   findline        ();
+ unsigned long   num             ();
+ long            snum            ();
+@@ -316,7 +316,7 @@
+     h = 0L;  v = 0L;                        /* initialize coordinates   */
+     x = 0L;  w = 0L;  y = 0L;  z = 0L;      /* initialize amounts       */
+     sptr = 0;                               /* initialize stack         */
+-    currentline = getline();                /* initialize list of lines */
++    currentline = tl_getline();                /* initialize list of lines */
+     currentline->vv = 0L;
+     firstline   = currentline;
+     lastline    = currentline;
+@@ -671,7 +671,7 @@
+ 
+ /*----------------------------------------------------------------------------*/
+ 
+-linetype *getline()             /* returns an initialized line-object */
++linetype *tl_getline()             /* returns an initialized line-object */
+ {
+     register int  i;
+     register linetype *temp;
+@@ -686,7 +686,7 @@
+     temp->text[i] = '\0';
+     return temp;
+ 
+-} /* getline */
++} /* tl_getline */
+ 
+ /*----------------------------------------------------------------------------*/
+ 
+@@ -697,7 +697,7 @@
+ 
+     if (v <= firstline->vv) {                      /* above first line */
+         if (firstline->vv - v > VERTICALEPSILON) {
+-            temp = getline();
++            temp = tl_getline();
+             temp->next = firstline;
+             firstline->prev = temp;
+             temp->vv = v;
+@@ -708,7 +708,7 @@
+ 
+     if (v >= lastline->vv) {                       /* below last line */
+         if (v - lastline->vv > VERTICALEPSILON) {
+-            temp = getline();
++            temp = tl_getline();
+             temp->prev = lastline;
+             lastline->next = temp;
+             temp->vv = v;
+@@ -732,7 +732,7 @@
+     }
+ 
+     /* no line fits suitable, generate a new one */
+-    currentline = getline();
++    currentline = tl_getline();
+     currentline->next = temp->next;
+     currentline->prev = temp;
+     temp->next->prev = currentline;