Deleted Added
full compact
mount_unionfs.c (146853) mount_unionfs.c (147242)
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

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

36 The Regents of the University of California. All rights reserved.\n";
37#endif /* not lint */
38
39#ifndef lint
40#if 0
41static char sccsid[] = "@(#)mount_union.c 8.5 (Berkeley) 3/27/94";
42#else
43static 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

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

36 The Regents of the University of California. All rights reserved.\n";
37#endif /* not lint */
38
39#ifndef lint
40#if 0
41static char sccsid[] = "@(#)mount_union.c 8.5 (Berkeley) 3/27/94";
42#else
43static const char rcsid[] =
44 "$FreeBSD: head/sbin/mount_unionfs/mount_unionfs.c 146853 2005-06-01 09:39:36Z delphij $";
44 "$FreeBSD: head/sbin/mount_unionfs/mount_unionfs.c 147242 2005-06-10 09:51:43Z delphij $";
45#endif
46#endif /* not lint */
47
48#include <sys/param.h>
49#include <sys/mount.h>
50#include <sys/uio.h>
51
52#include <err.h>
53#include <stdio.h>
54#include <stdlib.h>
55#include <string.h>
56#include <sysexits.h>
57#include <unistd.h>
58
59#include "mntopts.h"
60
61static struct mntopt mopts[] = {
62 MOPT_STDOPTS,
45#endif
46#endif /* not lint */
47
48#include <sys/param.h>
49#include <sys/mount.h>
50#include <sys/uio.h>
51
52#include <err.h>
53#include <stdio.h>
54#include <stdlib.h>
55#include <string.h>
56#include <sysexits.h>
57#include <unistd.h>
58
59#include "mntopts.h"
60
61static struct mntopt mopts[] = {
62 MOPT_STDOPTS,
63 MOPT_NULL
63 MOPT_END
64};
65
66static int subdir(const char *, const char *);
67static void usage (void) __dead2;
68
69int
70main(argc, argv)
71 int argc;

--- 89 unchanged lines hidden ---
64};
65
66static int subdir(const char *, const char *);
67static void usage (void) __dead2;
68
69int
70main(argc, argv)
71 int argc;

--- 89 unchanged lines hidden ---