--- MiNT/src/unifs.c 2018/04/24 17:55:36 1.1 +++ MiNT/src/unifs.c 2018/04/24 17:56:34 1.1.1.3 @@ -1,6 +1,10 @@ /* -Copyright 1991,1992 Eric R. Smith. All rights reserved. +Copyright 1991,1992 Eric R. Smith. + +Copyright 1992 Atari Corporation. + +All rights reserved. */ @@ -20,45 +24,47 @@ extern FILESYS bios_filesys, proc_filesy -static long uni_root P_((int drv, fcookie *fc)); +static long ARGS_ON_STACK uni_root P_((int drv, fcookie *fc)); -static long uni_lookup P_((fcookie *dir, const char *name, fcookie *fc)); +static long ARGS_ON_STACK uni_lookup P_((fcookie *dir, const char *name, fcookie *fc)); -static long uni_getxattr P_((fcookie *fc, XATTR *xattr)); +static long ARGS_ON_STACK uni_getxattr P_((fcookie *fc, XATTR *xattr)); -static long uni_chattr P_((fcookie *fc, int attrib)); +static long ARGS_ON_STACK uni_chattr P_((fcookie *fc, int attrib)); -static long uni_chown P_((fcookie *fc, int uid, int gid)); +static long ARGS_ON_STACK uni_chown P_((fcookie *fc, int uid, int gid)); -static long uni_chmode P_((fcookie *fc, unsigned mode)); +static long ARGS_ON_STACK uni_chmode P_((fcookie *fc, unsigned mode)); -static long uni_rmdir P_((fcookie *dir, const char *name)); +static long ARGS_ON_STACK uni_rmdir P_((fcookie *dir, const char *name)); -static long uni_remove P_((fcookie *dir, const char *name)); +static long ARGS_ON_STACK uni_remove P_((fcookie *dir, const char *name)); -static long uni_getname P_((fcookie *root, fcookie *dir, char *pathname)); +static long ARGS_ON_STACK uni_getname P_((fcookie *root, fcookie *dir, -static long uni_rename P_((fcookie *olddir, char *oldname, + char *pathname, int size)); + +static long ARGS_ON_STACK uni_rename P_((fcookie *olddir, char *oldname, fcookie *newdir, const char *newname)); -static long uni_opendir P_((DIR *dirh, int flags)); +static long ARGS_ON_STACK uni_opendir P_((DIR *dirh, int flags)); -static long uni_readdir P_((DIR *dirh, char *nm, int nmlen, fcookie *)); +static long ARGS_ON_STACK uni_readdir P_((DIR *dirh, char *nm, int nmlen, fcookie *)); -static long uni_rewinddir P_((DIR *dirh)); +static long ARGS_ON_STACK uni_rewinddir P_((DIR *dirh)); -static long uni_closedir P_((DIR *dirh)); +static long ARGS_ON_STACK uni_closedir P_((DIR *dirh)); -static long uni_pathconf P_((fcookie *dir, int which)); +static long ARGS_ON_STACK uni_pathconf P_((fcookie *dir, int which)); -static long uni_dfree P_((fcookie *dir, long *buf)); +static long ARGS_ON_STACK uni_dfree P_((fcookie *dir, long *buf)); -static DEVDRV * uni_getdev P_((fcookie *fc, long *devsp)); +static DEVDRV * ARGS_ON_STACK uni_getdev P_((fcookie *fc, long *devsp)); -static long uni_symlink P_((fcookie *dir, const char *name, const char *to)); +static long ARGS_ON_STACK uni_symlink P_((fcookie *dir, const char *name, const char *to)); -static long uni_readlink P_((fcookie *fc, char *buf, int buflen)); +static long ARGS_ON_STACK uni_readlink P_((fcookie *fc, char *buf, int buflen)); @@ -66,7 +72,7 @@ FILESYS uni_filesys = { (FILESYS *)0, - 0, + FS_LONGPATH, uni_root, @@ -110,7 +116,7 @@ typedef struct unifile { char name[NAME_MAX+1]; - short mode; + ushort mode; ushort dev; @@ -124,11 +130,7 @@ typedef struct unifile { -/* the "+1" is for shared memory, which has no BIOS drive */ - -#define UNI_DIRS NUM_DRIVES+1 - -static UNIFILE u_drvs[UNI_DIRS]; +static UNIFILE u_drvs[UNI_NUM_DRVS]; static UNIFILE *u_root = 0; @@ -148,7 +150,7 @@ unifs_init() u_root = u; - for (i = 0; i < NUM_DRIVES; i++,u++) { + for (i = 0; i < UNI_NUM_DRVS; i++,u++) { u->next = u+1; @@ -156,49 +158,55 @@ unifs_init() u->dev = i; - u->fs = 0; - - if (i == PROCDRV) + if (i == PROCDRV) { strcpy(u->name, "proc"); - else if (i == PIPEDRV) + u->fs = &proc_filesys; + + } else if (i == PIPEDRV) { strcpy(u->name, "pipe"); - else if (i == BIOSDRV) + u->fs = &pipe_filesys; + + } else if (i == BIOSDRV) { strcpy(u->name, "dev"); - else if (i == UNIDRV) { + u->fs = &bios_filesys; + + } else if (i == UNIDRV) { (u-1)->next = u->next; /* skip this drive */ + } else if (i == SHMDRV) { + + strcpy(u->name, "shm"); + + u->fs = &shm_filesys; + } else { u->name[0] = i + 'a'; u->name[1] = 0; + u->fs = 0; + } } - u->next = 0; + --u; /* oops, we went too far */ - u->mode = S_IFDIR|DEFAULT_DIRMODE; - - u->dev = SHMDEVICE; - - u->fs = &shm_filesys; - - strcpy(u->name, "shm"); + u->next = 0; } -static long +static long ARGS_ON_STACK uni_root(drv, fc) @@ -228,7 +236,7 @@ uni_root(drv, fc) -static long +static long ARGS_ON_STACK uni_lookup(dir, name, fc) @@ -246,17 +254,19 @@ uni_lookup(dir, name, fc) FILESYS *fs; + fcookie *tmp; + extern long dosdrvs; - TRACE("uni_lookup(%s)", name); + TRACE(("uni_lookup(%s)", name)); if (dir->index != 0) { - DEBUG("uni_lookup: bad directory"); + DEBUG(("uni_lookup: bad directory")); return EPTHNF; @@ -270,7 +280,7 @@ uni_lookup(dir, name, fc) if (!*name || !strcmp(name, ".") || !strcmp(name, "..")) { - *fc = *dir; + dup_cookie(fc, dir); return 0; @@ -302,20 +312,22 @@ uni_lookup(dir, name, fc) return EPTHNF; - *fc = curproc->root[u->dev]; + tmp = &curproc->root[u->dev]; - if (!fc->fs) { /* drive changed? */ + if (!tmp->fs) { /* drive changed? */ - changedrv(fc->dev); + changedrv(tmp->dev); - *fc = curproc->root[u->dev]; + tmp = &curproc->root[u->dev]; - if (!fc->fs) + if (!tmp->fs) return EPTHNF; } + dup_cookie(fc, tmp); + } else { /* a symbolic link */ fc->fs = &uni_filesys; @@ -332,7 +344,7 @@ uni_lookup(dir, name, fc) } - DEBUG("uni_lookup: name (%s) not found", name); + DEBUG(("uni_lookup: name (%s) not found", name)); return EFILNF; @@ -340,7 +352,7 @@ uni_lookup(dir, name, fc) -static long +static long ARGS_ON_STACK uni_getxattr(fc, xattr) @@ -414,7 +426,7 @@ uni_getxattr(fc, xattr) -static long +static long ARGS_ON_STACK uni_chattr(dir, attrib) @@ -424,13 +436,15 @@ uni_chattr(dir, attrib) { + UNUSED(dir); UNUSED(attrib); + return EACCDN; } -static long +static long ARGS_ON_STACK uni_chown(dir, uid, gid) @@ -440,13 +454,17 @@ uni_chown(dir, uid, gid) { + UNUSED(dir); UNUSED(uid); + + UNUSED(gid); + return EINVFN; } -static long +static long ARGS_ON_STACK uni_chmode(dir, mode) @@ -456,13 +474,17 @@ uni_chmode(dir, mode) { + UNUSED(dir); + + UNUSED(mode); + return EINVFN; } -static long +static long ARGS_ON_STACK uni_rmdir(dir, name) @@ -486,7 +508,7 @@ uni_rmdir(dir, name) -static long +static long ARGS_ON_STACK uni_remove(dir, name) @@ -500,6 +522,10 @@ uni_remove(dir, name) + UNUSED(dir); + + + lastu = 0; u = u_root; @@ -538,12 +564,14 @@ uni_remove(dir, name) -static long +static long ARGS_ON_STACK -uni_getname(root, dir, pathname) +uni_getname(root, dir, pathname, size) fcookie *root, *dir; char *pathname; + int size; + { FILESYS *fs; @@ -554,6 +582,18 @@ uni_getname(root, dir, pathname) fcookie relto; + char tmppath[PATH_MAX]; + + long r; + + + + UNUSED(root); + + + + if (size <= 0) return ERANGE; + fs = dir->fs; @@ -574,10 +614,16 @@ uni_getname(root, dir, pathname) *pathname++ = '\\'; - for (n = u->name; *n; ) + if (--size <= 0) return ERANGE; + + for (n = u->name; *n; ) { *pathname++ = *n++; + if (--size <= 0) return ERANGE; + + } + break; } @@ -600,11 +646,41 @@ uni_getname(root, dir, pathname) if ((*fs->root)(dir->dev, &relto) == 0) { - return (*fs->getname)(&relto, dir, pathname); + if (!(fs->fsflags & FS_LONGPATH)) { + + r = (*fs->getname)(&relto, dir, tmppath, PATH_MAX); + + release_cookie(&relto); + + if (r) { + + return r; + + } + + if (strlen(tmppath) < size) { + + strcpy(pathname, tmppath); + + return 0; + + } else { + + return ERANGE; + + } + + } + + r = (*fs->getname)(&relto, dir, pathname, size); + + release_cookie(&relto); + + return r; } else { - *pathname++ = 0; + *pathname = 0; return EINTRN; @@ -624,13 +700,33 @@ uni_getname(root, dir, pathname) - return (*fs->getname)(&curproc->root[dir->dev], dir, pathname); + if (!(fs->fsflags & FS_LONGPATH)) { + + r = (*fs->getname)(&curproc->root[dir->dev], dir, tmppath, PATH_MAX); + + if (r) return r; + + if (strlen(tmppath) < size) { + + strcpy(pathname, tmppath); + + return 0; + + } else { + + return ERANGE; + + } + + } + + return (*fs->getname)(&curproc->root[dir->dev], dir, pathname, size); } -static long +static long ARGS_ON_STACK uni_rename(olddir, oldname, newdir, newname) @@ -644,7 +740,7 @@ uni_rename(olddir, oldname, newdir, newn { - UNIFILE *u = 0; + UNIFILE *u; fcookie fc; @@ -652,6 +748,10 @@ uni_rename(olddir, oldname, newdir, newn + UNUSED(olddir); + + + for (u = u_root; u; u = u->next) { if (!stricmp(u->name, oldname)) @@ -664,7 +764,7 @@ uni_rename(olddir, oldname, newdir, newn if (!u) { - DEBUG("uni_rename: old file not found"); + DEBUG(("uni_rename: old file not found")); return EFILNF; @@ -676,9 +776,15 @@ uni_rename(olddir, oldname, newdir, newn r = uni_lookup(newdir, newname, &fc); + if (r == 0) + + release_cookie(&fc); + + + if (r != EFILNF) { - DEBUG("uni_rename: error %ld", r); + DEBUG(("uni_rename: error %ld", r)); return (r == 0) ? EACCDN : r; @@ -694,7 +800,7 @@ uni_rename(olddir, oldname, newdir, newn -static long +static long ARGS_ON_STACK uni_opendir(dirh, flags) @@ -704,9 +810,13 @@ uni_opendir(dirh, flags) { + UNUSED(flags); + + + if (dirh->fc.index != 0) { - DEBUG("uni_opendir: bad directory"); + DEBUG(("uni_opendir: bad directory")); return EPTHNF; @@ -722,7 +832,7 @@ uni_opendir(dirh, flags) -static long +static long ARGS_ON_STACK uni_readdir(dirh, name, namelen, fc) @@ -812,7 +922,7 @@ tryagain: } - *fc = curproc->root[u->dev]; + dup_cookie(fc, &curproc->root[u->dev]); if (!fc->fs) { /* drive not yet initialized */ @@ -842,9 +952,15 @@ tryagain: if (giveindex) { - namelen -= sizeof(long); + namelen -= (int)sizeof(long); + + if (namelen <= 0) { + + release_cookie(fc); - if (namelen <= 0) return ERANGE; + return ERANGE; + + } *((long *)name) = index; @@ -854,17 +970,21 @@ tryagain: strncpy(name, dirname, namelen-1); - if (strlen(name) < strlen(dirname)) + if (strlen(name) < strlen(dirname)) { + + release_cookie(fc); return ENAMETOOLONG; + } + return 0; } -static long +static long ARGS_ON_STACK uni_rewinddir(dirh) @@ -880,7 +1000,7 @@ uni_rewinddir(dirh) -static long +static long ARGS_ON_STACK uni_closedir(dirh) @@ -888,13 +1008,15 @@ uni_closedir(dirh) { + UNUSED(dirh); + return 0; } -static long +static long ARGS_ON_STACK uni_pathconf(dir, which) @@ -904,6 +1026,10 @@ uni_pathconf(dir, which) { + UNUSED(dir); + + + switch(which) { case -1: @@ -948,7 +1074,7 @@ uni_pathconf(dir, which) -static long +static long ARGS_ON_STACK uni_dfree(dir, buf) @@ -958,6 +1084,10 @@ uni_dfree(dir, buf) { + UNUSED(dir); + + + buf[0] = 0; /* number of free clusters */ buf[1] = 0; /* total number of clusters */ @@ -972,7 +1102,7 @@ uni_dfree(dir, buf) -static DEVDRV * +static DEVDRV * ARGS_ON_STACK uni_getdev(fc, devsp) @@ -982,6 +1112,10 @@ uni_getdev(fc, devsp) { + UNUSED(fc); + + + *devsp = EACCDN; return 0; @@ -990,7 +1124,7 @@ uni_getdev(fc, devsp) -static long +static long ARGS_ON_STACK uni_symlink(dir, name, to) @@ -1012,7 +1146,13 @@ uni_symlink(dir, name, to) r = uni_lookup(dir, name, &fc); - if (r == 0) return EACCDN; /* file already exists */ + if (r == 0) { + + release_cookie(&fc); + + return EACCDN; /* file already exists */ + + } if (r != EFILNF) return r; /* some other error */ @@ -1058,7 +1198,7 @@ uni_symlink(dir, name, to) -static long +static long ARGS_ON_STACK uni_readlink(fc, buf, buflen)