texlive[54953] Build/source/texk/upmendex: upmendex: Add bug report
commits+takuji at tug.org
commits+takuji at tug.org
Fri May 1 01:59:14 CEST 2020
Revision: 54953
http://tug.org/svn/texlive?view=revision&revision=54953
Author: takuji
Date: 2020-05-01 01:59:13 +0200 (Fri, 01 May 2020)
Log Message:
-----------
upmendex: Add bug report addresses on command line help
Modified Paths:
--------------
trunk/Build/source/texk/upmendex/ChangeLog
trunk/Build/source/texk/upmendex/Makefile.am
trunk/Build/source/texk/upmendex/Makefile.in
trunk/Build/source/texk/upmendex/convert.c
trunk/Build/source/texk/upmendex/main.c
Added Paths:
-----------
trunk/Build/source/texk/upmendex/version.h
Modified: trunk/Build/source/texk/upmendex/ChangeLog
===================================================================
--- trunk/Build/source/texk/upmendex/ChangeLog 2020-04-30 23:49:41 UTC (rev 54952)
+++ trunk/Build/source/texk/upmendex/ChangeLog 2020-04-30 23:59:13 UTC (rev 54953)
@@ -1,3 +1,9 @@
+2020-05-01 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * main.c, version.h, Makefile.{am.in}: Add bug report addresses
+ on command line help.
+ * convert.c: Tune buffer sizes to avoid tool warnings.
+
2020-02-22 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* version 0.54 Beta version.
Modified: trunk/Build/source/texk/upmendex/Makefile.am
===================================================================
--- trunk/Build/source/texk/upmendex/Makefile.am 2020-04-30 23:49:41 UTC (rev 54952)
+++ trunk/Build/source/texk/upmendex/Makefile.am 2020-04-30 23:59:13 UTC (rev 54953)
@@ -22,6 +22,7 @@
ktable.h \
main.c \
mendex.h \
+ version.h \
pageread.c \
qsort.c \
qsort.h \
Modified: trunk/Build/source/texk/upmendex/Makefile.in
===================================================================
--- trunk/Build/source/texk/upmendex/Makefile.in 2020-04-30 23:49:41 UTC (rev 54952)
+++ trunk/Build/source/texk/upmendex/Makefile.in 2020-04-30 23:59:13 UTC (rev 54953)
@@ -593,6 +593,7 @@
ktable.h \
main.c \
mendex.h \
+ version.h \
pageread.c \
qsort.c \
qsort.h \
Modified: trunk/Build/source/texk/upmendex/convert.c
===================================================================
--- trunk/Build/source/texk/upmendex/convert.c 2020-04-30 23:49:41 UTC (rev 54952)
+++ trunk/Build/source/texk/upmendex/convert.c 2020-04-30 23:59:13 UTC (rev 54953)
@@ -12,6 +12,9 @@
#include "kp.h"
#define BUFFERLEN 4096
+#define BUFFERLEN1 256
+#define BUFFERLEN2 (BUFFERLEN1*3)
+#define BUFFERLEN3 (BUFFERLEN2+50)
struct dictionary{
UChar* dic[2];
@@ -118,8 +121,8 @@
static int dicvalread(const char *filename, struct dictionary *dicval, int line)
{
int i,j,k;
- char buff[256],buff2[256];
- UChar ubuff[256],ubuff2[256];
+ char buff[BUFFERLEN1],buff2[BUFFERLEN1];
+ UChar ubuff[BUFFERLEN1],ubuff2[BUFFERLEN1];
FILE *fp;
if(kpse_in_name_ok(filename))
@@ -143,7 +146,7 @@
i--;
continue;
}
- multibyte_to_widechar(ubuff,256,buff2);
+ multibyte_to_widechar(ubuff,BUFFERLEN1,buff2);
dicval[i].dic[0]=u_xstrdup(ubuff);
for (;((buff[j]==' ')||(buff[j]=='\t'));j++);
for (k=0;((buff[j]!='\r')&&(buff[j]!='\n')&&(buff[j]!=' ')&&(buff[j]!='\t'));j++,k++) {
@@ -155,7 +158,7 @@
i--;
continue;
}
- multibyte_to_widechar(ubuff,256,buff2);
+ multibyte_to_widechar(ubuff,BUFFERLEN1,buff2);
convert(ubuff,ubuff2);
dicval[i].dic[1]=u_xstrdup(ubuff2);
}
@@ -173,7 +176,7 @@
const struct dictionary *buff2 = (const struct dictionary *) bf2;
int i;
- for (i=0;i<256;i++) {
+ for (i=0;i<BUFFERLEN1;i++) {
if (((*buff1).dic[0][i]==L'\0')&&((*buff2).dic[0][i]==L'\0')) return 0;
else if (((*buff1).dic[0][i]==L'\0')&&((*buff2).dic[0][i]!=L'\0')) return 1;
else if (((*buff1).dic[0][i]!=L'\0')&&((*buff2).dic[0][i]==L'\0')) return -1;
@@ -187,7 +190,7 @@
int convert(UChar *buff1, UChar *buff2)
{
int i=0,j=0,k;
- char errbuff[BUFFERLEN],errbuff2[BUFFERLEN];
+ char errbuff[BUFFERLEN2],errbuff2[BUFFERLEN3];
int wclen;
UChar buff3[3];
@@ -270,10 +273,10 @@
j+=wclen;
}
else {
- widechar_to_multibyte(errbuff2,BUFFERLEN,&buff1[i]);
- snprintf(errbuff,BUFFERLEN,"\nError: %s is no entry in dictionary file ",errbuff2);
- fputs(errbuff,efp);
- if (efp!=stderr) fputs(errbuff,stderr);
+ widechar_to_multibyte(errbuff,BUFFERLEN2,&buff1[i]);
+ snprintf(errbuff2,BUFFERLEN3,"\nError: %s is no entry in dictionary file ",errbuff);
+ fputs(errbuff2,efp);
+ if (efp!=stderr) fputs(errbuff2,stderr);
return -1;
}
}
Modified: trunk/Build/source/texk/upmendex/main.c
===================================================================
--- trunk/Build/source/texk/upmendex/main.c 2020-04-30 23:49:41 UTC (rev 54952)
+++ trunk/Build/source/texk/upmendex/main.c 2020-04-30 23:59:13 UTC (rev 54953)
@@ -1,4 +1,5 @@
#include "mendex.h"
+#include "version.h"
#include <kpathsea/tex-file.h>
#include <kpathsea/variable.h>
@@ -19,8 +20,6 @@
#endif
KpathseaSupportInfo kp_ist,kp_dict;
-#define VERSION "version 0.54"
-
int main(int argc, char **argv)
{
int i,j,cc=0,startpagenum=-1,ecount=0,chkopt=1;
@@ -174,6 +173,7 @@
fprintf(stderr,"-t log take log as the error log file.\n");
fprintf(stderr,"-p no set the starting page number of index.\n");
fprintf(stderr,"idx... input files.\n");
+ fprintf(stderr,"\nEmail bug reports to %s.\n", BUG_ADDRESS);
exit(0);
break;
}
Added: trunk/Build/source/texk/upmendex/version.h
===================================================================
--- trunk/Build/source/texk/upmendex/version.h (rev 0)
+++ trunk/Build/source/texk/upmendex/version.h 2020-04-30 23:59:13 UTC (rev 54953)
@@ -0,0 +1,2 @@
+#define VERSION "version " PACKAGE_VERSION
+#define BUG_ADDRESS "issue at texjp.org, tex-k at tug.org"
More information about the tex-live-commits
mailing list.