BSD 4_4_Lite1 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 db310d0..b39e710 100644 (file)
--- a/usr/src/bin/ln/ln.c
+++ b/usr/src/bin/ln/ln.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1987, 1993
+ * Copyright (c) 1987, 1993, 1994

  *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -33,12 +33,12 @@
 
 #ifndef lint
 static char copyright[] =
 
 #ifndef lint
 static char copyright[] =

-"@(#) Copyright (c) 1987, 1993\n\
+"@(#) Copyright (c) 1987, 1993, 1994\n\

        The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
        The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)ln.c       8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)ln.c       8.2 (Berkeley) 3/31/94";

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


@@ -51,13 +51,14 @@ static char sccsid[] = "@(#)ln.c    8.1 (Berkeley) 5/31/93";
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 

-int    dirflag,                        /* Undocumented force flag. */
-       sflag,                          /* Symbolic, not hard, link. */
+int    dirflag;                        /* Undocumented directory flag. */
+int    fflag;                          /* Unlink existing files. */
+int    sflag;                          /* Symbolic, not hard, link. */

                                        /* System link call. */
                                        /* System link call. */

-       (*linkf) __P((const char *, const char *));
+int (*linkf) __P((const char *, const char *));

 
 

-static int     linkit __P((char *, char *, int));
-static void    usage __P((void));
+int    linkit __P((char *, char *, int));
+void   usage __P((void));

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


@@ -69,10 +70,13 @@ main(argc, argv)
        int ch, exitval;
        char *sourcedir;
 
        int ch, exitval;
        char *sourcedir;
 

-       while ((ch = getopt(argc, argv, "Fs")) != EOF)
-               switch((char)ch) {
+       while ((ch = getopt(argc, argv, "Ffs")) != EOF)
+               switch (ch) {

                case 'F':
                case 'F':

-                       dirflag = 1;
+                       dirflag = 1;    /* XXX: deliberately undocumented. */
+                       break;
+               case 'f':
+                       fflag = 1;

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


@@ -106,48 +110,55 @@ main(argc, argv)
        exit(exitval);
 }
 
        exit(exitval);
 }
 

-static int
+int

 linkit(target, source, isdir)
        char *target, *source;
        int isdir;
 {
        struct stat sb;
 linkit(target, source, isdir)
        char *target, *source;
        int isdir;
 {
        struct stat sb;

-       char path[MAXPATHLEN], *p;
+       int exists;
+       char *p, path[MAXPATHLEN];

 
        if (!sflag) {
 
        if (!sflag) {

-               /* if target doesn't exist, quit now */
+               /* If target doesn't exist, quit now. */

                if (stat(target, &sb)) {
                        warn("%s", target);
                        return (1);
                }
                if (stat(target, &sb)) {
                        warn("%s", target);
                        return (1);
                }

-               /* only symbolic links to directories, unless -F option used */
+               /* Only symbolic links to directories, unless -F option used. */

                if (!dirflag && (sb.st_mode & S_IFMT) == S_IFDIR) {
                        warnx("%s: is a directory", target);
                        return (1);
                }
        }
 
                if (!dirflag && (sb.st_mode & S_IFMT) == S_IFDIR) {
                        warnx("%s: is a directory", target);
                        return (1);
                }
        }
 

-       /* if the source is a directory, append the target's name */
-       if (isdir || !stat(source, &sb) && (sb.st_mode & S_IFMT) == S_IFDIR) {
-               if (!(p = strrchr(target, '/')))
+       /* If the source is a directory, append the target's name. */
+       if (isdir || (exists = !stat(source, &sb)) && S_ISDIR(sb.st_mode)) {
+               if ((p = strrchr(target, '/')) == NULL)

                        p = target;
                else
                        ++p;
                (void)snprintf(path, sizeof(path), "%s/%s", source, p);
                source = path;
                        p = target;
                else
                        ++p;
                (void)snprintf(path, sizeof(path), "%s/%s", source, p);
                source = path;

-       }
-
-       if ((*linkf)(target, source)) {
+               exists = !stat(source, &sb);
+       } else
+               exists = !stat(source, &sb);
+
+       /*
+        * If the file exists, and -f was specified, unlink it.
+        * Attempt the link.
+        */
+       if (fflag && exists && unlink(source) || (*linkf)(target, source)) {

                warn("%s", source);
                return (1);
        }
        return (0);
 }
 
                warn("%s", source);
                return (1);
        }
        return (0);
 }
 

-static void
+void

 usage()
 {
        (void)fprintf(stderr,
 usage()
 {
        (void)fprintf(stderr,

-           "usage:\tln [-s] file1 file2\n\tln [-s] file ... directory\n");
+           "usage:\tln [-fs] file1 file2\n\tln [-fs] file ... directory\n");

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