Skip to content

Commit cd5e246

Browse files
ChenPi11ChenPi11
committed
Remove unused canonical files and codes.
 修改： ChangeLog 修改： FILELIST 修改： Makefile.devel 修改： lib/genaliases.c 修改： lib/genaliases2.c 删除： lib/generated/canonical.h 删除： lib/generated/canonical_aix.h 删除： lib/generated/canonical_aix_sysaix.h 删除： lib/generated/canonical_dos.h 删除： lib/generated/canonical_extra.h 删除： lib/generated/canonical_local.h 删除： lib/generated/canonical_local_sysaix.h 删除： lib/generated/canonical_local_syshpux.h 删除： lib/generated/canonical_local_sysosf1.h 删除： lib/generated/canonical_local_syssolaris.h 删除： lib/generated/canonical_osf1.h 删除： lib/generated/canonical_osf1_sysosf1.h 删除： lib/generated/canonical_sysaix.h 删除： lib/generated/canonical_syshpux.h 删除： lib/generated/canonical_sysosf1.h 删除： lib/generated/canonical_syssolaris.h 删除： lib/generated/canonical_zos.h 修改： lib/iconv.cpp
1 parent 8a4aa09 commit cd5e246

23 files changed

+45
-833
lines changed

‎ChangeLog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
2023-10-03 ChenPi11 <wushengwuxi-msctinoulk@outlook.com>
22

33
Update C++ standard of the project.
4+
Remove unused canonical files and codes.
45

56
2023-09-09 ChenPi11 <wushengwuxi-msctinoulk@outlook.com>
67

‎FILELIST‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -121,41 +121,24 @@ lib/euc_jp.h
121121
lib/hkscs2008.h
122122
lib/mac_centraleurope.h
123123
lib/cp1129.h
124-
lib/generated/canonical.h
125-
lib/generated/canonical_syssolaris.h
126124
lib/generated/flags.h
127125
lib/generated/aliases_sysosf1.h
128-
lib/generated/canonical_sysaix.h
129126
lib/generated/aliases_osf1_sysosf1.h
130-
lib/generated/canonical_extra.h
131127
lib/generated/aliases_aix_sysaix.h
132-
lib/generated/canonical_osf1.h
133128
lib/generated/aliases.h
134129
lib/generated/aliases.gperf
135-
lib/generated/canonical_osf1_sysosf1.h
136130
lib/generated/aliases_syssolaris.h
137131
lib/generated/aliases_sysosf1.gperf
138-
lib/generated/canonical_sysosf1.h
139132
lib/generated/aliases_syssolaris.gperf
140133
lib/generated/aliases_syshpux.gperf
141134
lib/generated/aliases_extra.h
142-
lib/generated/canonical_local_syshpux.h
143-
lib/generated/canonical_local_sysosf1.h
144-
lib/generated/canonical_local_sysaix.h
145135
lib/generated/aliases_aix.h
146-
lib/generated/canonical_dos.h
147-
lib/generated/canonical_local.h
148136
lib/generated/aliases_sysaix.h
149137
lib/generated/aliases_sysaix.gperf
150138
lib/generated/aliases_syshpux.h
151139
lib/generated/aliases_zos.h
152-
lib/generated/canonical_syshpux.h
153-
lib/generated/canonical_zos.h
154140
lib/generated/aliases_dos.h
155-
lib/generated/canonical_aix.h
156-
lib/generated/canonical_local_syssolaris.h
157141
lib/generated/aliases_osf1.h
158-
lib/generated/canonical_aix_sysaix.h
159142
lib/ebcdic12712.h
160143
lib/uhc_2.h
161144
lib/iso8859_1.h

‎Makefile.devel‎

Lines changed: 29 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -26,89 +26,79 @@ all : lib/generated \
2626
lib/generated :
2727
$(MKDIR) lib/generated
2828

29-
lib/generated/aliases.h lib/generated/canonical.h lib/generated/canonical_local.h : lib/encodings.def lib/genaliases.c
29+
lib/generated/aliases.h : lib/encodings.def lib/genaliases.c
3030
$(CC) $(CFLAGS) lib/genaliases.c -o genaliases
31-
./genaliases lib/generated/aliases.gperf canonical.sh canonical_local.sh
31+
./genaliases lib/generated/aliases.gperf
3232
$(RM) genaliases
3333
$(GPERF) -m 10 lib/generated/aliases.gperf > tmp.h
3434
sed -e 's/^\(const struct alias \)/static \1/' < tmp.h > lib/generated/aliases.h
35-
sh canonical.sh > lib/generated/canonical.h
36-
sh canonical_local.sh > lib/generated/canonical_local.h
37-
$(RM) tmp.h canonical.sh canonical_local.sh
35+
$(RM) tmp.h
3836

39-
lib/generated/aliases_sysaix.h lib/generated/canonical_sysaix.h lib/generated/canonical_local_sysaix.h : lib/encodings.def lib/genaliases.c
37+
lib/generated/aliases_sysaix.h : lib/encodings.def lib/genaliases.c
4038
$(CC) $(CFLAGS) -DUSE_AIX_ALIASES lib/genaliases.c -o genaliases
41-
./genaliases lib/generated/aliases_sysaix.gperf canonical.sh canonical_local.sh
39+
./genaliases lib/generated/aliases_sysaix.gperf
4240
$(RM) genaliases
4341
$(GPERF) -m 10 lib/generated/aliases_sysaix.gperf > tmp.h
4442
sed -e 's/^\(const struct alias \)/static \1/' < tmp.h > lib/generated/aliases_sysaix.h
45-
sh canonical.sh > lib/generated/canonical_sysaix.h
46-
sh canonical_local.sh > lib/generated/canonical_local_sysaix.h
47-
$(RM) tmp.h canonical.sh canonical_local.sh
43+
$(RM) tmp.h
4844

49-
lib/generated/aliases_syshpux.h lib/generated/canonical_syshpux.h lib/generated/canonical_local_syshpux.h : lib/encodings.def lib/genaliases.c
45+
lib/generated/aliases_syshpux.h : lib/encodings.def lib/genaliases.c
5046
$(CC) $(CFLAGS) -DUSE_HPUX_ALIASES lib/genaliases.c -o genaliases
51-
./genaliases lib/generated/aliases_syshpux.gperf canonical.sh canonical_local.sh
47+
./genaliases lib/generated/aliases_syshpux.gperf
5248
$(RM) genaliases
5349
$(GPERF) -m 10 lib/generated/aliases_syshpux.gperf > tmp.h
5450
sed -e 's/^\(const struct alias \)/static \1/' < tmp.h > lib/generated/aliases_syshpux.h
55-
sh canonical.sh > lib/generated/canonical_syshpux.h
56-
sh canonical_local.sh > lib/generated/canonical_local_syshpux.h
57-
$(RM) tmp.h canonical.sh canonical_local.sh
51+
$(RM) tmp.h
5852

59-
lib/generated/aliases_sysosf1.h lib/generated/canonical_sysosf1.h lib/generated/canonical_local_sysosf1.h : lib/encodings.def lib/genaliases.c
53+
lib/generated/aliases_sysosf1.h : lib/encodings.def lib/genaliases.c
6054
$(CC) $(CFLAGS) -DUSE_OSF1_ALIASES lib/genaliases.c -o genaliases
61-
./genaliases lib/generated/aliases_sysosf1.gperf canonical.sh canonical_local.sh
55+
./genaliases lib/generated/aliases_sysosf1.gperf
6256
$(RM) genaliases
6357
$(GPERF) -m 10 lib/generated/aliases_sysosf1.gperf > tmp.h
6458
sed -e 's/^\(const struct alias \)/static \1/' < tmp.h > lib/generated/aliases_sysosf1.h
65-
sh canonical.sh > lib/generated/canonical_sysosf1.h
66-
sh canonical_local.sh > lib/generated/canonical_local_sysosf1.h
67-
$(RM) tmp.h canonical.sh canonical_local.sh
59+
$(RM) tmp.h
6860

69-
lib/generated/aliases_syssolaris.h lib/generated/canonical_syssolaris.h lib/generated/canonical_local_syssolaris.h : lib/encodings.def lib/genaliases.c
61+
lib/generated/aliases_syssolaris.h : lib/encodings.def lib/genaliases.c
7062
$(CC) $(CFLAGS) -DUSE_SOLARIS_ALIASES lib/genaliases.c -o genaliases
71-
./genaliases lib/generated/aliases_syssolaris.gperf canonical.sh canonical_local.sh
63+
./genaliases lib/generated/aliases_syssolaris.gperf
7264
$(RM) genaliases
7365
$(GPERF) -m 10 lib/generated/aliases_syssolaris.gperf > tmp.h
7466
sed -e 's/^\(const struct alias \)/static \1/' < tmp.h > lib/generated/aliases_syssolaris.h
75-
sh canonical.sh > lib/generated/canonical_syssolaris.h
76-
sh canonical_local.sh > lib/generated/canonical_local_syssolaris.h
77-
$(RM) tmp.h canonical.sh canonical_local.sh
67+
$(RM) tmp.h
7868

79-
lib/generated/aliases_aix.h lib/generated/canonical_aix.h : lib/encodings_aix.def lib/genaliases2.c
69+
lib/generated/aliases_aix.h : lib/encodings_aix.def lib/genaliases2.c
8070
$(CC) $(CFLAGS) -DUSE_AIX lib/genaliases2.c -o genaliases
81-
./genaliases aix lib/generated/aliases_aix.h lib/generated/canonical_aix.h
71+
./genaliases aix lib/generated/aliases_aix.h
8272
$(RM) genaliases
8373

84-
lib/generated/aliases_aix_sysaix.h lib/generated/canonical_aix_sysaix.h : lib/encodings_aix.def lib/genaliases2.c
74+
lib/generated/aliases_aix_sysaix.h : lib/encodings_aix.def lib/genaliases2.c
8575
$(CC) $(CFLAGS) -DUSE_AIX -DUSE_AIX_ALIASES lib/genaliases2.c -o genaliases
86-
./genaliases aix lib/generated/aliases_aix_sysaix.h lib/generated/canonical_aix_sysaix.h
76+
./genaliases aix lib/generated/aliases_aix_sysaix.h
8777
$(RM) genaliases
8878

89-
lib/generated/aliases_osf1.h lib/generated/canonical_osf1.h : lib/encodings_osf1.def lib/genaliases2.c
79+
lib/generated/aliases_osf1.h : lib/encodings_osf1.def lib/genaliases2.c
9080
$(CC) $(CFLAGS) -DUSE_OSF1 lib/genaliases2.c -o genaliases
91-
./genaliases osf1 lib/generated/aliases_osf1.h lib/generated/canonical_osf1.h
81+
./genaliases osf1 lib/generated/aliases_osf1.h
9282
$(RM) genaliases
9383

94-
lib/generated/aliases_osf1_sysosf1.h lib/generated/canonical_osf1_sysosf1.h : lib/encodings_osf1.def lib/genaliases2.c
84+
lib/generated/aliases_osf1_sysosf1.h : lib/encodings_osf1.def lib/genaliases2.c
9585
$(CC) $(CFLAGS) -DUSE_OSF1 -DUSE_OSF1_ALIASES lib/genaliases2.c -o genaliases
96-
./genaliases osf1 lib/generated/aliases_osf1_sysosf1.h lib/generated/canonical_osf1_sysosf1.h
86+
./genaliases osf1 lib/generated/aliases_osf1_sysosf1.h
9787
$(RM) genaliases
9888

99-
lib/generated/aliases_dos.h lib/generated/canonical_dos.h : lib/encodings_dos.def lib/genaliases2.c
89+
lib/generated/aliases_dos.h : lib/encodings_dos.def lib/genaliases2.c
10090
$(CC) $(CFLAGS) -DUSE_DOS lib/genaliases2.c -o genaliases
101-
./genaliases dos lib/generated/aliases_dos.h lib/generated/canonical_dos.h
91+
./genaliases dos lib/generated/aliases_dos.h
10292
$(RM) genaliases
10393

104-
lib/generated/aliases_zos.h lib/generated/canonical_zos.h : lib/encodings_zos.def lib/genaliases2.c
94+
lib/generated/aliases_zos.h : lib/encodings_zos.def lib/genaliases2.c
10595
$(CC) $(CFLAGS) -DUSE_ZOS lib/genaliases2.c -o genaliases
106-
./genaliases zos lib/generated/aliases_zos.h lib/generated/canonical_zos.h
96+
./genaliases zos lib/generated/aliases_zos.h
10797
$(RM) genaliases
10898

109-
lib/generated/aliases_extra.h lib/generated/canonical_extra.h : lib/encodings_extra.def lib/genaliases2.c
99+
lib/generated/aliases_extra.h : lib/encodings_extra.def lib/genaliases2.c
110100
$(CC) $(CFLAGS) -DUSE_EXTRA lib/genaliases2.c -o genaliases
111-
./genaliases extra lib/generated/aliases_extra.h lib/generated/canonical_extra.h
101+
./genaliases extra lib/generated/aliases_extra.h
112102
$(RM) genaliases
113103

114104

@@ -125,11 +115,4 @@ clean :
125115
rm -f lib/generated/aliases_dos.h
126116
rm -f lib/generated/aliases_zos.h
127117
rm -f lib/generated/aliases_extra.h
128-
rm -f lib/generated/canonical.h lib/generated/canonical_sysaix.h lib/generated/canonical_syshpux.h lib/generated/canonical_sysosf1.h lib/generated/canonical_syssolaris.h
129-
rm -f lib/generated/canonical_aix.h lib/generated/canonical_aix_sysaix.h
130-
rm -f lib/generated/canonical_osf1.h lib/generated/canonical_osf1_sysosf1.h
131-
rm -f lib/generated/canonical_dos.h
132-
rm -f lib/generated/canonical_zos.h
133-
rm -f lib/generated/canonical_extra.h
134-
rm -f lib/generated/canonical_local.h lib/generated/canonical_local_sysaix.h lib/generated/canonical_local_syshpux.h lib/generated/canonical_local_sysosf1.h lib/generated/canonical_local_syssolaris.h
135118
rm -f lib/generated/flags.h

‎lib/genaliases.c‎

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
# define BINARY_MODE "b"
3131
#endif
3232

33-
static void emit_alias (FILE* out1, const char* alias, const char* c_name)
33+
static void emit_alias (FILE* out, const char* alias, const char* c_name)
3434
{
3535
/* Output alias in upper case. */
3636
const char* s = alias;
@@ -40,47 +40,28 @@ static void emit_alias (FILE* out1, const char* alias, const char* c_name)
4040
exit(1);
4141
if (c >= 'a' && c <= 'z')
4242
c -= 'a'-'A';
43-
putc(c, out1);
43+
putc(c, out);
4444
}
45-
fprintf(out1,", ei_%s\n", c_name);
45+
fprintf(out,", ei_%s\n", c_name);
4646
}
4747

48-
static void emit_encoding (FILE* out1, FILE* out2, const char* const* names, size_t n, const char* c_name)
48+
static void emit_encoding (FILE* out, const char* const* names, size_t n, const char* c_name)
4949
{
50-
fprintf(out2,"grep 'sizeof(\"");
51-
/* Output *names in upper case. */
52-
{
53-
const char* s = *names;
54-
for (; *s; s++) {
55-
unsigned char c = * (unsigned char *) s;
56-
if (c >= 0x80)
57-
exit(1);
58-
if (c >= 'a' && c <= 'z')
59-
c -= 'a'-'A';
60-
putc(c, out2);
61-
}
62-
}
63-
fprintf(out2,"\")' tmp.h | sed -e 's|^.*\\(stringpool_str[0-9]*\\).*$| (unsigned short)(size_t)(void*)\\&((struct stringpool_t *)0)->\\1,|'\n");
6450
for (; n > 0; names++, n--)
65-
emit_alias(out1, *names, c_name);
51+
emit_alias(out, *names, c_name);
6652
}
6753

6854
int main (int argc, char* argv[])
6955
{
7056
char* aliases_file_name;
71-
char* canonical_sh_file_name;
72-
char* canonical_local_sh_file_name;
7357
FILE* aliases_file;
74-
FILE* canonical_sh_file;
7558

7659
if (argc != 4) {
77-
fprintf(stderr, "Usage: genaliases aliases.gperf canonical.sh canonical_local.sh\n");
60+
fprintf(stderr, "Usage: genaliases aliases.gperf\n");
7861
exit(1);
7962
}
8063

8164
aliases_file_name = argv[1];
82-
canonical_sh_file_name = argv[2];
83-
canonical_local_sh_file_name = argv[3];
8465

8566
aliases_file = fopen(aliases_file_name, "w");
8667
if (aliases_file == NULL) {
@@ -103,27 +84,12 @@ int main (int argc, char* argv[])
10384
#define DEFENCODING(xxx_names,codepage,xxx,xxx_ifuncs1,xxx_ifuncs2,xxx_ofuncs1,xxx_ofuncs2) \
10485
{ \
10586
static const char* const names[] = BRACIFY xxx_names; \
106-
emit_encoding(aliases_file,canonical_sh_file,names,sizeof(names)/sizeof(names[0]),#xxx); \
87+
emit_encoding(aliases_file,names,sizeof(names)/sizeof(names[0]),#xxx); \
10788
}
10889
#define BRACIFY(...) { __VA_ARGS__ }
10990
#define DEFALIAS(xxx_alias,xxx) emit_alias(aliases_file,xxx_alias,#xxx);
11091

111-
canonical_sh_file = fopen(canonical_sh_file_name, "w" BINARY_MODE);
112-
if (canonical_sh_file == NULL) {
113-
fprintf(stderr, "Could not open '%s' for writing\n", canonical_sh_file_name);
114-
exit(1);
115-
}
11692
#include "encodings.def"
117-
if (ferror(canonical_sh_file) || fclose(canonical_sh_file))
118-
exit(1);
119-
120-
canonical_sh_file = fopen(canonical_local_sh_file_name, "w" BINARY_MODE);
121-
if (canonical_sh_file == NULL) {
122-
fprintf(stderr, "Could not open '%s' for writing\n", canonical_local_sh_file_name);
123-
exit(1);
124-
}
125-
if (ferror(canonical_sh_file) || fclose(canonical_sh_file))
126-
exit(1);
12793

12894
#undef DEFALIAS
12995
#undef BRACIFY

‎lib/genaliases2.c‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
static unsigned int counter = 0;
2424

25-
static void emit_alias (FILE* out1, const char* tag, const char* alias, const char* c_name)
25+
static void emit_alias (FILE* out, const char* tag, const char* alias, const char* c_name)
2626
{
27-
fprintf(out1," S(%s_%u, \"",tag,counter);
27+
fprintf(out," S(%s_%u, \"",tag,counter);
2828
/* Output alias in upper case. */
2929
{
3030
const char* s = alias;
@@ -34,53 +34,43 @@ static void emit_alias (FILE* out1, const char* tag, const char* alias, const ch
3434
exit(1);
3535
if (c >= 'a' && c <= 'z')
3636
c -= 'a'-'A';
37-
putc(c, out1);
37+
putc(c, out);
3838
}
3939
}
40-
fprintf(out1,"\", ei_%s )\n", c_name);
40+
fprintf(out,"\", ei_%s )\n", c_name);
4141
counter++;
4242
}
4343

44-
static void emit_encoding (FILE* out1, FILE* out2, const char* tag, const char* const* names, size_t n, const char* c_name)
44+
static void emit_encoding (FILE* out, const char* tag, const char* const* names, size_t n, const char* c_name)
4545
{
46-
fprintf(out2," (unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_%s_%u,\n",tag,counter);
4746
for (; n > 0; names++, n--)
48-
emit_alias(out1, tag, *names, c_name);
47+
emit_alias(out, tag, *names, c_name);
4948
}
5049

5150
int main (int argc, char* argv[])
5251
{
5352
const char* tag;
5453
char* aliases_file_name;
55-
char* canonical_file_name;
5654
FILE* aliases_file;
57-
FILE* canonical_file;
5855

5956
if (argc != 4) {
60-
fprintf(stderr, "Usage: genaliases2 tag aliases.h canonical.h\n");
57+
fprintf(stderr, "Usage: genaliases2 tag aliases.h\n");
6158
exit(1);
6259
}
6360

6461
tag = argv[1];
6562
aliases_file_name = argv[2];
66-
canonical_file_name = argv[3];
6763

6864
aliases_file = fopen(aliases_file_name, "w");
6965
if (aliases_file == NULL) {
7066
fprintf(stderr, "Could not open '%s' for writing\n", aliases_file_name);
7167
exit(1);
7268
}
7369

74-
canonical_file = fopen(canonical_file_name, "w");
75-
if (canonical_file == NULL) {
76-
fprintf(stderr, "Could not open '%s' for writing\n", canonical_file_name);
77-
exit(1);
78-
}
79-
8070
#define DEFENCODING(xxx_names,codepage,xxx,xxx_ifuncs1,xxx_ifuncs2,xxx_ofuncs1,xxx_ofuncs2) \
8171
{ \
8272
static const char* const names[] = BRACIFY xxx_names; \
83-
emit_encoding(aliases_file,canonical_file,tag,names,sizeof(names)/sizeof(names[0]),#xxx); \
73+
emit_encoding(aliases_file,tag,names,sizeof(names)/sizeof(names[0]),#xxx); \
8474
}
8575
#define BRACIFY(...) { __VA_ARGS__ }
8676
#define DEFALIAS(xxx_alias,xxx) emit_alias(aliases_file,tag,xxx_alias,#xxx);
@@ -104,7 +94,5 @@ int main (int argc, char* argv[])
10494
#undef DEFENCODING
10595
if (ferror(aliases_file) || fclose(aliases_file))
10696
exit(1);
107-
if (ferror(canonical_file) || fclose(canonical_file))
108-
exit(1);
10997
exit(0);
11098
}

0 commit comments

Comments
 (0)