--- MiNT/src/unifs.c	2018/04/24 17:56:34	1.1.1.3
+++ MiNT/src/unifs.c	2018/04/24 17:58:54	1.1.1.6
@@ -2,7 +2,7 @@
 
 Copyright 1991,1992 Eric R. Smith.
 
-Copyright 1992 Atari Corporation.
+Copyright 1992,1993,1994 Atari Corporation.
 
 All rights reserved.
 
@@ -66,6 +66,8 @@ static long	ARGS_ON_STACK uni_symlink	P_
 
 static long	ARGS_ON_STACK uni_readlink	P_((fcookie *fc, char *buf, int buflen));
 
+static long	ARGS_ON_STACK uni_fscntl	P_((fcookie *dir, const char *name, int cmd, long arg));
+
 
 
 FILESYS uni_filesys = {
@@ -86,7 +88,7 @@ FILESYS uni_filesys = {
 
 	uni_pathconf, uni_dfree, nowritelabel, noreadlabel,
 
-	uni_symlink, uni_readlink, nohardlink, nofscntl, nodskchng
+	uni_symlink, uni_readlink, nohardlink, uni_fscntl, nodskchng
 
 };
 
@@ -126,6 +128,8 @@ typedef struct unifile {
 
 	struct unifile *next;
 
+	short cdate, ctime;
+
 } UNIFILE;
 
 
@@ -136,6 +140,34 @@ static UNIFILE *u_root = 0;
 
 
 
+static long	do_ulookup	P_((fcookie *, const char *, fcookie *, UNIFILE **));
+
+
+
+FILESYS *
+
+get_filesys (dev)
+
+     int dev;
+
+{
+
+  UNIFILE *u;
+
+
+
+  for (u = u_root; u; u = u->next)
+
+    if (u->dev == dev)
+
+      return u->fs;
+
+  return (FILESYS *) 0L;
+
+}
+
+
+
 void
 
 unifs_init()
@@ -158,6 +190,10 @@ unifs_init()
 
 		u->dev = i;
 
+		u->cdate = datestamp;
+
+		u->ctime = timestamp;
+
 		if (i == PROCDRV) {
 
 			strcpy(u->name, "proc");
@@ -248,6 +284,32 @@ uni_lookup(dir, name, fc)
 
 {
 
+	return do_ulookup(dir, name, fc, (UNIFILE **)0);
+
+}
+
+
+
+/* worker function for uni_lookup; can also return the UNIFILE
+
+ * pointer for the root directory
+
+ */
+
+static long
+
+do_ulookup(dir, name, fc, up)
+
+	fcookie *dir;
+
+	const char *name;
+
+	fcookie *fc;
+
+	UNIFILE **up;
+
+{
+
 	UNIFILE *u;
 
 	long drvs;
@@ -296,7 +358,7 @@ uni_lookup(dir, name, fc)
 
 	for (u = u_root; u; u = u->next) {
 
-		if (!stricmp(name, u->name)) {
+		if (!strnicmp(name, u->name, NAME_MAX)) {
 
 			if ( (u->mode & S_IFMT) == S_IFDIR ) {
 
@@ -304,6 +366,8 @@ uni_lookup(dir, name, fc)
 
 					fs = u->fs;
 
+					if (up) *up = u;
+
 					return (*fs->root)(u->dev,fc);
 
 				}
@@ -338,6 +402,8 @@ uni_lookup(dir, name, fc)
 
 			}
 
+			if (up) *up = u;
+
 			return 0;
 
 		}
@@ -378,7 +444,7 @@ uni_getxattr(fc, xattr)
 
 	xattr->index = fc->index;
 
-	xattr->dev = fc->dev;
+	xattr->dev = xattr->rdev = fc->dev;
 
 	xattr->nlink = 1;
 
@@ -416,9 +482,9 @@ uni_getxattr(fc, xattr)
 
 	}
 
-	xattr->mtime = xattr->atime = xattr->ctime = 0;
+	xattr->mtime = xattr->atime = xattr->ctime = u->ctime;
 
-	xattr->mdate = xattr->adate = xattr->cdate = 0;
+	xattr->mdate = xattr->adate = xattr->cdate = u->cdate;
 
 	return 0;
 
@@ -532,10 +598,14 @@ uni_remove(dir, name)
 
 	while (u) {
 
-		if (!strncmp(u->name, name, NAME_MAX)) {
+		if (!strnicmp(u->name, name, NAME_MAX)) {
 
 			if ( (u->mode & S_IFMT) != S_IFLNK ) return EFILNF;
 
+			if (curproc->euid && (u->dev != curproc->euid))
+
+				return EACCDN;
+
 			kfree(u->data);
 
 			if (lastu)
@@ -700,6 +770,14 @@ uni_getname(root, dir, pathname, size)
 
 
 
+	if (!fs) {
+
+		*pathname = 0;
+
+		return 0;
+
+	}
+
 	if (!(fs->fsflags & FS_LONGPATH)) {
 
 		r = (*fs->getname)(&curproc->root[dir->dev], dir, tmppath, PATH_MAX);
@@ -754,7 +832,7 @@ uni_rename(olddir, oldname, newdir, newn
 
 	for (u = u_root; u; u = u->next) {
 
-		if (!stricmp(u->name, oldname))
+		if (!strnicmp(u->name, oldname, NAME_MAX))
 
 			break;
 
@@ -1064,6 +1142,14 @@ uni_pathconf(dir, which)
 
 		return DP_CASEINSENS;
 
+	case DP_MODEATTR:
+
+		return DP_FT_DIR|DP_FT_LNK;
+
+	case DP_XATTRFIELDS:
+
+		return DP_INDEX|DP_DEV|DP_NLINK|DP_SIZE;
+
 	default:
 
 		return EINVFN;
@@ -1158,6 +1244,12 @@ uni_symlink(dir, name, to)
 
 
 
+	if (curproc->egid)
+
+		return EACCDN;	/* only members of admin group may do that */
+
+
+
 	u = kmalloc(SIZEOF(UNIFILE));
 
 	if (!u) return EACCDN;
@@ -1184,12 +1276,16 @@ uni_symlink(dir, name, to)
 
 	u->mode = S_IFLNK | DEFAULT_DIRMODE;
 
-	u->dev = curproc->ruid;
+	u->dev = curproc->euid;
 
 	u->next = u_root;
 
 	u->fs = &uni_filesys;
 
+	u->cdate = datestamp;
+
+	u->ctime = timestamp;
+
 	u_root = u;
 
 	return 0;
@@ -1232,3 +1328,323 @@ uni_readlink(fc, buf, buflen)
 
 }
 
+
+
+
+
+
+
+
+
+/* uk: use these Dcntl's to install a new filesystem which is only visible
+
+ *     on drive u:
+
+ *
+
+ *     FS_INSTALL:   let the kernel know about the file system; it does NOT
+
+ *                   get a device number.
+
+ *     FS_MOUNT:     use Dcntl(FS_MOUNT, "u:\\foo", &descr) to make a directory
+
+ *                   foo where the filesytem resides in; the file system now
+
+ *                   gets its device number which is also written into the
+
+ *                   dev_no field of the fs_descr structure.
+
+ *     FS_UNMOUNT:   remove a file system's directory; this call closes all
+
+ *                   open files, directory searches and directories on this
+
+ *                   device. Make sure that the FS will not recognise any
+
+ *                   accesses to this device, as fs->root will be called
+
+ *                   during the reinitalisation!
+
+ *     FS_UNINSTALL: remove a file system completely from the kernel list,
+
+ *                   but that will only be possible if there is no directory
+
+ *                   associated with this file system.
+
+ *                   This function allows it to write file systems as demons
+
+ *                   which stay in memory only as long as needed.
+
+ *
+
+ * BUG: it is not possible yet to lock such a filesystem.
+
+ */
+
+
+
+/* here we start with gemdos only file system device numbers */
+
+static curr_dev_no = 0x100;
+
+
+
+
+
+
+
+static long ARGS_ON_STACK
+
+uni_fscntl(dir, name, cmd, arg)
+
+	fcookie *dir;
+
+	const char *name;
+
+	int cmd;
+
+	long arg;
+
+{
+
+	fcookie fc;
+
+	long r;
+
+
+
+	extern struct kerinfo kernelinfo;
+
+	extern FILESYS *active_fs;
+
+
+
+	if (cmd == (int)FS_INSTALL) { /* install a new filesystem */
+
+		struct fs_descr *d = (struct fs_descr*)arg;
+
+		FILESYS *fs;
+
+
+
+	/* check if FS is installed already */
+
+		for (fs = active_fs;  fs;  fs = fs->next)
+
+			if (d->file_system == fs)  return 0L;
+
+	/* include new file system into chain of file systems */
+
+		d->file_system->next = active_fs;
+
+		active_fs = d->file_system;
+
+		return (long)&kernelinfo;  /* return pointer to kernel info as OK */
+
+	} else if (cmd == (int)FS_MOUNT) {  /* install a new gemdos-only device for this FS */
+
+		struct fs_descr *d = (struct fs_descr*)arg;
+
+		FILESYS *fs;
+
+		UNIFILE *u;
+
+
+
+	/* first check for existing names */
+
+		r = uni_lookup(dir, name, &fc);
+
+		if (r == 0) {
+
+			release_cookie(&fc);
+
+			return EACCDN;   /* name exists already */
+
+		}
+
+		if (r != EFILNF) return r; /* some other error */
+
+		if (!d) return EACCDN;
+
+		if (!d->file_system) return EACCDN;
+
+	/* check if FS is installed */
+
+		for (fs = active_fs;  fs;  fs = fs->next)
+
+			if (d->file_system == fs)  break;
+
+		if (!fs) return EACCDN;  /* not installed, so return an error */
+
+		u = kmalloc(SIZEOF(UNIFILE));
+
+		if (!u) return EACCDN;
+
+		strncpy(u->name, name, NAME_MAX);
+
+		u->name[NAME_MAX] = 0;
+
+		u->mode = S_IFDIR|DEFAULT_DIRMODE;
+
+		u->data = 0;
+
+		u->fs = d->file_system;
+
+	/* now get the file system its own device number */
+
+		u->dev = d->dev_no = curr_dev_no++;
+
+	/* chain new entry into unifile list */
+
+		u->next = u_root;
+
+		u_root = u;
+
+		return (long)u->dev;
+
+	} else if (cmd == (int)FS_UNMOUNT) {  /* remove a file system's directory */
+
+		struct fs_descr *d = (struct fs_descr*)arg;
+
+		FILESYS *fs;
+
+		UNIFILE *u;
+
+
+
+	/* first check that directory exists */
+
+	/* use special uni_lookup mode to get the unifile entry */
+
+		r = do_ulookup(dir, name, &fc, &u);
+
+		if (r != 0)  return EFILNF;   /* name does not exist */
+
+		if (!d) return EFILNF;
+
+		if (!d->file_system) return EFILNF;
+
+		if (d->file_system != fc.fs)
+
+			return EFILNF;  /* not the right name! */
+
+		release_cookie(&fc);
+
+
+
+		if (!u || (u->fs != d->file_system))
+
+			return EFILNF;
+
+	/* check if FS is installed */
+
+		for (fs = active_fs;  fs;  fs = fs->next)
+
+			if (d->file_system == fs)  break;
+
+		if (!fs) return EACCDN;  /* not installed, so return an error */
+
+
+
+	/* here comes the difficult part: we have to close all files on that
+
+	 * device, so we have to call changedrv(). The file system driver
+
+	 * has to make sure that further calls to fs.root() with this device
+
+	 * number will fail!
+
+	 *
+
+	 * Kludge: mark the directory as a link, so uni_remove will remove it.
+
+	 */
+
+		changedrv(u->dev);
+
+		u->mode &= ~S_IFMT;
+
+		u->mode |= S_IFLNK;
+
+		return uni_remove(dir, name);
+
+	} else if (cmd == (int)FS_UNINSTALL) {    /* remove file system from kernel list */
+
+		struct fs_descr *d = (struct fs_descr*)arg;
+
+		FILESYS *fs, *last_fs;
+
+		UNIFILE *u;
+
+
+
+	/* first check if there are any files or directories associated with
+
+	 * this file system
+
+	 */
+
+		for (u = u_root;  u;  u = u->next)
+
+			if (u->fs == d->file_system)
+
+				return EACCDN;   /* we cannot remove it before unmount */
+
+		last_fs = 0;
+
+		fs = active_fs;
+
+		while (fs)  {   /* go through the list and remove the file system */
+
+			if (fs == d->file_system)  {
+
+				if (last_fs)
+
+					last_fs->next = fs->next;
+
+				else
+
+					active_fs = fs->next;
+
+				d->file_system->next = 0;
+
+				return 0;
+
+			}
+
+			last_fs = fs;
+
+			fs = fs->next;
+
+		}
+
+		return EFILNF;
+
+	} else {
+
+	/* see if we should just pass this along to another file system */
+
+		r = uni_lookup(dir, name, &fc);
+
+		if (r == 0) {
+
+			if (fc.fs != &uni_filesys) {
+
+				r = (*fc.fs->fscntl)(&fc, ".", cmd, arg);
+
+				release_cookie(&fc);
+
+				return r;
+
+			}
+
+			release_cookie(&fc);
+
+		}
+
+	}
+
+	return EINVFN;
+
+}
+