--- uae/src/od-win32/fsdb_win32.c	2018/04/24 16:59:28	1.1.1.2
+++ uae/src/od-win32/fsdb_win32.c	2018/04/24 17:17:42	1.1.1.6
@@ -13,6 +13,7 @@
 #include "sysdeps.h"
 
 #include "fsdb.h"
+#include <windows.h>
 
 /* these are deadly (but I think allowed on the Amiga): */
 #define NUM_EVILCHARS 7
@@ -26,35 +27,32 @@ int fsdb_name_invalid (const char *n)
     char b = (a == '\0' ? a : n[1]);
     char c = (b == '\0' ? b : n[2]);
     char d = (c == '\0' ? c : n[3]);
+    int l = strlen (n);
 
     if (a >= 'a' && a <= 'z')
-        a -= 32;
+	a -= 32;
     if (b >= 'a' && b <= 'z')
-        b -= 32;
+	b -= 32;
     if (c >= 'a' && c <= 'z')
-        c -= 32;
+	c -= 32;
 
-    /* reserved dos devices */
-    if ((a == 'A' && b == 'U' && c == 'X')                                  /* AUX  */
-        || (a == 'C' && b == 'O' && c == 'N')                               /* CON  */
-        || (a == 'P' && b == 'R' && c == 'N')                               /* PRN  */
-        || (a == 'N' && b == 'U' && c == 'L')                               /* NUL  */
-        || (a == 'L' && b == 'P' && c == 'T'  && (d >= '0' && d <= '9'))    /* LPT# */
-        || (a == 'C' && b == 'O' && c == 'M'  && (d >= '0' && d <= '9')))   /* COM# */
+    if ((a == 'A' && b == 'U' && c == 'X' && l == 3) /* AUX  */
+	|| (a == 'C' && b == 'O' && c == 'N' && l == 3) /* CON  */
+	|| (a == 'P' && b == 'R' && c == 'N' && l == 3) /* PRN  */
+	|| (a == 'N' && b == 'U' && c == 'L' && l == 3) /* NUL  */
+	|| (a == 'L' && b == 'P' && c == 'T'  && (d >= '0' && d <= '9') && l == 4)  /* LPT# */
+	|| (a == 'C' && b == 'O' && c == 'M'  && (d >= '0' && d <= '9') && l == 4)) /* COM# */
 	return 1;
-
-    /* spaces and periods at the beginning or the end are a no-no */
-    if (n[0] == '.' || n[0] == ' ')
-	return 1;
-
+  
+    /* spaces and periods at the end are a no-no */
     i = strlen(n) - 1;
     if (n[i] == '.' || n[i] == ' ')
 	return 1;
 
     /* these characters are *never* allowed */
     for (i = 0; i < NUM_EVILCHARS; i++) {
-        if (strchr (n, evilchars[i]) != 0)
-            return 1;
+	if (strchr (n, evilchars[i]) != 0)
+	    return 1;
     }
 
     /* the reserved fsdb filename */
@@ -65,7 +63,7 @@ int fsdb_name_invalid (const char *n)
 
 uae_u32 filesys_parse_mask(uae_u32 mask)
 {
-    return(mask ^ 0xf);
+    return mask ^ 0xf;
 }
 
 /* For an a_inode we have newly created based on a filename we found on the
@@ -77,25 +75,29 @@ void fsdb_fill_file_attrs (a_inode *aino
     if((mode = GetFileAttributes(aino->nname)) == 0xFFFFFFFF) return;
 	
     aino->dir = (mode & FILE_ATTRIBUTE_DIRECTORY) ? 1 : 0;
-    aino->amigaos_mode = (FILE_ATTRIBUTE_ARCHIVE & mode) ? 0 : A_FIBF_ARCHIVE;
-    aino->amigaos_mode |= 0xf; /* set rwed by default */
+    aino->amigaos_mode = A_FIBF_EXECUTE | A_FIBF_READ;
+    if (FILE_ATTRIBUTE_ARCHIVE & mode)
+	aino->amigaos_mode |= A_FIBF_ARCHIVE;
+    if (! (FILE_ATTRIBUTE_READONLY & mode))
+	aino->amigaos_mode |= A_FIBF_WRITE | A_FIBF_DELETE;
     aino->amigaos_mode = filesys_parse_mask(aino->amigaos_mode);
 }
 
-int fsdb_set_file_attrs (a_inode *aino, uae_u32 mask)
+int fsdb_set_file_attrs (a_inode *aino, int mask)
 {
     struct stat statbuf;
     uae_u32 mode=0, tmpmask;
 
     tmpmask = filesys_parse_mask(mask);
-	
+
     if (stat (aino->nname, &statbuf) == -1)
 	return ERROR_OBJECT_NOT_AROUND;
-	
+
     /* Unix dirs behave differently than AmigaOS ones.  */
     /* windows dirs go where no dir has gone before...  */
     if (! aino->dir) {
-	
+	if ((tmpmask & (A_FIBF_READ | A_FIBF_DELETE)) == 0)
+	    mode |= FILE_ATTRIBUTE_READONLY;
 	if (tmpmask & A_FIBF_ARCHIVE)
 	    mode |= FILE_ATTRIBUTE_ARCHIVE;
 	else
@@ -113,14 +115,24 @@ int fsdb_set_file_attrs (a_inode *aino,
  * native FS.  Return zero if that is not possible.  */
 int fsdb_mode_representable_p (const a_inode *aino)
 {
+    int mask = aino->amigaos_mode;
+    int m1;
+
     if (aino->dir)
 	return aino->amigaos_mode == 0;
-    return (aino->amigaos_mode & (A_FIBF_DELETE
-				  | A_FIBF_SCRIPT
-				  | A_FIBF_PURE
-				  | A_FIBF_EXECUTE
-				  | A_FIBF_READ
-				  | A_FIBF_WRITE)) == 0;
+
+    /* P or S set, or E or R clear, means we can't handle it.  */
+    if (mask & (A_FIBF_SCRIPT | A_FIBF_PURE | A_FIBF_EXECUTE | A_FIBF_READ))
+	return 0;
+
+    m1 = A_FIBF_DELETE | A_FIBF_WRITE;
+    /* If it's rwed, we are OK... */
+    if ((mask & m1) == 0)
+	return 1;
+    /* We can also represent r-e-, by setting the host's readonly flag.  */
+    if ((mask & m1) == m1)
+	return 1;
+    return 0;
 }
 
 char *fsdb_create_unique_nname (a_inode *base, const char *suggestion)
@@ -133,13 +145,13 @@ char *fsdb_create_unique_nname (a_inode
 	
     /* replace the evil ones... */
     for (i=0; i < NUM_EVILCHARS; i++)
-        while ((c = strchr (tmp, evilchars[i])) != 0)
-            *c = '_';
+	while ((c = strchr (tmp, evilchars[i])) != 0)
+	    *c = '_';
 
     while ((c = strchr (tmp, '.')) != 0)
-        *c = '_';
+	*c = '_';
     while ((c = strchr (tmp, ' ')) != 0)
-        *c = '_';
+	*c = '_';
 
     for (;;) {
 	char *p = build_nname (base->nname, tmp);
@@ -152,7 +164,7 @@ char *fsdb_create_unique_nname (a_inode
 	/* tmpnam isn't reentrant and I don't really want to hack configure
 	 * right now to see whether tmpnam_r is available...  */
 	for (i = 0; i < 8; i++) {
-	    tmp[i+8] = "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"[random () % 63];
+	    tmp[i+8] = "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"[rand () % 63];
 	}
     }
 }