Deleted Added
full compact
mount_unionfs.c (77133) mount_unionfs.c (92882)
1/*
2 * Copyright (c) 1992, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software donated to Berkeley by
6 * Jan-Simon Pendry.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

40 The Regents of the University of California. All rights reserved.\n";
41#endif /* not lint */
42
43#ifndef lint
44#if 0
45static char sccsid[] = "@(#)mount_union.c 8.5 (Berkeley) 3/27/94";
46#else
47static const char rcsid[] =
1/*
2 * Copyright (c) 1992, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software donated to Berkeley by
6 * Jan-Simon Pendry.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

40 The Regents of the University of California. All rights reserved.\n";
41#endif /* not lint */
42
43#ifndef lint
44#if 0
45static char sccsid[] = "@(#)mount_union.c 8.5 (Berkeley) 3/27/94";
46#else
47static const char rcsid[] =
48 "$FreeBSD: head/sbin/mount_unionfs/mount_unionfs.c 77133 2001-05-24 15:20:11Z ru $";
48 "$FreeBSD: head/sbin/mount_unionfs/mount_unionfs.c 92882 2002-03-21 13:14:21Z imp $";
49#endif
50#endif /* not lint */
51
52#include <sys/param.h>
53#include <sys/mount.h>
54
55#include <fs/unionfs/union.h>
56

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

63
64#include "mntopts.h"
65
66static struct mntopt mopts[] = {
67 MOPT_STDOPTS,
68 { NULL }
69};
70
49#endif
50#endif /* not lint */
51
52#include <sys/param.h>
53#include <sys/mount.h>
54
55#include <fs/unionfs/union.h>
56

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

63
64#include "mntopts.h"
65
66static struct mntopt mopts[] = {
67 MOPT_STDOPTS,
68 { NULL }
69};
70
71static int subdir __P((const char *, const char *));
72static void usage __P((void)) __dead2;
71static int subdir(const char *, const char *);
72static void usage (void) __dead2;
73
74int
75main(argc, argv)
76 int argc;
77 char *argv[];
78{
79 struct union_args args;
80 int ch, mntflags;

--- 80 unchanged lines hidden ---
73
74int
75main(argc, argv)
76 int argc;
77 char *argv[];
78{
79 struct union_args args;
80 int ch, mntflags;

--- 80 unchanged lines hidden ---