Deleted Added
sdiff udiff text old ( 77577 ) new ( 92882 )
full compact
mount.c (77577) mount.c (92882)
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 77577 2001-06-01 10:57:26Z ru $";
45 "$FreeBSD: head/sbin/mount/mount.c 92882 2002-03-21 13:14:21Z imp $";
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 <err.h>

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

65#include "pathnames.h"
66
67/* `meta' options */
68#define MOUNT_META_OPTION_FSTAB "fstab"
69#define MOUNT_META_OPTION_CURRENT "current"
70
71int debug, fstab_style, verbose;
72
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 <err.h>

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

65#include "pathnames.h"
66
67/* `meta' options */
68#define MOUNT_META_OPTION_FSTAB "fstab"
69#define MOUNT_META_OPTION_CURRENT "current"
70
71int debug, fstab_style, verbose;
72
73char *catopt __P((char *, const char *));
74struct statfs
75 *getmntpt __P((const char *));
76int hasopt __P((const char *, const char *));
77int ismounted __P((struct fstab *, struct statfs *, int));
78int isremountable __P((const char *));
79void mangle __P((char *, int *, const char **));
80char *update_options __P((char *, char *, int));
81int mountfs __P((const char *, const char *, const char *,
82 int, const char *, const char *));
83void remopt __P((char *, const char *));
84void prmount __P((struct statfs *));
85void putfsent __P((const struct statfs *));
86void usage __P((void));
87char *flags2opts __P((int));
73char *catopt(char *, const char *);
74struct statfs *getmntpt(const char *);
75int hasopt(const char *, const char *);
76int ismounted(struct fstab *, struct statfs *, int);
77int isremountable(const char *);
78void mangle(char *, int *, const char **);
79char *update_options(char *, char *, int);
80int mountfs(const char *, const char *, const char *,
81 int, const char *, const char *);
82void remopt(char *, const char *);
83void prmount(struct statfs *);
84void putfsent(const struct statfs *);
85void usage(void);
86char *flags2opts(int);
88
89/* Map from mount options to printable formats. */
90static struct opt {
91 int o_opt;
92 const char *o_name;
93} optnames[] = {
94 { MNT_ASYNC, "asynchronous" },
95 { MNT_EXPORTED, "NFS exported" },

--- 656 unchanged lines hidden --- 		87
88/* Map from mount options to printable formats. */
89static struct opt {
90 int o_opt;
91 const char *o_name;
92} optnames[] = {
93 { MNT_ASYNC, "asynchronous" },
94 { MNT_EXPORTED, "NFS exported" },

--- 656 unchanged lines hidden ---