X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fdumper.c;h=9e93d0967d2877ec671927078680b0132341d41d;hb=3f56098210002ecef7ce82e894c65428869c554c;hp=640309dc7ad024865f97905054d3a8afd9638163;hpb=3062d425fac0473eb5aa2efc0bb002f6ce0cb028;p=chise%2Fxemacs-chise.git.1

diff --git a/src/dumper.c b/src/dumper.c
index 640309d..9e93d09 100644
--- a/src/dumper.c
+++ b/src/dumper.c
@@ -29,6 +29,7 @@ Boston, MA 02111-1307, USA.  */
 #include "sysfile.h"
 #include "console-stream.h"
 #include "dumper.h"
+#include "sysdep.h"
 
 #ifdef WIN32_NATIVE
 #include "nt.h"
@@ -281,7 +282,11 @@ static int pdump_fd;
 static void *pdump_buf;
 static FILE *pdump_out;
 
+#ifdef UTF2000
+#define PDUMP_HASHSIZE 20000001
+#else
 #define PDUMP_HASHSIZE 200001
+#endif
 
 static pdump_entry_list_elt **pdump_hash;
 
@@ -414,7 +419,7 @@ pdump_get_indirect_count (EMACS_INT code,
 			  const struct lrecord_description *idesc,
 			  const void *idata)
 {
-  EMACS_INT count;
+  EMACS_INT count = 0;		/* initialize to shut up GCC */
   const void *irdata;
 
   int line = XD_INDIRECT_VAL (code);
@@ -439,7 +444,7 @@ pdump_get_indirect_count (EMACS_INT code,
       stderr_out ("Unsupported count type : %d (line = %d, code=%ld)\n",
 		  idesc[line].type, line, (long)code);
       pdump_backtrace ();
-      abort ();
+      ABORT ();
     }
   count += delta;
   return count;
@@ -539,7 +544,7 @@ pdump_register_sub (const void *data, const struct lrecord_description *desc, in
 	default:
 	  stderr_out ("Unsupported dump type : %d\n", desc[pos].type);
 	  pdump_backtrace ();
-	  abort ();
+	  ABORT ();
 	};
     }
 }
@@ -565,10 +570,10 @@ pdump_register_object (Lisp_Object obj)
   if (imp->description)
     {
       int me = depth++;
-      if (me>65536)
+      if (me>=65536)
 	{
 	  stderr_out ("Backtrace overflow, loop ?\n");
-	  abort ();
+	  ABORT ();
 	}
       backtrace[me].obj = objh;
       backtrace[me].position = 0;
@@ -600,10 +605,10 @@ pdump_register_struct (const void *data,
     {
       int me = depth++;
       int i;
-      if (me>65536)
+      if (me>=65536)
 	{
 	  stderr_out ("Backtrace overflow, loop ?\n");
-	  abort ();
+	  ABORT ();
 	}
       backtrace[me].obj = 0;
       backtrace[me].position = 0;
@@ -716,7 +721,7 @@ pdump_dump_data (pdump_entry_list_elt *elt,
 		  }
 		default:
 		  stderr_out ("Unsupported dump type : %d\n", desc[pos].type);
-		  abort ();
+		  ABORT ();
 		}
 	    }
 	}
@@ -794,7 +799,7 @@ pdump_reloc_one (void *data, EMACS_INT delta,
 	  }
 	default:
 	  stderr_out ("Unsupported dump type : %d\n", desc[pos].type);
-	  abort ();
+	  ABORT ();
 	};
     }
 }
@@ -818,7 +823,7 @@ pdump_scan_by_alignment (void (*f)(pdump_entry_list_elt *,
 
   for (align = ALIGNOF (max_align_t); align; align>>=1)
     {
-      int i;
+      size_t i;
       pdump_entry_list_elt *elt;
 
       for (i=0; i<lrecord_type_count; i++)
@@ -843,7 +848,7 @@ pdump_scan_by_alignment (void (*f)(pdump_entry_list_elt *,
 static void
 pdump_dump_root_struct_ptrs (void)
 {
-  int i;
+  size_t i;
   size_t count = Dynarr_length (pdump_root_struct_ptrs);
   pdump_static_pointer *data = alloca_array (pdump_static_pointer, count);
   for (i = 0; i < count; i++)
@@ -870,7 +875,7 @@ pdump_dump_opaques (void)
 static void
 pdump_dump_rtables (void)
 {
-  int i;
+  size_t i;
   pdump_entry_list_elt *elt;
   pdump_reloc_table rt;
 
@@ -922,7 +927,7 @@ pdump_dump_root_objects (void)
 {
   size_t count = (Dynarr_length (pdump_root_objects) +
 		  Dynarr_length (pdump_weak_object_chains));
-  size_t i;
+  EMACS_INT i;
 
   PDUMP_WRITE_ALIGNED (size_t, count);
   PDUMP_ALIGN_OUTPUT (pdump_static_Lisp_Object);
@@ -969,7 +974,7 @@ pdump_dump_root_objects (void)
 void
 pdump (void)
 {
-  int i;
+  size_t i;
   Lisp_Object t_console, t_device, t_frame;
   int none;
   pdump_header header;
@@ -990,7 +995,7 @@ pdump (void)
   t_frame   = Vterminal_frame;   Vterminal_frame   = Qnil;
   t_device  = Vterminal_device;  Vterminal_device  = Qnil;
 
-  dump_add_opaque (&lrecord_implementations_table,
+  dump_add_opaque ((void *) &lrecord_implementations_table,
 		   lrecord_type_count * sizeof (lrecord_implementations_table[0]));
   dump_add_opaque (&lrecord_markers,
 		   lrecord_type_count * sizeof (lrecord_markers[0]));
@@ -1027,7 +1032,7 @@ pdump (void)
   if (!none)
     return;
 
-  for (i=0; i<Dynarr_length (pdump_root_struct_ptrs); i++)
+  for (i=0; i<(size_t)Dynarr_length (pdump_root_struct_ptrs); i++)
     {
       pdump_root_struct_ptr info = Dynarr_at (pdump_root_struct_ptrs, i);
       pdump_register_struct (*(info.ptraddress), info.desc, 1);
@@ -1066,7 +1071,8 @@ pdump (void)
   pdump_dump_root_objects ();
 
   fclose (pdump_out);
-  close (pdump_fd);
+  /* pdump_fd is already closed by the preceding fclose call
+  close (pdump_fd); */
 
   free (pdump_buf);
 
@@ -1364,9 +1370,11 @@ pdump_file_try (char *exe_path)
 int
 pdump_load (const char *argv0)
 {
-  char exe_path[PATH_MAX];
+  char exe_path[PATH_MAX], real_exe_path[PATH_MAX];
 #ifdef WIN32_NATIVE
   GetModuleFileName (NULL, exe_path, PATH_MAX);
+  /* #### urk, needed for xrealpath() below */
+  Vdirectory_sep_char = make_char ('\\');
 #else /* !WIN32_NATIVE */
   char *w;
   const char *dir, *p;
@@ -1412,13 +1420,17 @@ pdump_load (const char *argv0)
 	    }
 	  strcpy (w, name);
 
-	  /* ### #$%$#^$^@%$^#%@$ ! */
-#ifdef access
-#undef access
-#endif
+	  /* Check that exe_path is executable and not a directory */
+#undef access /* avoid !@#$%^& encapsulated access */
+#undef stat   /* avoid !@#$%^& encapsulated stat */
+	  {
+	    struct stat statbuf;
+	    if (access (exe_path, X_OK) == 0
+		&& stat (exe_path, &statbuf) == 0
+		&& ! S_ISDIR (statbuf.st_mode))
+	      break;
+	  }
 
-	  if (!access (exe_path, X_OK))
-	    break;
 	  if (!*p)
 	    {
 	      /* Oh well, let's have some kind of default */
@@ -1430,7 +1442,11 @@ pdump_load (const char *argv0)
     }
 #endif /* WIN32_NATIVE */
 
-  if (pdump_file_try (exe_path))
+  /* Save exe_path because pdump_file_try() modifies it */
+  strcpy(real_exe_path, exe_path);
+  if (pdump_file_try (exe_path)
+      || (xrealpath(real_exe_path, real_exe_path)
+	  && pdump_file_try (real_exe_path)))
     {
       pdump_load_finish ();
       return 1;