--- sbbs/src/sbbs3/nopen.c	2018/04/24 16:41:23	1.1.1.1
+++ sbbs/src/sbbs3/nopen.c	2018/04/24 16:43:06	1.1.1.2
@@ -2,13 +2,13 @@
 
 /* Network open functions (nopen and fnopen) */
 
-/* $Id: nopen.c,v 1.1.1.1 2018/04/24 16:41:23 root Exp $ */
+/* $Id: nopen.c,v 1.1.1.2 2018/04/24 16:43:06 root Exp $ */
 
 /****************************************************************************
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2006 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2010 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This program is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU General Public License				*
@@ -39,9 +39,10 @@
 #include "crc32.h"
 
 /****************************************************************************/
-/* Network open function. Opens all files DENYALL and retries LOOP_NOPEN    */
-/* number of times if the attempted file is already open or denying access  */
-/* for some other reason.	All files are opened in BINARY mode.			*/
+/* Network open function. Opens all files DENYALL, DENYWRITE, or DENYNONE	*/
+/* depending on access, and retries LOOP_NOPEN number of times if the		*/
+/* attempted file is already open or denying access  for some other reason. */
+/* All files are opened in BINARY mode.										*/
 /****************************************************************************/
 int nopen(const char* str, int access)
 {
@@ -60,19 +61,20 @@ int nopen(const char* str, int access)
 	if(!(access&O_TEXT))
 		access|=O_BINARY;
 #endif
-    while(((file=sopen(str,access,share,S_IREAD|S_IWRITE))==-1)
+    while(((file=sopen(str,access,share,DEFFILEMODE))==-1)
         && (errno==EACCES || errno==EAGAIN || errno==EDEADLOCK) && count++<LOOP_NOPEN)
         if(count)
             mswait(100);
     return(file);
 }
+
 /****************************************************************************/
 /* This function performs an nopen, but returns a file stream with a buffer */
 /* allocated.																*/
 /****************************************************************************/
 FILE* fnopen(int* fd, const char* str, int access)
 {
-	char	mode[128];
+	char*	mode;
 	int		file;
 	FILE *	stream;
 
@@ -84,19 +86,19 @@ FILE* fnopen(int* fd, const char* str, i
 
     if(access&O_APPEND) {
         if((access&O_RDWR)==O_RDWR)
-            strcpy(mode,"a+");
+            mode="a+";
         else
-            strcpy(mode,"a"); 
+            mode="a"; 
 	} else if(access&(O_TRUNC|O_WRONLY)) {
 		if((access&O_RDWR)==O_RDWR)
-			strcpy(mode,"w+");
+			mode="w+";
 		else
-			strcpy(mode,"w");
+			mode="w";
 	} else {
         if((access&O_RDWR)==O_RDWR)
-            strcpy(mode,"r+");
+            mode="r+";
         else
-            strcpy(mode,"r"); 
+            mode="r"; 
 	}
     stream=fdopen(file,mode);
     if(stream==NULL) {
@@ -110,11 +112,17 @@ FILE* fnopen(int* fd, const char* str, i
 BOOL ftouch(const char* fname)
 {
 	int file;
+	struct utimbuf ut;
+
+	/* update the time stamp */
+	ut.actime = ut.modtime = time(NULL);
+	if(utime(fname, &ut)==0)
+		return(TRUE);
 
+	/* create the file */
 	if((file=nopen(fname,O_WRONLY|O_CREAT))<0)
 		return(FALSE);
 	close(file);
-
 	return(TRUE);
 }
 
@@ -132,7 +140,7 @@ BOOL fmutex(const char* fname, const cha
 		if(remove(fname)!=0)
 			return(FALSE);
 	}
-	if((file=open(fname,O_CREAT|O_WRONLY|O_EXCL,S_IREAD|S_IWRITE))<0)
+	if((file=open(fname,O_CREAT|O_WRONLY|O_EXCL,DEFFILEMODE))<0)
 		return(FALSE);
 	if(text!=NULL)
 		write(file,text,strlen(text));