diff options
| author | peter <peter@FreeBSD.org> | 1998-01-26 03:09:57 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-01-26 03:09:57 +0000 |
| commit | 6389db38d7b06e7b98156d32743e434ff54d16bf (patch) | |
| tree | 89329fdee7ed645ba832211843b2a06ec770876f /contrib/cvs/src/expand_path.c | |
| parent | 7af9f5342ee4b2cb50ef6a8bef0772c31efddf7b (diff) | |
| parent | e6e45661e44f15cb8c5c6f063080509bd910b98d (diff) | |
| download | FreeBSD-src-6389db38d7b06e7b98156d32743e434ff54d16bf.zip FreeBSD-src-6389db38d7b06e7b98156d32743e434ff54d16bf.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r32785,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/cvs/src/expand_path.c')
| -rw-r--r-- | contrib/cvs/src/expand_path.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/contrib/cvs/src/expand_path.c b/contrib/cvs/src/expand_path.c index 7d0bc39..5cf414e 100644 --- a/contrib/cvs/src/expand_path.c +++ b/contrib/cvs/src/expand_path.c @@ -184,6 +184,19 @@ expand_path (name, file, line) t = get_homedir (); else { +#ifdef GETPWNAM_MISSING + for (; *p!='/' && *p; p++) + ; + *p = 0; + if (line != 0) + error (0, 0, + "%s:%d:tilde expansion not supported on this system", + file, line); + else + error (0, 0, "%s:tilde expansion not supported on this system", + file); + return NULL; +#else struct passwd *ps; for (; *p!='/' && *p; p++) ; @@ -199,6 +212,7 @@ expand_path (name, file, line) return NULL; } t = ps->pw_dir; +#endif } doff = d - buf; expand_string (&buf, &buf_size, doff + 1); @@ -256,8 +270,11 @@ expand_variable (name, file, line) { if (strcmp (name, CVSROOT_ENV) == 0) return CVSroot_original; - else if (strcmp (name, RCSBIN_ENV) == 0) - return Rcsbin; + else if (strcmp (name, "RCSBIN") == 0) + { + error (0, 0, "RCSBIN internal variable is no longer supported"); + return NULL; + } else if (strcmp (name, EDITOR1_ENV) == 0) return Editor; else if (strcmp (name, EDITOR2_ENV) == 0) |
