BSD 4_3_Net_2 release

[unix-history] / usr / src / bin / ln / ln.c

diff --git a/usr/src/bin/ln/ln.c b/usr/src/bin/ln/ln.c
index 792ef13..c421fe0 100644 (file)
--- a/usr/src/bin/ln/ln.c
+++ b/usr/src/bin/ln/ln.c
@@ -2,7 +2,33 @@
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -12,31 +38,35 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)ln.c       4.12 (Berkeley) %G%";
+static char sccsid[] = "@(#)ln.c       4.15 (Berkeley) 2/24/91";

 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <errno.h>
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <errno.h>

+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>

 
 

-static int     fflag,                          /* undocumented force flag */
+static int     dirflag,                        /* undocumented force flag */

                sflag,                          /* symbolic, not hard, link */
                (*linkf)();                     /* system link call */
                sflag,                          /* symbolic, not hard, link */
                (*linkf)();                     /* system link call */

+static linkit(), usage();

 
 main(argc, argv)
 
 main(argc, argv)

-       int     argc;
-       char    **argv;
+       int argc;
+       char **argv;

 {
 {

-       extern int      optind;
-       struct stat     buf;
-       int     ch, exitval, link(), symlink();
-       char    *sourcedir;
+       extern int optind;
+       struct stat buf;
+       int ch, exitval, link(), symlink();
+       char *sourcedir;

 
 

-       while ((ch = getopt(argc, argv, "fs")) != EOF)
+       while ((ch = getopt(argc, argv, "Fs")) != EOF)

                switch((char)ch) {
                switch((char)ch) {

-               case 'f':
-                       fflag = 1;
+               case 'F':
+                       dirflag = 1;

                        break;
                case 's':
                        sflag = 1;
                        break;
                case 's':
                        sflag = 1;


@@ -61,37 +91,37 @@ main(argc, argv)
        default:                        /* ln target1 target2 directory */
                sourcedir = argv[argc - 1];
                if (stat(sourcedir, &buf)) {
        default:                        /* ln target1 target2 directory */
                sourcedir = argv[argc - 1];
                if (stat(sourcedir, &buf)) {

-                       perror(sourcedir);
+                       (void)fprintf(stderr,
+                           "ln: %s: %s\n", sourcedir, strerror(errno));

                        exit(1);
                }
                        exit(1);
                }

-               if ((buf.st_mode & S_IFMT) != S_IFDIR)
+               if (!S_ISDIR(buf.st_mode))

                        usage();
                for (exitval = 0; *argv != sourcedir; ++argv)
                        exitval |= linkit(*argv, sourcedir, 1);
                exit(exitval);
        }
                        usage();
                for (exitval = 0; *argv != sourcedir; ++argv)
                        exitval |= linkit(*argv, sourcedir, 1);
                exit(exitval);
        }

-       /*NOTREACHED*/
+       /* NOTREACHED */

 }
 
 static
 linkit(target, source, isdir)
 }
 
 static
 linkit(target, source, isdir)

-       char    *target, *source;
-       int     isdir;
+       char *target, *source;
+       int isdir;

 {
 {

-       extern int      errno;
-       struct stat     buf;
-       char    path[MAXPATHLEN],
-               *cp, *rindex(), *strcpy();
+       struct stat buf;
+       char path[MAXPATHLEN], *cp;

 
        if (!sflag) {
                /* if target doesn't exist, quit now */
                if (stat(target, &buf)) {
 
        if (!sflag) {
                /* if target doesn't exist, quit now */
                if (stat(target, &buf)) {

-                       perror(target);
+                       (void)fprintf(stderr,
+                           "ln: %s: %s\n", target, strerror(errno));

                        return(1);
                }
                        return(1);
                }

-               /* only symbolic links to directories, unless -f option used */
-               if (!fflag && (buf.st_mode & S_IFMT) == S_IFDIR) {
-                       printf("%s is a directory.\n", target);
+               /* only symbolic links to directories, unless -F option used */
+               if (!dirflag && (buf.st_mode & S_IFMT) == S_IFDIR) {
+                       (void)printf("ln: %s is a directory.\n", target);

                        return(1);
                }
        }
                        return(1);
                }
        }


@@ -107,7 +137,7 @@ linkit(target, source, isdir)
        }
 
        if ((*linkf)(target, source)) {
        }
 
        if ((*linkf)(target, source)) {

-               perror(source);
+               (void)fprintf(stderr, "ln: %s: %s\n", source, strerror(errno));

                return(1);
        }
        return(0);
                return(1);
        }
        return(0);


@@ -116,6 +146,7 @@ linkit(target, source, isdir)
 static
 usage()
 {
 static
 usage()
 {

-       fputs("usage:\tln [-s] targetname [sourcename]\n\tln [-s] targetname1 targetname2 [... targetnameN] sourcedirectory\n", stderr);
+       (void)fprintf(stderr,
+           "usage:\tln [-s] file1 file2\n\tln [-s] file ... directory\n");

        exit(1);
 }
        exit(1);
 }