HuntnGather – Diff between revs 8 and 9
?pathlinks?
Rev 8 | Rev 9 | |||
---|---|---|---|---|
Line 22... | Line 22... | |||
22 | #if defined ___AmigaOS___ |
22 | #if defined ___AmigaOS___ |
|
23 | /*************************************************************************/ |
23 | /*************************************************************************/ |
|
24 | /* Version string used for querrying the program version. */ |
24 | /* Version string used for querrying the program version. */ |
|
25 | /*************************************************************************/ |
25 | /*************************************************************************/ |
|
26 | TEXT version_string[] = |
26 | TEXT version_string[] = |
|
27 | "\0$VER: Hunt 1.5 "__DATE__" by Wizardry and Steamworks"; |
27 | "\0$VER: Hunt 1.6 "__DATE__" by Wizardry and Steamworks"; |
|
28 | #endif |
28 | #endif |
|
Line 29... | Line 29... | |||
29 | |
29 | |
|
30 | #if !defined TRUE |
30 | #if !defined TRUE |
|
31 | #define TRUE 1; |
31 | #define TRUE 1; |
|
Line 75... | Line 75... | |||
75 | upe = strupr(need); |
75 | upe = strupr(need); |
|
76 | upn = strupr(name); |
76 | upn = strupr(name); |
|
Line 77... | Line 77... | |||
77 | |
77 | |
|
Line -... | Line 78... | |||
- | 78 | size = strlen(upe) * 3; |
||
- | 79 | |
||
78 | size = strlen(upe) * 3; |
80 | success = FALSE; |
|
Line 79... | Line 81... | |||
79 | |
81 | |
|
80 | if(pattern = AllocVec(size, MEMF_ANY|MEMF_CLEAR)) { |
82 | if(pattern = AllocVec(size, MEMF_ANY|MEMF_CLEAR)) { |
|
Line 81... | Line 83... | |||
81 | |
83 | |
|
- | 84 | if(ParsePatternNoCase(upe, pattern, (LONG)size) > 0) { |
||
- | 85 | success = MatchPatternNoCase(pattern, upn); |
||
Line 82... | Line 86... | |||
82 | if(ParsePatternNoCase(upe, pattern, (LONG)size) > 0) { |
86 | |
|
83 | success = MatchPatternNoCase(pattern, upn); |
87 | FreeVec(pattern); |
|
Line 84... | Line 88... | |||
84 | |
88 | free(upe); |
|
85 | FreeMem(pattern, size); |
89 | free(upn); |
|
Line 86... | Line -... | |||
86 | |
- | ||
87 | return success; |
- | ||
88 | } |
90 | |
|
- | 91 | return success; |
||
89 | |
92 | } |
|
Line 90... | Line 93... | |||
90 | FreeMem(pattern, size); |
93 | |
|
- | 94 | FreeVec(pattern); |
||
- | 95 | } |
||
- | 96 | |
||
- | 97 | free(upe); |
||
- | 98 | free(upn); |
||
- | 99 | return success; |
||
91 | } |
100 | |
|
- | 101 | #else |
||
- | 102 | char *upn, *upe; |
||
- | 103 | int success = FALSE; |
||
- | 104 | |
||
92 | |
105 | upe = strupr(need); |
|
93 | success = strstr(upn, upe) != NULL; |
106 | upn = strupr(name); |
|
Line 94... | Line 107... | |||
94 | free(upn); |
107 | |
|
Line 120... | Line 133... | |||
120 | return; |
133 | return; |
|
121 | } |
134 | } |
|
Line 122... | Line 135... | |||
122 | |
135 | |
|
123 | name = (char *) malloc(sizeof(char)); |
136 | name = (char *) malloc(sizeof(char)); |
|
- | 137 | path = (char *) malloc(sizeof(char)); |
||
124 | path = (char *) malloc(sizeof(char)); |
138 | |
|
125 | i = 0; |
139 | i = 0; |
|
126 | side = 0; |
140 | side = 0; |
|
127 | match = FALSE; |
141 | match = FALSE; |
|
- | 142 | total = 0; |
||
128 | total = 0; |
143 | |
|
129 | while(run && fscanf(fp, "%c", &c) == 1) { |
144 | while(run && fscanf(fp, "%c", &c) == 1) { |
|
130 | #if defined ___AmigaOS___ |
145 | #if defined ___AmigaOS___ |
|
131 | // Check if CTRL+C was pressed and abort the program. |
146 | // Check if CTRL+C was pressed and abort the program. |
|
132 | if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) { |
147 | if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) { |
|
Line 180... | Line 195... | |||
180 | ++i; |
195 | ++i; |
|
181 | break; |
196 | break; |
|
182 | } |
197 | } |
|
183 | } |
198 | } |
|
Line -... | Line 199... | |||
- | 199 | |
||
- | 200 | free(name); |
||
- | 201 | free(path); |
||
184 | |
202 | |
|
185 | fclose(fp); |
203 | fclose(fp); |
|
Line 186... | Line 204... | |||
186 | } |
204 | } |
|
187 | |
205 | |