Changeset 379

Timestamp:

10/14/09 18:02:25 (5 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• ChangeLog (modified) (1 diff)
• magick/utility.c (modified) (5 diffs)

ImageMagick/trunk/ChangeLog

@@ +1 @@
+2009-10-14  6.5.7-0 Pino Toscano  <pino@kde...>
+  * ImageMagick fails to build in GNU/HURD due to absence of PATH_MAX.
+
 2009-10-14  6.5.7-0 Cristy  <quetzlzacatenango@image...>
   * Black channel is now set properly when resizing CMYKA images.

ImageMagick/trunk/magick/utility.c

@@ -906 +906 @@
   *path='\0';
   cwd=getcwd(path,(unsigned long) extent);
-#if defined(MAGICKCORE_HAVE_GETPID) && defined(MAGICKCORE_HAVE_READLINK)
+#if defined(MAGICKCORE_HAVE_GETPID) && defined(MAGICKCORE_HAVE_READLINK) && defined(PATH_MAX)
   {
     char
       link_path[MaxTextExtent],
-      real_path[PATH_MAX+1];
+      execution_path[PATH_MAX+1];
 
     ssize_t
@@ -917 +917 @@
     (void) FormatMagickString(link_path,MaxTextExtent,"/proc/%ld/exe",
       (long) getpid());
-    count=readlink(link_path,real_path,PATH_MAX);
+    count=readlink(link_path,execution_path,PATH_MAX);
     if (count == -1)
       {
         (void) FormatMagickString(link_path,MaxTextExtent,"/proc/%ld/file",
           (long) getpid());
-        count=readlink(link_path,real_path,PATH_MAX);
+        count=readlink(link_path,execution_path,PATH_MAX);
       }
     if ((count > 0) && (count <= (ssize_t) PATH_MAX))
       {
-        real_path[count]='\0';
-        (void) CopyMagickString(path,real_path,extent);
+        execution_path[count]='\0';
+        (void) CopyMagickString(path,execution_path,extent);
       }
   }
@@ -935 +935 @@
     char
       executable_path[PATH_MAX << 1],
-      real_path[PATH_MAX+1];
+      execution_path[PATH_MAX+1];
 
     uint32_t
@@ -942 +942 @@
     length=sizeof(executable_path);
     if ((_NSGetExecutablePath(executable_path,&length) == 0) &&
-        (realpath(executable_path,real_path) != (char *) NULL))
-      (void) CopyMagickString(path,real_path,extent);
+        (realpath(executable_path,execution_path) != (char *) NULL))
+      (void) CopyMagickString(path,execution_path,extent);
   }
 #endif
@@ -962 +962 @@
 #if defined(__WINDOWS__)
   NTGetExecutionPath(path,extent);
+#endif
+#if defined(__GNU__)
+  {
+    char
+      *program_name,
+      *execution_path;
+
+    long
+      count;
+
+    count=0;
+    execution_path=(char *) NULL;
+    program_name=program_invocation_name;
+    if (*program_invocation_name != '/')
+      {
+        size_t
+          extent;
+
+        extent=strlen(cwd)+strlen(program_name)+1;
+        program_name=AcquireQuantumMemory(extent,sizeof(*program_name));
+        if (program_name == (char *) NULL)
+          program_name=program_invocation_name;
+        else
+          count=FormatMagickString(program_name,extent,"%s/%s",cwd,
+            program_invocation_name);
+      }
+    if (count != -1)
+      {
+        execution_path=realpath(program_name,NULL);
+        if (execution_path != (char *) NULL)
+          (void) CopyMagickString(path,execution_path,extent);
+      }
+    if (program_name != program_invocation_name)
+      program_name=(char *) RelinquishMagickMemory(program_name);
+    execution_path=(char *) RelinquishMagickMemory(execution_path);
+  }
 #endif
   return(IsPathAccessible(path));