Makefile: Changes to split Solaris into Solaris2.3 and previous, and 2.4 and after from Paul Eggert.

Makefile: Added AMIGA changes from Rask Ingemann Lambertsen <rask@k4315.kampsax.dtu.dk>.
charset.c: Patch for Western European Languages from Josef Hinteregger <joehtg@joehtg.co.at>
charset.h: Patch for Western European Languages from Josef Hinteregger <joehtg@joehtg.co.at>
clitar.c: Patch to re-sync after read fail from (lost contributor name, sorry).
includes.h: Patch for AMIGA from Rask Ingemann Lambertsen <rask@k4315.kampsax.dtu.dk>
includes.h: Patch for SunOS atexit by Jeremy (jra@cygnus.com)
interface.c: Patch for AMIGA from Rask Ingemann Lambertsen <rask@k4315.kampsax.dtu.dk>
kanji.h: Patch for Western European Languages from Josef Hinteregger <joehtg@joehtg.co.at>
locking.c: Patch to fix file locking from Jeremy (jra@cygnus.com)
locking.c: Patch to add granularity of lock files to usec by Jeremy (jra@cygnus.com)
pipes.c: Patch to fix file locking from Jeremy (jra@cygnus.com)
proto.h: Patch to fix file locking from Jeremy (jra@cygnus.com)
reply.c: Patch to fix file locking from Jeremy (jra@cygnus.com)
server.c: Patch to fix file locking from Jeremy (jra@cygnus.com)
server.c: Patch for FAST_SHARE_MODE fix from (lost contributor name, sorry).
smb.h: Patch to fix file locking from Jeremy (jra@cygnus.com)
smb.h: Patch to add granularity of lock files to usec by Jeremy (jra@cygnus.com)
status.c: Patch to fix file locking from Jeremy (jra@cygnus.com)
statuc.c: Patch to add granularity of lock files to usec by Jeremy (jra@cygnus.com)
system.c: Patch for Western European Languages from Josef Hinteregger <joehtg@joehtg.co.at>
trans2.c: Patch to fix file locking from Jeremy (jra@cygnus.com)
trans2.c: Patch to fix volume name reported to Win95 from Jeremy (jra@cygnus.com)
util.c: Patch for Western European Languages from Josef Hinteregger <joehtg@joehtg.co.at>
util.c: Patch to fix client_name from continuously returning UNKNOWN (from various contributors).
version.h: Update to 1.9.16p10.

1 files changed, 21 insertions, 4 deletions

diff --git a/source/include/smb.h b/source/include/smb.h
index f499459f98a..bbb477f5f77 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -286,10 +286,27 @@ typedef struct
 	BOOL  wr_discard; /* discard all further data */
         } write_bmpx_struct;
 
+/*
+ * Structure used to indirect fd's from the files_struct.
+ * Needed as POSIX locking is based on file and process, not
+ * file descriptor and process.
+ */
+
 typedef struct
 {
-  int cnum;
+  uint16 ref_count;
+  int32 dev;
+  int32 inode;
   int fd;
+  int fd_readonly;
+  int fd_writeonly;
+  int real_open_flags;
+} file_fd_struct;
+
+typedef struct
+{
+  int cnum;
+  file_fd_struct *fd_ptr;
   int pos;
   int size;
   int mode;
@@ -297,7 +314,7 @@ typedef struct
   char *mmap_ptr;
   int mmap_size;
   write_bmpx_struct *wbmpx_ptr;
-  time_t open_time;
+  struct timeval open_time;
   BOOL open;
   BOOL can_lock;
   BOOL can_read;
@@ -405,7 +422,7 @@ typedef struct
   shm_offset_t next_offset; /* offset of next record in list in shared mem */
   int locking_version;
   int share_mode;
-  time_t time;
+  struct timeval time;
   int pid;
   dev_t st_dev;
   ino_t st_ino;
@@ -428,7 +445,7 @@ struct connect_record
 };
 
 
-#define LOCKING_VERSION 2
+#define LOCKING_VERSION 3
 
 /* these are useful macros for checking validity of handles */
 #define VALID_FNUM(fnum)   (((fnum) >= 0) && ((fnum) < MAX_OPEN_FILES))