Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct bogons and omissions in previous change. 

Also, remove the `-F' option, which was undocumented and is no longer useful.
This commit is contained in:
mycroft 1997-05-16 14:44:01 +00:00
parent e5b01aa2f2
commit 8da4c69623
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/ln/ln.1
View File

@ -1,4 +1,4 @@
.\" $NetBSD: ln.1,v 1.11 1997/05/16 02:59:38 jtk Exp $
.\" $NetBSD: ln.1,v 1.12 1997/05/16 14:44:01 mycroft Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@ -44,11 +44,11 @@
.Nd make links
.Sh SYNOPSIS
.Nm ln
.Op Fl fs
.Op Fl fhns
.Ar source_file
.Op target_file
.Nm ln
.Op Fl fs
.Op Fl fhns
.Ar source_file ...
.Op target_dir
.Sh DESCRIPTION
@ -71,14 +71,22 @@ The options are as follows:
.Bl -tag -width flag
.It Fl f
Unlink any already existing file, permitting the link to occur.
.It Fl s
Create a symbolic link.
.It Fl h
If the
.Ar target_file
or
.Ar target_dir
is a symbolic link, do not follow it.
is a symbolic link, do not follow it. This is most useful with the
.Fl f
option, to replace a symlink which may point to a directory.
.It Fl n
Same as
.Fl h ,
for compatibility with other
.Nm
implementations.
.It Fl s
Create a symbolic link.
.El
.Pp
By default

33
bin/ln/ln.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ln.c,v 1.11 1997/05/16 02:59:39 jtk Exp $ */
/* $NetBSD: ln.c,v 1.12 1997/05/16 14:44:02 mycroft Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@ -43,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94";
#else
static char rcsid[] = "$NetBSD: ln.c,v 1.11 1997/05/16 02:59:39 jtk Exp $";
static char rcsid[] = "$NetBSD: ln.c,v 1.12 1997/05/16 14:44:02 mycroft Exp $";
#endif
#endif /* not lint */
@ -57,9 +57,8 @@ static char rcsid[] = "$NetBSD: ln.c,v 1.11 1997/05/16 02:59:39 jtk Exp $";
#include <string.h>
#include <unistd.h>
int dirflag; /* Undocumented directory flag. */
int fflag; /* Unlink existing files. */
int lflag; /* Check new name for symlink first. */
int hflag; /* Check new name for symlink first. */
int sflag; /* Symbolic, not hard, link. */
/* System link call. */
int (*linkf) __P((const char *, const char *));
@ -76,21 +75,18 @@ main(argc, argv)
int ch, exitval;
char *sourcedir;
while ((ch = getopt(argc, argv, "hnFfs")) != -1)
while ((ch = getopt(argc, argv, "fhns")) != -1)
switch (ch) {
case 'F':
dirflag = 1; /* XXX: deliberately undocumented. */
break;
case 'f':
fflag = 1;
break;
case 'h':
case 'n':
hflag = 1;
break;
case 's':
sflag = 1;
break;
case 'h':
case 'n': /* GNU compat; undocumented */
lflag = 1;
break;
case '?':
default:
usage();
@ -111,7 +107,7 @@ main(argc, argv)
}
/* ln target1 target2 directory */
sourcedir = argv[argc - 1];
if (lflag && lstat(sourcedir, &sb) == 0 && S_ISLNK(sb.st_mode)) {
if (hflag && lstat(sourcedir, &sb) == 0 && S_ISLNK(sb.st_mode)) {
/* we were asked not to follow symlinks, but found one at
the target--simulate "not a directory" error */
errno = ENOTDIR;
@ -140,18 +136,13 @@ linkit(target, source, isdir)
warn("%s", target);
return (1);
}
/* Only symbolic links to directories, unless -F option used. */
if (!dirflag && S_ISDIR(sb.st_mode)) {
warnx("%s: is a directory", target);
return (1);
}
}
/* If the source is a directory (and not a symlink if lflag),
/* If the source is a directory (and not a symlink if hflag),
append the target's name. */
if (isdir ||
!lstat(source, &sb) && S_ISDIR(sb.st_mode) ||
!lflag && !stat(source, &sb) && S_ISDIR(sb.st_mode)) {
!hflag && !stat(source, &sb) && S_ISDIR(sb.st_mode)) {
if ((p = strrchr(target, '/')) == NULL)
p = target;
else
@ -178,6 +169,6 @@ usage()
{
(void)fprintf(stderr,
"usage:\tln [-fsh] file1 file2\n\tln [-fsh] file ... directory\n");
"usage:\tln [-fhns] file1 file2\n\tln [-fhns] file ... directory\n");
exit(1);
}