• R/O
  • SSH

GM: Commit

Main GraphicsMagick source repository


Commit MetaInfo

Révision039108a89de43c8243d46387612c6412175ebe9f (tree)
l'heure2002-07-04 09:47:01
AuteurJohn Cristy <duc.sequere.aut.de.via.decede@gmai...>
CommiterJohn Cristy

Message de Log

*** empty log message ***

Change Summary

Modification

diff -r 530738351efd -r 039108a89de4 magick/magick.c
--- a/magick/magick.c Wed Jul 03 19:16:22 2002 -0500
+++ b/magick/magick.c Wed Jul 03 19:47:01 2002 -0500
@@ -246,7 +246,7 @@
246246 return(path);
247247 search_path=AllocateString(path);
248248 FormatString(path,"%.1024s%s%.1024s",SetClientPath((char *) NULL),
249- DirectorySeparator,filename);
249+ DirectorySeparator,filename);
250250 if (IsAccessible(path))
251251 {
252252 LiberateMemory((void **) &search_path);
@@ -257,7 +257,7 @@
257257 if (getenv("MAGICK_HOME") != (char *) NULL)
258258 {
259259 FormatString(path,"%.1024s%s%.1024s",getenv("MAGICK_HOME"),
260- DirectorySeparator,filename);
260+ DirectorySeparator,filename);
261261 if (IsAccessible(path))
262262 {
263263 LiberateMemory((void **) &search_path);
@@ -269,8 +269,8 @@
269269 if (getenv("HOME") != (char *) NULL)
270270 {
271271 FormatString(path,"%.1024s%s%s%s%.1024s",getenv("HOME"),
272- *getenv("HOME") == '/' ? "/.magick" : "",DirectorySeparator,
273- DirectorySeparator,filename);
272+ *getenv("HOME") == '/' ? "/.magick" : "",DirectorySeparator,
273+ DirectorySeparator,filename);
274274 if (IsAccessible(path))
275275 {
276276 LiberateMemory((void **) &search_path);
@@ -282,7 +282,7 @@
282282 if (getenv("MAGICK_FONT_PATH") != (char *) NULL)
283283 {
284284 FormatString(path,"%.1024s%s%.1024s",getenv("MAGICK_FONT_PATH"),
285- DirectorySeparator,filename);
285+ DirectorySeparator,filename);
286286 if (IsAccessible(path))
287287 {
288288 LiberateMemory((void **) &search_path);
@@ -293,37 +293,36 @@
293293 }
294294 #if defined(WIN32)
295295 {
296+ char
297+ *key_value;
298+
299+ long
300+ i;
301+
296302 static char
297- *registry_path_keys[] = {
303+ *registry_path_keys[] =
304+ {
298305 "LibPath",
299306 "ModulesPath",
300307 "SharePath",
301308 NULL
302309 };
303310
304- char
305- *key_value;
306-
307- int
308- i;
309-
310- for( i=0; registry_path_keys[i] != NULL; i++ )
311- {
312- if( (key_value = NTRegistryKeyLookup(registry_path_keys[i])) != (char *) NULL)
313- {
314- FormatString(path,"%.1024s%s%.1024s",key_value,DirectorySeparator,
315- filename);
316- LiberateMemory((void**) &key_value);
317-
318- if (IsAccessible(path))
319- {
320- return(path);
321- }
322- ConcatenateString(&search_path,"; Registry[");
323- ConcatenateString(&search_path, registry_path_keys[i]);
324- ConcatenateString(&search_path,"]:");
325- ConcatenateString(&search_path,path);
326- }
311+ for (i=0; registry_path_keys[i] != NULL; i++)
312+ {
313+ key_value=NTRegistryKeyLookup(registry_path_keys[i]);
314+ if (key_value != (char *) NULL)
315+ {
316+ FormatString(path,"%.1024s%s%.1024s",key_value,DirectorySeparator,
317+ filename);
318+ LiberateMemory((void**) &key_value);
319+ if (IsAccessible(path))
320+ return(path);
321+ ConcatenateString(&search_path,"; Registry[");
322+ ConcatenateString(&search_path, registry_path_keys[i]);
323+ ConcatenateString(&search_path,"]:");
324+ ConcatenateString(&search_path,path);
325+ }
327326 }
328327 }
329328 #endif
@@ -369,7 +368,7 @@
369368 }
370369 #endif
371370 ThrowException(exception,ConfigurationError,
372- "Unable to open configuration file",search_path);
371+ "Unable to open configuration file",search_path);
373372 LiberateMemory((void **) &search_path);
374373 LiberateMemory((void **) &path);
375374 return((char *) NULL);
Afficher sur ancien navigateur de dépôt.