1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
diff -ur detex-2.8.orig/detex.l detex-2.8/detex.l
--- detex-2.8.orig/detex.l 2010-06-09 13:34:01.000000000 +0200
+++ detex-2.8/detex.l 2010-06-09 22:11:27.086080276 +0200
@@ -65,15 +65,15 @@
#undef IGNORE
-int BeginEnv(char *sbEnv);
-int EndEnv(char *sbEnv);
+int BeginEnv(const char *sbEnv);
+int EndEnv(const char *sbEnv);
void InputFile(char *sbFile);
void IncludeFile(char *sbFile);
void AddInclude(char *sbFile);
void SetInputPaths(void);
-void SetEnvIgnore(char *sbEnvList);
-void Warning(char *sb1, char *sb2);
-void ErrorExit(char *sb1);
+void SetEnvIgnore(const char *sbEnvList);
+void Warning(const char *sb1, const char *sb2);
+void ErrorExit(const char *sb1);
int SeparateList(char *sbList, char *rgsbList[] ,char chSep,int csbMax);
int InList(char *sbFile);
FILE * TexOpen(char *sbFile);
@@ -87,10 +87,13 @@
#define STRIPARGS(x) cArgs=x; LaBEGIN LaMacro2
#define CITE(x) if (fLatex && !fCite) KILLARGS(x)
-char *SafeMalloc(int cch, char *sbMessage);
+char *SafeMalloc(int cch, const char *sbMessage);
#ifndef NO_MALLOC_DECL
char *malloc();
#endif
+#ifndef WIN32
+char *getenv();
+#endif
#ifdef OS2
void yyless(int);
#endif
@@ -386,7 +389,8 @@
int
main(int cArgs, char *rgsbArgs[])
{
- char *pch, *sbEnvList = DEFAULTENV, sbBadOpt[2];
+ char *pch, sbBadOpt[2];
+ const char *sbEnvList = DEFAULTENV;
int fSawFile = 0, iArgs = 1;
/* get base name and decide what we are doing, detex or delatex */
@@ -531,7 +535,7 @@
******/
void
-SetEnvIgnore(char *sbEnvList)
+SetEnvIgnore(const char *sbEnvList)
{
char *sb;
@@ -548,7 +552,7 @@
******/
int
-BeginEnv(char *sbEnv)
+BeginEnv(const char *sbEnv)
{
int i;
@@ -566,7 +570,7 @@
******/
int
-EndEnv(char *sbEnv)
+EndEnv(const char *sbEnv)
{
if (!fLatex) return(0);
if (strcmp(sbEnv, sbCurrentEnv) == 0)
@@ -671,7 +675,11 @@
void
SetInputPaths(void)
{
- char *sb, *sbPaths, *getenv();
+ const char *sb;
+ char *sbPaths;
+#ifndef WIN32
+ char *getenv();
+#endif
int cchDefaults, cchPaths;
cchDefaults = strlen(DEFAULTINPUTS);
@@ -793,7 +801,7 @@
******/
char *
-SafeMalloc(int cch, char *sbMessage)
+SafeMalloc(int cch, const char *sbMessage)
{
char *sb;
@@ -807,7 +815,7 @@
******/
void
-Warning(char *sb1, char *sb2)
+Warning(const char *sb1, const char *sb2)
{
(void)fprintf(stderr, "%s: warning: %s %s\n", sbProgName, sb1, sb2);
}
@@ -818,7 +826,7 @@
******/
void
-ErrorExit(char *sb1)
+ErrorExit(const char *sb1)
{
(void)fflush(stdout);
(void)fprintf(stderr, "%s: error: %s\n", sbProgName, sb1);
|