Deleted Added
full compact
mount.c (96707) mount.c (101205)
1/*-
2 * Copyright (c) 1980, 1989, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 28 unchanged lines hidden (view full) ---

37 The Regents of the University of California. All rights reserved.\n";
38#endif /* not lint */
39
40#ifndef lint
41#if 0
42static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95";
43#endif
44static const char rcsid[] =
1/*-
2 * Copyright (c) 1980, 1989, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 28 unchanged lines hidden (view full) ---

37 The Regents of the University of California. All rights reserved.\n";
38#endif /* not lint */
39
40#ifndef lint
41#if 0
42static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95";
43#endif
44static const char rcsid[] =
45 "$FreeBSD: head/sbin/mount/mount.c 96707 2002-05-16 04:10:46Z trhodes $";
45 "$FreeBSD: head/sbin/mount/mount.c 101205 2002-08-02 07:02:51Z rwatson $";
46#endif /* not lint */
47
48#include <sys/param.h>
49#include <sys/mount.h>
50#include <sys/stat.h>
51#include <sys/wait.h>
52
53#include <ctype.h>

--- 48 unchanged lines hidden (view full) ---

102 { MNT_QUOTA, "with quotas" },
103 { MNT_RDONLY, "read-only" },
104 { MNT_SYNCHRONOUS, "synchronous" },
105 { MNT_UNION, "union" },
106 { MNT_NOCLUSTERR, "noclusterr" },
107 { MNT_NOCLUSTERW, "noclusterw" },
108 { MNT_SUIDDIR, "suiddir" },
109 { MNT_SOFTDEP, "soft-updates" },
46#endif /* not lint */
47
48#include <sys/param.h>
49#include <sys/mount.h>
50#include <sys/stat.h>
51#include <sys/wait.h>
52
53#include <ctype.h>

--- 48 unchanged lines hidden (view full) ---

102 { MNT_QUOTA, "with quotas" },
103 { MNT_RDONLY, "read-only" },
104 { MNT_SYNCHRONOUS, "synchronous" },
105 { MNT_UNION, "union" },
106 { MNT_NOCLUSTERR, "noclusterr" },
107 { MNT_NOCLUSTERW, "noclusterw" },
108 { MNT_SUIDDIR, "suiddir" },
109 { MNT_SOFTDEP, "soft-updates" },
110 { MNT_MULTILABEL, "multilabel" },
110 { 0, NULL }
111};
112
113/*
114 * List of VFS types that can be remounted without becoming mounted on top
115 * of each other.
116 * XXX Is this list correct?
117 */

--- 639 unchanged lines hidden (view full) ---

757 if (flags & MNT_NODEV) res = catopt(res, "nodev");
758 if (flags & MNT_UNION) res = catopt(res, "union");
759 if (flags & MNT_ASYNC) res = catopt(res, "async");
760 if (flags & MNT_NOATIME) res = catopt(res, "noatime");
761 if (flags & MNT_NOCLUSTERR) res = catopt(res, "noclusterr");
762 if (flags & MNT_NOCLUSTERW) res = catopt(res, "noclusterw");
763 if (flags & MNT_NOSYMFOLLOW) res = catopt(res, "nosymfollow");
764 if (flags & MNT_SUIDDIR) res = catopt(res, "suiddir");
111 { 0, NULL }
112};
113
114/*
115 * List of VFS types that can be remounted without becoming mounted on top
116 * of each other.
117 * XXX Is this list correct?
118 */

--- 639 unchanged lines hidden (view full) ---

758 if (flags & MNT_NODEV) res = catopt(res, "nodev");
759 if (flags & MNT_UNION) res = catopt(res, "union");
760 if (flags & MNT_ASYNC) res = catopt(res, "async");
761 if (flags & MNT_NOATIME) res = catopt(res, "noatime");
762 if (flags & MNT_NOCLUSTERR) res = catopt(res, "noclusterr");
763 if (flags & MNT_NOCLUSTERW) res = catopt(res, "noclusterw");
764 if (flags & MNT_NOSYMFOLLOW) res = catopt(res, "nosymfollow");
765 if (flags & MNT_SUIDDIR) res = catopt(res, "suiddir");
766 if (flags & MNT_MULTILABEL) res = catopt(res, "multilabel");
765
766 return res;
767}
767
768 return res;
769}