summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2023-08-01 14:42:54 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2023-08-01 14:42:54 +0000
commitdf7406293837602e2de77ae834b7ec9c822c436f (patch)
tree6546ce5a6af3d67215ca20f47c9a9e84455cf354 /Build/source
parente0b0be42765cdf51f3c13794a0983beffc83bd92 (diff)
[CWEB] Squeeze section 51 to preserve page count.
git-svn-id: svn://tug.org/texlive/trunk@67786 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/web2c/cwebboot.cin142
-rw-r--r--Build/source/texk/web2c/cwebdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-w2c.ch4
-rw-r--r--Build/source/texk/web2c/cwebdir/common.c102
-rw-r--r--Build/source/texk/web2c/cwebdir/common.w4
5 files changed, 129 insertions, 129 deletions
diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin
index 8889fceedae..e579678f617 100644
--- a/Build/source/texk/web2c/cwebboot.cin
+++ b/Build/source/texk/web2c/cwebboot.cin
@@ -370,12 +370,12 @@ hash_pointer hash_end= hash+hash_size-1;
hash_pointer h;
/*:46*//*65:*/
-#line 1003 "cwebdir/common.w"
+#line 1001 "cwebdir/common.w"
int history= spotless;
/*:65*//*73:*/
-#line 1126 "cwebdir/common.w"
+#line 1124 "cwebdir/common.w"
int argc;
char**argv;
@@ -385,11 +385,11 @@ char idx_file_name[max_file_name_length];
#line 453 "cwebdir/comm-w2c.ch"
char scn_file_name[max_file_name_length];
char check_file_name[max_file_name_length];
-#line 1133 "cwebdir/common.w"
+#line 1131 "cwebdir/common.w"
boolean flags[128];
/*:73*//*83:*/
-#line 1267 "cwebdir/common.w"
+#line 1265 "cwebdir/common.w"
FILE*C_file;
FILE*tex_file;
@@ -398,7 +398,7 @@ FILE*scn_file;
#line 583 "cwebdir/comm-w2c.ch"
FILE*active_file;
FILE*check_file;
-#line 1273 "cwebdir/common.w"
+#line 1271 "cwebdir/common.w"
#line 600 "cwebdir/comm-w2c.ch"
/*:83*//*86:*/
@@ -471,18 +471,18 @@ static void prime_the_change_buffer(void);
static void check_change(void);
/*:33*//*55:*/
-#line 764 "cwebdir/common.w"
+#line 762 "cwebdir/common.w"
static int web_strcmp(char*,size_t,char*,size_t);
static name_pointer add_section_name(name_pointer,int,char*,char*,boolean);
static void extend_section_name(name_pointer,char*,char*,boolean);
/*:55*//*64:*/
-#line 991 "cwebdir/common.w"
+#line 989 "cwebdir/common.w"
static int section_name_cmp(char**,size_t,name_pointer);
/*:64*//*76:*/
-#line 1186 "cwebdir/common.w"
+#line 1184 "cwebdir/common.w"
static void scan_args(void);
#line 513 "cwebdir/comm-w2c.ch"
@@ -548,11 +548,11 @@ textdomain("cweb");
#line 85 "cwebdir/comm-w2c.ch"
/*74:*/
-#line 1139 "cwebdir/common.w"
+#line 1137 "cwebdir/common.w"
#line 460 "cwebdir/comm-w2c.ch"
make_xrefs= true;
-#line 1141 "cwebdir/common.w"
+#line 1139 "cwebdir/common.w"
/*:74*/
#line 86 "cwebdir/comm-w2c.ch"
@@ -611,7 +611,7 @@ fatal(_("! Cannot open output file "),check_file_name);
else if((tex_file= fopen(tex_file_name,"wb"))==NULL)
fatal(_("! Cannot open output file "),tex_file_name);
}
-#line 1285 "cwebdir/common.w"
+#line 1283 "cwebdir/common.w"
#line 618 "cwebdir/comm-w2c.ch"
/*:84*/
@@ -1022,10 +1022,8 @@ if(name_ptr>=name_dir_end)overflow(_("name"));
strncpy(byte_ptr,first,l);
(++name_ptr)->byte_start= byte_ptr+= l;
#line 306 "cwebdir/comm-w2c.ch"
-if(program!=ctangle){
+if(program!=ctangle)p->ilk= t,init_node(p);
#line 680 "cwebdir/common.w"
-p->ilk= t;init_node(p);
-}
}
/*:51*/
@@ -1035,7 +1033,7 @@ return p;
}
/*:48*//*52:*/
-#line 708 "cwebdir/common.w"
+#line 706 "cwebdir/common.w"
void
print_section_name(
@@ -1054,7 +1052,7 @@ if(q)term_write("...",3);
}
/*:52*//*53:*/
-#line 725 "cwebdir/common.w"
+#line 723 "cwebdir/common.w"
void
sprint_section_name(
@@ -1074,7 +1072,7 @@ s= p->byte_start;
}
/*:53*//*54:*/
-#line 743 "cwebdir/common.w"
+#line 741 "cwebdir/common.w"
void
print_prefix_name(
@@ -1087,7 +1085,7 @@ if(s+l<(p+1)->byte_start)term_write("...",3);
}
/*:54*//*56:*/
-#line 769 "cwebdir/common.w"
+#line 767 "cwebdir/common.w"
static int web_strcmp(
char*j,
@@ -1105,7 +1103,7 @@ else return greater;
}
/*:56*//*57:*/
-#line 798 "cwebdir/common.w"
+#line 796 "cwebdir/common.w"
static name_pointer
add_section_name(
@@ -1121,7 +1119,7 @@ size_t name_len= (size_t)(last-first+(int)ispref);
#line 313 "cwebdir/comm-w2c.ch"
if(s+name_len> byte_mem_end)overflow(_("byte memory"));
if(name_ptr+1>=name_dir_end)overflow(_("name"));
-#line 812 "cwebdir/common.w"
+#line 810 "cwebdir/common.w"
(++name_ptr)->byte_start= byte_ptr= s+name_len;
if(ispref){
*(byte_ptr-1)= ' ';
@@ -1137,7 +1135,7 @@ return par==NULL?(root= p):c==less?(par->llink= p):(par->rlink= p);
}
/*:57*//*58:*/
-#line 826 "cwebdir/common.w"
+#line 824 "cwebdir/common.w"
static void
extend_section_name(
@@ -1151,21 +1149,21 @@ name_pointer q= p+1;
size_t name_len= (size_t)(last-first+(int)ispref);
#line 320 "cwebdir/comm-w2c.ch"
if(name_ptr>=name_dir_end)overflow(_("name"));
-#line 838 "cwebdir/common.w"
+#line 836 "cwebdir/common.w"
while(q->link!=name_dir)q= q->link;
q->link= name_ptr;
s= name_ptr->byte_start;
name_ptr->link= name_dir;
#line 326 "cwebdir/comm-w2c.ch"
if(s+name_len> byte_mem_end)overflow(_("byte memory"));
-#line 843 "cwebdir/common.w"
+#line 841 "cwebdir/common.w"
(++name_ptr)->byte_start= byte_ptr= s+name_len;
strncpy(s,first,name_len);
if(ispref)*(byte_ptr-1)= ' ';
}
/*:58*//*59:*/
-#line 854 "cwebdir/common.w"
+#line 852 "cwebdir/common.w"
name_pointer
section_lookup(
@@ -1180,7 +1178,7 @@ name_pointer par= NULL;
size_t name_len= (size_t)(last-first+1);
/*60:*/
-#line 878 "cwebdir/common.w"
+#line 876 "cwebdir/common.w"
while(p){
c= web_strcmp(first,name_len,first_chunk(p),prefix_length(p));
@@ -1192,12 +1190,12 @@ p= (c==less?p->llink:p->rlink);
if(r!=NULL){
#line 332 "cwebdir/comm-w2c.ch"
fputs(_("\n! Ambiguous prefix: matches <"),stdout);
-#line 888 "cwebdir/common.w"
+#line 886 "cwebdir/common.w"
print_prefix_name(p);
#line 338 "cwebdir/comm-w2c.ch"
fputs(_(">\n and <"),stdout);
-#line 891 "cwebdir/common.w"
+#line 889 "cwebdir/common.w"
print_prefix_name(r);
err_print(">");
return name_dir;
@@ -1211,19 +1209,19 @@ p= q,q= NULL;
}
/*:60*/
-#line 868 "cwebdir/common.w"
+#line 866 "cwebdir/common.w"
/*61:*/
-#line 903 "cwebdir/common.w"
+#line 901 "cwebdir/common.w"
if(r==NULL)
return add_section_name(par,c,first,last+1,ispref);
/*:61*/
-#line 869 "cwebdir/common.w"
+#line 867 "cwebdir/common.w"
/*62:*/
-#line 911 "cwebdir/common.w"
+#line 909 "cwebdir/common.w"
switch(section_name_cmp(&first,name_len,r)){
@@ -1231,7 +1229,7 @@ case prefix:
if(!ispref){
#line 344 "cwebdir/comm-w2c.ch"
fputs(_("\n! New name is a prefix of <"),stdout);
-#line 917 "cwebdir/common.w"
+#line 915 "cwebdir/common.w"
print_section_name(r);
err_print(">");
@@ -1245,7 +1243,7 @@ break;
case bad_extension:
#line 350 "cwebdir/comm-w2c.ch"
fputs(_("\n! New name extends <"),stdout);
-#line 929 "cwebdir/common.w"
+#line 927 "cwebdir/common.w"
print_section_name(r);
err_print(">");
@@ -1253,24 +1251,24 @@ break;
default:
#line 356 "cwebdir/comm-w2c.ch"
fputs(_("\n! Section name incompatible with <"),stdout);
-#line 935 "cwebdir/common.w"
+#line 933 "cwebdir/common.w"
print_prefix_name(r);
#line 362 "cwebdir/comm-w2c.ch"
fputs(_(">,\n which abbreviates <"),stdout);
-#line 938 "cwebdir/common.w"
+#line 936 "cwebdir/common.w"
print_section_name(r);
err_print(">");
}
return r;
/*:62*/
-#line 870 "cwebdir/common.w"
+#line 868 "cwebdir/common.w"
}
/*:59*//*63:*/
-#line 959 "cwebdir/common.w"
+#line 957 "cwebdir/common.w"
static int section_name_cmp(
char**pfirst,
@@ -1304,7 +1302,7 @@ default:return c;
}
/*:63*//*66:*/
-#line 1013 "cwebdir/common.w"
+#line 1011 "cwebdir/common.w"
void
err_print(
@@ -1312,7 +1310,7 @@ const char*s)
{
*s=='!'?printf("\n%s",s):printf("%s",s);
if(web_file_open)/*67:*/
-#line 1032 "cwebdir/common.w"
+#line 1030 "cwebdir/common.w"
{char*k,*l;
if(changing&&include_depth==change_depth)
@@ -1320,7 +1318,7 @@ if(changing&&include_depth==change_depth)
printf(_(". (l. %d of change file)\n"),change_line);
else if(include_depth==0)printf(_(". (l. %d)\n"),cur_line);
else printf(_(". (l. %d of include file %s)\n"),cur_line,cur_file_name);
-#line 1038 "cwebdir/common.w"
+#line 1036 "cwebdir/common.w"
l= (loc>=limit?limit:loc);
if(l> buffer){
for(k= buffer;k<l;k++)
@@ -1335,13 +1333,13 @@ putchar(' ');
}
/*:67*/
-#line 1019 "cwebdir/common.w"
+#line 1017 "cwebdir/common.w"
update_terminal();mark_error();
}
/*:66*//*68:*/
-#line 1065 "cwebdir/common.w"
+#line 1063 "cwebdir/common.w"
int wrap_up(void){
if(show_progress)new_line();
@@ -1349,7 +1347,7 @@ if(show_stats)
print_stats();
#line 400 "cwebdir/comm-w2c.ch"
/*69:*/
-#line 1075 "cwebdir/common.w"
+#line 1073 "cwebdir/common.w"
switch(history){
#line 426 "cwebdir/comm-w2c.ch"
@@ -1361,7 +1359,7 @@ case error_message:
puts(_("(Pardon me, but I think I spotted something wrong.)"));break;
case fatal_message:default:
puts(_("(That was a fatal error, my friend.)"));
-#line 1085 "cwebdir/common.w"
+#line 1083 "cwebdir/common.w"
}
/*:69*/
@@ -1386,11 +1384,11 @@ case harmless_message:return RETURN_WARN;
case error_message:return RETURN_ERROR;
case fatal_message:default:return RETURN_FAIL;
}
-#line 1073 "cwebdir/common.w"
+#line 1071 "cwebdir/common.w"
}
/*:68*//*70:*/
-#line 1093 "cwebdir/common.w"
+#line 1091 "cwebdir/common.w"
void
fatal(
const char*s,const char*t)
@@ -1401,19 +1399,19 @@ history= fatal_message;exit(wrap_up());
}
/*:70*//*71:*/
-#line 1104 "cwebdir/common.w"
+#line 1102 "cwebdir/common.w"
void
overflow(
const char*t)
{
#line 439 "cwebdir/comm-w2c.ch"
printf(_("\n! Sorry, %s capacity exceeded"),t);fatal("","");
-#line 1109 "cwebdir/common.w"
+#line 1107 "cwebdir/common.w"
}
/*:71*//*75:*/
-#line 1157 "cwebdir/common.w"
+#line 1155 "cwebdir/common.w"
static void
scan_args(void)
@@ -1436,10 +1434,10 @@ change_file_name[max_file_name_length-2]= '\0';
#endif
#line 491 "cwebdir/comm-w2c.ch"
-#line 1168 "cwebdir/common.w"
+#line 1166 "cwebdir/common.w"
while(--argc> 0){
if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*80:*/
-#line 1245 "cwebdir/common.w"
+#line 1243 "cwebdir/common.w"
#line 526 "cwebdir/comm-w2c.ch"
{
@@ -1484,7 +1482,7 @@ if(sscanf(++dot_pos,"%u",&kpathsea_debug)!=1)/*81:*/
cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
-#line 1260 "cwebdir/common.w"
+#line 1258 "cwebdir/common.w"
#line 577 "cwebdir/comm-w2c.ch"
/*:81*/
@@ -1499,11 +1497,11 @@ default:flags[(eight_bits)*dot_pos]= flag_change;continue;
break;
}
}
-#line 1248 "cwebdir/common.w"
+#line 1246 "cwebdir/common.w"
#line 569 "cwebdir/comm-w2c.ch"
/*:80*/
-#line 1169 "cwebdir/common.w"
+#line 1167 "cwebdir/common.w"
else{
s= name_pos= *argv;dot_pos= NULL;
@@ -1514,20 +1512,20 @@ else if(*s==DIR_SEPARATOR||*s==DEVICE_SEPARATOR||*s=='/')
dot_pos= NULL,name_pos= ++s;
else s++;
-#line 1176 "cwebdir/common.w"
+#line 1174 "cwebdir/common.w"
if(!found_web)/*77:*/
-#line 1195 "cwebdir/common.w"
+#line 1193 "cwebdir/common.w"
{
if(s-*argv> max_file_name_length-5)
/*82:*/
#line 577 "cwebdir/comm-w2c.ch"
fatal(_("! Filename too long\n"),*argv);
-#line 1262 "cwebdir/common.w"
+#line 1260 "cwebdir/common.w"
/*:82*/
-#line 1198 "cwebdir/common.w"
+#line 1196 "cwebdir/common.w"
if(dot_pos==NULL)
sprintf(web_file_name,"%s.w",*argv);
@@ -1535,7 +1533,7 @@ else{
strcpy(web_file_name,*argv);
*dot_pos= '\0';
}
-#line 1206 "cwebdir/common.w"
+#line 1204 "cwebdir/common.w"
sprintf(tex_file_name,"%s.tex",name_pos);
sprintf(idx_file_name,"%s.idx",name_pos);
sprintf(scn_file_name,"%s.scn",name_pos);
@@ -1544,10 +1542,10 @@ found_web= true;
}
/*:77*/
-#line 1177 "cwebdir/common.w"
+#line 1175 "cwebdir/common.w"
else if(!found_change)/*78:*/
-#line 1213 "cwebdir/common.w"
+#line 1211 "cwebdir/common.w"
{
if(strcmp(*argv,"-")!=0){
@@ -1555,11 +1553,11 @@ if(s-*argv> max_file_name_length-4)
/*82:*/
#line 577 "cwebdir/comm-w2c.ch"
fatal(_("! Filename too long\n"),*argv);
-#line 1262 "cwebdir/common.w"
+#line 1260 "cwebdir/common.w"
/*:82*/
-#line 1217 "cwebdir/common.w"
+#line 1215 "cwebdir/common.w"
if(dot_pos==NULL)
sprintf(change_file_name,"%s.ch",*argv);
@@ -1569,21 +1567,21 @@ found_change= true;
}
/*:78*/
-#line 1178 "cwebdir/common.w"
+#line 1176 "cwebdir/common.w"
else if(!found_out)/*79:*/
-#line 1225 "cwebdir/common.w"
+#line 1223 "cwebdir/common.w"
{
if(s-*argv> max_file_name_length-5)
/*82:*/
#line 577 "cwebdir/comm-w2c.ch"
fatal(_("! Filename too long\n"),*argv);
-#line 1262 "cwebdir/common.w"
+#line 1260 "cwebdir/common.w"
/*:82*/
-#line 1228 "cwebdir/common.w"
+#line 1226 "cwebdir/common.w"
if(dot_pos==NULL){
sprintf(tex_file_name,"%s.tex",*argv);
@@ -1601,18 +1599,18 @@ found_out= true;
}
/*:79*/
-#line 1179 "cwebdir/common.w"
+#line 1177 "cwebdir/common.w"
else/*81:*/
#line 569 "cwebdir/comm-w2c.ch"
cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
-#line 1260 "cwebdir/common.w"
+#line 1258 "cwebdir/common.w"
#line 577 "cwebdir/comm-w2c.ch"
/*:81*/
-#line 1180 "cwebdir/common.w"
+#line 1178 "cwebdir/common.w"
}
}
@@ -1621,11 +1619,11 @@ if(!found_web)/*81:*/
cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
-#line 1260 "cwebdir/common.w"
+#line 1258 "cwebdir/common.w"
#line 577 "cwebdir/comm-w2c.ch"
/*:81*/
-#line 1183 "cwebdir/common.w"
+#line 1181 "cwebdir/common.w"
}
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
index 3c2cfd754bb..e952f92955d 100644
--- a/Build/source/texk/web2c/cwebdir/ChangeLog
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,9 @@
+2023-08-01 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-w2c.ch,
+ * common.c,
+ * common.w: Squeeze section 51 to preserve page count.
+
2023-07-29 Andreas Scherer <https://ascherer.github.io>
* comm-bs.ch,
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
index 1170c3a43a8..7b641abfee1 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
@@ -301,9 +301,9 @@ else if (strlen(found_filename) < max_file_name_length) {
@z
@x
- if (program==cweave) {
+ if (program==cweave) p->ilk=t, init_node(p);
@y
- if (program!=ctangle) {
+ if (program!=ctangle) p->ilk=t, init_node(p);
@z
@x
diff --git a/Build/source/texk/web2c/cwebdir/common.c b/Build/source/texk/web2c/cwebdir/common.c
index 78773eed8f9..05e8b9cb90b 100644
--- a/Build/source/texk/web2c/cwebdir/common.c
+++ b/Build/source/texk/web2c/cwebdir/common.c
@@ -307,12 +307,12 @@ hash_pointer hash_end= hash+hash_size-1;
hash_pointer h;
/*:46*//*65:*/
-#line 1003 "common.w"
+#line 1001 "common.w"
int history= spotless;
/*:65*//*73:*/
-#line 1126 "common.w"
+#line 1124 "common.w"
int argc;
char**argv;
@@ -323,7 +323,7 @@ char scn_file_name[max_file_name_length];
boolean flags[128];
/*:73*//*83:*/
-#line 1267 "common.w"
+#line 1265 "common.w"
FILE*C_file;
FILE*tex_file;
@@ -382,18 +382,18 @@ static void prime_the_change_buffer(void);
static void check_change(void);
/*:33*//*55:*/
-#line 764 "common.w"
+#line 762 "common.w"
static int web_strcmp(char*,size_t,char*,size_t);
static name_pointer add_section_name(name_pointer,int,char*,char*,boolean);
static void extend_section_name(name_pointer,char*,char*,boolean);
/*:55*//*64:*/
-#line 991 "common.w"
+#line 989 "common.w"
static int section_name_cmp(char**,size_t,name_pointer);
/*:64*//*76:*/
-#line 1186 "common.w"
+#line 1184 "common.w"
static void scan_args(void);
/*:76*/
@@ -423,7 +423,7 @@ for(h= hash;h<=hash_end;*h++= NULL);
#line 99 "common.w"
/*74:*/
-#line 1139 "common.w"
+#line 1137 "common.w"
show_banner= show_happiness= show_progress= make_xrefs= true;
@@ -431,7 +431,7 @@ show_banner= show_happiness= show_progress= make_xrefs= true;
#line 100 "common.w"
/*84:*/
-#line 1274 "common.w"
+#line 1272 "common.w"
scan_args();
if(program==ctangle){
@@ -818,9 +818,7 @@ if(byte_ptr+l> byte_mem_end)overflow("byte memory");
if(name_ptr>=name_dir_end)overflow("name");
strncpy(byte_ptr,first,l);
(++name_ptr)->byte_start= byte_ptr+= l;
-if(program==cweave){
-p->ilk= t;init_node(p);
-}
+if(program==cweave)p->ilk= t,init_node(p);
}
/*:51*/
@@ -830,7 +828,7 @@ return p;
}
/*:48*//*52:*/
-#line 708 "common.w"
+#line 706 "common.w"
void
print_section_name(
@@ -849,7 +847,7 @@ if(q)term_write("...",3);
}
/*:52*//*53:*/
-#line 725 "common.w"
+#line 723 "common.w"
void
sprint_section_name(
@@ -869,7 +867,7 @@ s= p->byte_start;
}
/*:53*//*54:*/
-#line 743 "common.w"
+#line 741 "common.w"
void
print_prefix_name(
@@ -882,7 +880,7 @@ if(s+l<(p+1)->byte_start)term_write("...",3);
}
/*:54*//*56:*/
-#line 769 "common.w"
+#line 767 "common.w"
static int web_strcmp(
char*j,
@@ -900,7 +898,7 @@ else return greater;
}
/*:56*//*57:*/
-#line 798 "common.w"
+#line 796 "common.w"
static name_pointer
add_section_name(
@@ -930,7 +928,7 @@ return par==NULL?(root= p):c==less?(par->llink= p):(par->rlink= p);
}
/*:57*//*58:*/
-#line 826 "common.w"
+#line 824 "common.w"
static void
extend_section_name(
@@ -954,7 +952,7 @@ if(ispref)*(byte_ptr-1)= ' ';
}
/*:58*//*59:*/
-#line 854 "common.w"
+#line 852 "common.w"
name_pointer
section_lookup(
@@ -969,7 +967,7 @@ name_pointer par= NULL;
size_t name_len= (size_t)(last-first+1);
/*60:*/
-#line 878 "common.w"
+#line 876 "common.w"
while(p){
c= web_strcmp(first,name_len,first_chunk(p),prefix_length(p));
@@ -996,19 +994,19 @@ p= q,q= NULL;
}
/*:60*/
-#line 868 "common.w"
+#line 866 "common.w"
/*61:*/
-#line 903 "common.w"
+#line 901 "common.w"
if(r==NULL)
return add_section_name(par,c,first,last+1,ispref);
/*:61*/
-#line 869 "common.w"
+#line 867 "common.w"
/*62:*/
-#line 911 "common.w"
+#line 909 "common.w"
switch(section_name_cmp(&first,name_len,r)){
@@ -1042,12 +1040,12 @@ err_print(">");
return r;
/*:62*/
-#line 870 "common.w"
+#line 868 "common.w"
}
/*:59*//*63:*/
-#line 959 "common.w"
+#line 957 "common.w"
static int section_name_cmp(
char**pfirst,
@@ -1081,7 +1079,7 @@ default:return c;
}
/*:63*//*66:*/
-#line 1013 "common.w"
+#line 1011 "common.w"
void
err_print(
@@ -1089,7 +1087,7 @@ const char*s)
{
*s=='!'?printf("\n%s",s):printf("%s",s);
if(web_file_open)/*67:*/
-#line 1032 "common.w"
+#line 1030 "common.w"
{char*k,*l;
if(changing&&include_depth==change_depth)
@@ -1110,20 +1108,20 @@ putchar(' ');
}
/*:67*/
-#line 1019 "common.w"
+#line 1017 "common.w"
update_terminal();mark_error();
}
/*:66*//*68:*/
-#line 1065 "common.w"
+#line 1063 "common.w"
int wrap_up(void){
if(show_progress)new_line();
if(show_stats)
print_stats();
/*69:*/
-#line 1075 "common.w"
+#line 1073 "common.w"
switch(history){
case spotless:
@@ -1137,14 +1135,14 @@ puts("(That was a fatal error, my friend.)");
}
/*:69*/
-#line 1070 "common.w"
+#line 1068 "common.w"
if(history> harmless_message)return EXIT_FAILURE;
else return EXIT_SUCCESS;
}
/*:68*//*70:*/
-#line 1093 "common.w"
+#line 1091 "common.w"
void
fatal(
const char*s,const char*t)
@@ -1155,7 +1153,7 @@ history= fatal_message;exit(wrap_up());
}
/*:70*//*71:*/
-#line 1104 "common.w"
+#line 1102 "common.w"
void
overflow(
const char*t)
@@ -1165,7 +1163,7 @@ printf("\n! Sorry, %s capacity exceeded",t);fatal("","");
/*:71*//*75:*/
-#line 1157 "common.w"
+#line 1155 "common.w"
static void
scan_args(void)
@@ -1179,13 +1177,13 @@ boolean found_web= false,found_change= false,found_out= false;
strcpy(change_file_name,"/dev/null");
while(--argc> 0){
if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*80:*/
-#line 1245 "common.w"
+#line 1243 "common.w"
for(dot_pos= *argv+1;*dot_pos> '\0';dot_pos++)
flags[(eight_bits)*dot_pos]= flag_change;
/*:80*/
-#line 1169 "common.w"
+#line 1167 "common.w"
else{
s= name_pos= *argv;dot_pos= NULL;
@@ -1194,17 +1192,17 @@ if(*s=='.')dot_pos= s++;
else if(*s=='/')dot_pos= NULL,name_pos= ++s;
else s++;
if(!found_web)/*77:*/
-#line 1195 "common.w"
+#line 1193 "common.w"
{
if(s-*argv> max_file_name_length-5)
/*82:*/
-#line 1261 "common.w"
+#line 1259 "common.w"
fatal("! Filename too long\n",*argv);
/*:82*/
-#line 1198 "common.w"
+#line 1196 "common.w"
if(dot_pos==NULL)
sprintf(web_file_name,"%s.w",*argv);
@@ -1221,21 +1219,21 @@ found_web= true;
}
/*:77*/
-#line 1177 "common.w"
+#line 1175 "common.w"
else if(!found_change)/*78:*/
-#line 1213 "common.w"
+#line 1211 "common.w"
{
if(strcmp(*argv,"-")!=0){
if(s-*argv> max_file_name_length-4)
/*82:*/
-#line 1261 "common.w"
+#line 1259 "common.w"
fatal("! Filename too long\n",*argv);
/*:82*/
-#line 1217 "common.w"
+#line 1215 "common.w"
if(dot_pos==NULL)
sprintf(change_file_name,"%s.ch",*argv);
@@ -1245,20 +1243,20 @@ found_change= true;
}
/*:78*/
-#line 1178 "common.w"
+#line 1176 "common.w"
else if(!found_out)/*79:*/
-#line 1225 "common.w"
+#line 1223 "common.w"
{
if(s-*argv> max_file_name_length-5)
/*82:*/
-#line 1261 "common.w"
+#line 1259 "common.w"
fatal("! Filename too long\n",*argv);
/*:82*/
-#line 1228 "common.w"
+#line 1226 "common.w"
if(dot_pos==NULL){
sprintf(tex_file_name,"%s.tex",*argv);
@@ -1276,10 +1274,10 @@ found_out= true;
}
/*:79*/
-#line 1179 "common.w"
+#line 1177 "common.w"
else/*81:*/
-#line 1249 "common.w"
+#line 1247 "common.w"
{
if(program==ctangle)
@@ -1293,12 +1291,12 @@ else fatal(
}
/*:81*/
-#line 1180 "common.w"
+#line 1178 "common.w"
}
}
if(!found_web)/*81:*/
-#line 1249 "common.w"
+#line 1247 "common.w"
{
if(program==ctangle)
@@ -1312,7 +1310,7 @@ else fatal(
}
/*:81*/
-#line 1183 "common.w"
+#line 1181 "common.w"
}
diff --git a/Build/source/texk/web2c/cwebdir/common.w b/Build/source/texk/web2c/cwebdir/common.w
index 74133d57e4b..f3f22834853 100644
--- a/Build/source/texk/web2c/cwebdir/common.w
+++ b/Build/source/texk/web2c/cwebdir/common.w
@@ -676,9 +676,7 @@ in a slightly different way in \.{CWEAVE} than in \.{CTANGLE}.
if (name_ptr>=name_dir_end) overflow("name");
strncpy(byte_ptr,first,l);
(++name_ptr)->byte_start=byte_ptr+=l;
- if (program==cweave) {
- p->ilk=t; init_node(p);
- }
+ if (program==cweave) p->ilk=t, init_node(p);
}
@ If |p| is a |name_pointer| variable, as we have seen,