summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/web2c/ChangeLog4
-rw-r--r--Build/source/texk/web2c/cwebboot.cin28
-rw-r--r--Build/source/texk/web2c/cwebdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-ql.ch24
-rw-r--r--Build/source/texk/web2c/cwebdir/common.c22
-rw-r--r--Build/source/texk/web2c/cwebdir/common.w12
6 files changed, 48 insertions, 48 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 80a19fb4de6..06a24f2a4d1 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2023-07-09 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebboot.cin: Regenerate boot source.
+
2023-06-20 Andreas Scherer <https://ascherer.github.io>
* ctangleboot.cin,
diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin
index 15c9a28d05b..78788c9a5f8 100644
--- a/Build/source/texk/web2c/cwebboot.cin
+++ b/Build/source/texk/web2c/cwebboot.cin
@@ -388,7 +388,7 @@ char check_file_name[max_file_name_length];
boolean flags[128];
/*:73*//*83:*/
-#line 1269 "cwebdir/common.w"
+#line 1267 "cwebdir/common.w"
FILE*C_file;
FILE*tex_file;
@@ -397,7 +397,7 @@ FILE*scn_file;
#line 578 "cwebdir/comm-w2c.ch"
FILE*active_file;
FILE*check_file;
-#line 1275 "cwebdir/common.w"
+#line 1273 "cwebdir/common.w"
#line 595 "cwebdir/comm-w2c.ch"
/*:83*//*86:*/
@@ -608,7 +608,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 1287 "cwebdir/common.w"
+#line 1285 "cwebdir/common.w"
#line 613 "cwebdir/comm-w2c.ch"
/*:84*/
@@ -1432,7 +1432,7 @@ change_file_name[max_file_name_length-2]= '\0';
#line 1168 "cwebdir/common.w"
while(--argc> 0){
if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*80:*/
-#line 1247 "cwebdir/common.w"
+#line 1245 "cwebdir/common.w"
#line 521 "cwebdir/comm-w2c.ch"
{
@@ -1477,7 +1477,7 @@ if(sscanf(++dot_pos,"%u",&kpathsea_debug)!=1)/*81:*/
cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
-#line 1262 "cwebdir/common.w"
+#line 1260 "cwebdir/common.w"
#line 572 "cwebdir/comm-w2c.ch"
/*:81*/
@@ -1492,7 +1492,7 @@ default:flags[(eight_bits)*dot_pos]= flag_change;continue;
break;
}
}
-#line 1250 "cwebdir/common.w"
+#line 1248 "cwebdir/common.w"
#line 564 "cwebdir/comm-w2c.ch"
/*:80*/
@@ -1516,7 +1516,7 @@ if(s-*argv> max_file_name_length-5)
/*82:*/
#line 572 "cwebdir/comm-w2c.ch"
fatal(_("! Filename too long\n"),*argv);
-#line 1264 "cwebdir/common.w"
+#line 1262 "cwebdir/common.w"
/*:82*/
@@ -1548,7 +1548,7 @@ if(s-*argv> max_file_name_length-4)
/*82:*/
#line 572 "cwebdir/comm-w2c.ch"
fatal(_("! Filename too long\n"),*argv);
-#line 1264 "cwebdir/common.w"
+#line 1262 "cwebdir/common.w"
/*:82*/
@@ -1572,7 +1572,7 @@ if(s-*argv> max_file_name_length-5)
/*82:*/
#line 572 "cwebdir/comm-w2c.ch"
fatal(_("! Filename too long\n"),*argv);
-#line 1264 "cwebdir/common.w"
+#line 1262 "cwebdir/common.w"
/*:82*/
@@ -1580,18 +1580,16 @@ fatal(_("! Filename too long\n"),*argv);
if(dot_pos==NULL){
sprintf(tex_file_name,"%s.tex",*argv);
-sprintf(idx_file_name,"%s.idx",*argv);
-sprintf(scn_file_name,"%s.scn",*argv);
sprintf(C_file_name,"%s.c",*argv);
}else{
strcpy(tex_file_name,*argv);
strcpy(C_file_name,*argv);
-if(make_xrefs){
*dot_pos= '\0';
+}
+if(make_xrefs){
sprintf(idx_file_name,"%s.idx",*argv);
sprintf(scn_file_name,"%s.scn",*argv);
}
-}
found_out= true;
}
@@ -1603,7 +1601,7 @@ else/*81:*/
cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
-#line 1262 "cwebdir/common.w"
+#line 1260 "cwebdir/common.w"
#line 572 "cwebdir/comm-w2c.ch"
/*:81*/
@@ -1616,7 +1614,7 @@ if(!found_web)/*81:*/
cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
-#line 1262 "cwebdir/common.w"
+#line 1260 "cwebdir/common.w"
#line 572 "cwebdir/comm-w2c.ch"
/*:81*/
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
index 69f33a0b559..a6ef501eb1d 100644
--- a/Build/source/texk/web2c/cwebdir/ChangeLog
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,9 @@
+2023-07-09 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-ql.ch,
+ * common.c,
+ * common.w: Don't create index/section file names.
+
2023-07-08 Andreas Scherer <https://ascherer.github.io>
* ctwill-w2c.ch,
diff --git a/Build/source/texk/web2c/cwebdir/comm-ql.ch b/Build/source/texk/web2c/cwebdir/comm-ql.ch
index 1e15fd49755..c00d7982be3 100644
--- a/Build/source/texk/web2c/cwebdir/comm-ql.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-ql.ch
@@ -212,17 +212,15 @@ the routine as if it would work.
@<Complain about argument length@>@;
if (dot_pos==NULL) {
sprintf(tex_file_name,"%s.tex",*argv);
- sprintf(idx_file_name,"%s.idx",*argv);
- sprintf(scn_file_name,"%s.scn",*argv);
sprintf(C_file_name,"%s.c",*argv);
} else {
strcpy(tex_file_name,*argv);
strcpy(C_file_name,*argv);
- if (make_xrefs) { /* indexes will be generated */
- *dot_pos='\0';
- sprintf(idx_file_name,"%s.idx",*argv);
- sprintf(scn_file_name,"%s.scn",*argv);
- }
+ *dot_pos='\0'; /* string now ends where the dot was */
+ }
+ if (make_xrefs) { /* indexes will be generated */
+ sprintf(idx_file_name,"%s.idx",*argv);
+ sprintf(scn_file_name,"%s.scn",*argv);
}
found_out=true;
}
@@ -233,17 +231,15 @@ the routine as if it would work.
@<Complain about argument length@>;
if (dot_pos==NULL) {
sprintf(tex_file_name,"%s_tex",*argv);
- sprintf(idx_file_name,"%s_idx",*argv);
- sprintf(scn_file_name,"%s_scn",*argv);
sprintf(C_file_name,"%s_c",*argv);
} else {
strcpy(tex_file_name,*argv);
strcpy(C_file_name,*argv);
- if (make_xrefs) { /* indexes will be generated */
- *dot_pos='\0';
- sprintf(idx_file_name,"%s_idx",*argv);
- sprintf(scn_file_name,"%s_scn",*argv);
- }
+ *dot_pos='\0'; /* string now ends where the dot was */
+ }
+ if (make_xrefs) { /* indexes will be generated */
+ sprintf(idx_file_name,"%s_idx",*argv);
+ sprintf(scn_file_name,"%s_scn",*argv);
}
found_out=true;
}
diff --git a/Build/source/texk/web2c/cwebdir/common.c b/Build/source/texk/web2c/cwebdir/common.c
index 635c4dfaf9b..324cd0ee4b4 100644
--- a/Build/source/texk/web2c/cwebdir/common.c
+++ b/Build/source/texk/web2c/cwebdir/common.c
@@ -322,7 +322,7 @@ char scn_file_name[max_file_name_length];
boolean flags[128];
/*:73*//*83:*/
-#line 1269 "common.w"
+#line 1267 "common.w"
FILE*C_file;
FILE*tex_file;
@@ -429,7 +429,7 @@ show_banner= show_happiness= show_progress= make_xrefs= true;
#line 100 "common.w"
/*84:*/
-#line 1276 "common.w"
+#line 1274 "common.w"
scan_args();
if(program==ctangle){
@@ -1176,7 +1176,7 @@ 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 1247 "common.w"
+#line 1245 "common.w"
for(dot_pos= *argv+1;*dot_pos> '\0';dot_pos++)
flags[(eight_bits)*dot_pos]= flag_change;
@@ -1196,7 +1196,7 @@ if(!found_web)/*77:*/
{
if(s-*argv> max_file_name_length-5)
/*82:*/
-#line 1263 "common.w"
+#line 1261 "common.w"
fatal("! Filename too long\n",*argv);
@@ -1227,7 +1227,7 @@ else if(!found_change)/*78:*/
if(strcmp(*argv,"-")!=0){
if(s-*argv> max_file_name_length-4)
/*82:*/
-#line 1263 "common.w"
+#line 1261 "common.w"
fatal("! Filename too long\n",*argv);
@@ -1250,7 +1250,7 @@ else if(!found_out)/*79:*/
{
if(s-*argv> max_file_name_length-5)
/*82:*/
-#line 1263 "common.w"
+#line 1261 "common.w"
fatal("! Filename too long\n",*argv);
@@ -1259,18 +1259,16 @@ fatal("! Filename too long\n",*argv);
if(dot_pos==NULL){
sprintf(tex_file_name,"%s.tex",*argv);
-sprintf(idx_file_name,"%s.idx",*argv);
-sprintf(scn_file_name,"%s.scn",*argv);
sprintf(C_file_name,"%s.c",*argv);
}else{
strcpy(tex_file_name,*argv);
strcpy(C_file_name,*argv);
-if(make_xrefs){
*dot_pos= '\0';
+}
+if(make_xrefs){
sprintf(idx_file_name,"%s.idx",*argv);
sprintf(scn_file_name,"%s.scn",*argv);
}
-}
found_out= true;
}
@@ -1278,7 +1276,7 @@ found_out= true;
#line 1179 "common.w"
else/*81:*/
-#line 1251 "common.w"
+#line 1249 "common.w"
{
if(program==ctangle)
@@ -1297,7 +1295,7 @@ else fatal(
}
}
if(!found_web)/*81:*/
-#line 1251 "common.w"
+#line 1249 "common.w"
{
if(program==ctangle)
diff --git a/Build/source/texk/web2c/cwebdir/common.w b/Build/source/texk/web2c/cwebdir/common.w
index 0a7b9616a05..c3d82f3c942 100644
--- a/Build/source/texk/web2c/cwebdir/common.w
+++ b/Build/source/texk/web2c/cwebdir/common.w
@@ -1228,17 +1228,15 @@ after the dot. We must check that there is enough room in
@<Complain about argument length@>@;
if (dot_pos==NULL) {
sprintf(tex_file_name,"%s.tex",*argv);
- sprintf(idx_file_name,"%s.idx",*argv);
- sprintf(scn_file_name,"%s.scn",*argv);
sprintf(C_file_name,"%s.c",*argv);
} else {
strcpy(tex_file_name,*argv);
strcpy(C_file_name,*argv);
- if (make_xrefs) { /* indexes will be generated */
- *dot_pos='\0';
- sprintf(idx_file_name,"%s.idx",*argv);
- sprintf(scn_file_name,"%s.scn",*argv);
- }
+ *dot_pos='\0'; /* string now ends where the dot was */
+ }
+ if (make_xrefs) { /* indexes will be generated */
+ sprintf(idx_file_name,"%s.idx",*argv);
+ sprintf(scn_file_name,"%s.scn",*argv);
}
found_out=true;
}