mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
Remove vestigial 3DFS support code (re: f88f302c)
Support for the long-dead 3DFS userland versioning file system was
already removed from ksh93 (although I'd overlooked some minor
things), but libast still supported it. This removes that too.
src/lib/libast/include/fs3d.h,
src/lib/libast/man/fs3d.3,
src/lib/libast/misc/fs3d.c:
- Removed.
bin/package,
src/cmd/INIT/package.sh:
- Remove attempted use of removed vpath builtin.
src/cmd/ksh93/*:
- Remove minor 3dfs vestiges.
src/lib/lib{ast,cmd,coshell}/*:
- Remove code supporting 3dfs.
This commit is contained in:
parent
2db9953ae0
commit
fbc6cd4286
32 changed files with 83 additions and 683 deletions
|
|
@ -30,13 +30,8 @@
|
|||
* remove redundant .'s and /'s
|
||||
* move ..'s to the front
|
||||
* /.. preserved (for pdu and newcastle hacks)
|
||||
* FS_3D handles ...
|
||||
* if (flags&PATH_PHYSICAL) then symlinks resolved at each component
|
||||
* if (flags&PATH_DOTDOT) then each .. checked for access
|
||||
* if (flags&PATH_EXISTS) then path must exist at each component
|
||||
* if (flags&PATH_VERIFIED(n)) then first n chars of path exist
|
||||
*
|
||||
* longer pathname possible if (flags&PATH_PHYSICAL) or FS_3D ... involved
|
||||
* longer pathname possible if (flags&PATH_PHYSICAL) involved
|
||||
* 0 returned on error and if (flags&(PATH_DOTDOT|PATH_EXISTS)) then path
|
||||
* will contain the components following the failure point
|
||||
*/
|
||||
|
|
@ -45,7 +40,6 @@
|
|||
|
||||
#include <ast.h>
|
||||
#include <ls.h>
|
||||
#include <fs3d.h>
|
||||
#include <error.h>
|
||||
|
||||
char*
|
||||
|
|
@ -70,9 +64,6 @@ pathcanon_20100601(char* path, size_t size, int flags)
|
|||
char* v;
|
||||
int loop;
|
||||
int oerrno;
|
||||
#if defined(FS_3D)
|
||||
long visits = 0;
|
||||
#endif
|
||||
|
||||
oerrno = errno;
|
||||
dots = loop = 0;
|
||||
|
|
@ -129,31 +120,7 @@ pathcanon_20100601(char* path, size_t size, int flags)
|
|||
else for (t -= 5; t > r && *(t - 1) != '/'; t--);
|
||||
break;
|
||||
case 3:
|
||||
#if defined(FS_3D)
|
||||
{
|
||||
char* x;
|
||||
char* o;
|
||||
int c;
|
||||
|
||||
o = t;
|
||||
if ((t -= 5) <= path) t = path + 1;
|
||||
c = *t;
|
||||
*t = 0;
|
||||
if (x = pathnext(phys, s - (*s != 0), &visits))
|
||||
{
|
||||
r = path;
|
||||
if (t == r + 1) x = r;
|
||||
v = s = t = x;
|
||||
}
|
||||
else
|
||||
{
|
||||
*t = c;
|
||||
t = o;
|
||||
}
|
||||
}
|
||||
#else
|
||||
r = t;
|
||||
#endif
|
||||
break;
|
||||
default:
|
||||
if ((flags & PATH_PHYSICAL) && loop < 32 && (t - 1) > path)
|
||||
|
|
|
|||
|
|
@ -31,25 +31,12 @@
|
|||
|
||||
#include <ast.h>
|
||||
|
||||
/*
|
||||
* building 3d flirts with the dark side
|
||||
*/
|
||||
|
||||
#if _BLD_3d
|
||||
|
||||
#undef pathcat
|
||||
#define pathcat_20100601 _3d_pathcat
|
||||
|
||||
#else
|
||||
|
||||
char*
|
||||
pathcat(char* path, const char* dirs, int sep, const char* a, const char* b)
|
||||
{
|
||||
return pathcat_20100601(dirs, sep, a, b, path, PATH_MAX);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#undef _AST_API
|
||||
|
||||
#include <ast_api.h>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
|
||||
#include <ast.h>
|
||||
#include <ctype.h>
|
||||
#include <fs3d.h>
|
||||
#include <preroot.h>
|
||||
#include <ls.h>
|
||||
|
||||
|
|
@ -105,13 +104,6 @@ pathkey_20100601(const char* lang, const char* tool, const char* apath, char* ke
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* 3D
|
||||
*/
|
||||
|
||||
if (!flags && fs3d(FS3D_TEST) && (c = mount(path, tmp, FS3D_GET|FS3D_ALL|FS3D_SIZE(PATH_MAX), NiL)) > 1 && c < PATH_MAX)
|
||||
path = tmp;
|
||||
|
||||
/*
|
||||
* preroot
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue