BSD 4_3_Net_2 release

[unix-history] / usr / src / sbin / umount / umount.c

diff --git a/usr/src/sbin/umount/umount.c b/usr/src/sbin/umount/umount.c
index 514b22f..750cb43 100644 (file)
--- a/usr/src/sbin/umount/umount.c
+++ b/usr/src/sbin/umount/umount.c
@@ -2,19 +2,33 @@
  * Copyright (c) 1980, 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1980, 1989 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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


@@ -24,7 +38,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)umount.c   5.14 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)umount.c   5.16 (Berkeley) 6/3/91";

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


@@ -167,16 +181,15 @@ allocfsent(fs)
 {
        register struct fstab *new;
        register char *cp;
 {
        register struct fstab *new;
        register char *cp;

-       char *malloc();

 
        new = (struct fstab *)malloc((unsigned)sizeof (*fs));
 
        new = (struct fstab *)malloc((unsigned)sizeof (*fs));

-       cp = malloc((unsigned)strlen(fs->fs_file) + 1);
+       cp = (char *)malloc((unsigned)strlen(fs->fs_file) + 1);

        strcpy(cp, fs->fs_file);
        new->fs_file = cp;
        strcpy(cp, fs->fs_file);
        new->fs_file = cp;

-       cp = malloc((unsigned)strlen(fs->fs_type) + 1);
+       cp = (char *)malloc((unsigned)strlen(fs->fs_type) + 1);

        strcpy(cp, fs->fs_type);
        new->fs_type = cp;
        strcpy(cp, fs->fs_type);
        new->fs_type = cp;

-       cp = malloc((unsigned)strlen(fs->fs_spec) + 1);
+       cp = (char *)malloc((unsigned)strlen(fs->fs_spec) + 1);

        strcpy(cp, fs->fs_spec);
        new->fs_spec = cp;
        new->fs_passno = fs->fs_passno;
        strcpy(cp, fs->fs_spec);
        new->fs_spec = cp;
        new->fs_passno = fs->fs_passno;


@@ -215,15 +228,23 @@ umountfs(name, typelist)
 #endif /* NFS */
 
        if (stat(name, &stbuf) < 0) {
 #endif /* NFS */
 
        if (stat(name, &stbuf) < 0) {

-               if ((mntpt = getmntname(name, MNTON, &type)) == 0)
+               if (getmntname(name, MNTFROM, &type) != 0)
+                       mntpt = name;
+               else if ((mntpt = getmntname(name, MNTON, &type)) == 0) {
+                       fprintf(stderr, "%s: not currently mounted\n", name);

                        return (0);
                        return (0);

+               }

        } else if ((stbuf.st_mode & S_IFMT) == S_IFBLK) {
        } else if ((stbuf.st_mode & S_IFMT) == S_IFBLK) {

-               if ((mntpt = getmntname(name, MNTON, &type)) == 0)
+               if ((mntpt = getmntname(name, MNTON, &type)) == 0) {
+                       fprintf(stderr, "%s: not currently mounted\n", name);

                        return (0);
                        return (0);

+               }

        } else if ((stbuf.st_mode & S_IFMT) == S_IFDIR) {
                mntpt = name;
        } else if ((stbuf.st_mode & S_IFMT) == S_IFDIR) {
                mntpt = name;

-               if ((name = getmntname(mntpt, MNTFROM, &type)) == 0)
+               if (getmntname(mntpt, MNTFROM, &type) == 0) {
+                       fprintf(stderr, "%s: not currently mounted\n", name);

                        return (0);
                        return (0);

+               }

        } else {
                fprintf(stderr, "%s: not a directory or special device\n",
                        name);
        } else {
                fprintf(stderr, "%s: not a directory or special device\n",
                        name);


@@ -310,7 +331,6 @@ getmntname(name, what, type)
                        return (mntbuf[i].f_mntfromname);
                }
        }
                        return (mntbuf[i].f_mntfromname);
                }
        }

-       fprintf(stderr, "%s: not currently mounted\n", name);

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


@@ -336,7 +356,6 @@ maketypelist(fslist)
 {
        register char *nextcp;
        register int *av, i;
 {
        register char *nextcp;
        register int *av, i;

-       char *malloc();

 
        if (fslist == NULL)
                return(NULL);
 
        if (fslist == NULL)
                return(NULL);