partial: 0.1.55.jcn

[lilypond.git] / lib / mapped-file-storage.cc

diff --git a/lib/mapped-file-storage.cc b/lib/mapped-file-storage.cc
index ad39630b3792e54b9328d9a6f8b6e277d6abe393..c318925b4e543aa60100d2d4fca3d21ec9d6d417 100644 (file)
--- a/lib/mapped-file-storage.cc
+++ b/lib/mapped-file-storage.cc
@@ -1,11 +1,16 @@
+#ifdef HAIRY_STUFF
+
 /*
   file-storage.cc -- implement Mapped_file_storage
 
   source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-  Jan Nieuwenhuizen <jan@digicash.com>
+  Jan Nieuwenhuizen <jan@digicash.com>.
+
+  Nextstep fixes by tiggr@ics.ele.tue.nl
 */
+
 #include <sys/types.h>         // open, mmap
 #include <sys/stat.h>          // open
 #include <sys/mman.h>          // mmap
@@ -18,84 +23,117 @@
 
 
 
+#ifdef __NeXT__
+#include <mach/mach.h>
+#include <mach/mach_traps.h>
+#include <mach/mach_error.h>
+#endif
+
 #include "string.hh"
 #include "proto.hh"
 #include "warn.hh"
 #include "file-storage.hh"
 
-Mapped_file_storage::Mapped_file_storage(String s)
+Mapped_file_storage::Mapped_file_storage (String s)
 {
   data_caddr_ = 0;
   fildes_i_ = 0;
   size_off_ = 0;
-  open(s);
+  open (s);
 }
 
 char const*
-Mapped_file_storage::ch_C() const
+Mapped_file_storage::ch_C () const
 {
   return (char const*)data_caddr_;
 }
 
 void
-Mapped_file_storage::map()
+Mapped_file_storage::map ()
 {
   if (fildes_i_ == -1)
     return;
-
-  data_caddr_ = (caddr_t)mmap((void*)0, size_off_, PROT_READ, MAP_SHARED, fildes_i_, 0);
+  
+#ifdef __NeXT__
+   /* Should be #if !HAVE_MMAP && HAVE_MAP_FD...  */
+   {
+     vm_offset_t address;
+     kern_return_t r;
+ 
+     r = map_fd (fildes_i_, (vm_offset_t) 0, &address, TRUE, size_off_);
+     if (r != KERN_SUCCESS)
+       warning (String (_ ("map_fd: ")) + mach_error_string (r));
+     else
+       data_caddr_ = (char *) address;
+   }
+#else
+
+  data_caddr_ = (caddr_t)mmap ((void*)0, size_off_, PROT_READ, MAP_SHARED, fildes_i_, 0);
 
   if ((int)data_caddr_ == -1)
-    warning(String(_("can't map: error no: ")) + strerror(errno));
+    warning (String (_ ("can't map: error no: ")) + strerror (errno));
+
+#endif
 }
 
 
 void
-Mapped_file_storage::open(String name_str)
+Mapped_file_storage::open (String name_str)
 {
-  fildes_i_ = ::open(name_str.ch_C (), O_RDONLY);
+  fildes_i_ = ::open (name_str.ch_C (), O_RDONLY);
 
   if (fildes_i_ == -1)
     {
-      warning(String(_("can't open: ")) + name_str + String(": ") + strerror(errno));
+      warning (String (_ ("can't open: ")) + name_str + String (": ") + strerror (errno));
       return;
     }
 
   struct stat file_stat;
-  fstat(fildes_i_, &file_stat);
+  fstat (fildes_i_, &file_stat);
   size_off_ = file_stat.st_size;
-  map();
+  map ();
 }
 
 void
-Mapped_file_storage::unmap()
+Mapped_file_storage::unmap ()
 {
   if (data_caddr_)
     {
-      munmap(data_caddr_, size_off_);
+#ifdef __NeXT__
+       kern_return_t r;
+ 
+       r = vm_deallocate (task_self (), (vm_address_t) data_caddr_, 
+size_off_);
+       if (r != KERN_SUCCESS)
+       warning (String (_ ("vm_deallocate: ")) + mach_error_string (r));
+#else
+       munmap (data_caddr_, size_off_);
+#endif
+       
       data_caddr_ = 0;
       size_off_ = 0;
     }
 }
 
 void
-Mapped_file_storage::close()
+Mapped_file_storage::close ()
 {
-  unmap();
+  unmap ();
   if (fildes_i_)
     {
-      ::close(fildes_i_);
+      ::close (fildes_i_);
       fildes_i_ = 0;
     }
 }
 
 int
-Mapped_file_storage::length_i() const
+Mapped_file_storage::length_i () const
 {
   return size_off_;
 }
 
-Mapped_file_storage::~Mapped_file_storage()
+Mapped_file_storage::~Mapped_file_storage ()
 {
-  close();
+  close ();
 }
+#endif